From 5a630282f63171edbd4fe0895a24c0a04434e671 Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Wed, 25 Jan 2023 11:28:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B8=D0=B4=D0=B5=D0=BD=D1=82=D0=B8=D1=84=D0=B8=D0=BA=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=20=D0=B2=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA?= =?UTF-8?q?=D1=82=20Message.=20=D0=A3=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=BB=20SentBox?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quarkus/context/service/Sending.java | 4 +- .../context/service/SendingService.java | 6 +-- .../simple/context/service/Sending.java | 4 +- .../context/service/SendingService.java | 6 +-- .../quarkus/core/GeneralAutoResponder.java | 4 +- .../core/action/AnswerCheckAction.java | 4 +- .../quarkus/core/action/AnswerTextAction.java | 6 +-- .../quarkus/core/unit/AnswerText.java | 2 +- .../core/unit/func/CallBackConsumer.java | 11 ++++++ .../unit/func/collback/CallBackConsumer.java | 11 ------ .../unit/func/collback/IntegerCallBack.java | 11 ------ .../unit/func/collback/StringCallBack.java | 11 ------ .../simple/core/GeneralAutoResponder.java | 4 +- .../simple/core/action/AnswerCheckAction.java | 5 ++- .../simple/core/action/AnswerTextAction.java | 10 ++--- .../simple/core/pusher/UserSanderPusher.java | 4 +- .../simple/core/unit/AnswerText.java | 4 +- .../core/unit/func/CallBackConsumer.java | 10 +++++ .../unit/func/collback/CallBackConsumer.java | 10 ----- .../unit/func/collback/IntegerCallBack.java | 10 ----- .../unit/func/collback/StringCallBack.java | 10 ----- .../godfather/main/domain/BoxAnswer.java | 39 +++++++++++++++---- .../godfather/main/domain/SentBox.java | 18 ++++++--- .../main/domain/content/Message.java | 16 +++++++- 24 files changed, 110 insertions(+), 110 deletions(-) create mode 100644 bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/CallBackConsumer.java delete mode 100644 bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/collback/CallBackConsumer.java delete mode 100644 bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/collback/IntegerCallBack.java delete mode 100644 bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/collback/StringCallBack.java create mode 100644 bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/CallBackConsumer.java delete mode 100644 bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/collback/CallBackConsumer.java delete mode 100644 bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/collback/IntegerCallBack.java delete mode 100644 bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/collback/StringCallBack.java diff --git a/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/Sending.java b/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/Sending.java index d657105..8dbe224 100644 --- a/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/Sending.java +++ b/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/Sending.java @@ -11,14 +11,14 @@ import org.jetbrains.annotations.NotNull; * * @author upagge [08/07/2019] */ -public interface Sending { +public interface Sending { /** * Отправляет сообщение пользователю * * @param boxAnswer Объект с данными, которые необходимо отправить */ - Uni> send(@NotNull BoxAnswer boxAnswer); + Uni send(@NotNull BoxAnswer boxAnswer); /** * Возвращает тип объекта отправляющего ответ пользователя. В зависимости от типа ответ будет отправлен с помощью diff --git a/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/SendingService.java b/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/SendingService.java index 136b731..0410c2c 100644 --- a/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/SendingService.java +++ b/bot-context/bot-context-quarkus/src/main/java/dev/struchkov/godfather/quarkus/context/service/SendingService.java @@ -10,12 +10,12 @@ import org.jetbrains.annotations.NotNull; * * @author upagge [08/07/2019] */ -public interface SendingService extends Sending { +public interface SendingService extends Sending { void addPreSendProcess(@NotNull PreSendProcessing processing); - Uni deleteMessage(@NotNull String personId, @NotNull MESSAGE_ID messageId); + Uni deleteMessage(@NotNull String personId, @NotNull String messageId); - Uni> replaceMessage(@NotNull String personId, @NotNull MESSAGE_ID messageId, @NotNull BoxAnswer newAnswer); + Uni replaceMessage(@NotNull String personId, @NotNull String messageId, @NotNull BoxAnswer newAnswer); } diff --git a/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/Sending.java b/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/Sending.java index 897a0fd..9ec7dea 100644 --- a/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/Sending.java +++ b/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/Sending.java @@ -12,14 +12,14 @@ import java.util.Optional; * * @author upagge [08/07/2019] */ -public interface Sending { +public interface Sending { /** * Отравляет сообщение пользователю. * * @param boxAnswer Объект с данными, которые необходимо отправить */ - Optional> send(@NotNull BoxAnswer boxAnswer); + Optional send(@NotNull BoxAnswer boxAnswer); /** * Возвращает тип объекта отправляющего ответ пользователя. В зависимости от типа ответ будет отправлен с помощью diff --git a/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/SendingService.java b/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/SendingService.java index ccac6d2..39bd880 100644 --- a/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/SendingService.java +++ b/bot-context/bot-context-simple/src/main/java/dev/struchkov/godfather/simple/context/service/SendingService.java @@ -11,12 +11,12 @@ import java.util.Optional; * * @author upagge [08/07/2019] */ -public interface SendingService extends Sending { +public interface SendingService extends Sending { void addPreSendProcess(@NotNull PreSendProcessing processing); - void deleteMessage(@NotNull String personId, @NotNull MESSAGE_ID messageId); + void deleteMessage(@NotNull String personId, @NotNull String messageId); - Optional> replaceMessage(@NotNull String personId, @NotNull MESSAGE_ID messageId, @NotNull BoxAnswer newAnswer); + Optional replaceMessage(@NotNull String personId, @NotNull String messageId, @NotNull BoxAnswer newAnswer); } diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/GeneralAutoResponder.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/GeneralAutoResponder.java index 310c44c..d571c6c 100644 --- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/GeneralAutoResponder.java +++ b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/GeneralAutoResponder.java @@ -43,7 +43,7 @@ public class GeneralAutoResponder { protected ErrorHandler errorHandler; protected GeneralAutoResponder( - Sending sending, + Sending sending, PersonSettingService personSettingService, StorylineService storyLineService ) { @@ -52,7 +52,7 @@ public class GeneralAutoResponder { init(sending); } - private void init(Sending sending) { + private void init(Sending sending) { actionUnitMap.put(TypeUnit.CHECK, new AnswerCheckAction<>(sending)); actionUnitMap.put(TypeUnit.TEXT, new AnswerTextAction(sending)); actionUnitMap.put(TypeUnit.REPLACE_CMD, new ReplaceCmdAction()); diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerCheckAction.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerCheckAction.java index 98d12af..18ef5b4 100644 --- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerCheckAction.java +++ b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerCheckAction.java @@ -20,9 +20,9 @@ import static dev.struchkov.haiti.utils.Checker.checkTrue; */ public class AnswerCheckAction implements ActionUnit, M> { - private final Sending sending; + private final Sending sending; - public AnswerCheckAction(Sending sending) { + public AnswerCheckAction(Sending sending) { this.sending = sending; } diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerTextAction.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerTextAction.java index 06dc6a4..c91cea3 100644 --- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerTextAction.java +++ b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerTextAction.java @@ -5,7 +5,7 @@ import dev.struchkov.godfather.quarkus.context.service.Sending; import dev.struchkov.godfather.quarkus.core.unit.AnswerText; import dev.struchkov.godfather.quarkus.core.unit.MainUnit; import dev.struchkov.godfather.quarkus.core.unit.UnitRequest; -import dev.struchkov.godfather.quarkus.core.unit.func.collback.CallBackConsumer; +import dev.struchkov.godfather.quarkus.core.unit.func.CallBackConsumer; import io.smallrye.mutiny.Uni; import static dev.struchkov.haiti.utils.Checker.checkNotNull; @@ -17,9 +17,9 @@ import static dev.struchkov.haiti.utils.Checker.checkNotNull; */ public class AnswerTextAction implements ActionUnit, Message> { - private final Sending sending; + private final Sending sending; - public AnswerTextAction(Sending sending) { + public AnswerTextAction(Sending sending) { this.sending = sending; } diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/AnswerText.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/AnswerText.java index c7ed014..288904d 100644 --- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/AnswerText.java +++ b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/AnswerText.java @@ -6,8 +6,8 @@ import dev.struchkov.godfather.main.core.unit.UnitActiveType; import dev.struchkov.godfather.main.domain.BoxAnswer; import dev.struchkov.godfather.main.domain.content.Message; import dev.struchkov.godfather.quarkus.context.service.Accessibility; +import dev.struchkov.godfather.quarkus.core.unit.func.CallBackConsumer; import dev.struchkov.godfather.quarkus.core.unit.func.ProcessingData; -import dev.struchkov.godfather.quarkus.core.unit.func.collback.CallBackConsumer; import io.smallrye.mutiny.Uni; import java.util.HashSet; diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/CallBackConsumer.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/CallBackConsumer.java new file mode 100644 index 0000000..bb31d85 --- /dev/null +++ b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/CallBackConsumer.java @@ -0,0 +1,11 @@ +package dev.struchkov.godfather.quarkus.core.unit.func; + +import dev.struchkov.godfather.main.domain.SentBox; +import io.smallrye.mutiny.Uni; + +@FunctionalInterface +public interface CallBackConsumer { + + Uni processing(SentBox sentBox); + +} diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/collback/CallBackConsumer.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/collback/CallBackConsumer.java deleted file mode 100644 index 1310ae1..0000000 --- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/collback/CallBackConsumer.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.struchkov.godfather.quarkus.core.unit.func.collback; - -import dev.struchkov.godfather.main.domain.SentBox; -import io.smallrye.mutiny.Uni; - -@FunctionalInterface -public interface CallBackConsumer { - - Uni processing(SentBox sentBox); - -} diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/collback/IntegerCallBack.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/collback/IntegerCallBack.java deleted file mode 100644 index ec9aefa..0000000 --- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/collback/IntegerCallBack.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.struchkov.godfather.quarkus.core.unit.func.collback; - -import dev.struchkov.godfather.main.domain.SentBox; -import io.smallrye.mutiny.Uni; - -@FunctionalInterface -public interface IntegerCallBack extends CallBackConsumer { - - Uni processing(SentBox sentBox); - -} diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/collback/StringCallBack.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/collback/StringCallBack.java deleted file mode 100644 index b862363..0000000 --- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/unit/func/collback/StringCallBack.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.struchkov.godfather.quarkus.core.unit.func.collback; - -import dev.struchkov.godfather.main.domain.SentBox; -import io.smallrye.mutiny.Uni; - -@FunctionalInterface -public interface StringCallBack extends CallBackConsumer { - - Uni processing(SentBox sentBox); - -} diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/GeneralAutoResponder.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/GeneralAutoResponder.java index 5bd25f6..51a0357 100644 --- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/GeneralAutoResponder.java +++ b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/GeneralAutoResponder.java @@ -42,7 +42,7 @@ public class GeneralAutoResponder { protected ExecutorService executorService; protected GeneralAutoResponder( - Sending sending, + Sending sending, PersonSettingService personSettingService, StorylineService storyLineService ) { @@ -51,7 +51,7 @@ public class GeneralAutoResponder { init(sending); } - private void init(Sending sending) { + private void init(Sending sending) { actionUnitMap.put(TypeUnit.CHECK, new AnswerCheckAction<>(sending)); actionUnitMap.put(TypeUnit.TEXT, new AnswerTextAction(sending)); actionUnitMap.put(TypeUnit.REPLACE_CMD, new ReplaceCmdAction()); diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/action/AnswerCheckAction.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/action/AnswerCheckAction.java index 90dd791..ea89e34 100644 --- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/action/AnswerCheckAction.java +++ b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/action/AnswerCheckAction.java @@ -22,9 +22,9 @@ public class AnswerCheckAction implements ActionUnit sending; + private final Sending sending; - public AnswerCheckAction(Sending sending) { + public AnswerCheckAction(Sending sending) { this.sending = sending; } @@ -56,4 +56,5 @@ public class AnswerCheckAction implements ActionUnit, Message> { - private final Sending sending; + private final Sending sending; - public AnswerTextAction(Sending sending) { + public AnswerTextAction(Sending sending) { this.sending = sending; } @@ -39,10 +39,10 @@ public class AnswerTextAction implements ActionUnit, Message final BoxAnswer answer = optAnswer.get(); answer.setRecipientIfNull(message.getPersonId()); - final Optional> optSentBox = sending.send(answer); + final Optional optSentBox = sending.send(answer); final CallBackConsumer callBack = unit.getCallBack(); if (checkNotNull(callBack) && optAnswer.isPresent()) { - final SentBox sentBox = optSentBox.get(); + final SentBox sentBox = optSentBox.get(); callBack.processing(sentBox); } } diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/pusher/UserSanderPusher.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/pusher/UserSanderPusher.java index 9e55aff..a5c2351 100644 --- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/pusher/UserSanderPusher.java +++ b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/pusher/UserSanderPusher.java @@ -12,9 +12,9 @@ public class UserSanderPusher implements Pusher { private final String personId; private final String nameForm; - private final Sending sending; + private final Sending sending; - public UserSanderPusher(String personId, String nameForm, Sending sending) { + public UserSanderPusher(String personId, String nameForm, Sending sending) { this.personId = personId; this.nameForm = nameForm; this.sending = sending; diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/AnswerText.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/AnswerText.java index 5e365fc..2dca11e 100644 --- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/AnswerText.java +++ b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/AnswerText.java @@ -6,8 +6,8 @@ import dev.struchkov.godfather.main.core.unit.UnitActiveType; import dev.struchkov.godfather.main.domain.BoxAnswer; import dev.struchkov.godfather.main.domain.content.Message; import dev.struchkov.godfather.simple.context.service.Accessibility; +import dev.struchkov.godfather.simple.core.unit.func.CallBackConsumer; import dev.struchkov.godfather.simple.core.unit.func.ProcessingData; -import dev.struchkov.godfather.simple.core.unit.func.collback.CallBackConsumer; import java.util.HashSet; import java.util.List; @@ -132,7 +132,7 @@ public class AnswerText extends MainUnit { return this; } - public Builder callBack(CallBackConsumer callBack) { + public Builder callBack(CallBackConsumer callBack) { this.callBack = callBack; return this; } diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/CallBackConsumer.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/CallBackConsumer.java new file mode 100644 index 0000000..cd0cf12 --- /dev/null +++ b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/CallBackConsumer.java @@ -0,0 +1,10 @@ +package dev.struchkov.godfather.simple.core.unit.func; + +import dev.struchkov.godfather.main.domain.SentBox; + +@FunctionalInterface +public interface CallBackConsumer { + + void processing(SentBox sentBox); + +} diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/collback/CallBackConsumer.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/collback/CallBackConsumer.java deleted file mode 100644 index 986b0cc..0000000 --- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/collback/CallBackConsumer.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.struchkov.godfather.simple.core.unit.func.collback; - -import dev.struchkov.godfather.main.domain.SentBox; - -@FunctionalInterface -public interface CallBackConsumer { - - void processing(SentBox sentBox); - -} diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/collback/IntegerCallBack.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/collback/IntegerCallBack.java deleted file mode 100644 index a26cacb..0000000 --- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/collback/IntegerCallBack.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.struchkov.godfather.simple.core.unit.func.collback; - -import dev.struchkov.godfather.main.domain.SentBox; - -@FunctionalInterface -public interface IntegerCallBack extends CallBackConsumer { - - void processing(SentBox sentBox); - -} diff --git a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/collback/StringCallBack.java b/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/collback/StringCallBack.java deleted file mode 100644 index 75d121c..0000000 --- a/bot-core/bot-core-simple/src/main/java/dev/struchkov/godfather/simple/core/unit/func/collback/StringCallBack.java +++ /dev/null @@ -1,10 +0,0 @@ -package dev.struchkov.godfather.simple.core.unit.func.collback; - -import dev.struchkov.godfather.main.domain.SentBox; - -@FunctionalInterface -public interface StringCallBack extends CallBackConsumer { - - void processing(SentBox sentBox); - -} diff --git a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/BoxAnswer.java b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/BoxAnswer.java index dacd14b..7160ba4 100644 --- a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/BoxAnswer.java +++ b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/BoxAnswer.java @@ -21,6 +21,8 @@ public class BoxAnswer { */ private final boolean replace; + private final String replaceMessageId; + /** * Обычное текстовое сообщение. */ @@ -35,6 +37,7 @@ public class BoxAnswer { message = builder.message; keyBoard = builder.keyBoard; replace = builder.replace; + replaceMessageId = builder.replaceMessageId; recipientPersonId = builder.recipientPersonId; } @@ -50,16 +53,24 @@ public class BoxAnswer { return boxAnswer(false, message); } - public static BoxAnswer boxAnswer(String messageText, KeyBoard keyBoard) { - return boxAnswer(false, messageText, keyBoard); + public static BoxAnswer boxAnswer(String message, KeyBoard keyBoard) { + return boxAnswer(false, message, keyBoard); } public static BoxAnswer replaceBoxAnswer(String message) { return boxAnswer(true, message); } - public static BoxAnswer replaceBoxAnswer(String messageText, KeyBoard keyBoard) { - return boxAnswer(true, messageText, keyBoard); + public static BoxAnswer replaceBoxAnswer(String message, KeyBoard keyBoard) { + return boxAnswer(true, message, keyBoard); + } + + public static BoxAnswer replaceBoxAnswer(String messageId, String message) { + return BoxAnswer.builder().replace(true).replaceMessageId(messageId).message(message).build(); + } + + public static BoxAnswer replaceBoxAnswer(String messageId, String message, KeyBoard keyBoard) { + return BoxAnswer.builder().replace(true).replaceMessageId(messageId).message(message).keyBoard(keyBoard).build(); } public static Builder builder() { @@ -86,6 +97,10 @@ public class BoxAnswer { return replace; } + public String getReplaceMessageId() { + return replaceMessageId; + } + public String getRecipientPersonId() { return recipientPersonId; } @@ -103,16 +118,18 @@ public class BoxAnswer { @Override public String toString() { return "BoxAnswer{" + - "message='" + message + '\'' + - ", keyBoard=" + keyBoard + - ", replace=" + replace + - '}'; + "message='" + message + '\'' + + ", keyBoard=" + keyBoard + + ", replace=" + replace + + '}'; } public static final class Builder { + private String message; private KeyBoard keyBoard; private boolean replace; + private String replaceMessageId; private String recipientPersonId; private Builder() { @@ -138,9 +155,15 @@ public class BoxAnswer { return this; } + public Builder replaceMessageId(String val) { + replaceMessageId = val; + return this; + } + public BoxAnswer build() { return new BoxAnswer(this); } + } } diff --git a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/SentBox.java b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/SentBox.java index 1e98676..74babf2 100644 --- a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/SentBox.java +++ b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/SentBox.java @@ -2,23 +2,29 @@ package dev.struchkov.godfather.main.domain; import java.util.Optional; -public class SentBox { +public class SentBox { - private T messageId; + private String personId; + private String messageId; private BoxAnswer sentAnswer; private BoxAnswer originalAnswer; - public SentBox(T messageId, BoxAnswer sentAnswer, BoxAnswer originalAnswer) { + public SentBox(String personId, String messageId, BoxAnswer sentAnswer, BoxAnswer originalAnswer) { + this.personId = personId; this.messageId = messageId; this.sentAnswer = sentAnswer; this.originalAnswer = originalAnswer; } - public static Optional> optional(T messageId, BoxAnswer sentAnswer, BoxAnswer originalAnswer) { - return Optional.of(new SentBox<>(messageId, sentAnswer, originalAnswer)); + public static Optional optional(String personId, String messageId, BoxAnswer sentAnswer, BoxAnswer originalAnswer) { + return Optional.of(new SentBox(personId, messageId, sentAnswer, originalAnswer)); } - public T getMessageId() { + public String getPersonId() { + return personId; + } + + public String getMessageId() { return messageId; } diff --git a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/Message.java b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/Message.java index 3cb23db..ef70c38 100644 --- a/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/Message.java +++ b/bot-domain/bot-domain-main/src/main/java/dev/struchkov/godfather/main/domain/content/Message.java @@ -12,6 +12,8 @@ import java.util.Objects; */ public abstract class Message implements DeliverableText { + protected String id; + /** * Тип сообщения. */ @@ -33,6 +35,7 @@ public abstract class Message implements DeliverableText { private String text; protected Message(Message source) { + this.id = source.getId(); this.personId = source.getPersonId(); this.text = source.getText(); this.createDate = source.getCreateDate(); @@ -74,16 +77,25 @@ public abstract class Message implements DeliverableText { this.text = text; } + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + @Override public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; Message message = (Message) o; - return contentType == message.contentType && Objects.equals(createDate, message.createDate) && Objects.equals(personId, message.personId) && Objects.equals(text, message.text); + return Objects.equals(id, message.id); } @Override public int hashCode() { - return Objects.hash(contentType, createDate, personId, text); + return Objects.hash(id); } + }