integrate generic scheduler api

Author: fupelaqu

api/build.sbt

@@ -29,5 +29,5 @@ name := "notification-api"
 
 libraryDependencies ++= Seq(
   "app.softnetwork.persistence" %% "persistence-jdbc" % Versions.genericPersistence,
-  "app.softnetwork.persistence" %% "persistence-scheduler-api" % Versions.genericPersistence
+  "app.softnetwork.scheduler" %% "scheduler-api" % Versions.scheduler
 )

api/src/universal/bin/entrypoint.sh

@@ -25,4 +25,4 @@ function clean() {
 
 export CLUSTER_IP=$(hostname -i | awk '{print $1}')
 
-/opt/docker/bin/persistence-notification-api -DCLUSTER_MANAGEMENT_HOST="$CLUSTER_IP"
+/opt/docker/bin/notification-api -DCLUSTER_MANAGEMENT_HOST="$CLUSTER_IP"

build.sbt

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

common/build.sbt

@@ -8,8 +8,8 @@ val guavaExclusion =  ExclusionRule(organization = "com.google.guava", name="gua
 
 libraryDependencies ++= Seq(
   "app.softnetwork.persistence" %% "persistence-kv" % Versions.genericPersistence,
-  "app.softnetwork.persistence" %% "persistence-scheduler" % Versions.genericPersistence,
-  "app.softnetwork.persistence" %% "persistence-scheduler" % Versions.genericPersistence % "protobuf",
+  "app.softnetwork.scheduler" %% "scheduler-common" % Versions.scheduler,
+  "app.softnetwork.scheduler" %% "scheduler-common" % Versions.scheduler % "protobuf",
   "app.softnetwork.api" %% "generic-server-api" % Versions.genericPersistence,
   "app.softnetwork.protobuf" %% "scalapb-extensions" % "0.1.5",
   "org.apache.commons" % "commons-email" % "1.5",

core/build.sbt

@@ -5,5 +5,6 @@ organization := "app.softnetwork.notification"
 name := "notification-core"
 
 libraryDependencies ++= Seq(
+  "app.softnetwork.scheduler" %% "scheduler-core" % Versions.scheduler,
   "app.softnetwork.persistence" %% "persistence-session" % Versions.genericPersistence
 )

core/src/main/scala/app/softnetwork/notification/launch/NotificationApplication.scala

@@ -6,6 +6,7 @@ import app.softnetwork.api.server.launch.HealthCheckApplication
 import app.softnetwork.notification.api.NotificationServiceApiHandler
 import app.softnetwork.notification.model.Notification
 import app.softnetwork.persistence.query.SchemaProvider
+import app.softnetwork.schedule.api.SchedulerServiceApiHandler
 
 import scala.concurrent.Future
 
@@ -15,5 +16,7 @@ trait NotificationApplication[T <: Notification]
   _: SchemaProvider =>
   override def grpcServices
     : ActorSystem[_] => Seq[PartialFunction[HttpRequest, Future[HttpResponse]]] = system =>
-    notificationServers(system).map(NotificationServiceApiHandler.partial(_)(system))
+    notificationServers(system).map(
+      NotificationServiceApiHandler.partial(_)(system)
+    ) :+ SchedulerServiceApiHandler.partial(schedulerServer(system))(system)
 }

core/src/main/scala/app/softnetwork/notification/persistence/typed/NotificationBehavior.scala

@@ -16,7 +16,7 @@ import app.softnetwork.notification.model._
 import app.softnetwork.notification.spi.NotificationProvider
 import org.softnetwork.notification.message._
 import org.softnetwork.notification.model._
-import app.softnetwork.scheduler.config.{Settings => SchedulerSettings}
+import app.softnetwork.scheduler.config.SchedulerSettings
 import org.softnetwork.notification.model.NotificationStatus._
 
 import scala.language.{implicitConversions, postfixOps}
@@ -96,7 +96,14 @@ trait NotificationBehavior[T <: Notification]
                   event,
                   ScheduleForNotificationAdded(
                     AddSchedule(
-                      Schedule(persistenceId, entityId, notificationTimerKey, delay)
+                      Schedule(
+                        persistenceId,
+                        entityId,
+                        notificationTimerKey,
+                        delay,
+                        Some(true),
+                        Some(now())
+                      )
                     )
                   )
                 )
@@ -232,7 +239,7 @@ trait NotificationBehavior[T <: Notification]
     ) {
       ScheduleForNotificationAdded(
         AddSchedule(
-          Schedule(persistenceId, entityId, notificationTimerKey, delay)
+          Schedule(persistenceId, entityId, notificationTimerKey, delay, Some(true), Some(now()))
         )
       )
     } else {

project/src/main/scala/app/softnetwork/sbt/build/Versions.scala

@@ -4,5 +4,7 @@ object Versions {
 
   val genericPersistence = "0.2.5.15"
 
+  val scheduler = "0.1.2"
+
   val scalatest = "3.1.1"
 }

testkit/build.sbt

@@ -7,7 +7,7 @@ organization := "app.softnetwork.notification"
 name := "notification-testkit"
 
 libraryDependencies ++= Seq(
-  "app.softnetwork.persistence" %% "persistence-scheduler-testkit" % Versions.genericPersistence,
+  "app.softnetwork.scheduler" %% "scheduler-testkit" % Versions.scheduler,
   "app.softnetwork.persistence" %% "persistence-session-testkit" % Versions.genericPersistence,
   "com.github.kirviq" % "dumbster" % "1.7.1",
   "org.rapidoid" % "rapidoid-http-server" % "5.5.5"

testkit/src/main/scala/app/softnetwork/notification/api/NotificationGrpcServer.scala

@@ -10,5 +10,5 @@ trait NotificationGrpcServer[T <: Notification]
     extends PersistenceScalatestGrpcTest
     with NotificationGrpcServices[T]
     with InMemoryPersistenceTestKit { _: Suite with NotificationGuardian[T] =>
-  override lazy val additionalConfig: String = grpcConfig
+  override lazy val additionalConfig: String = notificationGrpcConfig
 }