Skip to content

Commit ab633f5

Browse files
committed
upgrade dependencies
1 parent 17170da commit ab633f5

File tree

5 files changed

+40
-3
lines changed

5 files changed

+40
-3
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ThisBuild / organization := "app.softnetwork"
3131

3232
name := "scheduler"
3333

34-
ThisBuild / version := "0.2.5.3"
34+
ThisBuild / version := "0.2.6"
3535

3636
ThisBuild / scalaVersion := "2.12.15"
3737

common/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ libraryDependencies ++= Seq(
1111
// session
1212
"app.softnetwork.session" %% "session-core" % Versions.session,
1313
"app.softnetwork.api" %% "generic-server-api" % Versions.server,
14-
"app.softnetwork.protobuf" %% "scalapb-extensions" % "0.1.5"
14+
"app.softnetwork.protobuf" %% "scalapb-extensions" % "0.1.6"
1515
)
1616

1717
Compile / unmanagedResourceDirectories += baseDirectory.value / "src/main/protobuf"

core/src/main/scala/app/softnetwork/scheduler/service/SchedulerService.scala

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,17 @@ trait SchedulerService
119119
case _ => complete(HttpResponse(StatusCodes.BadRequest))
120120
}
121121
}
122+
} ~ get {
123+
loadScheduler() completeWith {
124+
case Some(s) =>
125+
complete(
126+
HttpResponse(
127+
StatusCodes.OK,
128+
entity = s.cronTabs.toList
129+
)
130+
)
131+
case _ => complete(HttpResponse(StatusCodes.NotFound))
132+
}
122133
}
123134
}
124135

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package app.softnetwork.sbt.build
22

33
object Versions {
44

5-
val genericPersistence = "0.2.6.1"
5+
val genericPersistence = "0.2.6.2"
66

77
val akkaPersistenceJdbc = "5.0.4"
88

testkit/src/test/scala/app/softnetwork/scheduler/service/SchedulerServiceSpec.scala

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,44 @@
11
package app.softnetwork.scheduler.service
22

3+
import akka.actor.typed.ActorSystem
34
import app.softnetwork.scheduler.model.{CronTab, Schedule}
45
import app.softnetwork.scheduler.scalatest.SchedulerRouteTestKit
6+
import app.softnetwork.serialization
57
import org.scalatest.wordspec.AnyWordSpecLike
68

9+
import scala.concurrent.ExecutionContextExecutor
10+
import scala.util.{Failure, Success, Try}
11+
712
class SchedulerServiceSpec extends AnyWordSpecLike with SchedulerRouteTestKit {
813

14+
implicit lazy val asystem: ActorSystem[Nothing] = typedSystem()
15+
16+
implicit lazy val ec: ExecutionContextExecutor = asystem.executionContext
17+
918
val schedule: Schedule = Schedule("s", "0", "add", 1, Some(true), None, None)
1019

1120
val cronTab: CronTab = CronTab("c", "*", "cron", "* * * * *")
1221

22+
val json: String =
23+
"""
24+
|{
25+
| "persistenceId": "Order",
26+
| "entityId": "de72dc88-b333-4ff0-a8a1-29aef0ec9810",
27+
| "key": "CancelNonValidatedOrderTimerKey",
28+
| "delay": 1,
29+
| "scheduledDate": "2023-02-03T17:10:09.149Z"
30+
|}""".stripMargin
31+
1332
"scheduler service" must {
1433
"add schedule" in {
1534
createSession("admin", admin = Some(true))
35+
Try(serialization.serialization.read[Schedule](json)) match {
36+
case Success(value) =>
37+
assert(value.triggerable)
38+
assert(!value.removable)
39+
case Failure(f) =>
40+
fail(f.getMessage)
41+
}
1642
addSchedule(schedule)
1743
}
1844
"add cron tab" in {

0 commit comments

Comments
 (0)