send data about live flights

Author: ViLsonCake

telegram-bot/src/main/java/project/vilsoncake/telegrambot/bot/ScheduleSender.java

@@ -124,11 +124,14 @@ public void checkNewFlightAndSendsThem() throws TelegramApiException {
                             flight.getAirport(), flight.getCode(), flight.getAirlineName(), user.getAirport()
                     ));
 
-                    try {
-                        absSender.execute(message);
-                    } catch (TelegramApiException e) {
-                        throw new RuntimeException(e);
-                    }
+                    absSender.execute(message);
+                } else if (flightService.existsByUserAndFlightId(user, flight.getId()) && flight.isLive() && !flightService.findByUserAndFlightId(user, flight.getId()).isActive()) {
+                    flightService.changeFlightActive(flightService.findByUserAndFlightId(user, flight.getId()), true);
+                    SendMessage message = new SendMessage();
+                    message.setChatId(user.getChatId());
+                    message.setText(String.format(MessageConst.LIVE_FLIGHT_TEXT, flight.getAirport(), flight.getCode(), flight.getAirlineName(), flight.getCallsign(), flight.getId()));
+
+                    absSender.execute(message);
                 }
             }
         }

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

@@ -17,31 +17,38 @@ public class MessageConst {
             Flight to your airport from %s.
             Aircraft: %s
             Airline: %s
-            View there:
+            View here:
             https://www.flightradar24.com/airport/%s/arrivals
             """;
+    public static final String LIVE_FLIGHT_TEXT = """
+            Flight now to your airport from %s.
+            Aircraft: %s
+            Airline: %s
+            View here:
+            https://www.flightradar24.com/%s/%s
+            """;
     public static final String AN_124_FLIGHT_TEXT = """
             An-124 in the air right now.
             Altitude: %sm:
             Ground speed: %skm/h
             Distance from your airport: %skm
-            View there:
+            View here:
             https://www.flightradar24.com/%s/%s
             """;
     public static final String AN_124_NEARLY_CLOSE_TO_YOUR_AIRPORT_TEXT = """
             An-124 NEARLY CLOSE TO YOUR AIRPORT right now.
             Altitude: %sm:
             Ground speed: %skm/h
             Distance from your airport: %skm
-            View there:
+            View here:
             https://www.flightradar24.com/%s/%s
             """;
     public static final String AN_124_IN_YOUR_AIRPORT_NOW_TEXT = """
             An-124 IN YOUR AIRPORT RIGHT NOW.
             Altitude: %sm:
             Ground speed: %skm/h
             Distance from your airport: %skm
-            View there:
+            View here:
             https://www.flightradar24.com/%s/%s
             """;
     public static final String AN_124_CODE = "A124";

telegram-bot/src/main/java/project/vilsoncake/telegrambot/dto/FlightDataDto.java

@@ -17,4 +17,13 @@ public class FlightDataDto {
 
     @JsonAlias("airport")
     private String airport;
+
+    @JsonAlias("callsign")
+    private String callsign;
+
+    @JsonAlias("live")
+    private boolean live;
+
+    @JsonAlias("text")
+    private String text;
 }