link schedule to cron tab when applicable

Author: fupelaqu

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

@@ -29,6 +29,7 @@ message Schedule {
     optional bool repeatedly = 5;
     optional google.protobuf.Timestamp scheduledDate = 6 [(scalapb.field).type = "java.util.Date"];
     optional google.protobuf.Timestamp lastTriggered = 7 [(scalapb.field).type = "java.util.Date"];
+    optional string cronTab = 8;
 }
 
 // CronTab

common/src/main/scala/app/softnetwork/scheduler/model/package.scala

@@ -103,6 +103,7 @@ package object model {
             .withKey(cronTab.key)
             .withScheduledDate(date)
             .withRepeatedly(true)
+            .withCronTab(cronTab.uuid)
         )
       case _ => None
     }

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

@@ -377,7 +377,9 @@ private[scheduler] trait SchedulerBehavior
                         ct.entityId != ALL_KEY && ct.persistenceId == cronTab.persistenceId && ct.key == cronTab.key
                       )
                       .map(ct => CronTabRemovedEvent(ct.persistenceId, ct.entityId, ct.key))
-                      .toList
+                      .toList ++ scheduler.schedules
+                      .filter(_.getCronTab == cmd.uuid)
+                      .map(s => ScheduleRemovedEvent(s.persistenceId, s.entityId, s.key))
                   } else {
                     List.empty
                   }

testkit/src/test/scala/app/softnetwork/scheduler/handlers/SchedulerHandlerSpec.scala

@@ -1,13 +1,11 @@
 package app.softnetwork.scheduler.handlers
 
-import akka.actor.testkit.typed.scaladsl.TestProbe
 import akka.actor.typed.ActorSystem
 import app.softnetwork.persistence._
 import app.softnetwork.scheduler.message.SampleMessages.{AddSample, SampleAdded}
 import app.softnetwork.scheduler.scalatest.SchedulerWithSampleTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 import app.softnetwork.scheduler.message._
-import app.softnetwork.scheduler.persistence.query.SampleScheduleTriggered
 import app.softnetwork.scheduler.persistence.typed.SampleBehavior
 import org.softnetwork.akka.model.{CronTab, Schedule}
 
@@ -25,14 +23,14 @@ class SchedulerHandlerSpec
   implicit lazy val ec: ExecutionContextExecutor = system.executionContext
 
   "Scheduler" must {
+    val cronTab = CronTab(SampleBehavior.persistenceId, ALL_KEY, "cron", "* * * * *")
     "add Cron Tab" in {
       // add Sample[sample] entity
       SampleHandler ? ("sample", AddSample) assert {
         case SampleAdded => succeed
         case _           => fail()
       }
       // add cron tab for all Sample entity
-      val cronTab = CronTab(SampleBehavior.persistenceId, ALL_KEY, "cron", "* * * * *")
       this !? AddCronTab(cronTab) assert {
         case _: CronTabAdded => succeed
         case other           => fail(other.getClass)
@@ -55,11 +53,31 @@ class SchedulerHandlerSpec
             case Some(schedule) =>
               assert(schedule.repeatedly.getOrElse(false))
               assert(schedule.getScheduledDate.equals(schedule.getLastTriggered))
+              assert(schedule.getCronTab == cronTab.uuid)
             case _ => fail("schedule not found")
           }
         case _ => fail()
       }
     }
+    "remove Cron Tab" in {
+      this !? RemoveCronTab(cronTab.persistenceId, cronTab.entityId, cronTab.key) assert {
+        case _: CronTabRemoved => succeed
+        case other             => fail(other.getClass)
+      }
+      this !? LoadScheduler assert {
+        case r: SchedulerLoaded =>
+          val scheduler = r.scheduler
+          logger.info(scheduler.toProtoString)
+          assert(!scheduler.cronTabs.exists(ct => ct.uuid == cronTab.uuid))
+          scheduler.schedules.find(s =>
+            s.persistenceId == SampleBehavior.persistenceId && s.entityId == "sample" && s.key == cronTab.key
+          ) match {
+            case Some(_) => fail()
+            case _       => succeed
+          }
+        case _ => fail()
+      }
+    }
     "remove schedule that is not repeatable and has already been triggered" in {
       val schedule = Schedule("p", "0", "add", 1, None, None, None)
       // add schedule which has to be triggered