From 0ac055b488c19a8c656a427697d2d51607bcf86d Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Mon, 19 Sep 2022 20:21:31 +0300 Subject: [PATCH] release-0.0.34 --- docker-compose.yml | 20 --------- pom.xml | 11 +++-- telegram-consumer/pom.xml | 2 +- .../telegram-consumer-main/pom.xml | 2 +- .../main/consumer/CallbackQueryConvert.java | 3 ++ .../telegram-consumer-quarkus/pom.xml | 2 +- .../telegram-consumer-simple/pom.xml | 2 +- telegram-context/pom.xml | 2 +- .../telegram-context-main/pom.xml | 2 +- .../telegram-context-quarkus/pom.xml | 2 +- .../telegram-context-simple/pom.xml | 2 +- telegram-core/pom.xml | 2 +- telegram-core/telegram-core-main/pom.xml | 2 +- telegram-core/telegram-core-quarkus/pom.xml | 2 +- telegram-core/telegram-core-simple/pom.xml | 2 +- telegram-domain/pom.xml | 2 +- telegram-sender/pom.xml | 2 +- telegram-sender/telegram-sender-main/pom.xml | 2 +- .../telegram-sender-quarkus/pom.xml | 2 +- .../quarkus/sender/TelegramSender.java | 44 +++++++++++-------- .../telegram-sender-simple/pom.xml | 2 +- {telegram => telegram-simple}/pom.xml | 10 ++--- 22 files changed, 58 insertions(+), 64 deletions(-) delete mode 100644 docker-compose.yml rename {telegram => telegram-simple}/pom.xml (78%) diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 81aa912..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,20 +0,0 @@ -postgres: - image: 192.168.235.157:8182/postgres:13.1-alpine - container_name: theater-postgres - hostname: postgres - restart: on-failure - networks: - - network - ports: - - 5433:5432 - volumes: - - ./volume/db/01-init.sh:/docker-entrypoint-initdb.d/01-init.sh - - ./volume/db/storage:/var/lib/postgresql/data:z - environment: - - POSTGRES_USER=${POSTGRES_USER} - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - - APP_DB_USER=${DATASOURCE_USERNAME} - - APP_DB_PASS=${DATASOURCE_PASSWORD} - -volumes: - gitlab-notify: \ No newline at end of file diff --git a/pom.xml b/pom.xml index a07057e..b39d84f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-bot - 0.0.30 + 0.0.34 pom @@ -14,7 +14,7 @@ telegram-domain telegram-consumer telegram-context - telegram + telegram-simple Telegram Bot @@ -38,7 +38,7 @@ UTF-8 UTF-8 - 0.0.25 + 0.0.27 6.1.0 1.4.0 @@ -74,6 +74,11 @@ ${project.version} + + dev.struchkov.godfather.telegram + telegram-core + ${project.version} + dev.struchkov.godfather.telegram telegram-core-main diff --git a/telegram-consumer/pom.xml b/telegram-consumer/pom.xml index 26fe469..0987280 100644 --- a/telegram-consumer/pom.xml +++ b/telegram-consumer/pom.xml @@ -5,7 +5,7 @@ telegram-bot dev.struchkov.godfather.telegram - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-consumer/telegram-consumer-main/pom.xml b/telegram-consumer/telegram-consumer-main/pom.xml index 6635644..b6da63d 100644 --- a/telegram-consumer/telegram-consumer-main/pom.xml +++ b/telegram-consumer/telegram-consumer-main/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-consumer - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-consumer/telegram-consumer-main/src/main/java/dev/struchkov/godfather/telegram/main/consumer/CallbackQueryConvert.java b/telegram-consumer/telegram-consumer-main/src/main/java/dev/struchkov/godfather/telegram/main/consumer/CallbackQueryConvert.java index cdf806d..b7e511f 100644 --- a/telegram-consumer/telegram-consumer-main/src/main/java/dev/struchkov/godfather/telegram/main/consumer/CallbackQueryConvert.java +++ b/telegram-consumer/telegram-consumer-main/src/main/java/dev/struchkov/godfather/telegram/main/consumer/CallbackQueryConvert.java @@ -4,6 +4,8 @@ import dev.struchkov.godfather.main.domain.content.Mail; import org.telegram.telegrambots.meta.api.objects.CallbackQuery; import org.telegram.telegrambots.meta.api.objects.User; +import java.time.LocalDateTime; + /** * TODO: Добавить описание класса. * @@ -13,6 +15,7 @@ public class CallbackQueryConvert { public static Mail apply(CallbackQuery callbackQuery) { final Mail mail = new Mail(); + mail.setCreateDate(LocalDateTime.now()); mail.setText(callbackQuery.getData()); mail.setPersonId(callbackQuery.getMessage().getChatId()); diff --git a/telegram-consumer/telegram-consumer-quarkus/pom.xml b/telegram-consumer/telegram-consumer-quarkus/pom.xml index a3fc7f4..c1a93c0 100644 --- a/telegram-consumer/telegram-consumer-quarkus/pom.xml +++ b/telegram-consumer/telegram-consumer-quarkus/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-consumer - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-consumer/telegram-consumer-simple/pom.xml b/telegram-consumer/telegram-consumer-simple/pom.xml index e95e12b..6aa2aea 100644 --- a/telegram-consumer/telegram-consumer-simple/pom.xml +++ b/telegram-consumer/telegram-consumer-simple/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-consumer - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-context/pom.xml b/telegram-context/pom.xml index a8eeb18..32164dd 100644 --- a/telegram-context/pom.xml +++ b/telegram-context/pom.xml @@ -5,7 +5,7 @@ telegram-bot dev.struchkov.godfather.telegram - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-context/telegram-context-main/pom.xml b/telegram-context/telegram-context-main/pom.xml index 8e128bd..3a11b29 100644 --- a/telegram-context/telegram-context-main/pom.xml +++ b/telegram-context/telegram-context-main/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-context - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-context/telegram-context-quarkus/pom.xml b/telegram-context/telegram-context-quarkus/pom.xml index f41b5f6..585b332 100644 --- a/telegram-context/telegram-context-quarkus/pom.xml +++ b/telegram-context/telegram-context-quarkus/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-context - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-context/telegram-context-simple/pom.xml b/telegram-context/telegram-context-simple/pom.xml index fcec8ee..4dd4ee7 100644 --- a/telegram-context/telegram-context-simple/pom.xml +++ b/telegram-context/telegram-context-simple/pom.xml @@ -5,7 +5,7 @@ telegram-context dev.struchkov.godfather.telegram - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-core/pom.xml b/telegram-core/pom.xml index de1dab6..9c92fd8 100644 --- a/telegram-core/pom.xml +++ b/telegram-core/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-bot - 0.0.30 + 0.0.34 telegram-core-main diff --git a/telegram-core/telegram-core-main/pom.xml b/telegram-core/telegram-core-main/pom.xml index 0e7241c..6857b5e 100644 --- a/telegram-core/telegram-core-main/pom.xml +++ b/telegram-core/telegram-core-main/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-core - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-core/telegram-core-quarkus/pom.xml b/telegram-core/telegram-core-quarkus/pom.xml index 9e7efc1..3f3eb10 100644 --- a/telegram-core/telegram-core-quarkus/pom.xml +++ b/telegram-core/telegram-core-quarkus/pom.xml @@ -5,7 +5,7 @@ telegram-core dev.struchkov.godfather.telegram - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-core/telegram-core-simple/pom.xml b/telegram-core/telegram-core-simple/pom.xml index 10ae98d..61aae18 100644 --- a/telegram-core/telegram-core-simple/pom.xml +++ b/telegram-core/telegram-core-simple/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-core - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-domain/pom.xml b/telegram-domain/pom.xml index 8e9bb68..b8a1242 100644 --- a/telegram-domain/pom.xml +++ b/telegram-domain/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-bot - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-sender/pom.xml b/telegram-sender/pom.xml index 61000e9..30745e9 100644 --- a/telegram-sender/pom.xml +++ b/telegram-sender/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-bot - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-sender/telegram-sender-main/pom.xml b/telegram-sender/telegram-sender-main/pom.xml index a2f1006..8e421d7 100644 --- a/telegram-sender/telegram-sender-main/pom.xml +++ b/telegram-sender/telegram-sender-main/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-sender - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-sender/telegram-sender-quarkus/pom.xml b/telegram-sender/telegram-sender-quarkus/pom.xml index eebb70b..47a990a 100644 --- a/telegram-sender/telegram-sender-quarkus/pom.xml +++ b/telegram-sender/telegram-sender-quarkus/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-sender - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram-sender/telegram-sender-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/sender/TelegramSender.java b/telegram-sender/telegram-sender-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/sender/TelegramSender.java index 4c73121..545e081 100644 --- a/telegram-sender/telegram-sender-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/sender/TelegramSender.java +++ b/telegram-sender/telegram-sender-quarkus/src/main/java/dev/struchkov/godfather/telegram/quarkus/sender/TelegramSender.java @@ -55,31 +55,32 @@ public class TelegramSender implements TelegramSending { } @Override - public SendType getType() { - return SendType.PRIVATE; - } - public Uni sendNotSave(@NotNull Long telegramId, @NotNull BoxAnswer boxAnswer) { return sendBoxAnswer(telegramId, boxAnswer, false); } private Uni sendBoxAnswer(@NotNull Long telegramId, @NotNull BoxAnswer boxAnswer, boolean saveMessageId) { - isNotNull(telegramId, boxAnswer); + return Uni.createFrom().voidItem() + .onItem().transformToUni( + v -> { + isNotNull(telegramId, boxAnswer); - if (boxAnswer.isReplace() && checkNotNull(senderStorageService)) { - return senderStorageService.getLastSendMessage(telegramId) - .onItem().transformToUni( - lastId -> { - if (checkNotNull(lastId)) { - return replaceMessage(telegramId, lastId, boxAnswer); - } else { - return sendMessage(telegramId, boxAnswer, saveMessageId); - } + if (boxAnswer.isReplace() && checkNotNull(senderStorageService)) { + return senderStorageService.getLastSendMessage(telegramId) + .onItem().transformToUni( + lastId -> { + if (checkNotNull(lastId)) { + return replaceMessage(telegramId, lastId, boxAnswer); + } else { + return sendMessage(telegramId, boxAnswer, saveMessageId); + } + } + ); + } else { + return sendMessage(telegramId, boxAnswer, saveMessageId); } - ); - } else { - return sendMessage(telegramId, boxAnswer, saveMessageId); - } + } + ); } private Uni replaceMessage(@NotNull Long telegramId, @NotNull Integer lastMessageId, @NotNull BoxAnswer boxAnswer) { @@ -131,7 +132,12 @@ public class TelegramSender implements TelegramSending { } return Uni.createFrom().voidItem(); } - ); + ).replaceWithVoid(); + } + + @Override + public SendType getType() { + return SendType.PRIVATE; } } diff --git a/telegram-sender/telegram-sender-simple/pom.xml b/telegram-sender/telegram-sender-simple/pom.xml index beefb17..ca1eb84 100644 --- a/telegram-sender/telegram-sender-simple/pom.xml +++ b/telegram-sender/telegram-sender-simple/pom.xml @@ -5,7 +5,7 @@ dev.struchkov.godfather.telegram telegram-sender - 0.0.30 + 0.0.34 4.0.0 diff --git a/telegram/pom.xml b/telegram-simple/pom.xml similarity index 78% rename from telegram/pom.xml rename to telegram-simple/pom.xml index 5c3c4bc..7e6e5ac 100644 --- a/telegram/pom.xml +++ b/telegram-simple/pom.xml @@ -5,11 +5,11 @@ dev.struchkov.godfather.telegram telegram-bot - 0.0.30 + 0.0.34 4.0.0 - telegram + telegram-simple 17 @@ -19,15 +19,15 @@ dev.struchkov.godfather.telegram - telegram-core + telegram-core-simple dev.struchkov.godfather.telegram - telegram-consumer + telegram-consumer-simple dev.struchkov.godfather.telegram - telegram-simple-sender + telegram-sender-simple