Skip to content

Commit d16dbb7

Browse files
ViLsonCakeViLsonCake
committed
bugfix and refactoring
1 parent 8028a01 commit d16dbb7

File tree

6 files changed

+26
-30
lines changed

6 files changed

+26
-30
lines changed

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ public void checkNewFlightAndSendsThem() throws TelegramApiException {
100100
message.setChatId(user.getChatId());
101101
message.setParseMode(MARKDOWN_PARSE_MODE);
102102
message.setText(String.format(botMessageUtils.getMessageByLanguage(AN_124_ON_GROUND_TEXT, user.getBotLanguage()),
103-
geonameAirportDto.getName(), geonameCityDto.getName(), geonameCityDto.getCountryName(),
104-
flight.getId().substring(flight.getId().length() - 4), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
103+
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), user.getAirport(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
105104
));
106105
absSender.execute(message);
107106
} catch (AirportNotFoundException e) {
@@ -122,16 +121,16 @@ public void checkNewFlightAndSendsThem() throws TelegramApiException {
122121
message.setChatId(user.getChatId());
123122

124123
if (flight.getVerticalSpeed() > 0) {
124+
flightService.changeFlightTookOff(flightEntity, true);
125125
message.setParseMode(MARKDOWN_PARSE_MODE);
126-
message.setText(String.format(botMessageUtils.getMessageByLanguage(AN_124_TAKEOFF_MESSAGE, user.getBotLanguage()),
127-
geonameAirportDto.getName(), geonameCityDto.getName(), geonameCityDto.getCountryName(),
128-
flight.getId().substring(flight.getId().length() - 4), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
126+
message.setText(String.format(botMessageUtils.getMessageByLanguage(AN_124_TAKEOFF_TEXT, user.getBotLanguage()),
127+
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), user.getAirport(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
129128
));
130129
} else if (flight.getVerticalSpeed() < 0) {
130+
flightService.changeFlightLanding(flightEntity, true);
131131
message.setParseMode(MARKDOWN_PARSE_MODE);
132132
message.setText(String.format(botMessageUtils.getMessageByLanguage(AN_124_LANDING_TEXT, user.getBotLanguage()),
133-
geonameAirportDto.getName(), geonameCityDto.getName(), geonameCityDto.getCountryName(),
134-
flight.getId().substring(flight.getId().length() - 4), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
133+
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), user.getAirport(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
135134
));
136135
}
137136

@@ -204,8 +203,7 @@ public void checkNewFlightAndSendsThem() throws TelegramApiException {
204203
message.setChatId(user.getChatId());
205204
message.setParseMode(MARKDOWN_PARSE_MODE);
206205
message.setText(String.format(botMessageUtils.getMessageByLanguage(AN_124_ON_GROUND_TEXT, user.getBotLanguage()),
207-
geonameAirportDto.getName(), geonameCityDto.getName(), geonameCityDto.getCountryName(),
208-
flight.getId().substring(flight.getId().length() - 4), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
206+
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), user.getAirport(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
209207
));
210208
absSender.execute(message);
211209
} catch (AirportNotFoundException e) {
@@ -226,9 +224,8 @@ public void checkNewFlightAndSendsThem() throws TelegramApiException {
226224
SendMessage message = new SendMessage();
227225
message.setChatId(user.getChatId());
228226
message.setParseMode(MARKDOWN_PARSE_MODE);
229-
message.setText(String.format(botMessageUtils.getMessageByLanguage(AN_124_TAKEOFF_MESSAGE, user.getBotLanguage()),
230-
geonameAirportDto.getName(), geonameCityDto.getName(), geonameCityDto.getCountryName(),
231-
flight.getId().substring(flight.getId().length() - 4), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
227+
message.setText(String.format(botMessageUtils.getMessageByLanguage(AN_124_TAKEOFF_TEXT, user.getBotLanguage()),
228+
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), user.getAirport(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
232229
));
233230

234231
absSender.execute(message);
@@ -251,8 +248,7 @@ public void checkNewFlightAndSendsThem() throws TelegramApiException {
251248
message.setChatId(user.getChatId());
252249
message.setParseMode(MARKDOWN_PARSE_MODE);
253250
message.setText(String.format(botMessageUtils.getMessageByLanguage(AN_124_LANDING_TEXT, user.getBotLanguage()),
254-
geonameAirportDto.getName(), geonameCityDto.getName(), geonameCityDto.getCountryName(),
255-
flight.getId().substring(flight.getId().length() - 4), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
251+
flight.getId().substring(flight.getId().length() - 4), geonameAirportDto.getName(), user.getAirport(), geonameCityDto.getName(), geonameCityDto.getCountryName(), flight.getAltitude(), flight.getGroundSpeed(), flight.getDistance(), flight.getCallsign(), flight.getId()
256252
));
257253

258254
absSender.execute(message);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ _Scheduled_ flight (*%s*) to your airport from *%s* (*%s*), *%s*.
5151
[View here](https://www.flightradar24.com/%s/%s)
5252
""";
5353
public static final String AN_124_ON_GROUND_TEXT = """
54-
*An-124* (*%s*) is now at *%s*, *%s*, *%s*.
54+
*An-124* (*%s*) is now at *%s* (*%s*), *%s*, *%s*.
5555
5656
Altitude: *%sm*
5757
Ground speed: *%skm/h*
@@ -60,7 +60,7 @@ _Scheduled_ flight (*%s*) to your airport from *%s* (*%s*), *%s*.
6060
[View here](https://www.flightradar24.com/%s/%s)
6161
""";
6262
public static final String AN_124_LANDING_TEXT = """
63-
*An-124* (*%s*) _approaches_ *%s*, *%s*, *%s*.
63+
*An-124* (*%s*) _approaches_ *%s* (*%s*), *%s*, *%s*.
6464
6565
Altitude: %sm:
6666
Ground speed: %skm/h
@@ -69,8 +69,8 @@ _Scheduled_ flight (*%s*) to your airport from *%s* (*%s*), *%s*.
6969
View here:
7070
https://www.flightradar24.com/%s/%s
7171
""";
72-
public static final String AN_124_TAKEOFF_MESSAGE = """
73-
*An-124* (*%s*) _gaining altitude_ after takeoff from *%s*, *%s*, *%s*.
72+
public static final String AN_124_TAKEOFF_TEXT = """
73+
*An-124* (*%s*) _gaining altitude_ after takeoff from *%s* (*%s*), *%s*, *%s*.
7474
7575
Altitude: *%sm*
7676
Ground speed: *%skm/h*

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class BotMessageRuConst {
5151
[Смотрите здесь](https://www.flightradar24.com/%s/%s)
5252
""";
5353
public static final String AN_124_ON_GROUND_TEXT = """
54-
*Ан-124* (*%s*) сейчас находится в *%s*, *%s*, *%s*.
54+
*Ан-124* (*%s*) сейчас находится в *%s* (*%s*), *%s*, *%s*.
5555
5656
Высота: %sм
5757
Скорость: %sкм/ч
@@ -61,16 +61,16 @@ public class BotMessageRuConst {
6161
https://www.flightradar24.com/%s/%s
6262
""";
6363
public static final String AN_124_LANDING_TEXT = """
64-
*Ан-124* (*%s*) _заходит на посадку_ в *%s*, *%s*, *%s*.
64+
*Ан-124* (*%s*) _заходит на посадку_ в *%s* (*%s*), *%s*, *%s*.
6565
6666
Высота: *%sм*
6767
Скорость: *%sкм/ч*
6868
Расстояние от вашего аэропорта: *%sкм*
6969
7070
[Смотрите здесь](https://www.flightradar24.com/%s/%s)
7171
""";
72-
public static final String AN_124_TAKEOFF_MESSAGE = """
73-
*Ан-124* (*%s*) _набирает высоту_ после взлета из *%s*, *%s*, *%s*.
72+
public static final String AN_124_TAKEOFF_TEXT = """
73+
*Ан-124* (*%s*) _набирает высоту_ после взлета из *%s* (*%s*), *%s*, *%s*.
7474
7575
Высота: *%sм*
7676
Скорость: *%sкм/ч*

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class BotMessageUkConst {
5151
[Дивіться тут](https://www.flightradar24.com/%s/%s)
5252
""";
5353
public static final String AN_124_ON_GROUND_TEXT = """
54-
*Ан-124* (*%s*) зараз знаходиться в *%s*, *%s*, *%s*.
54+
*Ан-124* (*%s*) зараз знаходиться в *%s* (*%s*), *%s*, *%s*.
5555
5656
Висота: *%sм*
5757
Швидкість: *%sкм/г*
@@ -60,16 +60,16 @@ public class BotMessageUkConst {
6060
[Дивіться тут](https://www.flightradar24.com/%s/%s)
6161
""";
6262
public static final String AN_124_LANDING_TEXT = """
63-
*Ан-124* (*%s*) _заходить на посадку_ в *%s*, *%s*, *%s*.
63+
*Ан-124* (*%s*) _заходить на посадку_ в *%s* (*%s*), *%s*, *%s*.
6464
6565
Висота: *%sм*
6666
Швидкість: *%sкм/г*
6767
Відстань від вашого аеропорту: *%sкм*
6868
6969
[Дивіться тут](https://www.flightradar24.com/%s/%s)
7070
""";
71-
public static final String AN_124_TAKEOFF_MESSAGE = """
72-
*Ан-124* (*%s*) _набирає висоту_ після зльоту з *%s*, *%s*, *%s*.
71+
public static final String AN_124_TAKEOFF_TEXT = """
72+
*Ан-124* (*%s*) _набирає висоту_ після зльоту з *%s* (*%s*), *%s*, *%s*.
7373
7474
Висота: *%sм*
7575
Швидкість: *%sкм/г*

‎telegram-bot/src/main/java/project/vilsoncake/telegrambot/entity/enumerated/BotMessageTemplate.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public enum BotMessageTemplate {
1313
AN_124_FLIGHT_TEXT,
1414
AN_124_ON_GROUND_TEXT,
1515
AN_124_LANDING_TEXT,
16-
AN_124_TAKEOFF_MESSAGE,
16+
AN_124_TAKEOFF_TEXT,
1717
AN_124_LIKELY_TO_LAND_AIRPORT_TEXT,
1818
AN_124_FLYING_NEAR_YOUR_AIRPORT_TEXT,
1919
AN_124_IN_YOUR_AIRPORT_NOW_TEXT,

‎telegram-bot/src/main/java/project/vilsoncake/telegrambot/utils/BotMessageUtils.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ private String getEngConstant(BotMessageTemplate template) {
3232
case AN_124_FLIGHT_TEXT -> BotMessageEngConst.AN_124_FLIGHT_TEXT;
3333
case AN_124_ON_GROUND_TEXT -> BotMessageEngConst.AN_124_ON_GROUND_TEXT;
3434
case AN_124_LANDING_TEXT -> BotMessageEngConst.AN_124_LANDING_TEXT;
35-
case AN_124_TAKEOFF_MESSAGE -> BotMessageEngConst.AN_124_TAKEOFF_MESSAGE;
35+
case AN_124_TAKEOFF_TEXT -> BotMessageEngConst.AN_124_TAKEOFF_TEXT;
3636
case AN_124_LIKELY_TO_LAND_AIRPORT_TEXT -> BotMessageEngConst.AN_124_LIKELY_TO_LAND_AIRPORT_TEXT;
3737
case AN_124_FLYING_NEAR_YOUR_AIRPORT_TEXT -> BotMessageEngConst.AN_124_FLYING_NEAR_YOUR_AIRPORT_TEXT;
3838
case AN_124_IN_YOUR_AIRPORT_NOW_TEXT -> BotMessageEngConst.AN_124_IN_YOUR_AIRPORT_NOW_TEXT;
@@ -72,7 +72,7 @@ private String getRuConstant(BotMessageTemplate template) {
7272
case AN_124_FLIGHT_TEXT -> BotMessageRuConst.AN_124_FLIGHT_TEXT;
7373
case AN_124_ON_GROUND_TEXT -> BotMessageRuConst.AN_124_ON_GROUND_TEXT;
7474
case AN_124_LANDING_TEXT -> BotMessageRuConst.AN_124_LANDING_TEXT;
75-
case AN_124_TAKEOFF_MESSAGE -> BotMessageRuConst.AN_124_TAKEOFF_MESSAGE;
75+
case AN_124_TAKEOFF_TEXT -> BotMessageRuConst.AN_124_TAKEOFF_TEXT;
7676
case AN_124_LIKELY_TO_LAND_AIRPORT_TEXT -> BotMessageRuConst.AN_124_LIKELY_TO_LAND_AIRPORT_TEXT;
7777
case AN_124_FLYING_NEAR_YOUR_AIRPORT_TEXT -> BotMessageRuConst.AN_124_FLYING_NEAR_YOUR_AIRPORT_TEXT;
7878
case AN_124_IN_YOUR_AIRPORT_NOW_TEXT -> BotMessageRuConst.AN_124_IN_YOUR_AIRPORT_NOW_TEXT;
@@ -112,7 +112,7 @@ private String getUaConstant(BotMessageTemplate template) {
112112
case AN_124_FLIGHT_TEXT -> BotMessageUkConst.AN_124_FLIGHT_TEXT;
113113
case AN_124_ON_GROUND_TEXT -> BotMessageUkConst.AN_124_ON_GROUND_TEXT;
114114
case AN_124_LANDING_TEXT -> BotMessageUkConst.AN_124_LANDING_TEXT;
115-
case AN_124_TAKEOFF_MESSAGE -> BotMessageUkConst.AN_124_TAKEOFF_MESSAGE;
115+
case AN_124_TAKEOFF_TEXT -> BotMessageUkConst.AN_124_TAKEOFF_TEXT;
116116
case AN_124_LIKELY_TO_LAND_AIRPORT_TEXT -> BotMessageUkConst.AN_124_LIKELY_TO_LAND_AIRPORT_TEXT;
117117
case AN_124_FLYING_NEAR_YOUR_AIRPORT_TEXT -> BotMessageUkConst.AN_124_FLYING_NEAR_YOUR_AIRPORT_TEXT;
118118
case AN_124_IN_YOUR_AIRPORT_NOW_TEXT -> BotMessageUkConst.AN_124_IN_YOUR_AIRPORT_NOW_TEXT;

0 commit comments

Comments
 (0)