Changeset 8ca35dc for src/main/java/com/example/rezevirajmasa/demo/web/controller

Timestamp:

01/19/25 23:18:37 (4 months ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

f5b256e

Parents:

db39d9e

Message:

Done with stupid timeslots

Location:

src/main/java/com/example/rezevirajmasa/demo/web/controller

Files:

• ReservationController.java (modified) (4 diffs)
• ReservationHistoryController.java (modified) (3 diffs)

src/main/java/com/example/rezevirajmasa/demo/web/controller/ReservationController.java

@@ -1 +1 @@
 package com.example.rezevirajmasa.demo.web.controller;
 
+import com.example.rezevirajmasa.demo.dto.SignUpDto;
+import com.example.rezevirajmasa.demo.dto.UserDto;
+import com.example.rezevirajmasa.demo.mappers.UserMapper;
 import com.example.rezevirajmasa.demo.model.*;
 import com.example.rezevirajmasa.demo.model.exceptions.ExpiredReservationException;
@@ -19 +22 @@
 public class ReservationController {
     private final ReservationService reservationService;
-    private final CustomerService customerService;
+    private final UserService userService;
     private final TableService tableService;
     private final ReservationHistoryService reservationHistoryService;
 
-    public ReservationController(ReservationService reservationService, CustomerService customerService, TableService tableService, ReservationHistoryService reservationHistoryService) {
+    private final UserMapper userMapper;
+
+    public ReservationController(ReservationService reservationService, UserService userService, TableService tableService, ReservationHistoryService reservationHistoryService, UserMapper userMapper) {
         this.reservationService = reservationService;
-        this.customerService = customerService;
+        this.userService = userService;
         this.tableService = tableService;
         this.reservationHistoryService = reservationHistoryService;
+        this.userMapper = userMapper;
     }
 
     @GetMapping("/reservations")
     public String showReservations(Model model, Authentication authentication) {
-        Customer customer = customerService.findByEmail(authentication.getName());
-        List<Reservation> reservationList;
-        if(customer.getRole().equals(Role.ROLE_ADMIN)) {
-            reservationList = reservationService.listAll();
-        } else {
-            reservationList = reservationService.findReservationByCustomer(customer);
-        }
+        UserDto userDto = userService.findByEmail(authentication.getName());
+
+        SignUpDto signUpDto = userMapper.toSignUpDto(userDto);
+
+        User user = userMapper.signUpToUser(signUpDto);
+
+        List<Reservation> reservationList = reservationService.findReservationByUser(user);
+
         model.addAttribute("bodyContent", "reservationList");
         model.addAttribute("reservations", reservationList);
         return "index";
     }
+
 
     @GetMapping("/reservations/edit/{reservationId}")
@@ -62 +70 @@
         Restaurant restaurant = table.getRestaurant();
 
-        Customer customer = customerService.findByEmail(authentication.getName());
+        UserDto userDto = userService.findByEmail(authentication.getName());
+
+        SignUpDto signUpDto = userMapper.toSignUpDto(userDto);
+
+        User user = userMapper.signUpToUser(signUpDto);
 
         if(!table.isAvailable(reservationDateTime)) {
@@ -68 +80 @@
         }
         tableService.deleteTimeSlotsForReservation(tableNumber, reservationDateTime);
-        reservationService.makeReservation(customer, table, restaurant, LocalDateTime.now(), reservationDateTime, partySize, specialRequests);
+        reservationService.makeReservation(user, table, restaurant, LocalDateTime.now(), reservationDateTime, partySize, specialRequests);
         return "redirect:/reservations";
     }

src/main/java/com/example/rezevirajmasa/demo/web/controller/ReservationHistoryController.java

@@ -1 +1 @@
 package com.example.rezevirajmasa.demo.web.controller;
 
+import com.example.rezevirajmasa.demo.dto.SignUpDto;
+import com.example.rezevirajmasa.demo.dto.UserDto;
+import com.example.rezevirajmasa.demo.mappers.UserMapper;
 import com.example.rezevirajmasa.demo.model.Customer;
 import com.example.rezevirajmasa.demo.model.Restaurant;
 import com.example.rezevirajmasa.demo.model.Role;
+import com.example.rezevirajmasa.demo.model.User;
 import com.example.rezevirajmasa.demo.service.CustomerService;
 import com.example.rezevirajmasa.demo.service.ReservationHistoryService;
+import com.example.rezevirajmasa.demo.service.UserService;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
@@ -18 +23 @@
 public class ReservationHistoryController {
     private final ReservationHistoryService reservationHistoryService;
-    private final CustomerService customerService;
+    private final UserService userService;
+    private final UserMapper userMapper;
 
-    public ReservationHistoryController(ReservationHistoryService reservationHistoryService, CustomerService customerService) {
+    public ReservationHistoryController(ReservationHistoryService reservationHistoryService, UserService userService, UserMapper userMapper) {
         this.reservationHistoryService = reservationHistoryService;
-        this.customerService = customerService;
+        this.userService = userService;
+        this.userMapper = userMapper;
     }
 
@@ -28 +35 @@
     public String showPastReservations(Authentication authentication, Model model) {
         List<Restaurant.ReservationHistory> reservationHistoryList;
-        Customer customer = customerService.findByEmail(authentication.getName());
-        if(customer.getRole().equals(Role.ROLE_ADMIN)) {
-            reservationHistoryList = reservationHistoryService.findAll();
-        } else {
-            reservationHistoryList = reservationHistoryService.findByCustomer(customer);
-        }
+        UserDto userDto = userService.findByEmail(authentication.getName());
+
+        SignUpDto signUpDto = userMapper.toSignUpDto(userDto);
+
+        User user = userMapper.signUpToUser(signUpDto);
+
+        reservationHistoryList = reservationHistoryService.findByUser(user);
+//        if(customer.getRole().equals(Role.ROLE_ADMIN)) {
+//            reservationHistoryList = reservationHistoryService.findAll();
+//        } else {
+//            reservationHistoryList = reservationHistoryService.findByUser(User user);
+//        }
         model.addAttribute("historyReservations", reservationHistoryList);
         model.addAttribute("bodyContent", "pastReservations");