Changeset 2518b3a for src/main/java/com/example/rezevirajmasa/demo/dto/ReservationDTO.java

Timestamp:

05/02/25 00:37:10 (2 weeks ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

c44c5ed

Parents:

e15e8d9

Message:

Added menu tag

succesfull testing and implemnation

File:

• src/main/java/com/example/rezevirajmasa/demo/dto/ReservationDTO.java (modified) (7 diffs)

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

@@ -1 +1 @@
 package com.example.rezevirajmasa.demo.dto;
 
+import com.example.rezevirajmasa.demo.model.PreorderedItem;
 import com.example.rezevirajmasa.demo.model.Reservation;
 import com.example.rezevirajmasa.demo.model.Restaurant;
@@ -15 +16 @@
     private LocalDateTime reservationDateTime;
     private LocalDateTime checkInTime;
-    private Restaurant restaurant;
+    private Long restaurantId;
     private int partySize;
     private String status;
     private String specialRequests;
     private String paymentStatus;
-    private List<String> preOrderedItems;
-
+    private List<PreorderedItem> 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, List<String> preOrderedItems) {
+    public ReservationDTO(Long reservationID, String userEmail, BigDecimal rating, Long tableNumber, LocalDateTime reservationDateTime, LocalDateTime checkInTime, Long restaurantId, int partySize, String status, String specialRequests, String paymentStatus, List<PreorderedItem> preOrderedItems) {
         this.reservationID = reservationID;
         this.userEmail = userEmail;
@@ -33 +33 @@
         this.reservationDateTime = reservationDateTime;
         this.checkInTime = checkInTime;
-        this.restaurant = restaurant;
+        this.reservationID = restaurantId;
         this.partySize = partySize;
         this.status = status;
@@ -48 +48 @@
         this.reservationDateTime = reservation.getReservationDateTime();
         this.checkInTime = reservation.getCheckInTime();
-        this.restaurant = reservation.getRestaurant();
+        this.restaurantId = reservation.getRestaurant().getRestaurantId();
         this.partySize = reservation.getPartySize();
         this.status = reservation.getStatus();
@@ -54 +54 @@
         this.paymentStatus = reservation.getPaymentStatus();
         this.preOrderedItems = reservation.getPreOrderedItems();
-    }
-
-    public List<String> getPreOrderedItems() {
-        return preOrderedItems;
-    }
-
-    public void setPreOrderedItems(List<String> preOrderedItems) {
-        this.preOrderedItems = preOrderedItems;
     }
 
@@ -112 +104 @@
     }
 
-    public Restaurant getRestaurant() {
-        return restaurant;
+    public Long getRestaurantId() {
+        return restaurantId;
     }
 
-    public void setRestaurant(Restaurant restaurant) {
-        this.restaurant = restaurant;
+    public void setRestaurantId(Long restaurantId) {
+        this.restaurantId = restaurantId;
     }
 
@@ -151 +143 @@
         this.paymentStatus = paymentStatus;
     }
+
+    public List<PreorderedItem> getPreOrderedItems() {
+        return preOrderedItems;
+    }
+
+    public void setPreOrderedItems(List<PreorderedItem> preOrderedItems) {
+        this.preOrderedItems = preOrderedItems;
+    }
 }