Changeset 8a18cf5 for src

Timestamp:

03/06/23 19:58:20 (21 months ago)

Author:

DenicaKj <dkorvezir@…>

Branches:

master

Children:

40935d3

Parents:

7215773

Message:

fixes

Location:

src/main

Files:

• java/com/example/moviezone/service/Impl/SeatServiceImpl.java (modified) (3 diffs)
• java/com/example/moviezone/web/HomeController.java (modified) (2 diffs)
• resources/templates/film.html (modified) (2 diffs)

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

@@ -4 +4 @@
 import com.example.moviezone.model.Projection_Room;
 import com.example.moviezone.model.Seat;
+import com.example.moviezone.model.Ticket;
+import com.example.moviezone.model.manytomany.ProjectionIsPlayedInRoom;
+import com.example.moviezone.repository.ProjectionIsPlayedInRoomRepository;
+import com.example.moviezone.repository.Projection_RoomRepository;
 import com.example.moviezone.repository.SeatRepository;
 import com.example.moviezone.service.SeatService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -16 +21 @@
 
     private final SeatRepository seatRepository;
+    private final TicketServiceImpl ticketService;
+    private final ProjectionIsPlayedInRoomRepository projectionIsPlayedInRoomRepository;
+    private final Projection_RoomRepository projection_roomRepository;
 
-    public SeatServiceImpl(SeatRepository seatRepository) {
+    public SeatServiceImpl(SeatRepository seatRepository, TicketServiceImpl ticketService, ProjectionIsPlayedInRoomRepository projectionIsPlayedInRoomRepository, Projection_RoomRepository projection_roomRepository) {
         this.seatRepository = seatRepository;
+        this.ticketService = ticketService;
+        this.projectionIsPlayedInRoomRepository = projectionIsPlayedInRoomRepository;
+        this.projection_roomRepository = projection_roomRepository;
     }
 
@@ -33 +44 @@
     @Override
     public List<Seat> findAllByRoomAndCategory(Projection_Room projectionRoom, Category category) {
-        return seatRepository.findAllByCategoryAndProjection(category,projectionRoom);
+        List<Ticket> tickets=ticketService.findAllTickets();
+        List<Seat> seats=seatRepository.findAllByCategoryAndProjection(category,projectionRoom);
+        List<Seat> s=new ArrayList<>();
+        List<Projection_Room> projection_rooms=new ArrayList<>();
+        for (int i = 0; i < tickets.size(); i++) {
+            List<ProjectionIsPlayedInRoom> projectionIsPlayedInRooms= projectionIsPlayedInRoomRepository.findAllByProjectionId(tickets.get(i).getProjection().getId_projection());
+            for (int j = 0; j < projectionIsPlayedInRooms.size(); j++) {
+                projection_rooms.add(projection_roomRepository.getById(projectionIsPlayedInRooms.get(j).getIdroom()));
+            }
+        }
+        int f=0;
+        for (int i = 0; i < seats.size(); i++) {
+            for (int j = 0; j < tickets.size(); j++) {
+                if(seats.get(i).getId_seat().equals(tickets.get(j).getSeat().getId_seat())){
+                    for (int k = 0; k < projection_rooms.size(); k++) {
+                        if(seats.get(i).getProjection().getId_room().equals(projection_rooms.get(k).getId_room()))
+                            f=1;
+                    }
+                }
+
+            }
+
+            if(f==0){
+                s.add(seats.get(i));
+            }
+            f=0;
+        }
+        return s;
     }
 

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

@@ -199 +199 @@
             response.sendRedirect("/login");
         }
-        
+
     }
     @GetMapping("/registerWorker")
@@ -396 +396 @@
         Customer customer=customerService.findByUsername(request.getRemoteUser());
         Projection projection1=projectionService.findById(projection.intValue());
-        if(projection1.getDiscount().equals(discount)){
+        if(projection1.getDiscount()!=null && projection1.getDiscount().getCode().equals(discount)){
             t=ticketService.saveWithDiscount(LocalDate.now(),customer,projection1,projection1.getDiscount(),seatService.getSeatById(id_seat.intValue()).get());
+            Integer price=ticketService.priceForTicket(t.getId_ticket());
+            price+=seatService.getSeatById(id_seat.intValue()).get().getCategory().getExtra_amount();
+            price-=(price*projection1.getDiscount().getPercent())/100;
+            t.setPrice(price);
         }else{
             t=ticketService.saveWithout(LocalDate.now(),customer,projection1,seatService.getSeatById(id_seat.intValue()).get());
-        }
-        Integer price=ticketService.priceForTicket(t.getId_ticket());
-        t.setPrice(price);
+            Integer price=ticketService.priceForTicket(t.getId_ticket());
+            price+=seatService.getSeatById(id_seat.intValue()).get().getCategory().getExtra_amount();
+            t.setPrice(price);
+        }
+
         return "redirect:/myTickets";
     }

src/main/resources/templates/film.html

@@ -62 +62 @@
                 <span>/5</span>
             </h4>
+            <th:block sec:authorize="hasAuthority('ROLE_USER')" th:if="${#request.getRemoteUser() != null}">
             <form th:action="@{'/home/addRating/{id}' (id=${film.id_film})}"
                   th:method="POST">
@@ -70 +71 @@
                 <button class="button" type="submit">Додади Оцена</button>
             </form>
+            </th:block>
         </div>
     <div class="slika">