Changeset e15e8d9 for src

Timestamp:

04/30/25 18:24:41 (2 weeks ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

2518b3a

Parents:

deea3c4

Message:

menu feature done

Location:

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

Files:

• dto/ReservationDTO.java (modified) (4 diffs)
• model/Menu.java (modified) (3 diffs)
• model/Reservation.java (modified) (4 diffs)
• repository/MenuRepository.java (added)
• service/MenuService.java (added)
• service/impl/MenuServiceImpl.java (added)
• service/impl/ReservationImpl.java (modified) (2 diffs)
• web/rest/testController.java (modified) (3 diffs)

src/main/java/com/example/rezevirajmasa/demo/dto/ReservationDTO.java

@@ -6 +6 @@
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 public class ReservationDTO {
@@ -19 +20 @@
     private String specialRequests;
     private String paymentStatus;
+    private List<String> preOrderedItems;
+
 
     public ReservationDTO() {
     }
 
-    public ReservationDTO(Long reservationID, String userEmail, BigDecimal rating, Long tableNumber, LocalDateTime reservationDateTime, LocalDateTime checkInTime, Restaurant restaurant, int partySize, String status, String specialRequests, String paymentStatus) {
+    public ReservationDTO(Long reservationID, String userEmail, BigDecimal rating, Long tableNumber, LocalDateTime reservationDateTime, LocalDateTime checkInTime, Restaurant restaurant, int partySize, String status, String specialRequests, String paymentStatus, List<String> preOrderedItems) {
         this.reservationID = reservationID;
         this.userEmail = userEmail;
@@ -35 +38 @@
         this.specialRequests = specialRequests;
         this.paymentStatus = paymentStatus;
+        this.preOrderedItems = preOrderedItems;
     }
 
@@ -49 +53 @@
         this.specialRequests = reservation.getSpecialRequests();
         this.paymentStatus = reservation.getPaymentStatus();
+        this.preOrderedItems = reservation.getPreOrderedItems();
+    }
+
+    public List<String> getPreOrderedItems() {
+        return preOrderedItems;
+    }
+
+    public void setPreOrderedItems(List<String> preOrderedItems) {
+        this.preOrderedItems = preOrderedItems;
     }
 

src/main/java/com/example/rezevirajmasa/demo/model/Menu.java

@@ -1 +1 @@
 package com.example.rezevirajmasa.demo.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
+import lombok.Data;
 
 import java.math.BigDecimal;
@@ -7 +9 @@
 @Entity
 @Table(name = "menus")
+@Data
 public class Menu {
     @Id
@@ -15 +18 @@
     @ManyToOne
     @JoinColumn(name = "RestaurantID", nullable = false)
+    @JsonIgnore
     private Restaurant restaurant;
 

src/main/java/com/example/rezevirajmasa/demo/model/Reservation.java

@@ -4 +4 @@
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 import jakarta.persistence.*;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @Entity
 @Table(name = "reservations")
+@Data
 public class Reservation {
 
@@ -47 +53 @@
     private LocalDateTime checkInTime;
 
+    @Getter
     @Column(name = "CheckOutTime")
     private LocalDateTime checkOutTime;
 
-//    @Column(name = "TotalAmount", precision = 8, scale = 2)
-//    private BigDecimal totalAmount;
+    @ElementCollection
+    @CollectionTable(name = "reservation_preordered_items", joinColumns = @JoinColumn(name = "reservation_id"))
+    @Column(name = "item")
+    private List<String> preOrderedItems = new ArrayList<>();
 
     @Column(name = "PaymentStatus", length = 20, nullable = false, columnDefinition = "VARCHAR default 'Unpaid'")
@@ -71 +80 @@
 
     public Reservation(User user, TableEntity table, Restaurant restaurant, LocalDateTime reservationDateTime, int partySize, String specialRequests, String status, LocalDateTime checkInTime, LocalDateTime checkOutTime, String paymentStatus) {
-//        this.customer = customer;
         this.table = table;
         this.user = user;
@@ -84 +92 @@
     }
 
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public Long getReservationID() {
-        return reservationID;
-    }
-
-    public void setReservationID(Long reservationID) {
-        this.reservationID = reservationID;
-    }
-
-
-    public TableEntity getTable() {
-        return table;
-    }
-
-    public void setTable(TableEntity table) {
-        this.table = table;
-    }
-
-    public Restaurant getRestaurant() {
-        return restaurant;
-    }
-
-    public void setRestaurant(Restaurant restaurant) {
-        this.restaurant = restaurant;
-    }
-
-    public LocalDateTime getReservationDateTime() {
-        return reservationDateTime;
-    }
-
-    public void setReservationDateTime(LocalDateTime reservationDateTime) {
-        this.reservationDateTime = reservationDateTime;
-    }
-
-    public int getPartySize() {
-        return partySize;
-    }
-
-    public void setPartySize(int partySize) {
-        this.partySize = partySize;
-    }
-
-    public String getSpecialRequests() {
-        return specialRequests;
-    }
-
-    public void setSpecialRequests(String specialRequests) {
-        this.specialRequests = specialRequests;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public LocalDateTime getCheckInTime() {
-        return checkInTime;
-    }
-
-    public void setCheckInTime(LocalDateTime checkInTime) {
-        this.checkInTime = checkInTime;
-    }
-
-    public LocalDateTime getCheckOutTime() {
-        return checkOutTime;
-    }
-
-    public void setCheckOutTime(LocalDateTime checkOutTime) {
-        this.checkOutTime = checkOutTime;
-    }
-
-    public String getPaymentStatus() {
-        return paymentStatus;
-    }
-
-    public void setPaymentStatus(String paymentStatus) {
-        this.paymentStatus = paymentStatus;
-    }
 
     @Override

src/main/java/com/example/rezevirajmasa/demo/service/impl/ReservationImpl.java

@@ -63 +63 @@
             TableEntity table = optionalTable.get();
 
-            LocalDateTime reservationTime = reservationDTO.getReservationDateTime();
-            LocalDateTime startTime = reservationTime.minusHours(2);
-            LocalDateTime endTime = reservationTime.plusHours(2);
+            LocalDateTime startTime = reservationDTO.getReservationDateTime().plusHours(1);
+            LocalDateTime endTime = reservationDTO.getReservationDateTime().plusHours(3);
 
             boolean hasConflict = table.getReservations().stream()
@@ -93 +92 @@
             reservation.setPaymentStatus(reservationDTO.getPaymentStatus() != null ? reservationDTO.getPaymentStatus() : "Unpaid");
             reservation.setUser(user);
+            reservation.setPreOrderedItems(reservationDTO.getPreOrderedItems());
             reservation.setRestaurant(reservationDTO.getRestaurant());
-            reservation.setCheckInTime(reservationTime);
+            reservation.setCheckInTime(reservationDTO.getReservationDateTime().plusHours(1));
             reservation.setReservationDateTime(LocalDateTime.now());
-            reservation.setCheckOutTime(reservationTime.plusHours(2));
+            reservation.setCheckOutTime(reservationDTO.getReservationDateTime().plusHours(3));
             reservation.setRestaurant(reservationDTO.getRestaurant());
 

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

@@ -37 +37 @@
     private final ReservationHistoryService reservationHistoryService;
     private final TableService tableService;
+    private final MenuService menuService;
     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) {
+    public testController(RestaurantService restaurantService, CustomerService customerService, UserService userService, ReservationService reservationService, ReservationHistoryService reservationHistoryService, TableService tableService, MenuService menuService, UserMapper userMapper, TokenService tokenService) {
         this.restaurantService = restaurantService;
         this.customerService = customerService;
@@ -46 +47 @@
         this.reservationHistoryService = reservationHistoryService;
         this.tableService = tableService;
+        this.menuService = menuService;
         this.userMapper = userMapper;
         this.tokenService = tokenService;
@@ -272 +274 @@
         return new ResponseEntity<>(reservations, HttpStatus.OK);
     }
+
+    // menu calls
+    @GetMapping("/api/restaurant-menu/{restaurantId}")
+    public List<Menu> getMenuByRestaurantId(@PathVariable Long restaurantId) {
+        return menuService.getMenuByRestaurantId(restaurantId);
+    }
 }