Index: pom.xml =================================================================== --- pom.xml (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ pom.xml (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -69,5 +69,4 @@ 3.1.2.RELEASE - @@ -100,4 +99,3 @@ - Index: src/main/java/mk/ukim/finki/easyfood/model/AppUser.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/model/AppUser.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/model/AppUser.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -57,4 +57,66 @@ } + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public ROLE getRole() { + return role; + } + + public void setRole(ROLE role) { + this.role = role; + } + + public List
getAddresses() { + return addresses; + } + + public void setAddresses(List
addresses) { + this.addresses = addresses; + } } Index: src/main/java/mk/ukim/finki/easyfood/model/Category.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/model/Category.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/model/Category.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -38,4 +38,9 @@ this.description = description; } + + public Long getId() { + return id; + } + } Index: src/main/java/mk/ukim/finki/easyfood/model/Order.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/model/Order.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/model/Order.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -43,4 +43,19 @@ @Column(name = "total_amount") private BigDecimal totalAmount; + + @OneToMany(mappedBy = "order", fetch = FetchType.LAZY) + private List orderItems; + + public Restaurant getRestaurant() { + return restaurant; + } + + public List getOrderItems() { + return orderItems; + } + + public void setOrderItems(List orderItems) { + this.orderItems = orderItems; + } // getters and setters Index: src/main/java/mk/ukim/finki/easyfood/repository/CartItemsRepository.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/repository/CartItemsRepository.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/repository/CartItemsRepository.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -6,6 +6,10 @@ import mk.ukim.finki.easyfood.model.ShoppingCart; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; import java.util.Optional; @@ -16,3 +20,10 @@ Optional findByCart_CustomerAndItem(Customer customer, Item item); + + @Modifying + @Transactional + @Query("DELETE FROM CartItems c WHERE c.item.id = :itemId") + void deleteByItemId(Long itemId); + + List findByCart_Customer_Id(Long id); } Index: src/main/java/mk/ukim/finki/easyfood/repository/ItemCategoryRepository.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/repository/ItemCategoryRepository.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) +++ src/main/java/mk/ukim/finki/easyfood/repository/ItemCategoryRepository.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -0,0 +1,13 @@ +package mk.ukim.finki.easyfood.repository; + +import mk.ukim.finki.easyfood.model.ItemCategory; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + + +@Repository +public interface ItemCategoryRepository extends JpaRepository { +} Index: src/main/java/mk/ukim/finki/easyfood/repository/ItemIngredientRepository.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/repository/ItemIngredientRepository.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) +++ src/main/java/mk/ukim/finki/easyfood/repository/ItemIngredientRepository.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -0,0 +1,11 @@ +package mk.ukim.finki.easyfood.repository; + +import mk.ukim.finki.easyfood.model.ItemIngredient; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +public interface ItemIngredientRepository extends JpaSpecificationRepository { +} Index: src/main/java/mk/ukim/finki/easyfood/repository/ItemRepository.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/repository/ItemRepository.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/repository/ItemRepository.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -4,4 +4,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; @@ -14,3 +16,42 @@ List findAllByIdIn(List ids); + + @Query("SELECT i FROM Item i JOIN ItemCategory ic ON i.id = ic.item.id WHERE ic.category.id = :categoryId") + List findItemsByCategoryId(@Param("categoryId") Long categoryId); + + @Query(value = """ + SELECT i.* FROM item i + JOIN order_items oi ON i.item_id = oi.item_id + GROUP BY i.item_id + ORDER BY SUM(oi.quantity) DESC + LIMIT 5 + """, nativeQuery = true) + List findTop5PopularItems(); + + + @Query(value = """ + SELECT i.* FROM item i + JOIN order_items oi ON i.item_id = oi.item_id + JOIN orders o ON o.order_id = oi.order_id + WHERE o.user_id = :userId + GROUP BY i.item_id + ORDER BY SUM(oi.quantity) DESC + LIMIT 5 + """, nativeQuery = true) + List findTop5ItemsForUser(@Param("userId") Long userId); + + + @Query(value = """ + SELECT i.* + FROM item i + JOIN order_items oi ON i.item_id = oi.item_id + JOIN order_items oi2 ON oi2.order_id = oi.order_id + WHERE oi2.item_id IN :cartItemIds AND i.item_id NOT IN :cartItemIds + GROUP BY i.item_id + ORDER BY COUNT(*) DESC + LIMIT 5 + """, nativeQuery = true) + List findItemsBoughtTogether(@Param("cartItemIds") List cartItemIds); + } + Index: src/main/java/mk/ukim/finki/easyfood/repository/MenuItemRepository.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/repository/MenuItemRepository.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/repository/MenuItemRepository.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -5,5 +5,8 @@ import mk.ukim.finki.easyfood.model.MenuItem; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -17,3 +20,7 @@ Optional findFirstByItem(Item item); + + List findByMenuId(Long menuId); + + void deleteByItemId(Long itemId); } Index: src/main/java/mk/ukim/finki/easyfood/repository/OrderItemsRepository.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/repository/OrderItemsRepository.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/repository/OrderItemsRepository.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -1,6 +1,10 @@ package mk.ukim.finki.easyfood.repository; +import mk.ukim.finki.easyfood.model.Order; import mk.ukim.finki.easyfood.model.OrderItems; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; @@ -9,5 +13,13 @@ @Repository public interface OrderItemsRepository extends JpaRepository { - List findByOrderId(Long orderId); + List findByOrder(Order order); + + @Query("SELECT oi FROM OrderItems oi WHERE oi.order.id = :orderId") + List findByOrderId(@Param("orderId") Long orderId); + + @Modifying + @Query("UPDATE OrderItems SET item = null WHERE item.id = :itemId") + void setItemIdToNull(@Param("itemId") Long itemId); + } Index: src/main/java/mk/ukim/finki/easyfood/repository/OrderRepository.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/repository/OrderRepository.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/repository/OrderRepository.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -4,4 +4,7 @@ import mk.ukim.finki.easyfood.model.Order; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; @@ -15,4 +18,12 @@ List findByCustomerIdOrderByOrderDateDesc(Long customerId); + + @Modifying + @Query("UPDATE Order SET customer = null WHERE customer.id = :userId") + void setUserIdToNull(@Param("userId") Long userId); + + @Modifying + @Query("UPDATE Order SET restaurant = null WHERE restaurant.id = :restaurantId") + void setRestaurantIdToNull(@Param("restaurantId") Long restaurantId); } Index: src/main/java/mk/ukim/finki/easyfood/service/AdminService.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/service/AdminService.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) +++ src/main/java/mk/ukim/finki/easyfood/service/AdminService.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -0,0 +1,51 @@ +package mk.ukim.finki.easyfood.service; + +import mk.ukim.finki.easyfood.model.AppUser; +import mk.ukim.finki.easyfood.model.Restaurant; +import mk.ukim.finki.easyfood.model.Menu; +import mk.ukim.finki.easyfood.model.Item; + +import java.util.List; + +public interface AdminService { + + long getTotalUsersCount(); + + long getTotalRestaurantsCount(); + + long getTotalMenusCount(); + + long getTotalItemsCount(); + + List getAllUsers(); + + AppUser getUserById(Long id); + + void updateUser(Long id, String firstName, String lastName, String email, String phone); + + void deleteUser(Long id); + + List getAllRestaurants(); + + Restaurant getRestaurantById(Long id); + + void updateRestaurant(Long id, String name, String address, String phoneNumber); + + void deleteRestaurant(Long id); + + List getAllMenus(); + + Menu getMenuById(Long id); + + void updateMenu(Long id, String name, Long restaurantId); + + void deleteMenu(Long id); + + List getAllItems(); + + Item getItemById(Long id); + + void updateItem(Long id, String name, String description, String price, String imageUrl); + + void deleteItem(Long id); +} Index: src/main/java/mk/ukim/finki/easyfood/service/ItemService.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/service/ItemService.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/service/ItemService.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -11,7 +11,6 @@ List findAll(); - List findRecommendedItems(); + List findRecommendedItems(Long userId); - // List findItemsByRestaurantId(Long restaurantId); public List getItemsByMenuId(Long menuId); @@ -19,3 +18,5 @@ List searchItems(String searchTerm); + + List findItemsByCategoryId(Long categoryId); } Index: src/main/java/mk/ukim/finki/easyfood/service/impl/AdminServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/service/impl/AdminServiceImpl.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) +++ src/main/java/mk/ukim/finki/easyfood/service/impl/AdminServiceImpl.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -0,0 +1,182 @@ +package mk.ukim.finki.easyfood.service.impl; + +import mk.ukim.finki.easyfood.model.*; +import mk.ukim.finki.easyfood.repository.*; +import mk.ukim.finki.easyfood.service.AdminService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +@Service +public class AdminServiceImpl implements AdminService { + + private final AppUserRepository userRepository; + private final RestaurantRepository restaurantRepository; + private final MenuRepository menuRepository; + private final ItemRepository itemRepository; + private final MenuItemRepository menuItemRepository; + private final OrderRepository ordersRepository; + + public AdminServiceImpl(AppUserRepository userRepository, + RestaurantRepository restaurantRepository, + MenuRepository menuRepository, + ItemRepository itemRepository, + MenuItemRepository menuItemRepository, + OrderRepository ordersRepository) { + this.userRepository = userRepository; + this.restaurantRepository = restaurantRepository; + this.menuRepository = menuRepository; + this.itemRepository = itemRepository; + this.menuItemRepository = menuItemRepository; + this.ordersRepository = ordersRepository; + } + + @Override + public long getTotalUsersCount() { + return userRepository.count(); + } + + @Override + public long getTotalRestaurantsCount() { + return restaurantRepository.count(); + } + + @Override + public long getTotalMenusCount() { + return menuRepository.count(); + } + + @Override + public long getTotalItemsCount() { + return itemRepository.count(); + } + + @Override + public List getAllUsers() { + return userRepository.findAll(); + } + + @Override + public AppUser getUserById(Long id) { + return userRepository.findById(id) + .orElseThrow(() -> new RuntimeException("User not found with id: " + id)); + } + + @Override + public void updateUser(Long id, String firstName, String lastName, String email, String phone) { + AppUser user = getUserById(id); + user.setFirstName(firstName); + user.setLastName(lastName); + user.setEmail(email); + user.setPhone(phone); + userRepository.save(user); + } + + @Override + @Transactional + public void deleteUser(Long id) { + if (!userRepository.existsById(id)) { + throw new RuntimeException("User not found with id: " + id); + } + + ordersRepository.setUserIdToNull(id); + + userRepository.deleteById(id); + } + + @Override + public List getAllRestaurants() { + return restaurantRepository.findAll(); + } + + @Override + public Restaurant getRestaurantById(Long id) { + return restaurantRepository.findById(id) + .orElseThrow(() -> new RuntimeException("Restaurant not found with id: " + id)); + } + + @Override + public void updateRestaurant(Long id, String name, String websiteUrl, String phoneNumber) { + Restaurant restaurant = getRestaurantById(id); + restaurant.setName(name); + restaurant.setWebsiteUrl(websiteUrl); + restaurant.setPhoneNumber(phoneNumber); + restaurantRepository.save(restaurant); + } + + @Override + @Transactional + public void deleteRestaurant(Long id) { + if (!restaurantRepository.existsById(id)) { + throw new RuntimeException("Restaurant not found with id: " + id); + } + ordersRepository.setRestaurantIdToNull(id); + restaurantRepository.deleteById(id); + } + + @Override + public List getAllMenus() { + return menuRepository.findAll(); + } + + @Override + public Menu getMenuById(Long id) { + return menuRepository.findById(id) + .orElseThrow(() -> new RuntimeException("Menu not found with id: " + id)); + } + + @Override + public void updateMenu(Long id, String name, Long restaurantId) { + Menu menu = getMenuById(id); + Restaurant restaurant = getRestaurantById(restaurantId); + + menu.setName(name); + menu.setRestaurant(restaurant); + menu.setUpdatedAt(LocalDateTime.now()); + menuRepository.save(menu); + } + + @Override + @Transactional + public void deleteMenu(Long id) { + if (!menuRepository.existsById(id)) { + throw new RuntimeException("Menu not found with id: " + id); + } + List menuItems = menuItemRepository.findByMenuId(id); + for (MenuItem menuItem : menuItems) { + deleteItem(menuItem.getMenu().getId()); + } + menuRepository.deleteById(id); + } + @Override + public List getAllItems() { + return itemRepository.findAll(); + } + + @Override + public Item getItemById(Long id) { + return itemRepository.findById(id) + .orElseThrow(() -> new RuntimeException("Item not found with id: " + id)); + } + + @Override + public void updateItem(Long id, String name, String description, String price, String imageUrl) { + Item item = getItemById(id); + item.setName(name); + item.setDescription(description); + item.setPrice(new BigDecimal(price)); + item.setImageUrl(imageUrl); + itemRepository.save(item); + } + + @Override + @Transactional + public void deleteItem(Long id) { + if (!itemRepository.existsById(id)) { + throw new RuntimeException("Item not found with id: " + id); + } + } +} Index: src/main/java/mk/ukim/finki/easyfood/service/impl/ItemServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/service/impl/ItemServiceImpl.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/service/impl/ItemServiceImpl.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -5,12 +5,10 @@ import mk.ukim.finki.easyfood.model.exceptions.ItemNotFoundException; -import mk.ukim.finki.easyfood.repository.ItemRepository; -import mk.ukim.finki.easyfood.repository.MenuItemRepository; -import mk.ukim.finki.easyfood.repository.MenuRepository; -import mk.ukim.finki.easyfood.repository.RestaurantRepository; +import mk.ukim.finki.easyfood.repository.*; import mk.ukim.finki.easyfood.service.ItemService; import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; import jakarta.persistence.criteria.Predicate; // This is the correct one +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; @@ -25,13 +23,15 @@ private final MenuRepository menuRepository; private final RestaurantRepository restaurantRepository; + private final CartItemsRepository cartItemsRepository; public ItemServiceImpl(ItemRepository itemRepository, MenuItemRepository menuItemRepository, MenuRepository menuRepository, - RestaurantRepository restaurantRepository) { + RestaurantRepository restaurantRepository, CartItemsRepository cartItemsRepository) { this.itemRepository = itemRepository; this.menuItemRepository = menuItemRepository; this.menuRepository = menuRepository; this.restaurantRepository = restaurantRepository; + this.cartItemsRepository = cartItemsRepository; } @@ -42,21 +42,18 @@ @Override - public List findRecommendedItems() { - return itemRepository.findAll().stream().limit(5).collect(Collectors.toList()); + @Transactional(readOnly = true) + public List findRecommendedItems(Long userId) { + List cartItems = cartItemsRepository.findByCart_Customer_Id(userId); + List cartItemIds = cartItems.stream() + .map(ci -> ci.getItem().getId()) + .toList(); + + if (cartItemIds.isEmpty()) { + return itemRepository.findTop5PopularItems(); + } else { + return itemRepository.findItemsBoughtTogether(cartItemIds); + } } -// @Override -// public List findItemsByRestaurantId(Long restaurantId) { -// Restaurant restaurant = restaurantRepository.findById(restaurantId) -// .orElseThrow(() -> new RuntimeException("Restaurant not found")); -// -// Menu menu = menuRepository.findByRestaurant(restaurant); -// if (menu == null) return List.of(); -// -// List menuItems = menuItemRepository.findByMenu(menu); -// return menuItems.stream() -// .map(MenuItem::getItem) -// .collect(Collectors.toList()); -// } public List getItemsByMenuId(Long menuId) { @@ -104,3 +101,8 @@ } + @Override + public List findItemsByCategoryId(Long categoryId) { + return this.itemRepository.findItemsByCategoryId(categoryId); + } + } Index: src/main/java/mk/ukim/finki/easyfood/service/impl/OrderServiceImpl.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/service/impl/OrderServiceImpl.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/service/impl/OrderServiceImpl.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -9,4 +9,5 @@ import mk.ukim.finki.easyfood.repository.OrderRepository; import mk.ukim.finki.easyfood.service.OrderService; +import mk.ukim.finki.easyfood.service.ShoppingCartService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -21,9 +22,11 @@ private final DeliveryManRepository deliveryManRepository; private final OrderItemsRepository orderItemsRepository; + private final ShoppingCartService shoppingCartService; - public OrderServiceImpl(OrderRepository orderRepository, DeliveryManRepository deliveryManRepository, OrderItemsRepository orderItemsRepository) { + public OrderServiceImpl(OrderRepository orderRepository, DeliveryManRepository deliveryManRepository, OrderItemsRepository orderItemsRepository, ShoppingCartService shoppingCartService) { this.orderRepository = orderRepository; this.deliveryManRepository = deliveryManRepository; this.orderItemsRepository = orderItemsRepository; + this.shoppingCartService = shoppingCartService; } @@ -61,4 +64,6 @@ Order savedOrder = orderRepository.save(order); + BigDecimal totalAmount = BigDecimal.ZERO; + for (CartItems cartItem : cartItems) { OrderItems orderItem = new OrderItems(); @@ -66,9 +71,19 @@ orderItem.setItem(cartItem.getItem()); orderItem.setQuantity(cartItem.getQuantity()); - orderItem.setTotalPrice(cartItem.getItem().getPrice() - .multiply(BigDecimal.valueOf(cartItem.getQuantity()))); + + BigDecimal itemTotal = cartItem.getItem().getPrice() + .multiply(BigDecimal.valueOf(cartItem.getQuantity())); + + orderItem.setTotalPrice(itemTotal); + totalAmount = totalAmount.add(itemTotal); orderItemsRepository.save(orderItem); } + + savedOrder.setTotalAmount(totalAmount); + orderRepository.save(savedOrder); + + // ✅ clear cart inside same transaction + shoppingCartService.clearCart(order.getCustomer().getId()); return savedOrder; Index: src/main/java/mk/ukim/finki/easyfood/service/impl/ShoppingCartServiceImp.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/service/impl/ShoppingCartServiceImp.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/service/impl/ShoppingCartServiceImp.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -156,5 +156,4 @@ @Override public ShoppingCart getActiveShoppingCart(Long userId) { - // Find by customer ID instead of customer ID and active flag Optional customer = customerRepository.findById(userId); if (customer.isPresent()) { @@ -175,5 +174,4 @@ if (cartOpt.isPresent()) { ShoppingCart cart = cartOpt.get(); - // Delete all cart items first if (cart.getCartItems() != null) { cartItemsRepository.deleteAll(cart.getCartItems()); @@ -190,5 +188,4 @@ ShoppingCart cart = getActiveShoppingCart(userId); if (cart != null) { - // Delete all cart items first if (cart.getCartItems() != null) { cartItemsRepository.deleteAll(cart.getCartItems()); Index: src/main/java/mk/ukim/finki/easyfood/web/controller/AdminHomeController.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/web/controller/AdminHomeController.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) +++ src/main/java/mk/ukim/finki/easyfood/web/controller/AdminHomeController.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -0,0 +1,183 @@ +package mk.ukim.finki.easyfood.web.controller; + +import mk.ukim.finki.easyfood.model.AppUser; +import mk.ukim.finki.easyfood.model.Restaurant; +import mk.ukim.finki.easyfood.model.Menu; +import mk.ukim.finki.easyfood.model.Item; +import mk.ukim.finki.easyfood.service.AdminService; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Optional; + +@Controller +@RequestMapping("/admin") +public class AdminHomeController { + + private final AdminService adminService; + + public AdminHomeController(AdminService adminService) { + this.adminService = adminService; + } + + @GetMapping + public String adminHome(Model model) { + // Get counts for dashboard overview + model.addAttribute("totalUsers", adminService.getTotalUsersCount()); + model.addAttribute("totalRestaurants", adminService.getTotalRestaurantsCount()); + model.addAttribute("totalMenus", adminService.getTotalMenusCount()); + model.addAttribute("totalItems", adminService.getTotalItemsCount()); + + return "admin_home"; + } + + // Users Management + @GetMapping("/users") + public String getAllUsers(Model model) { + List users = adminService.getAllUsers(); + model.addAttribute("users", users); + return "admin_users"; + } + + @GetMapping("/users/edit/{id}") + public String editUser(@PathVariable Long id, Model model) { + AppUser user = adminService.getUserById(id); + if (user != null) { + model.addAttribute("user", user); + return "admin_edit_user"; + } else { + return "redirect:/admin/users?error=User not found"; + } + } + + @PostMapping("/users/update") + public String updateUser(@RequestParam Long id, + @RequestParam String firstName, + @RequestParam String lastName, + @RequestParam String email, + @RequestParam String phone, + Model model) { + try { + adminService.updateUser(id, firstName, lastName, email, phone); + return "redirect:/admin/users?success=User updated successfully"; + } catch (Exception e) { + model.addAttribute("error", e.getMessage()); + return "redirect:/admin/users?error=" + e.getMessage(); + } + } + + @PostMapping("/users/delete/{id}") + public String deleteUser(@PathVariable Long id) { + adminService.deleteUser(id); + return "redirect:/admin/users?success=User deleted successfully"; + } + + // Restaurants Management + @GetMapping("/restaurants") + public String getAllRestaurants(Model model) { + List restaurants = adminService.getAllRestaurants(); + model.addAttribute("restaurants", restaurants); + return "admin_restaurants"; + } + + @GetMapping("/restaurants/edit/{id}") + public String editRestaurant(@PathVariable Long id, Model model) { + Restaurant restaurant = adminService.getRestaurantById(id); + model.addAttribute("restaurant", restaurant); + return "admin_edit_restaurant"; + } + + @PostMapping("/restaurants/update") + public String updateRestaurant(@RequestParam Long id, + @RequestParam String name, + @RequestParam String webiste, + @RequestParam String phoneNumber, + Model model) { + try { + adminService.updateRestaurant(id, name, webiste, phoneNumber); + return "redirect:/admin/restaurants?success=Restaurant updated successfully"; + } catch (Exception e) { + return "redirect:/admin/restaurants?error=" + e.getMessage(); + } + } + + @PostMapping("/restaurants/delete/{id}") + public String deleteRestaurant(@PathVariable Long id) { + adminService.deleteRestaurant(id); + return "redirect:/admin/restaurants?success=Restaurant deleted successfully"; + } + + // Menus Management + @GetMapping("/menus") + public String getAllMenus(Model model) { + List menus = adminService.getAllMenus(); + model.addAttribute("menus", menus); + return "admin_menus"; + } + + @GetMapping("/menus/edit/{id}") + public String editMenu(@PathVariable Long id, Model model) { + Menu menu = adminService.getMenuById(id); + List restaurants = adminService.getAllRestaurants(); + model.addAttribute("menu", menu); + model.addAttribute("restaurants", restaurants); + return "admin_edit_menu"; + } + + @PostMapping("/menus/update") + public String updateMenu(@RequestParam Long id, + @RequestParam String name, + @RequestParam Long restaurantId, + Model model) { + try { + adminService.updateMenu(id, name, restaurantId); + return "redirect:/admin/menus?success=Menu updated successfully"; + } catch (Exception e) { + return "redirect:/admin/menus?error=" + e.getMessage(); + } + } + + @PostMapping("/menus/delete/{id}") + public String deleteMenu(@PathVariable Long id) { + adminService.deleteMenu(id); + return "redirect:/admin/menus?success=Menu deleted successfully"; + } + + // Items Management + @GetMapping("/items") + public String getAllItems(Model model) { + List items = adminService.getAllItems(); + model.addAttribute("items", items); + return "admin_items"; + } + + @GetMapping("/items/edit/{id}") + public String editItem(@PathVariable Long id, Model model) { + Item item = adminService.getItemById(id); + model.addAttribute("item", item); + return "admin_edit_item"; + } + + @PostMapping("/items/update") + public String updateItem(@RequestParam Long id, + @RequestParam String name, + @RequestParam String description, + @RequestParam String price, + @RequestParam String imageUrl, + Model model) { + try { + adminService.updateItem(id, name, description, price, imageUrl); + return "redirect:/admin/items?success=Item updated successfully"; + } catch (Exception e) { + return "redirect:/admin/items?error=" + e.getMessage(); + } + } + + @PostMapping("/items/delete/{id}") + public String deleteItem(@PathVariable Long id) { + adminService.deleteItem(id); + return "redirect:/admin/items?success=Item deleted successfully"; + } +} Index: src/main/java/mk/ukim/finki/easyfood/web/controller/HomeController.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/web/controller/HomeController.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/web/controller/HomeController.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -34,21 +34,25 @@ public String getHomePage(Model model, Authentication authentication, - @RequestParam(required = false) String searchTerm) { + @RequestParam(required = false) String searchTerm, + @RequestParam(required = false) Long categoryId) { List categories = categoryService.listCategories(); List items; - // If a search term is present, show search results; otherwise, show all items + if (authentication != null && authentication.isAuthenticated()) { + String username = authentication.getName(); + if (username.equals("admin@easyfood.com") || username.contains("admin")) { + return "redirect:/admin"; + } + } + if (searchTerm != null && !searchTerm.trim().isEmpty()) { items = itemService.searchItems(searchTerm); model.addAttribute("searchTerm", searchTerm); + } else if (categoryId != null) { + items = itemService.findItemsByCategoryId(categoryId); } else { items = itemService.findAll(); } - List recommendedItems = itemService.findRecommendedItems(); - - model.addAttribute("categories", categories); - model.addAttribute("items", items); - model.addAttribute("recommendedItems", recommendedItems); Long userId = null; @@ -64,4 +68,9 @@ model.addAttribute("numberOfItems", numberOfItems); + List recommendedItems = itemService.findRecommendedItems(userId); + + model.addAttribute("categories", categories); + model.addAttribute("items", items); + model.addAttribute("recommendedItems", recommendedItems); return "main_pg"; Index: src/main/java/mk/ukim/finki/easyfood/web/controller/LoginController.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/web/controller/LoginController.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/web/controller/LoginController.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -26,3 +26,5 @@ return "login"; } + + } Index: src/main/java/mk/ukim/finki/easyfood/web/controller/OrderController.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/web/controller/OrderController.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/web/controller/OrderController.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -173,6 +173,4 @@ if (paymentSuccessful) { - cartService.clearCart(customer.getId()); - redirectAttributes.addFlashAttribute("successMessage", "Order placed successfully! Order ID: " + savedOrder.getId()); Index: src/main/java/mk/ukim/finki/easyfood/web/controller/ProfileController.java =================================================================== --- src/main/java/mk/ukim/finki/easyfood/web/controller/ProfileController.java (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/java/mk/ukim/finki/easyfood/web/controller/ProfileController.java (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -4,7 +4,9 @@ import mk.ukim.finki.easyfood.model.Address; import mk.ukim.finki.easyfood.model.Order; +import mk.ukim.finki.easyfood.model.OrderItems; import mk.ukim.finki.easyfood.service.UserService; import mk.ukim.finki.easyfood.service.AddressService; import mk.ukim.finki.easyfood.service.OrderService; +import mk.ukim.finki.easyfood.repository.OrderItemsRepository; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -16,5 +18,4 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; - import java.util.List; @@ -28,9 +29,12 @@ private final AddressService addressService; private final OrderService orderService; + private final OrderItemsRepository orderItemsRepository; - public ProfileController(UserService userService, AddressService addressService, OrderService orderService) { + public ProfileController(UserService userService, AddressService addressService, + OrderService orderService, OrderItemsRepository orderItemsRepository) { this.userService = userService; this.addressService = addressService; this.orderService = orderService; + this.orderItemsRepository = orderItemsRepository; } @@ -49,5 +53,13 @@ Customer customer = customerOptional.get(); + // Get orders for the user List orders = orderService.findAllByUserId(customer.getId()); + + // Load order items for each order (including deleted items) + for (Order order : orders) { + List orderItems = orderItemsRepository.findByOrderId(order.getId()); + order.setOrderItems(orderItems); + } + List
addresses = customer.getAddresses(); model.addAttribute("user", customer); Index: src/main/resources/templates/admin_edit_item.html =================================================================== --- src/main/resources/templates/admin_edit_item.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) +++ src/main/resources/templates/admin_edit_item.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -0,0 +1,137 @@ + + + + + + Items Management - Admin + + + + + + + +
+
+
+ +
+

Items Management

+
+ + + + + + +
+
+
All Menu Items
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
IDImageNamePriceDescriptionActions
+ No items found +
+ Item Image +
+ +
+ 		+ + + + + + +
+ + Edit + + +
+ + +
+
+
+
+
Confirm Deletion
+ +
+
+ Are you sure you want to delete item ? +
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ + + + Index: src/main/resources/templates/admin_edit_menu.html =================================================================== --- src/main/resources/templates/admin_edit_menu.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) +++ src/main/resources/templates/admin_edit_menu.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -0,0 +1,98 @@ + + + + + + Edit Menu - Admin + + + + + + + +
+
+
+
+
+

+ Edit Menu +

+
+
+
+ + +
+ + +
+ +
+ + +
+ +
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+ + Note: The "Last Updated" time will be automatically set to the current time + when you save changes. +
+ +
+ + + Cancel + +
+
+
+
+
+
+
+ + + + Index: src/main/resources/templates/admin_edit_restaurant.html =================================================================== --- src/main/resources/templates/admin_edit_restaurant.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) +++ src/main/resources/templates/admin_edit_restaurant.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -0,0 +1,82 @@ + + + + + + Edit Restaurant - Admin + + + + + + + +
+
+
+
+
+

+ Edit Restaurant +

+
+
+
+ + +
+ + +
+ +
+ + +
+ +
+ + +
Format: 02-123-456 or 070-123-456
+
+ +
+ + Note: Changes to restaurant information will be visible to all customers. + Make sure all details are accurate. +
+ +
+ + + Cancel + +
+
+
+
+
+
+
+ + + + Index: src/main/resources/templates/admin_home.html =================================================================== --- src/main/resources/templates/admin_home.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) +++ src/main/resources/templates/admin_home.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -0,0 +1,175 @@ + + + + + + Admin Dashboard - EasyFood + + + + + + + +
+ +
+
+

Admin Dashboard

+

Manage your EasyFood platform

+
+
+ + +
+
+
+
+
+
+

0

+

Total Users

+
+
+ +
+
+
+
+ + View all users + +
+
+
+ +
+
+
+
+
+

0

+

Restaurants

+
+
+ +
+
+
+
+ + View all restaurants + +
+
+
+ +
+
+
+
+
+

0

+

Menus

+
+
+ +
+
+
+
+ + View all menus + +
+
+
+ +
+
+
+
+
+

0

+

Menu Items

+
+
+ +
+
+
+
+ + View all items + +
+
+
+
+ + +
+
+
+
+
Quick Actions
+
+
+
+
+ + + Manage Users + +
+
+ + + Manage Restaurants + +
+
+ + + Manage Menus + +
+
+ + + Manage Items + +
+
+
+
+
+
+
+ + + + Index: src/main/resources/templates/admin_items.html =================================================================== --- src/main/resources/templates/admin_items.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) +++ src/main/resources/templates/admin_items.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -0,0 +1,137 @@ + + + + + + Items Management - Admin + + + + + + + +
+
+
+ +
+

Items Management

+
+ + + + + + +
+
+
All Menu Items
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
IDImageNamePriceDescriptionActions
+ No items found +
+ Item Image +
+ +
+ 		+ + + + + + +
+ + Edit + + +
+ + +
+
+
+
+
Confirm Deletion
+ +
+
+ Are you sure you want to delete item ? +
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ + + + Index: src/main/resources/templates/admin_menus.html =================================================================== --- src/main/resources/templates/admin_menus.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) +++ src/main/resources/templates/admin_menus.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -0,0 +1,133 @@ + + + + + + Menus Management - Admin + + + + + + + +
+
+
+ +
+

Menus Management

+
+ + + + + + +
+
+
All Menus
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
IDMenu NameRestaurantCreated AtUpdated AtActions
+ No menus found +
+ + + + No Restaurant + + +
+ + Edit + + +
+ + +
+
+
+
+
Confirm Deletion
+ +
+
+ Are you sure you want to delete menu ? +
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ + + + Index: src/main/resources/templates/admin_restaurants.html =================================================================== --- src/main/resources/templates/admin_restaurants.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) +++ src/main/resources/templates/admin_restaurants.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -0,0 +1,117 @@ + + + + + + Restaurants Management - Admin + + + + + + + +
+
+
+ +
+

Restaurants Management

+
+ + + + + + +
+
+
All Restaurants
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
IDNameAddressPhoneActions
+ No restaurants found +
+
+ + Edit + + +
+ + +
+
+
+
+
Confirm Deletion
+ +
+
+ Are you sure you want to delete restaurant ? +
+
+ +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ + + + Index: src/main/resources/templates/admin_users.html =================================================================== --- src/main/resources/templates/admin_users.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) +++ src/main/resources/templates/admin_users.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -0,0 +1,101 @@ + + + + + + Users Management - Admin + + + + + + + +
+
+
+ +
+

Users Management

+ + Add New User + +
+ + + + + + +
+
+
All Users
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
IDNameEmailPhoneRoleActions
+ No users found +
+ + + +
+ + Edit + + +
+
+
+
+
+
+
+
+ + + + Index: src/main/resources/templates/main_pg.html =================================================================== --- src/main/resources/templates/main_pg.html (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/resources/templates/main_pg.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -144,8 +144,14 @@ -
-
+ + +
+ +
+

No categories available.

Index: src/main/resources/templates/profile.html =================================================================== --- src/main/resources/templates/profile.html (revision 01114642c04bc80550f138c9b451c661ebdfdaca) +++ src/main/resources/templates/profile.html (revision ec552d70dd27a3465c8420563dbde91ca2fc7579) @@ -228,18 +228,48 @@
  • -

    - Order ID: -

    -

    - Order Date: -

    -

    - Order Total: -

    -

    - Restaurant: -

    +
    +
    +

    + Order ID: +

    +

    + Order Date: + +

    +

    + Order Total: + +

    +

    + Restaurant: + + [Restaurant no longer available] +

    +

    + Status: + +

    +
    +
    +

    Items:

    +
    +
      +
    • + + [Deleted item] x + +
      • +
    +
    +
    +

    No items found

    +
    +
    +
@@ -250,43 +280,43 @@
- - - -