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

Timestamp:

05/07/25 18:34:01 (10 days ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Parents:

b67dfd3

Message:

Final version for DB

File:

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

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

@@ -4 +4 @@
 import com.example.rezevirajmasa.demo.model.Reservation;
 import com.example.rezevirajmasa.demo.model.Restaurant;
+import lombok.Setter;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
+@Setter
 public class ReservationDTO {
     private Long reservationID;
@@ -21 +24 @@
     private String specialRequests;
     private String paymentStatus;
-    private List<PreorderedItem> preOrderedItems;
+    private List<PreorderedItemDto> preOrderedItems;
 
     public ReservationDTO() {
@@ -29 +32 @@
                           LocalDateTime reservationDateTime, LocalDateTime checkInTime, Long restaurantId,
                           int partySize, String reservationStatus, String specialRequests,
-                          String paymentStatus, List<PreorderedItem> preOrderedItems) {
+                          String paymentStatus, List<PreorderedItemDto> preOrderedItems) {
         this.reservationID = reservationID;
         this.userEmail = userEmail;
@@ -56 +59 @@
         this.specialRequests = reservation.getSpecialRequests();
         this.paymentStatus = reservation.getPaymentStatus();
-        this.preOrderedItems = reservation.getPreOrderedItems();
+
+        this.preOrderedItems = reservation.getPreOrderedItems().stream()
+                .map(preorderedItem -> new PreorderedItemDto(
+                        preorderedItem.getPreorderedItemName(),
+                        preorderedItem.getQuantity(),
+                        preorderedItem.getPrice(),
+                        preorderedItem.getMenu().getMenuID()))
+                .collect(Collectors.toList());
     }
 
@@ -63 +73 @@
     }
 
-    public void setReservationID(Long reservationID) {
-        this.reservationID = reservationID;
-    }
-
     public String getUserEmail() {
         return userEmail;
-    }
-
-    public void setUserEmail(String userEmail) {
-        this.userEmail = userEmail;
     }
 
@@ -79 +81 @@
     }
 
-    public void setRating(BigDecimal rating) {
-        this.rating = rating;
-    }
-
     public Long getTableNumber() {
         return tableNumber;
-    }
-
-    public void setTableNumber(Long tableNumber) {
-        this.tableNumber = tableNumber;
     }
 
@@ -95 +89 @@
     }
 
-    public void setReservationDateTime(LocalDateTime reservationDateTime) {
-        this.reservationDateTime = reservationDateTime;
-    }
-
     public LocalDateTime getCheckInTime() {
         return checkInTime;
-    }
-
-    public void setCheckInTime(LocalDateTime checkInTime) {
-        this.checkInTime = checkInTime;
     }
 
@@ -111 +97 @@
     }
 
-    public void setRestaurantId(Long restaurantId) {
-        this.restaurantId = restaurantId;
-    }
-
     public int getPartySize() {
         return partySize;
-    }
-
-    public void setPartySize(int partySize) {
-        this.partySize = partySize;
     }
 
@@ -127 +105 @@
     }
 
-    public void setReservationStatus(String reservationStatus) {
-        this.reservationStatus = reservationStatus;
-    }
-
     public String getSpecialRequests() {
         return specialRequests;
-    }
-
-    public void setSpecialRequests(String specialRequests) {
-        this.specialRequests = specialRequests;
     }
 
@@ -143 +113 @@
     }
 
-    public void setPaymentStatus(String paymentStatus) {
-        this.paymentStatus = paymentStatus;
-    }
-
-    public List<PreorderedItem> getPreOrderedItems() {
+    public List<PreorderedItemDto> getPreOrderedItems() {
         return preOrderedItems;
     }
 
-    public void setPreOrderedItems(List<PreorderedItem> preOrderedItems) {
-        this.preOrderedItems = preOrderedItems;
-    }
 }