migrate to scheduler v 0.1.4

Author: fupelaqu

build.sbt

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

core/src/main/scala/app/softnetwork/notification/persistence/query/Scheduler2NotificationProcessorStream.scala

@@ -15,8 +15,6 @@ trait Scheduler2NotificationProcessorStream
     extends Scheduler2EntityProcessorStream[NotificationCommand, NotificationCommandResult] {
   _: JournalProvider with NotificationHandler =>
 
-  protected val forTests = false
-
   override protected def triggerSchedule(schedule: Schedule): Future[Boolean] = {
     !?(TriggerSchedule4Notification(schedule)) map {
       case result: Schedule4NotificationTriggered =>

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

@@ -102,7 +102,8 @@ trait NotificationBehavior[T <: Notification]
                         notificationTimerKey,
                         delay,
                         Some(true),
-                        Some(now())
+                        Some(now()),
+                        None
                       )
                     )
                   )
@@ -239,7 +240,15 @@ trait NotificationBehavior[T <: Notification]
     ) {
       ScheduleForNotificationAdded(
         AddSchedule(
-          Schedule(persistenceId, entityId, notificationTimerKey, delay, Some(true), Some(now()))
+          Schedule(
+            persistenceId,
+            entityId,
+            notificationTimerKey,
+            delay,
+            Some(true),
+            Some(now()),
+            None
+          )
         )
       )
     } else {

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

@@ -4,7 +4,7 @@ object Versions {
 
   val genericPersistence = "0.2.5.15"
 
-  val scheduler = "0.1.3"
+  val scheduler = "0.1.4"
 
   val server = "0.2.6.2"
 

testkit/src/main/scala/app/softnetwork/notification/scalatest/AllNotificationsTestKit.scala

@@ -86,7 +86,7 @@ trait AllNotificationsTestKit
           with AllNotificationsHandler
           with InMemoryJournalProvider {
           override val tag: String = s"${AllNotificationsBehavior.persistenceId}-scheduler"
-          override protected val forTests: Boolean = true
+          override val forTests: Boolean = true
           override implicit def system: ActorSystem[_] = sys
         }
       )

testkit/src/main/scala/app/softnetwork/notification/scalatest/ApnsNotificationsTestKit.scala

@@ -59,7 +59,7 @@ trait ApnsNotificationsTestKit
           with ApnsNotificationsHandler
           with InMemoryJournalProvider {
           override val tag: String = s"${ApnsNotificationsBehavior.persistenceId}-scheduler"
-          override protected val forTests: Boolean = true
+          override val forTests: Boolean = true
           override implicit def system: ActorSystem[_] = sys
         }
       )

testkit/src/main/scala/app/softnetwork/notification/scalatest/FcmAndApnsNotificationsTestKit.scala

@@ -63,7 +63,7 @@ trait FcmAndApnsNotificationsTestKit
           with InMemoryJournalProvider {
           override val tag: String =
             s"${FcmAndApnsNotificationsBehavior.persistenceId}-scheduler"
-          override protected val forTests: Boolean = true
+          override val forTests: Boolean = true
           override implicit def system: ActorSystem[_] = sys
         }
       )

testkit/src/main/scala/app/softnetwork/notification/scalatest/FcmNotificationsTestKit.scala

@@ -18,7 +18,7 @@ import app.softnetwork.notification.persistence.typed.{
 }
 import app.softnetwork.notification.spi.FcmMockProvider
 import app.softnetwork.persistence.query.InMemoryJournalProvider
-import com.typesafe.config.{Config, ConfigFactory}
+import com.typesafe.config.Config
 import org.scalatest.Suite
 import org.softnetwork.notification.model.Push
 
@@ -40,7 +40,7 @@ trait FcmNotificationsTestKit extends NotificationGrpcServer[Push] with Notifica
           with FcmNotificationsHandler
           with InMemoryJournalProvider {
           override val tag: String = s"${FcmNotificationsBehavior.persistenceId}-scheduler"
-          override protected val forTests: Boolean = true
+          override val forTests: Boolean = true
           override implicit def system: ActorSystem[_] = sys
         }
       )

testkit/src/main/scala/app/softnetwork/notification/scalatest/SMSModeNotificationsTestKit.scala

@@ -60,7 +60,7 @@ trait SMSModeNotificationsTestKit
           with SMSModeNotificationsHandler
           with InMemoryJournalProvider {
           override val tag: String = s"${SMSModeNotificationsBehavior.persistenceId}-scheduler"
-          override protected val forTests: Boolean = true
+          override val forTests: Boolean = true
           override implicit def system: ActorSystem[_] = sys
         }
       )

testkit/src/main/scala/app/softnetwork/notification/scalatest/SimpleMailNotificationsTestKit.scala

@@ -61,7 +61,7 @@ trait SimpleMailNotificationsTestKit
           with SimpleMailNotificationsHandler
           with InMemoryJournalProvider {
           override val tag: String = s"${SimpleMailNotificationsBehavior.persistenceId}-scheduler"
-          override protected val forTests: Boolean = true
+          override val forTests: Boolean = true
           override implicit def system: ActorSystem[_] = sys
         }
       )