Merge pull request #4 from SOFTNETWORK-APP/feature/coverage

Feature/coverage

Author: fupelaqu

api/build.sbt

@@ -1,7 +1,7 @@
 import app.softnetwork.sbt.build._
 import com.typesafe.sbt.packager.docker._
 
-Compile / mainClass := Some("app.softnetwork.notification.api.NotificationPostgresLauncher")
+Compile / mainClass := Some("app.softnetwork.notification.api.AllNotificationsPostgresLauncher")
 
 dockerBaseImage := "openjdk:8"
 

api/src/main/scala/app/softnetwork/notification/api/NotificationApi.scala renamed to api/src/main/scala/app/softnetwork/notification/api/AllNotificationsApi.scala

@@ -1,8 +1,7 @@
 package app.softnetwork.notification.api
 
 import akka.actor.typed.ActorSystem
-import akka.http.scaladsl.model.{HttpRequest, HttpResponse}
-import app.softnetwork.notification.handlers.NotificationHandler
+import app.softnetwork.notification.handlers.AllNotificationsHandler
 import app.softnetwork.notification.launch.NotificationApplication
 import app.softnetwork.notification.model.Notification
 import app.softnetwork.notification.persistence.query.{
@@ -16,19 +15,17 @@ import app.softnetwork.notification.persistence.typed.{
 import app.softnetwork.persistence.jdbc.query.{JdbcJournalProvider, JdbcSchema, JdbcSchemaProvider}
 import app.softnetwork.scheduler.api.SchedulerApi
 
-import scala.concurrent.Future
+trait AllNotificationsApi extends SchedulerApi with NotificationApplication[Notification] {
 
-trait NotificationApi extends SchedulerApi with NotificationApplication {
-
-  override def notificationBehavior: ActorSystem[_] => Option[NotificationBehavior[Notification]] =
-    _ => Some(AllNotificationsBehavior)
+  override def notificationBehaviors: ActorSystem[_] => Seq[NotificationBehavior[Notification]] =
+    _ => Seq(AllNotificationsBehavior)
 
   override def scheduler2NotificationProcessorStream
     : ActorSystem[_] => Option[Scheduler2NotificationProcessorStream] =
     sys =>
       Some(
         new Scheduler2NotificationProcessorStream()
-          with NotificationHandler
+          with AllNotificationsHandler
           with JdbcJournalProvider
           with JdbcSchemaProvider {
           override val tag = s"${AllNotificationsBehavior.persistenceId}-scheduler"
@@ -42,17 +39,17 @@ trait NotificationApi extends SchedulerApi with NotificationApplication {
     sys =>
       Some(
         new NotificationCommandProcessorStream
-          with NotificationHandler
+          with AllNotificationsHandler
           with JdbcJournalProvider
           with JdbcSchemaProvider {
           override lazy val schemaType: JdbcSchema.SchemaType = jdbcSchemaType
           override implicit def system: ActorSystem[_] = sys
         }
       )
 
-  override def grpcServices
-    : ActorSystem[_] => Seq[PartialFunction[HttpRequest, Future[HttpResponse]]] = system =>
-    Seq(
-      NotificationServiceApiHandler.partial(NotificationServer(system))(system)
-    )
+  /** initialize all notification servers
+    */
+  override def notificationServers: ActorSystem[_] => Seq[NotificationServer] = sys =>
+    Seq(AllNotificationsServer(sys))
+
 }

api/src/main/scala/app/softnetwork/notification/api/NotificationPostgresLauncher.scala renamed to api/src/main/scala/app/softnetwork/notification/api/AllNotificationsPostgresLauncher.scala

@@ -2,4 +2,4 @@ package app.softnetwork.notification.api
 
 import app.softnetwork.persistence.jdbc.query.PostgresSchemaProvider
 
-object NotificationPostgresLauncher extends NotificationApi with PostgresSchemaProvider
+object AllNotificationsPostgresLauncher extends AllNotificationsApi with PostgresSchemaProvider

build.sbt

@@ -31,7 +31,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "notification"
 
-ThisBuild / version := "0.1.2"
+ThisBuild / version := "0.1-SNAPSHOT"
 
 ThisBuild / scalaVersion := "2.12.15"
 

common/build.sbt

@@ -16,7 +16,7 @@ libraryDependencies ++= Seq(
   "com.google.auth" % "google-auth-library-oauth2-http" % "0.20.0" excludeAll guavaExclusion,
   "io.opencensus" % "opencensus-contrib-http-util" % "0.24.0" excludeAll(guavaExclusion, ExclusionRule(organization = "io.grpc", name="grpc-context")),
   "com.google.firebase" % "firebase-admin" % "7.1.0" excludeAll(ExclusionRule(organization = "io.opencensus", name="opencensus-contrib-http-util"), ExclusionRule(organization = "com.google.auth", name = "google-auth-library-oauth2-http")/*, ExclusionRule(organization = "org.apache.commons", name = "commons-lang3")*/, ExclusionRule(organization = "io.netty")),
-  "com.eatthepath" % "pushy" % "0.14.2"
+  "com.eatthepath" % "pushy" % "0.15.1"
 )
 
 Compile / unmanagedResourceDirectories += baseDirectory.value / "src/main/protobuf"

common/src/main/protobuf/model/notifications.proto

@@ -38,6 +38,7 @@ message NotificationStatusResult {
     required string recipient = 1;
     required NotificationStatus status = 2;
     optional string error = 3;
+    optional string uuid = 4;
 }
 
 message NotificationAck {

common/src/main/resources/reference.conf

@@ -1,75 +1,7 @@
 notification {
   akka-node-role = notifications
-  mail {
-    host = "smtp.gmail.com"
-    host = ${?MAIL_HOST}
-    port = 465
-    port = ${?MAIL_PORT}
-    sslPort = 465
-    sslPort = ${?MAIL_SSL_PORT}
-    sslEnabled = true
-    sslEnabled = ${?MAIL_SSL_ENABLED}
-    sslCheckServerIdentity = false
-    sslCheckServerIdentity = ${?MAIL_CHECK_SERVER_IDENTITY}
-    startTLSEnabled = false
-    startTLSEnabled = ${?MAIL_START_TLS_ENABLED}
-    socketConnectionTimeout = 2000
-    socketTimeout = 2000
-
-    from = ${credentials.mail.username}
-    from = ${?NOTIFICATION_MAIL_FROM}
-    name = "nobody"
-    name = ${?NOTIFICATION_MAIL_NAME}
-    username = ${credentials.mail.username}
-    password = ${credentials.mail.password}
-  }
-
-  push {
-    apns {
-      topic = ""
-      topic = ${?NOTIFICATION_PUSH_APNS_TOPIC}
-
-      keystore {
-        path     = ""
-        path     = ${?NOTIFICATION_PUSH_APNS_KEYSTORE_PATH}
-        password = ""
-        password = ${?NOTIFICATION_PUSH_APNS_KEYSTORE_PASSWORD}
-      }
-
-      dry-run = false
-      dry-run = ${?NOTIFICATION_PUSH_APNS_DRY_RUN}
-    }
-
-    fcm {
-      databaseUrl        = ""
-      databaseUrl        = ${?NOTIFICATION_PUSH_FCM_DATABASE_URL}
-      google-credentials = ""
-      google-credentials = ${?GOOGLE_APPLICATION_CREDENTIALS}
-    }
-
-    apps = []
-
-  }
-
-  sms {
-    mode {
-      access-token = ""
-      access-token = ${?NOTIFICATION_SMS_MODE_ACCESS_TOKEN}
-      base-url = "https://api.smsmode.com/http"
-      version = "1.6"
-    }
-  }
 
   event-streams {
     external-to-notification-tag = "external-to-notification"
   }
 }
-
-credentials{
-  mail{
-    username = "nobody@gmail.com"
-    username = ${?CREDENTIALS_MAIL_USERNAME}
-    password = "changeit"
-    password = ${?CREDENTIALS_MAIL_PASSWORD}
-  }
-}

common/src/main/scala/app/softnetwork/notification/config/InternalConfig.scala

@@ -0,0 +1,11 @@
+package app.softnetwork.notification.config
+
+import com.typesafe.config.{Config, ConfigFactory}
+
+trait InternalConfig {
+  def config: Config
+}
+
+trait DefaultConfig extends InternalConfig {
+  lazy val config: Config = ConfigFactory.load()
+}

common/src/main/scala/app/softnetwork/notification/config/NotificationSettings.scala

@@ -1,15 +1,11 @@
 package app.softnetwork.notification.config
 
-import com.typesafe.config.{Config, ConfigFactory}
 import com.typesafe.scalalogging.StrictLogging
 import configs.Configs
 
-import scala.language.implicitConversions
-
-trait NotificationSettings extends StrictLogging {
-
-  lazy val config: Config = ConfigFactory.load()
+import scala.language.{implicitConversions, reflectiveCalls}
 
+trait NotificationSettings extends StrictLogging { _: InternalConfig =>
   lazy val NotificationConfig: NotificationConfig =
     Configs[NotificationConfig].get(config, "notification").toEither match {
       case Left(configError) =>
@@ -20,4 +16,4 @@ trait NotificationSettings extends StrictLogging {
 
 }
 
-object NotificationSettings extends NotificationSettings
+object NotificationSettings extends NotificationSettings with DefaultConfig

common/src/main/scala/app/softnetwork/notification/message/package.scala

@@ -3,6 +3,7 @@ package app.softnetwork.notification
 import app.softnetwork.persistence.message._
 import org.softnetwork.akka.model.Schedule
 import app.softnetwork.notification.model.Notification
+import org.softnetwork.notification.model.NotificationStatusResult
 
 /** Created by smanciot on 15/04/2020.
   */
@@ -44,13 +45,16 @@ package object message {
   case object NotificationRemoved extends NotificationCommandResult
 
   @SerialVersionUID(0L)
-  case class NotificationSent(uuid: String) extends NotificationCommandResult
+  case class NotificationSent(uuid: String, results: Seq[NotificationStatusResult])
+      extends NotificationCommandResult
 
   @SerialVersionUID(0L)
-  case class NotificationDelivered(uuid: String) extends NotificationCommandResult
+  case class NotificationDelivered(uuid: String, results: Seq[NotificationStatusResult])
+      extends NotificationCommandResult
 
   @SerialVersionUID(0L)
-  case class NotificationPending(uuid: String) extends NotificationCommandResult
+  case class NotificationPending(uuid: String, results: Seq[NotificationStatusResult])
+      extends NotificationCommandResult
 
   case class Schedule4NotificationTriggered(schedule: Schedule) extends NotificationCommandResult
 
@@ -60,11 +64,11 @@ package object message {
       with NotificationCommandResult
 
   @SerialVersionUID(0L)
-  case class NotificationUndelivered(uuid: String)
-      extends NotificationErrorMessage("NotificationNotDelivered")
+  case class NotificationUndelivered(uuid: String, results: Seq[NotificationStatusResult])
+      extends NotificationErrorMessage("NotificationUndelivered")
 
   @SerialVersionUID(0L)
-  case class NotificationRejected(uuid: String)
+  case class NotificationRejected(uuid: String, results: Seq[NotificationStatusResult])
       extends NotificationErrorMessage("NotificationRejected")
 
   case object NotificationNotFound extends NotificationErrorMessage("NotificationNotFound")