From 5384dd34302eb634a08f31f2fc189ed38cf62452 Mon Sep 17 00:00:00 2001
From: Mikhail Yasnov <yasnov.mi@gmail.com>
Date: Fri, 3 Dec 2021 18:45:16 +0300
Subject: [PATCH] Add isDisabled method

---
 .../workers/manager/agent/scheduled/WorkerManagerWatcher.kt   | 2 +-
 .../workers/manager/core/trigger/dto/TriggerDescriptor.kt     | 4 ++++
 .../touchin/spring/workers/manager/core/worker/dto/Worker.kt  | 4 ----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-workers-manager-agent/src/main/kotlin/ru/touchin/spring/workers/manager/agent/scheduled/WorkerManagerWatcher.kt b/spring-workers-manager-agent/src/main/kotlin/ru/touchin/spring/workers/manager/agent/scheduled/WorkerManagerWatcher.kt
index dc2a5df..957f78b 100644
--- a/spring-workers-manager-agent/src/main/kotlin/ru/touchin/spring/workers/manager/agent/scheduled/WorkerManagerWatcher.kt
+++ b/spring-workers-manager-agent/src/main/kotlin/ru/touchin/spring/workers/manager/agent/scheduled/WorkerManagerWatcher.kt
@@ -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)
diff --git a/spring-workers-manager-core/src/main/kotlin/ru/touchin/spring/workers/manager/core/trigger/dto/TriggerDescriptor.kt b/spring-workers-manager-core/src/main/kotlin/ru/touchin/spring/workers/manager/core/trigger/dto/TriggerDescriptor.kt
index b443064..0111bd8 100644
--- a/spring-workers-manager-core/src/main/kotlin/ru/touchin/spring/workers/manager/core/trigger/dto/TriggerDescriptor.kt
+++ b/spring-workers-manager-core/src/main/kotlin/ru/touchin/spring/workers/manager/core/trigger/dto/TriggerDescriptor.kt
@@ -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
diff --git a/spring-workers-manager-core/src/main/kotlin/ru/touchin/spring/workers/manager/core/worker/dto/Worker.kt b/spring-workers-manager-core/src/main/kotlin/ru/touchin/spring/workers/manager/core/worker/dto/Worker.kt
index d81f299..4421be4 100644
--- a/spring-workers-manager-core/src/main/kotlin/ru/touchin/spring/workers/manager/core/worker/dto/Worker.kt
+++ b/spring-workers-manager-core/src/main/kotlin/ru/touchin/spring/workers/manager/core/worker/dto/Worker.kt
@@ -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 }
-
 }