update scheduler resetting for tests

Author: fupelaqu

common/src/main/resources/softnetwork-scheduler.conf

@@ -2,7 +2,7 @@ softnetwork{
   scheduler {
     # id = "*"
     akka-node-role = scheduler
-    reset-cron-tabs {
+    reset-scheduler {
       initial-delay = 60
       delay = 60
     }

common/src/main/scala/app/softnetwork/scheduler/config/SchedulerSettings.scala

@@ -23,11 +23,11 @@ object SchedulerSettings extends StrictLogging {
 
 case class SchedulerConfig(
   id: Option[String],
-  resetCronTabs: ResetCronTabs,
+  resetScheduler: ResetScheduler,
   eventStreams: SchedulerEventStreams,
   akkaNodeRole: String
 )
 
-case class ResetCronTabs(initialDelay: Int, delay: Int)
+case class ResetScheduler(initialDelay: Int, delay: Int)
 
 case class SchedulerEventStreams(entityToSchedulerTag: String)

core/src/main/scala/app/softnetwork/scheduler/handlers/SchedulerHandler.scala

@@ -36,7 +36,7 @@ trait SchedulerDao extends Completion {
     implicit val ec: ExecutionContextExecutor = system.executionContext
     resetScheduler() await { _ =>
       system.scheduler.scheduleOnce(
-        SchedulerSettings.SchedulerConfig.resetCronTabs.initialDelay.seconds,
+        SchedulerSettings.SchedulerConfig.resetScheduler.initialDelay.seconds,
         () => resetCronTabsAndSchedules(resetScheduler = true)
       )
     }

core/src/main/scala/app/softnetwork/scheduler/persistence/typed/SchedulerBehavior.scala

@@ -80,7 +80,7 @@ private[scheduler] trait SchedulerBehavior
           implicit val system: ActorSystem[_] = context.system
           implicit val ec: ExecutionContextExecutor = system.executionContext
           system.scheduler.scheduleOnce(
-            SchedulerSettings.SchedulerConfig.resetCronTabs.delay.seconds,
+            SchedulerSettings.SchedulerConfig.resetScheduler.delay.seconds,
             () => schedulerDao.resetCronTabsAndSchedules(resetScheduler = false)
           )
           Effect
@@ -96,7 +96,7 @@ private[scheduler] trait SchedulerBehavior
             if (
               scheduler.lastCronTabsAndSchedulesReseted.isEmpty ||
               ((now().getTime - scheduler.getLastCronTabsAndSchedulesReseted.getTime) >
-              SchedulerSettings.SchedulerConfig.resetCronTabs.delay * 1000)
+              SchedulerSettings.SchedulerConfig.resetScheduler.delay * 1000)
             ) {
               scheduler.cronTabs.foreach { cronTab =>
                 context.self ! AddCronTab(cronTab)
@@ -117,7 +117,7 @@ private[scheduler] trait SchedulerBehavior
           case Some(scheduler)
               if scheduler.lastCronTabsAndSchedulesReseted.isEmpty ||
                 ((now().getTime - scheduler.getLastCronTabsAndSchedulesReseted.getTime) >
-                SchedulerSettings.SchedulerConfig.resetCronTabs.delay * 1000) =>
+                SchedulerSettings.SchedulerConfig.resetScheduler.delay * 1000) =>
             trigerResetCronTabsAndSchedules(scheduler, switch = false)
           case _ => Effect.none.thenRun(_ => CronTabsAndSchedulesNotReseted ~> replyTo)
         }

testkit/src/test/resources/reference.conf

@@ -1,6 +1,10 @@
 softnetwork{
   scheduler {
     id = "my-scheduler"
+    reset-scheduler {
+      initial-delay = 0
+      delay = 1
+    }
     event-streams {
       entity-to-scheduler-tag = "entity-to-scheduler-"${softnetwork.scheduler.id}
     }