added opportunity to select period for invest plot

Dema-koder · Dema-koder · commit bd4d1ef65103 · 2025-05-14T05:36:28.000+03:00
diff --git a/src/main/java/org/example/project/configuration/BotKeyboardConfig.java b/src/main/java/org/example/project/configuration/BotKeyboardConfig.java
@@ -26,7 +26,7 @@ public ReplyKeyboardMarkup mainMenuKeyboard() {
 
         KeyboardRow row3 = new KeyboardRow();
         row3.add(new KeyboardButton("/leetcode"));
-        row3.add(new KeyboardButton("/investplot"));
+        row3.add(new KeyboardButton("/invest"));
 
         keyboard.add(row1);
         keyboard.add(row2);
@@ -152,4 +152,40 @@ public ReplyKeyboardMarkup difficultyMenuKeyboard() {
 
         return keyboardMarkup;
     }
+
+    @Bean
+    public ReplyKeyboardMarkup investMenuKeyboard() {
+        ReplyKeyboardMarkup keyboardMarkup = new ReplyKeyboardMarkup();
+        List<KeyboardRow> keyboard = new ArrayList<>();
+
+        KeyboardRow row1 = new KeyboardRow();
+        row1.add(new KeyboardButton("15min"));
+        row1.add(new KeyboardButton("30min"));
+        row1.add(new KeyboardButton("1h"));
+
+        KeyboardRow row2 = new KeyboardRow();
+        row2.add(new KeyboardButton("3h"));
+        row2.add(new KeyboardButton("6h"));
+        row2.add(new KeyboardButton("12h"));
+
+        KeyboardRow row3 = new KeyboardRow();
+        row3.add(new KeyboardButton("day"));
+        row3.add(new KeyboardButton("week"));
+        row3.add(new KeyboardButton("month"));
+
+        KeyboardRow row4 = new KeyboardRow();
+        row4.add(new KeyboardButton("year"));
+        row4.add(new KeyboardButton("/back"));
+
+        keyboard.add(row1);
+        keyboard.add(row2);
+        keyboard.add(row3);
+        keyboard.add(row4);
+
+        keyboardMarkup.setKeyboard(keyboard);
+        keyboardMarkup.setResizeKeyboard(true);
+        keyboardMarkup.setOneTimeKeyboard(true);
+
+        return keyboardMarkup;
+    }
 }
diff --git a/src/main/java/org/example/project/service/LeetcodeService.java b/src/main/java/org/example/project/service/LeetcodeService.java
@@ -9,7 +9,9 @@
 import org.example.project.data.leetcode.Question;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
@@ -19,16 +21,16 @@
 @Service
 public class LeetcodeService {
 
-    public String getProblemWithTagAndDifficulty(String difficulty, String userTag) {
-        var problems = getProblemsWithTagAndDifficulty(difficulty, userTag);
-        if (problems == null)
-            return "Sorry, command did not performed";
+    public String getProblemWithTagAndDifficulty(String difficulty, String userTag) throws URISyntaxException, IOException, InterruptedException {
+        List<Problem> problems = getProblemsWithTagAndDifficulty(difficulty, userTag);
+        if (problems.isEmpty())
+            throw new IOException();
         int randomNumber = new Random().nextInt(problems.size());
         var randomProblem = problems.get(randomNumber);
         return "Title: " + randomProblem.title + "\nLink: https://leetcode.com/problems/" + randomProblem.titleSlug;
     }
 
-    private List<Problem> getProblemsWithTagAndDifficulty(String difficulty, String userTag) {
+    private List<Problem> getProblemsWithTagAndDifficulty(String difficulty, String userTag) throws URISyntaxException, IOException, InterruptedException {
         try {
             HttpClient client = HttpClient.newHttpClient();
             HttpRequest request = HttpRequest.newBuilder()
@@ -50,7 +52,7 @@ private List<Problem> getProblemsWithTagAndDifficulty(String difficulty, String
             return problems;
         } catch (Exception e) {
             log.error("Exception: {}", e.getMessage());
-            return null;
+            throw e;
         }
     }
 
diff --git a/src/main/java/org/example/project/service/command/invest/BackCommandHandlerInvest.java b/src/main/java/org/example/project/service/command/invest/BackCommandHandlerInvest.java
@@ -0,0 +1,31 @@
+package org.example.project.service.command.invest;
+
+import lombok.RequiredArgsConstructor;
+import org.example.project.service.TelegramMessageSender;
+import org.example.project.service.UserSessionService;
+import org.example.project.service.command.CommandHandler;
+import org.example.project.service.state.DialogMode;
+import org.springframework.stereotype.Component;
+import org.telegram.telegrambots.meta.api.objects.Update;
+import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup;
+
+@Component
+@RequiredArgsConstructor
+public class BackCommandHandlerInvest implements InvestCommandHandler, CommandHandler {
+
+    private final TelegramMessageSender messageSender;
+    private final UserSessionService userSessionService;
+    private final ReplyKeyboardMarkup mainMenuKeyboard;
+
+    @Override
+    public void handleCommand(long chatId, Update update) {
+        messageSender.sendMessageWithKeyboard(chatId, "You returned to main state", mainMenuKeyboard);
+        userSessionService.setDialogMode(chatId, DialogMode.MAIN);
+    }
+
+    @Override
+    public boolean canHandle(String command) {
+        return command.equals("/back");
+    }
+}
+
diff --git a/src/main/java/org/example/project/service/command/invest/GotPeriodHandler.java b/src/main/java/org/example/project/service/command/invest/GotPeriodHandler.java
@@ -0,0 +1,42 @@
+package org.example.project.service.command.invest;
+
+import lombok.RequiredArgsConstructor;
+import org.example.project.service.StoncksPlotService;
+import org.example.project.service.TelegramMessageSender;
+import org.example.project.service.command.CommandHandler;
+import org.springframework.stereotype.Component;
+import org.telegram.telegrambots.meta.api.objects.Update;
+import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Component
+@RequiredArgsConstructor
+public class GotPeriodHandler implements InvestCommandHandler, CommandHandler {
+    private final TelegramMessageSender messageSender;
+    private final StoncksPlotService stoncksPlotService;
+    private final ReplyKeyboardMarkup investMenuKeyboard;
+
+    @Override
+    public void handleCommand(long chatId, Update update) {
+        String plot = stoncksPlotService.getPlotImage(update.getMessage().getText());
+        messageSender.sendPlotToUserWithKeyboard(chatId, plot, investMenuKeyboard);
+    }
+
+    @Override
+    public boolean canHandle(String command) {
+        Set<String> set = new HashSet<>();
+        set.add("15min");
+        set.add("30min");
+        set.add("1h");
+        set.add("3h");
+        set.add("6h");
+        set.add("12h");
+        set.add("day");
+        set.add("week");
+        set.add("month");
+        set.add("year");
+        return set.contains(command);
+    }
+}
diff --git a/src/main/java/org/example/project/service/command/invest/InvestCommandHandler.java b/src/main/java/org/example/project/service/command/invest/InvestCommandHandler.java
@@ -0,0 +1,5 @@
+package org.example.project.service.command.invest;
+
+public interface InvestCommandHandler {
+    boolean canHandle(String command);
+}
diff --git a/src/main/java/org/example/project/service/command/invest/InvestCommandHandlerFactory.java b/src/main/java/org/example/project/service/command/invest/InvestCommandHandlerFactory.java
@@ -0,0 +1,34 @@
+package org.example.project.service.command.invest;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.example.project.service.command.CommandHandler;
+import org.example.project.service.command.WrongMessageHandler;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class InvestCommandHandlerFactory {
+    private final List<InvestCommandHandler> handlers;
+    private final WrongMessageHandler wrongHandler;
+
+    public CommandHandler getHandler(String command) {
+        for (var handler: handlers)
+            if (handler.canHandle(command))
+                return (CommandHandler) handler;
+        return wrongHandler;
+    }
+
+    @PostConstruct
+    public void init() {
+        log.info("Registered handlers: {}",
+                handlers.stream()
+                        .map(h -> h.getClass().getSimpleName())
+                        .collect(Collectors.joining(", ")));
+    }
+}
diff --git a/src/main/java/org/example/project/service/command/leetcode/BackCommandHandlerLeetcode.java b/src/main/java/org/example/project/service/command/leetcode/BackCommandHandlerLeetcode.java
@@ -11,7 +11,7 @@
 
 @Component
 @RequiredArgsConstructor
-public class BackCommandHandler implements LeetcodeCommandHandler, CommandHandler {
+public class BackCommandHandlerLeetcode implements LeetcodeCommandHandler, CommandHandler {
 
     private final TelegramMessageSender messageSender;
     private final UserSessionService userSessionService;
diff --git a/src/main/java/org/example/project/service/command/leetcode/GotTagHandler.java b/src/main/java/org/example/project/service/command/leetcode/GotTagHandler.java
@@ -4,10 +4,14 @@
 import org.example.project.service.LeetcodeService;
 import org.example.project.service.TelegramMessageSender;
 import org.example.project.service.command.CommandHandler;
+import org.example.project.service.job.LeetcodeTags;
 import org.springframework.stereotype.Component;
 import org.telegram.telegrambots.meta.api.objects.Update;
 import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup;
 
+import java.io.IOException;
+import java.net.URISyntaxException;
+
 @Component
 @RequiredArgsConstructor
 public class GotTagHandler implements CommandHandler, LeetcodeCommandHandler{
@@ -18,12 +22,33 @@ public class GotTagHandler implements CommandHandler, LeetcodeCommandHandler{
 
     @Override
     public void handleCommand(long chatId, Update update) {
-        LeetcodeCommandHandlerFactory.setTag(update.getMessage().getText());
-        String link = leetcodeService.getProblemWithTagAndDifficulty(
-                LeetcodeCommandHandlerFactory.getDifficulty(),
-                LeetcodeCommandHandlerFactory.getTag()
+        String tag = update.getMessage().getText();
+        if (!LeetcodeTags.getTags().contains(tag)) {
+            messageSender.sendPlotToUserWithKeyboard(
+                    chatId,
+                    "Sorry, you sent wrong tag",
+                    leetcodeMenuKeyboard
+            );
+            return;
+        }
+        String link = "";
+        try {
+            link = leetcodeService.getProblemWithTagAndDifficulty(
+                    LeetcodeCommandHandlerFactory.getDifficulty(),
+                    tag
+            );
+        } catch (URISyntaxException | IOException | InterruptedException e) {
+            messageSender.sendMessageWithKeyboard(
+                    chatId,
+                    "Internal server error!",
+                    leetcodeMenuKeyboard
+            );
+        }
+        messageSender.sendMessageWithKeyboard(
+                chatId,
+                "Here is your task:\n" + link,
+                leetcodeMenuKeyboard
         );
-        messageSender.sendMessageWithKeyboard(chatId,"Here is your task:\n" + link, leetcodeMenuKeyboard);
     }
 
     @Override
diff --git a/src/main/java/org/example/project/service/command/main/SwitchToInvestPlotHandler.java b/src/main/java/org/example/project/service/command/main/SwitchToInvestPlotHandler.java
@@ -2,29 +2,30 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.example.project.service.StoncksPlotService;
 import org.example.project.service.TelegramMessageSender;
+import org.example.project.service.UserSessionService;
 import org.example.project.service.command.CommandHandler;
+import org.example.project.service.state.DialogMode;
 import org.springframework.stereotype.Component;
 import org.telegram.telegrambots.meta.api.objects.Update;
 import org.telegram.telegrambots.meta.api.objects.replykeyboard.ReplyKeyboardMarkup;
 
 @Slf4j
 @Component
 @RequiredArgsConstructor
-public class InvestPlotHandler implements MainCommandHandler, CommandHandler {
-    private final ReplyKeyboardMarkup mainMenuKeyboard;
+public class SwitchToInvestPlotHandler implements MainCommandHandler, CommandHandler {
+    private final ReplyKeyboardMarkup investMenuKeyboard;
     private final TelegramMessageSender messageSender;
-    private final StoncksPlotService stoncksPlotService;
+    private final UserSessionService userSessionService;
 
     @Override
     public boolean canHandle(String command) {
-        return command.equals("/investplot");
+        return command.equals("/invest");
     }
 
     @Override
     public void handleCommand(long chatId, Update update) {
-        String plot = stoncksPlotService.getPlotImage("week");
-        messageSender.sendPlotToUserWithKeyboard(chatId, plot, mainMenuKeyboard);
+        messageSender.sendMessageWithKeyboard(chatId, "Choose period", investMenuKeyboard);
+        userSessionService.setDialogMode(chatId, DialogMode.INVEST);
     }
 }
diff --git a/src/main/java/org/example/project/service/state/DialogMode.java b/src/main/java/org/example/project/service/state/DialogMode.java
@@ -4,5 +4,6 @@ public enum DialogMode {
     MAIN,
     NOTE,
     GPT,
-    LEETCODE
+    LEETCODE,
+    INVEST
 }
diff --git a/src/main/java/org/example/project/service/state/DialogStateFactory.java b/src/main/java/org/example/project/service/state/DialogStateFactory.java
@@ -10,13 +10,15 @@ public class DialogStateFactory {
     private final NoteState noteState;
     private final GPTState gptState;
     private final LeetcodeState leetcodeState;
+    private final InvestState investState;
 
     public DialogState getState(DialogMode mode) {
         return switch (mode) {
             case MAIN -> mainState;
             case NOTE -> noteState;
             case GPT -> gptState;
             case LEETCODE -> leetcodeState;
+            case INVEST -> investState;
         };
     }
 }
diff --git a/src/main/java/org/example/project/service/state/InvestState.java b/src/main/java/org/example/project/service/state/InvestState.java
@@ -0,0 +1,24 @@
+package org.example.project.service.state;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.example.project.service.command.CommandHandler;
+import org.example.project.service.command.invest.InvestCommandHandlerFactory;
+import org.springframework.stereotype.Component;
+import org.telegram.telegrambots.meta.api.objects.Update;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class InvestState implements DialogState{
+    private final InvestCommandHandlerFactory commandHandlerFactory;
+
+    @Override
+    public void handleUpdate(Update update) {
+        String command = update.getMessage().getText();
+        long chatId = update.getMessage().getChatId();
+
+        CommandHandler handler = commandHandlerFactory.getHandler(command);
+        handler.handleCommand(chatId, update);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@ public enum DialogMode {`
`4`	`4`	`MAIN,`
`5`	`5`	`NOTE,`
`6`	`6`	`GPT,`
`7`		`- LEETCODE`
	`7`	`+ LEETCODE,`
	`8`	`+ INVEST`
`8`	`9`	`}`