Changeset 1bd8d1e for src/main/java/com/example/autopartz/controller

Timestamp:

01/05/23 12:40:07 (23 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Children:

f484b14

Parents:

676144b

Message:

Added views and functionalities for deliveryman, warehouseman and admin

Location:

src/main/java/com/example/autopartz/controller

Files:

• AdminController.java (modified) (1 diff)
• HomeController.java (modified) (6 diffs)
• PartController.java (modified) (1 diff)
• TestController.java (modified) (1 diff)

src/main/java/com/example/autopartz/controller/AdminController.java

@@ -13 +13 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.annotation.security.RolesAllowed;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;

src/main/java/com/example/autopartz/controller/HomeController.java

@@ -1 +1 @@
 package com.example.autopartz.controller;
 
-import com.example.autopartz.model.Order;
-import com.example.autopartz.model.User;
-import com.example.autopartz.model.Warehouse;
-import com.example.autopartz.repository.OrderContainsPartRepository;
-import com.example.autopartz.repository.PartsForCarTypeAndCategoryRepository;
-import com.example.autopartz.repository.RepairShopReviewSummaryRepository;
-import com.example.autopartz.repository.WarehouseRepository;
+import com.example.autopartz.model.*;
+import com.example.autopartz.model.manytomany.PartIsInStockInWarehouse;
+import com.example.autopartz.repository.*;
 import com.example.autopartz.service.*;
 import org.springframework.stereotype.Controller;
@@ -20 +16 @@
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
+import java.util.List;
 import java.util.Objects;
 
@@ -34 +31 @@
     private final OrderContainsPartRepository orderContainsPartRepository;
     private final OrderService orderService;
-
+    private final UserService userService;
+    private final DeliveryService deliveryService;
+    private final PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository;
     public HomeController(LoginService loginService, PartService partService, PartsForCarTypeAndCategoryRepository partsForCarTypeAndCategoryRepository, CarService carService, CategoryService categoryService, RepairShopReviewSummaryRepository repairShopReviewSummaryRepository, WarehouseRepository warehouseRepository,
-                          OrderContainsPartRepository orderContainsPartRepository, OrderService orderService) {
+                          OrderContainsPartRepository orderContainsPartRepository, OrderService orderService, UserService userService, DeliveryService deliveryService, PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository) {
         this.loginService = loginService;
         this.partService = partService;
@@ -46 +45 @@
         this.orderContainsPartRepository = orderContainsPartRepository;
         this.orderService = orderService;
+        this.userService = userService;
+        this.deliveryService = deliveryService;
+        this.partIsInStockInWarehouseRepository = partIsInStockInWarehouseRepository;
     }
 
@@ -78 +80 @@
             model.addAttribute("hasError",false);
             model.addAttribute("order",o);
-            model.addAttribute("parts",orderService.findById(o.getID_order()).getPartList());
+            model.addAttribute("parts",orderService.findById(o.getOrderid()).getPartList());
         }
         model.addAttribute("bodyContent","currentOrder");
@@ -154 +156 @@
         }
     }
+    @GetMapping("/access_denied")
+    public String accessDenied(Model model){
+        model.addAttribute("bodyContent","access_denied");
+        return "master-template";
+    }
+    @GetMapping("/myWarehouse")
+    public String myWarehouse(Model model, HttpServletRequest request){
+        Warehouseman whm = (Warehouseman) userService.findByUsername(request.getRemoteUser());
+        Warehouse warehouse = whm.getWarehouse();
+        List<PartIsInStockInWarehouse> partIsInStockInWarehouseList = partIsInStockInWarehouseRepository.findAllByWarehouseid(warehouse.getID_warehouse());
+        model.addAttribute("bodyContent","myWarehouse");
+        model.addAttribute("warehouse",warehouse);
+        model.addAttribute("parts", partIsInStockInWarehouseList);
+        return "master-template";
+    }
+    @GetMapping("myDeliveries")
+    public String myDeliveries(Model model, HttpServletRequest request){
+        Deliveryman dm = (Deliveryman) userService.findByUsername(request.getRemoteUser());
+        List<Delivery> deliveries = deliveryService.findAllByDeliverer(dm);
+        model.addAttribute("bodyContent","myDeliveries");
+        model.addAttribute("deliveries",deliveries);
+        return "master-template";
+    }
 }

src/main/java/com/example/autopartz/controller/PartController.java

@@ -77 +77 @@
         }
         Order order = (Order) session.getAttribute("order");
-        orderContainsPartRepository.save(new OrderContainsPart(id,order.getID_order(),quantity));
+        orderContainsPartRepository.save(new OrderContainsPart(id,order.getOrderid(),quantity));
         try {
             response.sendRedirect("/products");

src/main/java/com/example/autopartz/controller/TestController.java

@@ -36 +36 @@
         User u = userService.findByUsername("client13");
         Order o = orderService.create((Client) u);
-        orderContainsPartRepository.save(new OrderContainsPart(5,o.getID_order(),2));
-        orderContainsPartRepository.save(new OrderContainsPart(7,o.getID_order(),1));
+        orderContainsPartRepository.save(new OrderContainsPart(5,o.getOrderid(),2));
+        orderContainsPartRepository.save(new OrderContainsPart(7,o.getOrderid(),1));
     }
     @GetMapping("/t")