to fix the conditions for which a repeatedly schedule should be removed from the scheduler

Author: fupelaqu

build.sbt

@@ -31,7 +31,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "scheduler"
 
-ThisBuild / version := "0.3.2.1"
+ThisBuild / version := "0.3.2.2"
 
 ThisBuild / scalaVersion := "2.12.15"
 

common/build.sbt

@@ -11,7 +11,7 @@ libraryDependencies ++= Seq(
   // session
   "app.softnetwork.session" %% "session-core" % Versions.genericPersistence,
   "app.softnetwork.api" %% "generic-server-api" % Versions.genericPersistence,
-  "app.softnetwork.protobuf" %% "scalapb-extensions" % "0.1.6"
+  "app.softnetwork.protobuf" %% "scalapb-extensions" % "0.1.7"
 )
 
 Compile / unmanagedResourceDirectories += baseDirectory.value / "src/main/protobuf"

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

@@ -48,8 +48,8 @@ package object model {
     def removable: Boolean = {
       // the schedule could not be triggered now
       !triggerable &&
-      // the schedule can not be triggered repeatedly
-      !repeatedly.getOrElse(false) &&
+      // the schedule can not be triggered repeatedly or should be triggered at a specified date
+      (!repeatedly.getOrElse(false) || scheduledDate.isDefined) &&
       // the schedule has not defined a date at which it should be triggered
       // or it has already been triggered at or after the specified date
       (scheduledDate.isEmpty || (lastTriggered.isDefined && (getLastTriggered.after(