Save into db

pom.xml

@@ -101,5 +101,10 @@
             <version>3.1.4</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+            <version>9.4.46.v20220331</version>
+        </dependency>
     </dependencies>
 </project>

src/main/java/org/oopproject/Database.java

@@ -60,7 +60,6 @@ public Integer getUserAge(long chatId) {
             e.printStackTrace();
         }
         return null;
-
     }
 
     public void updateGenreIndexesJson(long chatId, String genreIndexesJson) {

src/main/java/org/oopproject/SiteRequests.java

@@ -2,12 +2,13 @@
 
 import feign.Param;
 import feign.RequestLine;
-import org.oopproject.deserializers.FilmDeserializer;
+import org.oopproject.deserializers.*;
 import org.oopproject.parameters.MovieParameters;
-import org.oopproject.deserializers.AuthDeserializer;
-import org.oopproject.deserializers.ListDeserializer;
+
+import java.util.List;
 
 public interface SiteRequests {
+
     @RequestLine("GET /authentication?api_key={api_key}")
     AuthDeserializer checkAuthStatus(@Param("api_key") String token);
 
@@ -17,6 +18,18 @@ public interface SiteRequests {
     @RequestLine("GET /movie/{id}?api_key={api_key}")
     FilmDeserializer getMovieById(@Param("api_key") String token, @Param("id") String id);
 
+    @RequestLine("GET /movie/upcoming?api_key={api_key}&language={language}&page={page}")
+    ListDeserializer findUpcomingMovies(@Param("api_key") String token,
+                                               @Param("language") String language,
+                                               @Param("page") int page);
+
+    @RequestLine("GET /movie/{id}/videos?api_key={api_key}&language={language}")
+    MovieVideosResponse getMovieVideos(@Param("api_key") String token,
+                                       @Param("id") String movieId,
+                                       @Param("language") String language);
+
+
+
     @RequestLine("GET /discover/movie" +
             "?api_key={api_key}" +
             "&certification.lte={certification_lte}" +

src/main/java/org/oopproject/TelegramBot.java

@@ -3,22 +3,22 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import org.oopproject.deserializers.ListDeserializer;
+import org.oopproject.services.BroadcastingService;
 import org.oopproject.utils.CommandWaiter;
 import org.oopproject.utils.Genres;
 import org.oopproject.parameters.MovieParameters;
 import org.oopproject.parameters.ParametersBuilder;
 import org.oopproject.deserializers.FilmDeserializer;
+
+import static org.oopproject.utils.AgeRating.getRatingForAge;
 import static org.oopproject.utils.CommandWaiter.*;
 import static org.oopproject.utils.Config.tmdbService;
 import static org.oopproject.utils.Validators.isCommand;
 import static org.oopproject.utils.Replies.getReply;
 import java.lang.reflect.Type;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.*;
+
 import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.KeyboardRow;
 import org.telegram.telegrambots.meta.generics.TelegramClient;
 import org.telegram.telegrambots.meta.api.objects.Update;
@@ -42,10 +42,10 @@ public class TelegramBot implements LongPollingSingleThreadUpdateConsumer {
     private final HashMap<String, Integer> genreMovieIndexMap = new HashMap<>();
     private final Map<Long, CommandWaiter> commandWaiter = new ConcurrentHashMap<>();
 
-    public TelegramBot(String botToken) throws SQLException {
+    public TelegramBot(String botToken) {
         telegramClient = new OkHttpTelegramClient(botToken);
-        startBroadcasting();
-    }
+        BroadcastingService broadcastingService = new BroadcastingService(database, telegramClient);
+        broadcastingService.startBroadcasting();    }
 
     @Override
     public void consume(Update update) {
@@ -56,6 +56,7 @@ public void handleUpdate(Update update) {
         if (update.hasMessage() && update.getMessage().hasText()) {
             long chatId = update.getMessage().getChatId();
             database.insertChatId(chatId);
+            Integer userAge=getUserAge(chatId);
             loadGenreIndexFromDatabase(chatId);
             loadYearIndexFromDatabase(chatId);
 
@@ -98,7 +99,7 @@ public void handleUpdate(Update update) {
             }
         }
     }
-  
+
     private void loadGenreIndexFromDatabase(long chatId) {
         String jsonGenreString = database.getGenreIndexesJson(chatId);
         if (jsonGenreString != null) {
@@ -189,11 +190,11 @@ protected String handleGenre(String messageText, long chatId) {
 
         try {
             String genreId = Genres.valueOf(messageText.toUpperCase()).genreId;
+            String userRating = getRatingForAge(getUserAge(chatId));
 
             MovieParameters params = new ParametersBuilder()
                     .withGenres(genreId)
-                    .withCertificationLte("PG-13")
-                    .withCertificationCountry("US")
+                    .withCertificationLte(userRating)
                     .build();
             ListDeserializer moviesByGenre = tmdbService.findMovie(params);
 
@@ -212,7 +213,6 @@ protected String handleGenre(String messageText, long chatId) {
 
                 updateGenreIndexInDatabase(chatId);
 
-
                 responseMessage = movieListBuilder.toString();
 
             } else {
@@ -232,7 +232,6 @@ private void updateYearIndexInDatabase(long chatId) {
     }
 
     protected String handleYear(String messageText, long chatId) {
-
         if (isCommand(messageText)) {
             commandWaiter.put(chatId, NONE);
             return handleCommands(messageText, chatId);
@@ -243,16 +242,15 @@ protected String handleYear(String messageText, long chatId) {
         try {
             int userYear = Integer.parseInt(messageText);
             int currentYear = java.time.Year.now().getValue();
-
+            String userRating = getRatingForAge(getUserAge(chatId));
             if (userYear < 1900 || userYear > currentYear) {
                 responseMessage = "Пожалуйста, введите год в диапазоне от 1900 до " + currentYear;
                 return responseMessage;
             }
 
             MovieParameters params = new ParametersBuilder()
                     .withYear(userYear)
-                    .withCertificationLte("PG-13")
-                    .withCertificationCountry("US")
+                    .withCertificationLte(userRating)
                     .build();
             ListDeserializer moviesByYear = tmdbService.findMovie(params);
 
@@ -287,7 +285,7 @@ protected String handleYear(String messageText, long chatId) {
     protected void handleSubscribe(long chatId) {
         database.updateSubscribe(chatId, true);
     }
-  
+
     protected void handleUnsubscribe(long chatId) {
         database.updateSubscribe(chatId, false);
     }
@@ -317,15 +315,12 @@ protected String handleAge(String messageText, long chatId) {
         return responseMessage;
     }
 
-    public void startBroadcasting() {
-        scheduler.scheduleAtFixedRate(()-> {
-            List<Long> subscribedUsers = database.getSubscribedUsers();
-            for (Long chatId : subscribedUsers) {
-                sendMessage(chatId, "Подписчику");
-            }
-        }, 0, 1, TimeUnit.MINUTES);
+    public Integer getUserAge(long chatId) {
+        return database.getUserAge(chatId);
     }
-
+
+
+
     private void sendMessage(long chatId, String text) {
         SendMessage message=SendMessage.builder()
                 .chatId(chatId)
@@ -337,7 +332,7 @@ private void sendMessage(long chatId, String text) {
             e.printStackTrace();
         }
     }
-  
+
     public String handleSubscription(String messageText, long chatId) {
         if (isCommand(messageText)) {
             commandWaiter.put(chatId, NONE);
@@ -363,20 +358,4 @@ public String handleSubscription(String messageText, long chatId) {
         }
         return responseMessage;
     }
-
-//    protected void broadcastMessage(String message) {
-//        List<Long> users = database.getSubscribedUsers();
-//        for (Long chatId : users) {
-//            new SendMessage(chatId, message);
-//        }
-//    }
-//    protected void handleGetAge( long chatId) {
-//        Integer userAge = database.getUserAge(chatId);
-//        if (userAge != null) {
-//            System.out.println("возраст "+ userAge);
-//        }
-//        else {
-//            System.out.println("не нашли возраст");
-//        }
-//    }
 }

src/main/java/org/oopproject/deserializers/FilmDeserializer.java

@@ -27,6 +27,7 @@ public class FilmDeserializer {
     public boolean video;
     public double vote_average;
     public double vote_count;
+    public String trailerUrl;
 //    public boolean belongs_to_collection;
 //    public List<FilmDeserializer> production_companies;
 //    public List<FilmDeserializer> production_countries;

src/main/java/org/oopproject/deserializers/MovieVideosResponse.java

@@ -0,0 +1,11 @@
+package org.oopproject.deserializers;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+
+public class MovieVideosResponse {
+    @SerializedName("results")
+    public List<VideoDeserializer> results;  // Список видео
+
+    // Конструкторы и методы, если нужно
+}

src/main/java/org/oopproject/deserializers/VideoDeserializer.java

@@ -0,0 +1,16 @@
+package org.oopproject.deserializers;
+
+import com.google.gson.annotations.SerializedName;
+
+public class VideoDeserializer {
+    @SerializedName("key")
+    public String key;  // Ключ видео, который будет использоваться для ссылки
+
+    @SerializedName("name")
+    public String name;  // Название видео (например, "Трейлер")
+
+    @SerializedName("site")
+    public String site;  // Платформа видео (например, "YouTube")
+
+    // Конструкторы и методы, если нужно
+}

src/main/java/org/oopproject/services/BroadcastingService.java

@@ -0,0 +1,72 @@
+package org.oopproject.services;
+
+import org.oopproject.Database;
+import org.oopproject.deserializers.FilmDeserializer;
+import org.telegram.telegrambots.meta.api.methods.send.SendMessage;
+import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
+import org.telegram.telegrambots.meta.generics.TelegramClient;
+
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+public class BroadcastingService {
+    private final Database database;
+    private final MovieService movieService;
+    private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
+    private final TelegramClient telegramClient;
+
+    public BroadcastingService(Database database, TelegramClient telegramClient) {
+        this.database = database;
+        this.telegramClient = telegramClient;
+        this.movieService = new MovieService();
+    }
+
+    public void startBroadcasting() {
+        scheduler.scheduleAtFixedRate(() -> {
+            List<Long> subscribedUsers = database.getSubscribedUsers();
+            List<FilmDeserializer> upcomingMovies = movieService.getUpcomingMovies();
+
+            for (Long chatId : subscribedUsers) {
+                StringBuilder messageText = new StringBuilder("🎬 Фильмы, которые скоро выйдут:\n");
+
+                if (upcomingMovies.isEmpty()) {
+                    messageText.append("К сожалению, нет новых фильмов на данный момент.");
+                } else {
+                    for (int i = 0; i < upcomingMovies.size(); i++) {
+                        FilmDeserializer movie = upcomingMovies.get(i);
+                        messageText.append(i + 1)
+                                .append(". ")
+                                .append(movie.title)
+                                .append("\n")
+                                .append("Дата выхода: ")
+                                .append(movie.release_date)
+                                .append("\n")
+                                .append("Описание: ")
+                                .append(movie.overview != null && !movie.overview.isEmpty() ? movie.overview : "Нет описания")
+                                .append("\n");
+                        if (movie.trailerUrl != null) {
+                            messageText.append("Ссылка на трейлер: ").append(movie.trailerUrl).append("\n");
+                        }
+
+                        messageText.append("\n");
+                    }
+                }
+                sendMessage(chatId, messageText.toString());
+            }
+        }, 0, 3, TimeUnit.DAYS);
+    }
+
+    private void sendMessage(long chatId, String text) {
+        SendMessage message = SendMessage.builder()
+                .chatId(chatId)
+                .text(text)
+                .build();
+        try {
+            telegramClient.execute(message);
+        } catch (TelegramApiException e) {
+            e.printStackTrace();
+        }
+    }
+}