From 02f037c2923b4b04a4f24c381996364aa422f027 Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Sat, 25 Nov 2023 12:18:26 +0300 Subject: [PATCH] SubscribeConvert UnsubscribeConvert update --- .../main/context/convert/SubscribeConvert.java | 14 +++++++++++++- .../context/convert/UnsubscribeConvert.java | 17 +++++++++++++++-- .../telegram/domain/event/Subscribe.java | 6 ++++-- .../telegram/domain/event/Unsubscribe.java | 5 ++++- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/convert/SubscribeConvert.java b/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/convert/SubscribeConvert.java index dac01ef..45c3df3 100644 --- a/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/convert/SubscribeConvert.java +++ b/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/convert/SubscribeConvert.java @@ -4,8 +4,11 @@ import dev.struchkov.godfather.telegram.domain.event.Subscribe; import org.telegram.telegrambots.meta.api.objects.ChatMemberUpdated; import org.telegram.telegrambots.meta.api.objects.User; +import java.time.Instant; import java.time.LocalDateTime; +import java.time.ZoneId; +import static dev.struchkov.haiti.utils.Checker.checkNotNull; import static dev.struchkov.haiti.utils.Exceptions.utilityClass; public final class SubscribeConvert { @@ -21,9 +24,18 @@ public final class SubscribeConvert { subscribe.setTelegramId(user.getId().toString()); subscribe.setLastName(user.getLastName()); subscribe.setFirstName(user.getFirstName()); - subscribe.setSubscriptionDate(LocalDateTime.now()); + subscribe.setSubscriptionDate(LocalDateTime.ofInstant(Instant.ofEpochSecond(updated.getDate()), ZoneId.systemDefault())); subscribe.setLogin(user.getUserName()); + subscribe.setLanguageCode(user.getLanguageCode()); + subscribe.setPremium(convert(user.getIsPremium())); return subscribe; } + private static boolean convert(Boolean isPremium) { + if (checkNotNull(isPremium)) { + return isPremium; + } + return false; + } + } diff --git a/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/convert/UnsubscribeConvert.java b/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/convert/UnsubscribeConvert.java index 5a19d7c..9f8bb40 100644 --- a/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/convert/UnsubscribeConvert.java +++ b/telegram-context/telegram-context-main/src/main/java/dev/struchkov/godfather/telegram/main/context/convert/UnsubscribeConvert.java @@ -4,8 +4,11 @@ import dev.struchkov.godfather.telegram.domain.event.Unsubscribe; import org.telegram.telegrambots.meta.api.objects.ChatMemberUpdated; import org.telegram.telegrambots.meta.api.objects.User; +import java.time.Instant; import java.time.LocalDateTime; +import java.time.ZoneId; +import static dev.struchkov.haiti.utils.Checker.checkNotNull; import static dev.struchkov.haiti.utils.Exceptions.utilityClass; public final class UnsubscribeConvert { @@ -19,10 +22,20 @@ public final class UnsubscribeConvert { final Unsubscribe unsubscribe = new Unsubscribe(); unsubscribe.setTelegramId(user.getId().toString()); - unsubscribe.setLastName(user.getLastName()); + unsubscribe.setLogin(user.getUserName()); unsubscribe.setFirstName(user.getFirstName()); - unsubscribe.setUnsubscriptionDate(LocalDateTime.now()); + unsubscribe.setUnsubscriptionDate(LocalDateTime.ofInstant(Instant.ofEpochSecond(updated.getDate()), ZoneId.systemDefault())); + unsubscribe.setPremium(convert(user.getIsPremium())); + unsubscribe.setLastName(user.getLastName()); + unsubscribe.setLanguageCode(user.getLanguageCode()); return unsubscribe; } + private static boolean convert(Boolean isPremium) { + if (checkNotNull(isPremium)) { + return isPremium; + } + return false; + } + } diff --git a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/event/Subscribe.java b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/event/Subscribe.java index d6dc978..a361cc1 100644 --- a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/event/Subscribe.java +++ b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/event/Subscribe.java @@ -10,9 +10,11 @@ import java.time.LocalDateTime; public class Subscribe { private String telegramId; - private String firstName; - private String lastName; private String login; private LocalDateTime subscriptionDate; + private String languageCode; + private boolean premium; + private String firstName; + private String lastName; } diff --git a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/event/Unsubscribe.java b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/event/Unsubscribe.java index 7b8f0f5..2f4bd04 100644 --- a/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/event/Unsubscribe.java +++ b/telegram-domain/telegram-domain-main/src/main/java/dev/struchkov/godfather/telegram/domain/event/Unsubscribe.java @@ -17,8 +17,11 @@ import java.time.LocalDateTime; public class Unsubscribe { private String telegramId; + private String login; + private LocalDateTime unsubscriptionDate; + private String languageCode; + private boolean premium; private String firstName; private String lastName; - private LocalDateTime unsubscriptionDate; }