Spring Application v3

Author: Pastor

heroes/src/main/java/ru/mifi/practice/voln/entity/UserEntity.java

@@ -2,11 +2,13 @@
 
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import org.springframework.util.StringUtils;
 
 import java.util.UUID;
 
 @Builder(toBuilder = true)
+@Getter
 @EqualsAndHashCode(of = "id")
 public class UserEntity {
     private UUID id;

heroes/src/main/java/ru/mifi/practice/voln/repository/MessageRepository.java

@@ -0,0 +1,9 @@
+package ru.mifi.practice.voln.repository;
+
+import reactor.core.publisher.Mono;
+
+import java.util.UUID;
+
+public interface MessageRepository {
+    Mono<Void> receivedMessage(UUID userId, String text);
+}

heroes/src/main/java/ru/mifi/practice/voln/repository/implementation/MessageRepositoryPostgres.java

@@ -0,0 +1,22 @@
+package ru.mifi.practice.voln.repository.implementation;
+
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+import ru.mifi.practice.voln.repository.MessageRepository;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Service
+public class MessageRepositoryPostgres implements MessageRepository {
+    private final Map<UUID, List<String>> telegramUserMessages = new ConcurrentHashMap<>();
+
+    @Override
+    public Mono<Void> receivedMessage(UUID userId, String text) {
+        telegramUserMessages.computeIfAbsent(userId, (k) -> new ArrayList<>()).add(text);
+        return Mono.empty();
+    }
+}

heroes/src/main/java/ru/mifi/practice/voln/service/TelegramHandlerService.java

@@ -17,6 +17,7 @@
 import reactor.core.scheduler.Scheduler;
 import ru.mifi.practice.voln.api.TelegramHandler;
 import ru.mifi.practice.voln.entity.UserEntity;
+import ru.mifi.practice.voln.repository.MessageRepository;
 import ru.mifi.practice.voln.repository.UserRepository;
 
 import java.util.List;
@@ -26,8 +27,23 @@
 @Service("TelegramHandler.Default")
 public class TelegramHandlerService implements TelegramHandler {
     private final UserRepository userRepository;
+    private final MessageRepository messageRepository;
     private final Scheduler telegramScheduler;
 
+    private static void sendContactPermissions(TelegramLongPollingBot bot, Long chatId) {
+        ReplyKeyboardMarkup markup = new ReplyKeyboardMarkup(List.of(
+            new KeyboardRow(List.of(KeyboardButton.builder().text("Отправить карточку").requestContact(true).build()))
+        ));
+        try {
+            bot.execute(SendMessage.builder().chatId(chatId)
+                .text("Для регистрации отправьте свою персональную карточку").replyMarkup(markup).build());
+        } catch (TelegramApiException e) {
+            if (log.isErrorEnabled()) {
+                log.error("", e);
+            }
+        }
+    }
+
     @Override
     public void received(TelegramLongPollingBot bot, Update update) {
         processing(bot, update)
@@ -67,26 +83,20 @@ private Mono<Void> processing(TelegramLongPollingBot bot, Update update) {
                 if (entity.isTelegramRegistered()) {
                     sink.next(entity);
                 } else {
-                    ReplyKeyboardMarkup markup = new ReplyKeyboardMarkup(List.of(
-                        new KeyboardRow(List.of(KeyboardButton.builder().text("Отправить карточку").requestContact(true).build()))
-                    ));
-                    try {
-                        bot.execute(SendMessage.builder().chatId(chatId)
-                            .text("Для регистрации отправьте свою персональную карточку").replyMarkup(markup).build());
-                    } catch (TelegramApiException e) {
-                        if (log.isErrorEnabled()) {
-                            log.error("", e);
-                        }
-                    }
+                    sendContactPermissions(bot, chatId);
                     sink.complete();
                 }
             })
             .map(entity -> processing(bot, update, entity))
+            .switchIfEmpty(Mono.fromCallable(() -> {
+                sendContactPermissions(bot, chatId);
+                return Mono.empty();
+            }))
             .then();
     }
 
     @SuppressWarnings("PMD.UnusedFormalParameter")
     private Mono<Void> processing(TelegramLongPollingBot bot, Update update, UserEntity entity) {
-        return Mono.empty();
+        return messageRepository.receivedMessage(entity.getId(), update.toString());
     }
 }