Changeset bcb4acc for src/main/java

Timestamp:

08/24/23 03:31:06 (16 months ago)

Author:

DenicaKj <dkorvezir@…>

Branches:

master

Children:

4158cac

Parents:

1e7126f

Message:

filter for genre

Location:

src/main/java/com/example/moviezone

Files:

• service/Impl/SeatServiceImpl.java (modified) (1 diff)
• web/HomeController.java (modified) (2 diffs)

src/main/java/com/example/moviezone/service/Impl/SeatServiceImpl.java

@@ -43 +43 @@
         List<Ticket> tickets=ticketService.findAllTickets();
         List<Seat> seats=seatRepository.findAllByCategoryAndProjection(category,projectionRoom);
-
+        List<Seat> pom = new ArrayList<>();
         for (int i = 0; i < tickets.size(); i++) {
             if(tickets.get(i).getProjection()==projection){
-                if(seats.contains(tickets.get(i).getSeat())){
-                    seats.remove(tickets.get(i).getSeat());
+                if(!seats.contains(tickets.get(i).getSeat())){
+                    pom.add(seats.get(i));
                 }
             }
         }
-        return seats;
+        return pom;
     }
 

src/main/java/com/example/moviezone/web/HomeController.java

@@ -236 +236 @@
     @GetMapping("/films")
     @Transactional
-    public String getFilmsPage1(Model model,@RequestParam(required = false) Integer id_cinema){
+    public String getFilmsPage1(Model model,@RequestParam(required = false) Integer id_cinema, @RequestParam(required = false) Integer id_genre){
         model.addAttribute("cinemas",cinemaService.findAllCinemas());
-        model.addAttribute("genres", GenreEnum.values());
+        List<GenreEnum> genres = List.of(GenreEnum.values());
+        model.addAttribute("genres", genres);
+        List<Film> films = filmService.findAllFilms();
         if (id_cinema!=null) {
-            model.addAttribute("films",filmService.getFilmsFromCinema(id_cinema));
-        }else{
-            List<FilmsReturnTable> pom=new LinkedList<>();
-            model.addAttribute("films",filmService.findAllFilms());
-        }
+            films = filmService.getFilmsFromCinema(id_cinema);
+        }
+        if ( id_genre != null){
+            List<Film> pom= new ArrayList<>();
+            for (int i = 0; i < films.size(); i++) {
+                if(films.get(i).getGenre().contains(genres.get(id_genre).name().toLowerCase())){
+                   pom.add(films.get(i));
+                }
+            }
+            films=pom;
+        }
+        model.addAttribute("films",films);
         model.addAttribute("bodyContent","films");
         return "master-template";
@@ -270 +279 @@
             model.addAttribute("events",eventService.getEventsFromCinema(id_cinema));
         }else{
-            List<FilmsReturnTable> pom=new LinkedList<>();
             model.addAttribute("events",eventService.getEventsNow());
         }