refactor

Author: ViLsonCake

telegram-bot/src/main/java/project/vilsoncake/telegrambot/constant/MessageConst.java

@@ -5,12 +5,14 @@ public class MessageConst {
             Hello, %s. Welcome to avgeek bot!
             I will send you all wide-body aircraft flying into your airport, as well as An-124 alerts.
                         
-            For this, write the icao/iata code of your airport, you can get it on flightradar24.
+            For this, write the icao/iata code of your airport, for example (waw) - Warsaw Chopin Airport.
+            You can get it on flightradar24.
             """;
-    public static final String CHOOSE_AIRPORT_TEXT = "Great! How your airport is %s.";
+    public static final String CHOOSE_AIRPORT_TEXT = "Great! Now your airport is %s.";
     public static final String CHANGE_AIRPORT_TEXT = "Write the icao/iata code of your airport, you can get it on flightradar24.";
-    public static final String CURRENT_AIRPORT_TEXT = "Your current airport is: %s (%s)";
+    public static final String CURRENT_AIRPORT_TEXT = "Your current airport is: %s (%s).";
     public static final String INVALID_AIRPORT_CODE_TEXT = "The code \"%s\" is invalid, make sure you didn't make a typo.";
+    public static final String USER_CANNOT_CHOOSE_AIRPORT_TEXT = "You have not yet selected an airport, please write its iata/icao code.";
     public static final String FLIGHT_TEXT = """
             Flight to your airport from %s.
             Aircraft: %s

telegram-bot/src/main/java/project/vilsoncake/telegrambot/constant/TimeConst.java

@@ -1,5 +1,5 @@
 package project.vilsoncake.telegrambot.constant;
 
 public class TimeConst {
-    public static final int FLIGHT_CHECK_DELAY_IN_MINUTES = 15;
+    public static final int FLIGHT_CHECK_DELAY_IN_MINUTES = 10;
 }

telegram-bot/src/main/java/project/vilsoncake/telegrambot/service/impl/BotServiceImpl.java

@@ -61,6 +61,14 @@ public SendMessage changeUserAirportCommand(String username, Long chatId) {
 
     @Override
     public SendMessage getUserAirportCommand(String username, Long chatId) {
+        if (userService.getUserByUsername(username).getState().equals(UserState.CHOOSING_AIRPORT)) {
+            SendMessage message = new SendMessage();
+            message.setChatId(chatId);
+            message.setText(MessageConst.USER_CANNOT_CHOOSE_AIRPORT_TEXT);
+
+            return message;
+        }
+
         String airportCode = userService.getUserByUsername(username).getAirport();
 
         AirportNameDto airportNameDto = webClient.get()