Changeset e48199a for src

Timestamp:

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

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Parents:

b67dfd3

Message:

Final version for DB

Location:

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

Files:

• dto/PreorderedItemDto.java (added)
• dto/ReservationDTO.java (modified) (10 diffs)
• model/Menu.java (modified) (1 diff)
• model/PreorderedItem.java (modified) (2 diffs)
• model/PriceHistory.java (added)
• model/Reservation.java (modified) (1 diff)
• repository/PriceHistoryRepository.java (added)
• service/MenuService.java (modified) (1 diff)
• service/impl/MenuServiceImpl.java (modified) (3 diffs)
• service/impl/ReservationImpl.java (modified) (5 diffs)
• web/rest/testController.java (modified) (1 diff)

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;
-    }
 }

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

@@ -38 +38 @@
     private List<MenuTag> tags = new ArrayList<>();
 
+    @OneToMany(mappedBy = "menu", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
+    private List<PriceHistory> priceHistoryList = new ArrayList<>();
+
     public Menu() {
     }

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

@@ -26 +26 @@
     private Integer quantity;
 
+    @Column(name = "price_at_order", precision = 8, scale = 2, nullable = false)
     private BigDecimal price;
 
@@ -32 +33 @@
     @JoinColumn(name = "reservation_id", nullable = false)
     private Reservation reservation;
+
+    @ManyToOne
+    @JoinColumn(name = "menu_id", nullable = false)
+    private Menu menu;
 }

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

@@ -1 +1 @@
 package com.example.rezevirajmasa.demo.model;
 
+import com.example.rezevirajmasa.demo.dto.PreorderedItemDto;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonManagedReference;

src/main/java/com/example/rezevirajmasa/demo/service/MenuService.java

@@ -3 +3 @@
 import com.example.rezevirajmasa.demo.model.Menu;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 public interface MenuService {
     public List<Menu> getMenuByRestaurantId(Long restaurantId);
+    public void updateMenuPrice(Long menuId, BigDecimal newPrice);
+    public Menu getMenuById(Long id);
 }

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

@@ -2 +2 @@
 
 import com.example.rezevirajmasa.demo.model.Menu;
+import com.example.rezevirajmasa.demo.model.PriceHistory;
 import com.example.rezevirajmasa.demo.model.Restaurant;
 import com.example.rezevirajmasa.demo.repository.MenuRepository;
+import com.example.rezevirajmasa.demo.repository.PriceHistoryRepository;
 import com.example.rezevirajmasa.demo.service.MenuService;
 import com.example.rezevirajmasa.demo.service.RestaurantService;
+import org.openqa.selenium.InvalidArgumentException;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
@@ -15 +20 @@
     private final RestaurantService restaurantService;
 
-    public MenuServiceImpl(MenuRepository menuRepository, RestaurantService restaurantService) {
+    private final PriceHistoryRepository priceHistoryRepository;
+
+    public MenuServiceImpl(MenuRepository menuRepository, RestaurantService restaurantService, PriceHistoryRepository priceHistoryRepository) {
         this.menuRepository = menuRepository;
         this.restaurantService = restaurantService;
+        this.priceHistoryRepository = priceHistoryRepository;
     }
 
@@ -25 +33 @@
         return menuRepository.findAllByRestaurant(restaurant);
     }
+
+    @Override
+    public void updateMenuPrice(Long menuId, BigDecimal newPrice) {
+        Menu menu = menuRepository.findById(menuId)
+                .orElseThrow(() -> new IllegalArgumentException("Menu not found"));
+
+        if (menu.getPrice() != null && !menu.getPrice().equals(newPrice)) {
+            PriceHistory priceHistory = new PriceHistory(menu, menu.getPrice(), LocalDateTime.now());
+            priceHistoryRepository.save(priceHistory);
+        }
+
+        menu.setPrice(newPrice);
+        menuRepository.save(menu);
+    }
+
+    @Override
+    public Menu getMenuById(Long id) {
+        return menuRepository.findById(id)
+                .orElseThrow(()->new InvalidArgumentException("Invalid id sent: " + id));
+    }
 }

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

@@ -1 +1 @@
 package com.example.rezevirajmasa.demo.service.impl;
 
+import com.example.rezevirajmasa.demo.dto.PreorderedItemDto;
 import com.example.rezevirajmasa.demo.dto.ReservationDTO;
 import com.example.rezevirajmasa.demo.mappers.UserMapper;
@@ -8 +9 @@
 import com.example.rezevirajmasa.demo.repository.ReservationRepository;
 import com.example.rezevirajmasa.demo.repository.TableRepository;
+import com.example.rezevirajmasa.demo.service.MenuService;
 import com.example.rezevirajmasa.demo.service.ReservationHistoryService;
 import com.example.rezevirajmasa.demo.service.ReservationService;
 import com.example.rezevirajmasa.demo.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
@@ -31 +34 @@
     @Autowired
     private ReservationRepository reservationRepository;
+    @Autowired
+    @Lazy
+    private MenuService menuService;
 
     public ReservationImpl(UserMapper userMapper) {
@@ -82 +88 @@
             List<PreorderedItem> preOrderedItems = new ArrayList<>();
 
-            for (PreorderedItem dtoItem : reservationDTO.getPreOrderedItems()) {
+            for (PreorderedItemDto dtoItem : reservationDTO.getPreOrderedItems()) {
                 PreorderedItem item = new PreorderedItem();
                 item.setPreorderedItemName(dtoItem.getPreorderedItemName());
@@ -88 +94 @@
                 item.setPrice(dtoItem.getPrice());
                 item.setReservation(reservation);
+
+                Menu menu = menuService.getMenuById(dtoItem.getMenuID());
+                item.setMenu(menu);
 
                 preOrderedItems.add(item);

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

@@ -64 +64 @@
     @GetMapping("/api/restaurants/{restaurantId}")
     public ResponseEntity<RestaurantDTO> getRestaurantById(@PathVariable Long restaurantId) {
-        return new ResponseEntity<RestaurantDTO>(restaurantService.findById(restaurantId), HttpStatus.OK);
+        RestaurantDTO restaurantDTO = restaurantService.findById(restaurantId);
+        return new ResponseEntity<>(restaurantDTO, HttpStatus.OK);
     }