TouchInstinct
/
Backend-common
308
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add isDisabled method

This commit is contained in:
Mikhail Yasnov 2021-12-03 18:45:16 +03:00
parent 03e0676693
commit 5384dd3430
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-workers-manager-agent/src/main/kotlin/ru/touchin/spring/workers/manager/agent/scheduled/WorkerManagerWatcher.kt
View File

@ -49,7 +49,7 @@ class WorkerManagerWatcher(
val actualTriggerDescriptors = jobDefinitionsRegistry.jobs
.flatMap { (jobName, _) -> triggerDescriptorCoreService.getByWorkerName(jobName) }
.filter { it.disabledAt == null }
.filter { !it.isDisabled() }
val deletedTriggerDescriptors = currentTriggerDescriptors - actualTriggerDescriptors.toSet()
scheduleTriggerService.unscheduleTriggers(deletedTriggerDescriptors)

4
spring-workers-manager-core/src/main/kotlin/ru/touchin/spring/workers/manager/core/trigger/dto/TriggerDescriptor.kt
View File

@ -14,6 +14,10 @@ data class TriggerDescriptor(
val deletedAt: ZonedDateTime?,
) {
fun isDeleted() = deletedAt != null
fun isDisabled() = disabledAt != null
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other !is TriggerDescriptor) return false

4
spring-workers-manager-core/src/main/kotlin/ru/touchin/spring/workers/manager/core/worker/dto/Worker.kt
View File

@ -16,8 +16,4 @@ data class Worker(
fun isDisabled() = disabledAt != null
// fun getEnabledTriggerDescriptors() = triggerDescriptors.filter { it.disabledAt == null && it.deletedAt == null }
//
// fun getAllTriggerDescriptors() = triggerDescriptors.filter { it.deletedAt == null }
}