From c0b6a19bca9a378d7a95aedfef1cbd0d903c5748 Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Wed, 4 Oct 2023 23:34:16 +0200 Subject: [PATCH] [AB-82] adding instant for cooldown exception model removing not needed models for payday and slots cooldown exceptions --- .../exception/PayDayCooldownExceptionModel.java | 12 ------------ .../model/exception/SlotsCooldownExceptionModel.java | 12 ------------ .../core/command/execution/CoolDownCheckResult.java | 6 ++++++ 3 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/model/exception/PayDayCooldownExceptionModel.java delete mode 100644 abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/model/exception/SlotsCooldownExceptionModel.java diff --git a/abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/model/exception/PayDayCooldownExceptionModel.java b/abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/model/exception/PayDayCooldownExceptionModel.java deleted file mode 100644 index 1bab8e1b7..000000000 --- a/abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/model/exception/PayDayCooldownExceptionModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package dev.sheldan.abstracto.entertainment.model.exception; - -import lombok.Builder; -import lombok.Getter; - -import java.time.Duration; - -@Builder -@Getter -public class PayDayCooldownExceptionModel { - private Duration tryAgainDuration; -} diff --git a/abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/model/exception/SlotsCooldownExceptionModel.java b/abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/model/exception/SlotsCooldownExceptionModel.java deleted file mode 100644 index 07439fbe3..000000000 --- a/abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/model/exception/SlotsCooldownExceptionModel.java +++ /dev/null @@ -1,12 +0,0 @@ -package dev.sheldan.abstracto.entertainment.model.exception; - -import lombok.Builder; -import lombok.Getter; - -import java.time.Duration; - -@Builder -@Getter -public class SlotsCooldownExceptionModel { - private Duration tryAgainDuration; -} diff --git a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/CoolDownCheckResult.java b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/CoolDownCheckResult.java index e4fbce049..1a6555db2 100644 --- a/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/CoolDownCheckResult.java +++ b/abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/CoolDownCheckResult.java @@ -5,12 +5,15 @@ import lombok.Getter; import lombok.Setter; import java.time.Duration; +import java.time.Instant; +import java.time.temporal.ChronoUnit; @Getter @Setter @Builder public class CoolDownCheckResult { private Duration executeIn; + private Instant executeAt; private Boolean canExecute; private CoolDownReason reason; @@ -20,6 +23,7 @@ public class CoolDownCheckResult { .canExecute(false) .reason(CoolDownReason.SERVER) .executeIn(duration) + .executeAt(Instant.now().plus(duration.toSeconds(), ChronoUnit.SECONDS)) .build(); } @@ -28,6 +32,7 @@ public class CoolDownCheckResult { .builder() .canExecute(false) .reason(CoolDownReason.CHANNEL_GROUP) + .executeAt(Instant.now().plus(duration.toSeconds(), ChronoUnit.SECONDS)) .executeIn(duration) .build(); } @@ -37,6 +42,7 @@ public class CoolDownCheckResult { .builder() .canExecute(false) .reason(CoolDownReason.MEMBER) + .executeAt(Instant.now().plus(duration.toSeconds(), ChronoUnit.SECONDS)) .executeIn(duration) .build(); }