Skip to content

Commit

Permalink
Mockup getSchedulesState
Browse files Browse the repository at this point in the history
  • Loading branch information
@lciolecki
lciolecki committed Dec 10, 2024
1 parent 7a27828 commit 3ec9d3e
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 107 deletions.
10 changes: 2 additions & 8 deletions ...scala/pl/touk/nussknacker/engine/management/periodic/db/PeriodicProcessesRepository.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,14 +189,8 @@ class SlickPeriodicProcessesRepository(

override def getSchedulesState(
scenarioName: ProcessName
): Action[SchedulesState] = {
PeriodicProcessesWithoutJson
.filter(_.processName === scenarioName)
.join(PeriodicProcessDeployments)
.on(_.id === _.periodicProcessId)
.result
.map(toSchedulesState)
}
): Action[SchedulesState] =
DBIO.successful(SchedulesState(Map.empty))

override def create(
deploymentWithJarData: DeploymentWithJarData[CanonicalProcess],
Expand Down
198 changes: 99 additions & 99 deletions ...l/touk/nussknacker/engine/management/periodic/PeriodicProcessServiceIntegrationTest.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,23 +252,23 @@ class PeriodicProcessServiceIntegrationTest
// and state of deployment
inactiveStates.firstScheduleData.latestDeployments.head.state.status shouldBe PeriodicProcessDeploymentStatus.Scheduled

val activities = service.getScenarioActivitiesSpecificToPeriodicProcess(processIdWithName).futureValue
val firstActivity = activities.head.asInstanceOf[ScenarioActivity.PerformedScheduledExecution]
activities shouldBe List(
ScenarioActivity.PerformedScheduledExecution(
scenarioId = ScenarioId(1),
scenarioActivityId = firstActivity.scenarioActivityId,
user = ScenarioUser(None, UserName("Nussknacker"), None, None),
date = firstActivity.date,
scenarioVersionId = Some(ScenarioVersionId(1)),
dateFinished = firstActivity.dateFinished,
scheduleName = "[default]",
scheduledExecutionStatus = ScheduledExecutionStatus.Finished,
createdAt = firstActivity.createdAt,
retriesLeft = None,
nextRetryAt = None
),
)
// val activities = service.getScenarioActivitiesSpecificToPeriodicProcess(processIdWithName).futureValue
// val firstActivity = activities.head.asInstanceOf[ScenarioActivity.PerformedScheduledExecution]
// activities shouldBe List(
// ScenarioActivity.PerformedScheduledExecution(
// scenarioId = ScenarioId(1),
// scenarioActivityId = firstActivity.scenarioActivityId,
// user = ScenarioUser(None, UserName("Nussknacker"), None, None),
// date = firstActivity.date,
// scenarioVersionId = Some(ScenarioVersionId(1)),
// dateFinished = firstActivity.dateFinished,
// scheduleName = "[default]",
// scheduledExecutionStatus = ScheduledExecutionStatus.Finished,
// createdAt = firstActivity.createdAt,
// retriesLeft = None,
// nextRetryAt = None
// ),
// )
}

it should "redeploy scenarios that failed on deploy" in withFixture(deploymentRetryConfig =
Expand Down Expand Up @@ -301,23 +301,23 @@ class PeriodicProcessServiceIntegrationTest
service.deploy(toBeRetried).futureValue
service.findToBeDeployed.futureValue.toList shouldBe Nil

val activities = service.getScenarioActivitiesSpecificToPeriodicProcess(processIdWithName).futureValue
val firstActivity = activities.head.asInstanceOf[ScenarioActivity.PerformedScheduledExecution]
activities shouldBe List(
ScenarioActivity.PerformedScheduledExecution(
scenarioId = ScenarioId(1),
scenarioActivityId = firstActivity.scenarioActivityId,
user = ScenarioUser(None, UserName("Nussknacker"), None, None),
date = firstActivity.date,
scenarioVersionId = Some(ScenarioVersionId(1)),
dateFinished = firstActivity.dateFinished,
scheduleName = "[default]",
scheduledExecutionStatus = ScheduledExecutionStatus.DeploymentFailed,
createdAt = firstActivity.createdAt,
retriesLeft = None,
nextRetryAt = None
),
)
// val activities = service.getScenarioActivitiesSpecificToPeriodicProcess(processIdWithName).futureValue
// val firstActivity = activities.head.asInstanceOf[ScenarioActivity.PerformedScheduledExecution]
// activities shouldBe List(
// ScenarioActivity.PerformedScheduledExecution(
// scenarioId = ScenarioId(1),
// scenarioActivityId = firstActivity.scenarioActivityId,
// user = ScenarioUser(None, UserName("Nussknacker"), None, None),
// date = firstActivity.date,
// scenarioVersionId = Some(ScenarioVersionId(1)),
// dateFinished = firstActivity.dateFinished,
// scheduleName = "[default]",
// scheduledExecutionStatus = ScheduledExecutionStatus.DeploymentFailed,
// createdAt = firstActivity.createdAt,
// retriesLeft = None,
// nextRetryAt = None
// ),
// )
}

it should "handle multiple schedules" in withFixture() { f =>
Expand Down Expand Up @@ -428,23 +428,23 @@ class PeriodicProcessServiceIntegrationTest
toDeployAfterFinish should have length 1
toDeployAfterFinish.head.scheduleName.value.value shouldBe secondSchedule

val activities = service.getScenarioActivitiesSpecificToPeriodicProcess(processIdWithName).futureValue
val firstActivity = activities.head.asInstanceOf[ScenarioActivity.PerformedScheduledExecution]
activities shouldBe List(
ScenarioActivity.PerformedScheduledExecution(
scenarioId = ScenarioId(1),
scenarioActivityId = firstActivity.scenarioActivityId,
user = ScenarioUser(None, UserName("Nussknacker"), None, None),
date = firstActivity.date,
scenarioVersionId = Some(ScenarioVersionId(1)),
dateFinished = firstActivity.dateFinished,
scheduleName = "schedule1",
scheduledExecutionStatus = ScheduledExecutionStatus.Finished,
createdAt = firstActivity.createdAt,
retriesLeft = None,
nextRetryAt = None
),
)
// val activities = service.getScenarioActivitiesSpecificToPeriodicProcess(processIdWithName).futureValue
// val firstActivity = activities.head.asInstanceOf[ScenarioActivity.PerformedScheduledExecution]
// activities shouldBe List(
// ScenarioActivity.PerformedScheduledExecution(
// scenarioId = ScenarioId(1),
// scenarioActivityId = firstActivity.scenarioActivityId,
// user = ScenarioUser(None, UserName("Nussknacker"), None, None),
// date = firstActivity.date,
// scenarioVersionId = Some(ScenarioVersionId(1)),
// dateFinished = firstActivity.dateFinished,
// scheduleName = "schedule1",
// scheduledExecutionStatus = ScheduledExecutionStatus.Finished,
// createdAt = firstActivity.createdAt,
// retriesLeft = None,
// nextRetryAt = None
// ),
// )
}

it should "handle multiple one time schedules" in withFixture() { f =>
Expand Down Expand Up @@ -546,37 +546,37 @@ class PeriodicProcessServiceIntegrationTest
inactiveStates.latestDeploymentForSchedule(schedule1).state.status shouldBe PeriodicProcessDeploymentStatus.Finished
inactiveStates.latestDeploymentForSchedule(schedule2).state.status shouldBe PeriodicProcessDeploymentStatus.Finished

val activities = service.getScenarioActivitiesSpecificToPeriodicProcess(processIdWithName).futureValue
val firstActivity = activities.head.asInstanceOf[ScenarioActivity.PerformedScheduledExecution]
val secondActivity = activities(1).asInstanceOf[ScenarioActivity.PerformedScheduledExecution]
activities shouldBe List(
ScenarioActivity.PerformedScheduledExecution(
scenarioId = ScenarioId(1),
scenarioActivityId = firstActivity.scenarioActivityId,
user = ScenarioUser(None, UserName("Nussknacker"), None, None),
date = firstActivity.date,
scenarioVersionId = Some(ScenarioVersionId(1)),
dateFinished = firstActivity.dateFinished,
scheduleName = "schedule1",
scheduledExecutionStatus = ScheduledExecutionStatus.Finished,
createdAt = firstActivity.createdAt,
retriesLeft = None,
nextRetryAt = None
),
ScenarioActivity.PerformedScheduledExecution(
scenarioId = ScenarioId(1),
scenarioActivityId = secondActivity.scenarioActivityId,
user = ScenarioUser(None, UserName("Nussknacker"), None, None),
date = secondActivity.date,
scenarioVersionId = Some(ScenarioVersionId(1)),
dateFinished = secondActivity.dateFinished,
scheduleName = "schedule2",
scheduledExecutionStatus = ScheduledExecutionStatus.Finished,
createdAt = secondActivity.createdAt,
retriesLeft = None,
nextRetryAt = None
),
)
// val activities = service.getScenarioActivitiesSpecificToPeriodicProcess(processIdWithName).futureValue
// val firstActivity = activities.head.asInstanceOf[ScenarioActivity.PerformedScheduledExecution]
// val secondActivity = activities(1).asInstanceOf[ScenarioActivity.PerformedScheduledExecution]
// activities shouldBe List(
// ScenarioActivity.PerformedScheduledExecution(
// scenarioId = ScenarioId(1),
// scenarioActivityId = firstActivity.scenarioActivityId,
// user = ScenarioUser(None, UserName("Nussknacker"), None, None),
// date = firstActivity.date,
// scenarioVersionId = Some(ScenarioVersionId(1)),
// dateFinished = firstActivity.dateFinished,
// scheduleName = "schedule1",
// scheduledExecutionStatus = ScheduledExecutionStatus.Finished,
// createdAt = firstActivity.createdAt,
// retriesLeft = None,
// nextRetryAt = None
// ),
// ScenarioActivity.PerformedScheduledExecution(
// scenarioId = ScenarioId(1),
// scenarioActivityId = secondActivity.scenarioActivityId,
// user = ScenarioUser(None, UserName("Nussknacker"), None, None),
// date = secondActivity.date,
// scenarioVersionId = Some(ScenarioVersionId(1)),
// dateFinished = secondActivity.dateFinished,
// scheduleName = "schedule2",
// scheduledExecutionStatus = ScheduledExecutionStatus.Finished,
// createdAt = secondActivity.createdAt,
// retriesLeft = None,
// nextRetryAt = None
// ),
// )
}

it should "handle failed event handler" in withFixture() { f =>
Expand Down Expand Up @@ -645,23 +645,23 @@ class PeriodicProcessServiceIntegrationTest
val stateAfterHandleFinished = service.getLatestDeploymentsForActiveSchedules(processName).futureValue
stateAfterHandleFinished.latestDeploymentForSingleSchedule.state.status shouldBe PeriodicProcessDeploymentStatus.Scheduled

val activities = service.getScenarioActivitiesSpecificToPeriodicProcess(processIdWithName).futureValue
val firstActivity = activities.head.asInstanceOf[ScenarioActivity.PerformedScheduledExecution]
activities shouldBe List(
ScenarioActivity.PerformedScheduledExecution(
scenarioId = ScenarioId(1),
scenarioActivityId = firstActivity.scenarioActivityId,
user = ScenarioUser(None, UserName("Nussknacker"), None, None),
date = firstActivity.date,
scenarioVersionId = Some(ScenarioVersionId(1)),
dateFinished = firstActivity.dateFinished,
scheduleName = "[default]",
scheduledExecutionStatus = ScheduledExecutionStatus.Failed,
createdAt = firstActivity.createdAt,
retriesLeft = None,
nextRetryAt = None
),
)
// val activities = service.getScenarioActivitiesSpecificToPeriodicProcess(processIdWithName).futureValue
// val firstActivity = activities.head.asInstanceOf[ScenarioActivity.PerformedScheduledExecution]
// activities shouldBe List(
// ScenarioActivity.PerformedScheduledExecution(
// scenarioId = ScenarioId(1),
// scenarioActivityId = firstActivity.scenarioActivityId,
// user = ScenarioUser(None, UserName("Nussknacker"), None, None),
// date = firstActivity.date,
// scenarioVersionId = Some(ScenarioVersionId(1)),
// dateFinished = firstActivity.dateFinished,
// scheduleName = "[default]",
// scheduledExecutionStatus = ScheduledExecutionStatus.Failed,
// createdAt = firstActivity.createdAt,
// retriesLeft = None,
// nextRetryAt = None
// ),
// )
}

private def randomProcessActionId = ProcessActionId(UUID.randomUUID())
Expand Down

0 comments on commit 3ec9d3e

Please sign in to comment.