Changeset e48199a for src/main/java/com/example/rezevirajmasa/demo/service/impl

Timestamp:

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

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Parents:

b67dfd3

Message:

Final version for DB

Location:

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

Files:

• MenuServiceImpl.java (modified) (3 diffs)
• ReservationImpl.java (modified) (5 diffs)

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