Changeset 8ca35dc for src/main/java/com/example/rezevirajmasa/demo/web/rest/testController.java

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

File:

• src/main/java/com/example/rezevirajmasa/demo/web/rest/testController.java (modified) (7 diffs)

src/main/java/com/example/rezevirajmasa/demo/web/rest/testController.java

@@ -2 +2 @@
 
 import com.example.rezevirajmasa.demo.dto.CustomerDTO;
+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.service.CustomerService;
-import com.example.rezevirajmasa.demo.service.ReservationService;
-import com.example.rezevirajmasa.demo.service.RestaurantService;
-import com.example.rezevirajmasa.demo.service.TableService;
+import com.example.rezevirajmasa.demo.service.*;
+import com.example.rezevirajmasa.demo.service.impl.TokenService;
+import jakarta.servlet.http.HttpServletRequest;
 import jdk.jfr.consumer.RecordingStream;
 import org.apache.coyote.Response;
+import org.apache.http.protocol.HTTP;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.parameters.P;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
 
+import java.nio.file.attribute.UserPrincipal;
+import java.security.Principal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -26 +35 @@
     private final RestaurantService restaurantService;
     private final CustomerService customerService;
+    private final UserService userService;
     private final ReservationService reservationService;
+    private final ReservationHistoryService reservationHistoryService;
     private final TableService tableService;
-
-    public testController(RestaurantService restaurantService, CustomerService customerService, ReservationService reservationService, TableService tableService) {
+    private final UserMapper userMapper;
+    private final TokenService tokenService;
+    public testController(RestaurantService restaurantService, CustomerService customerService, UserService userService, ReservationService reservationService, ReservationHistoryService reservationHistoryService, TableService tableService, UserMapper userMapper, TokenService tokenService) {
         this.restaurantService = restaurantService;
         this.customerService = customerService;
+        this.userService = userService;
         this.reservationService = reservationService;
+        this.reservationHistoryService = reservationHistoryService;
         this.tableService = tableService;
+        this.userMapper = userMapper;
+        this.tokenService = tokenService;
     }
 
@@ -114 +130 @@
         );
     }
+    @GetMapping("/api/user")
+    public ResponseEntity<?> getCurrentUser() {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        if (authentication == null || !authentication.isAuthenticated() || authentication.getPrincipal().equals("anonymousUser")) {
+            return new ResponseEntity<>("User is not authenticated", HttpStatus.UNAUTHORIZED);
+        }
+
+        Customer customer = (Customer) authentication.getPrincipal();
+        return new ResponseEntity<>(customer, HttpStatus.OK);
+    }
+
 
     @PostMapping("/api/customers")
@@ -137 +165 @@
 //    Reservation Calls
 
-    @GetMapping("/api/reservations")
-    public ResponseEntity<List<Reservation>> getReservations() {
-        return new ResponseEntity<List<Reservation>>(reservationService.listAll(), HttpStatus.OK);
-    }
-
-    @PostMapping("/api/reservations")
-    public ResponseEntity<Reservation> createReservation(@RequestBody Reservation reservation) {
-        reservation.setReservationDateTime(LocalDateTime.now());
-        Reservation savedReservation = reservationService.makeReservationRest(reservation);
+    @GetMapping("/api/reservations/by/{email}")
+    public ResponseEntity<List<Reservation>> getReservations(@PathVariable String email) {
+        User user = userService.findByMail(email);
+        return new ResponseEntity<List<Reservation>>(reservationService.findReservationByUser(user), HttpStatus.OK);
+    }
+
+    @PostMapping("/api/reservations/{email}")
+    public ResponseEntity<Reservation> createReservation(@RequestBody Reservation reservation, @PathVariable String email) {
+        User user = userService.findByMail(email);
+        Reservation savedReservation = reservationService.makeReservationRest(reservation, user);
+
         return new ResponseEntity<>(savedReservation, HttpStatus.CREATED);
     }
+
 
     @GetMapping("/api/reservations/{reservationId}")
@@ -159 +190 @@
     }
 
-    @PostMapping("/api/reservations/{reservationId}")
+    @PostMapping("/api/reservations/{reservationId}/{email}")
     public ResponseEntity<Reservation> editReservation(@PathVariable Long reservationId,
-                                                       @RequestBody Reservation reservation) {
+                                                       @RequestBody Reservation reservation,
+                                                       @PathVariable String email) {
+        User user = userService.findByMail(email);
+
         if (!reservation.getReservationID().equals(reservationId)) {
             return ResponseEntity.badRequest().build();
         }
 
-        Reservation savedReservation = reservationService.findById(reservationId);
-        if(!reservation.getCheckInTime().equals(savedReservation.getCheckInTime())) {
-            tableService.canceledTimeSlots(savedReservation.getTable().getId(), savedReservation.getCheckInTime());
-        }
-
-        savedReservation.setReservationDateTime(LocalDateTime.now());
-        savedReservation.setCheckInTime(reservation.getCheckInTime());
-        savedReservation.setCheckOutTime(reservation.getCheckInTime().plusHours(2));
-        savedReservation.setPartySize(reservation.getPartySize());
-        savedReservation.setSpecialRequests(reservation.getSpecialRequests());
-        tableService.deleteTimeSlotsForReservation(reservation.getTable().getId(), reservation.getCheckInTime());
-
-        //moze da se vovede sistem za ako od 4ca doagjaat samo 2ca da se najde pomala masa po moznost ako ima u toj moment
-        //listaj samo slotovi za taa masa vo toj moment ili da ima da odbere od novo ama taka bolje nova rezevacij
-
-        Reservation updatedReservation = reservationService.makeReservationRest(savedReservation);
-        System.out.println("Saved reservation time: " + savedReservation.getCheckInTime());
+        // Fetch existing reservation
+        Reservation existingReservation = reservationService.findById(reservationId);
+        if (existingReservation == null) {
+            return ResponseEntity.notFound().build();
+        }
+
+        if (!reservation.getCheckInTime().equals(existingReservation.getCheckInTime())) {
+            tableService.canceledTimeSlots(existingReservation.getTable().getId(), existingReservation.getCheckInTime());
+
+            tableService.deleteTimeSlotsForReservation(reservation.getTable().getId(), reservation.getCheckInTime());
+        }
+
+        existingReservation.setReservationDateTime(LocalDateTime.now());
+        existingReservation.setCheckInTime(reservation.getCheckInTime());
+        existingReservation.setCheckOutTime(reservation.getCheckInTime().plusHours(2));
+        existingReservation.setPartySize(reservation.getPartySize());
+        existingReservation.setSpecialRequests(reservation.getSpecialRequests());
+
+        Reservation updatedReservation = reservationService.makeReservationRest(existingReservation, user);
+
+        System.out.println("Updated reservation time: " + updatedReservation.getCheckInTime());
         return ResponseEntity.ok(updatedReservation);
     }
+
 
     @DeleteMapping("/api/reservations/delete/{reservationId}")
@@ -196 +235 @@
     }
 
+    @GetMapping("/api/reservations/past/{email}")
+    public ResponseEntity<List<Restaurant.ReservationHistory>> pastReservations(@PathVariable String email) {
+        User user = userService.findByMail(email);
+        return null;
+    }
+
 //    TableEntity Calls
 
@@ -203 +248 @@
     }
 
+    // past reservation calls
+    @GetMapping("/api/past-reservations/{email}")
+    public ResponseEntity<List<Restaurant.ReservationHistory>> findPastReservationsByUser(@PathVariable String email) {
+        User user = userService.findByMail(email);
+        List<Restaurant.ReservationHistory> reservations = reservationHistoryService.findByUser(user);
+        return new ResponseEntity<>(reservations, HttpStatus.OK);
+    }
+
 }