Changeset 8a18cf5 for src/main/java/com/example/moviezone/web

Timestamp:

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

Author:

DenicaKj <dkorvezir@…>

Branches:

master

Children:

40935d3

Parents:

7215773

Message:

fixes

File:

• src/main/java/com/example/moviezone/web/HomeController.java (modified) (2 diffs)

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";
     }