Changeset 01a1ca6 for src/main/java/com

Timestamp:

02/10/23 00:10:41 (21 months ago)

Author:

DenicaKj <dkorvezir@…>

Branches:

master

Children:

73f0dbc

Parents:

5444409

Message:

added authorization

Location:

src/main/java/com/example/moviezone

Files:

• config/WebSecurityConfig.java (modified) (1 diff)
• repository/CustomerRepository.java (modified) (1 diff)
• service/CustomerService.java (modified) (1 diff)
• service/Impl/CustomerServiceImpl.java (modified) (1 diff)
• web/HomeController.java (modified) (2 diffs)

src/main/java/com/example/moviezone/config/WebSecurityConfig.java

@@ -32 +32 @@
         http.csrf().disable()
                 .authorizeRequests()
-                .antMatchers("/","/**","/home/getFilm/**","/films","/projections" ,"/home", "/assets/**", "/register", "/api/**").permitAll()
-                .antMatchers("/admin/**").hasRole("ADMIN")
+                .antMatchers("/","/films","/home/projections","/home/events","/home/getProjections/**","/home/films","/getFilm/**","/getEvent/**","/login","/events","/projections" ,"/home", "/assets/**", "/register", "/api/**").permitAll()
+                .antMatchers("/home/getSeats/**","/myTickets","/getProjection/**","/home/makeReservation").hasRole("USER")
+                .antMatchers("/**").hasRole("ADMIN")
                 .anyRequest()
                 .authenticated()

src/main/java/com/example/moviezone/repository/CustomerRepository.java

@@ -7 +7 @@
 @Repository
 public interface CustomerRepository extends JpaRepository<Customer,Integer> {
+    Customer getByUsername(String username);
 }

src/main/java/com/example/moviezone/service/CustomerService.java

@@ -11 +11 @@
     List<Customer> findAllCustomers();
     Optional<Customer> getCustomerById(int id);
+    Customer findByUsername(String username);
 }

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

@@ -26 +26 @@
         return customerRepository.findById(id);
     }
+
+    @Override
+    public Customer findByUsername(String username) {
+        return customerRepository.getByUsername(username);
+    }
 }

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

@@ -259 +259 @@
     }
     @GetMapping("/myTickets")
-    public  String getMyTicketsPage(Model model,HttpSession session)
-    {
-        model.addAttribute("tickets",ticketService.findAllByCustomer((Customer) session.getAttribute("user")));
+    public  String getMyTicketsPage(Model model,HttpServletRequest request)
+    {
+        Customer customer=customerService.findByUsername(request.getRemoteUser());
+        model.addAttribute("tickets",ticketService.findAllByCustomer(customer));
         model.addAttribute("bodyContent","myTickets");
         return "master-template";
@@ -380 +381 @@
     @PostMapping("/makeReservation")
     @Transactional
-    public String createTicketForReservation(@RequestParam Long film,@RequestParam Long projection,@RequestParam Long id_seat,@RequestParam String discount)
+    public String createTicketForReservation(@RequestParam Long film,@RequestParam Long projection,@RequestParam Long id_seat,@RequestParam String discount,HttpServletRequest request, HttpServletResponse respons)
     {
         Ticket t;
+        Customer customer=customerService.findByUsername(request.getRemoteUser());
         Projection projection1=projectionService.findById(projection.intValue());
         if(projection1.getDiscount().equals(discount)){
-            t=ticketService.saveWithDiscount(LocalDate.now(),customerService.getCustomerById(2).get(),projection1,projection1.getDiscount(),seatService.getSeatById(id_seat.intValue()).get());
+            t=ticketService.saveWithDiscount(LocalDate.now(),customer,projection1,projection1.getDiscount(),seatService.getSeatById(id_seat.intValue()).get());
         }else{
-            t=ticketService.saveWithout(LocalDate.now(),customerService.getCustomerById(4).get(),projection1,seatService.getSeatById(id_seat.intValue()).get());
+            t=ticketService.saveWithout(LocalDate.now(),customer,projection1,seatService.getSeatById(id_seat.intValue()).get());
         }
         Integer price=ticketService.priceForTicket(t.getId_ticket());
         t.setPrice(price);
-        return "redirect:/home";
+        return "redirect:/myTickets";
     }