Changeset f484b14 for src/main/java/com/example/autopartz/controller

Timestamp:

01/06/23 02:51:45 (23 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Children:

d4b888e

Parents:

1bd8d1e

Message:

Added full functionality for creating order

Location:

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

Files:

• AdminController.java (modified) (4 diffs)
• PartController.java (modified) (6 diffs)
• UserController.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package com.example.autopartz.controller;
 
+import com.example.autopartz.model.Deliveryman;
 import com.example.autopartz.model.Role;
 import com.example.autopartz.model.User;
 import com.example.autopartz.model.Warehouseman;
+import com.example.autopartz.repository.DeliverymanRepository;
 import com.example.autopartz.repository.WarehousemanRepository;
 import com.example.autopartz.service.UserService;
@@ -13 +15 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import javax.annotation.security.RolesAllowed;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -25 +26 @@
     private final UserService userService;
     private final WarehousemanRepository warehousemanRepository;
+    private final DeliverymanRepository deliverymanRepository;
 
-    public AdminController(UserService userService, WarehousemanRepository warehousemanRepository) {
+    public AdminController(UserService userService, WarehousemanRepository warehousemanRepository, DeliverymanRepository deliverymanRepository) {
         this.userService = userService;
         this.warehousemanRepository = warehousemanRepository;
+        this.deliverymanRepository = deliverymanRepository;
     }
 
@@ -44 +47 @@
             wh.setEmployed_from(LocalDate.now());
             warehousemanRepository.save(wh);
+
+        }
+        else {
+            Deliveryman dm = (Deliveryman) userService.findById(id);
+            dm.setEmployed_from(LocalDate.now());
+            deliverymanRepository.save(dm);
             try {
                 response.sendRedirect("/viewUsers");

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

@@ -1 +1 @@
 package com.example.autopartz.controller;
 
-import com.example.autopartz.model.Client;
-import com.example.autopartz.model.Order;
-import com.example.autopartz.model.Part;
-import com.example.autopartz.model.User;
+import com.example.autopartz.model.*;
 import com.example.autopartz.model.manytomany.OrderContainsPart;
-import com.example.autopartz.repository.OrderContainsPartRepository;
+import com.example.autopartz.model.manytomany.RsForCm;
+import com.example.autopartz.repository.*;
 import com.example.autopartz.service.*;
 import org.springframework.stereotype.Controller;
@@ -16 +14 @@
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 @Controller
@@ -26 +26 @@
     private final UserService userService;
     private final OrderContainsPartRepository orderContainsPartRepository;
-    public PartController(PartService partService, RepairShopService repairShopService, PriceService priceService, OrderService orderService, UserService userService, OrderContainsPartRepository orderContainsPartRepository) {
+    private final DeliveryRepository deliveryRepository;
+    private final RepairRepository repairRepository;
+    private final CarSampleRepository carSampleRepository;
+    private final ServiceBookRepository serviceBookRepository;
+    private final DeliverymanRepository deliverymanRepository;
+    private final RsForCmRepository rsForCmRepository;
+    public PartController(PartService partService, RepairShopService repairShopService, PriceService priceService, OrderService orderService, UserService userService, OrderContainsPartRepository orderContainsPartRepository, DeliveryRepository deliveryRepository, RepairRepository repairRepository, CarSampleRepository carSampleRepository, ServiceBookRepository serviceBookRepository, DeliverymanRepository deliverymanRepository, RsForCmRepository rsForCmRepository) {
         this.partService = partService;
         this.repairShopService = repairShopService;
@@ -33 +39 @@
         this.userService = userService;
         this.orderContainsPartRepository = orderContainsPartRepository;
+        this.deliveryRepository = deliveryRepository;
+        this.repairRepository = repairRepository;
+        this.carSampleRepository = carSampleRepository;
+        this.serviceBookRepository = serviceBookRepository;
+        this.deliverymanRepository = deliverymanRepository;
+        this.rsForCmRepository = rsForCmRepository;
     }
     @GetMapping("/{id}")
@@ -44 +56 @@
     }
     @GetMapping("/delivery")
-    public String getDeliveryPage(Model model){
-        model.addAttribute("repairShops",repairShopService.findAll());
+    public String getDeliveryPage(Model model, HttpServletRequest request){
+        Client cl = (Client) userService.findByUsername(request.getRemoteUser());
+        List<CarSample> cs = carSampleRepository.findAllByClient(cl);
+        model.addAttribute("cars",cs);
+        if(cs.size()==0){
+                model.addAttribute("hasError",true);
+                model.addAttribute("error","Внеси твоја кола");
+        }
+        else {
+            model.addAttribute("hasError",false);
+        }
         model.addAttribute("bodyContent","deliveryForPart");
         return "master-template";
     }
     @PostMapping("/repairshopdelivery")
-    public void setRepairShopDelivery(@RequestParam String name, HttpServletResponse response, HttpSession session){
+    public void setRepairShopDelivery(@RequestParam Integer vin, HttpServletResponse response, HttpSession session, HttpServletRequest request){
         // insert into project.repair (vin, id_repair_shop, id_service_book) values (1111,3,1)
+        session.setAttribute("carVin",vin);
+        try {
+            response.sendRedirect("/part/chooseRepairShop");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    @GetMapping("/chooseRepairShop")
+    public String chooseRepairShop(Model model, HttpSession session){
+        if(session.getAttribute("carVin")==null){
+            model.addAttribute("hasError",true);
+            model.addAttribute("error","Внеси твоја кола");
+        }
+        else {
+            model.addAttribute("hasError", false);
+            CarSample cs = carSampleRepository.findById((Integer) session.getAttribute("carVin")).get();
+            Integer idCM = cs.getCar().getCar_manufacturer().getID_car_manufacturer();
+            List<RsForCm> rsForCm = rsForCmRepository.findAllByCmid(idCM);
+            List<RepairShop> newRepairShopList = new ArrayList<>();
+            for (RsForCm forCm : rsForCm) {
+                newRepairShopList.add(repairShopService.getById(forCm.getRsid()));
+            }
+            model.addAttribute("authorized", newRepairShopList);
+        }
+        model.addAttribute("bodyContent", "chooseRepairShop");
+        return "master-template";
+    }
+    @PostMapping("/chooseRepairShop")
+    public void chooseRepairShop(@RequestParam Integer rs,HttpSession session, HttpServletResponse response){
+        Order o = (Order) session.getAttribute("order");
+        CarSample cs = (CarSample)session.getAttribute("car");
+        ServiceBook sb = serviceBookRepository.findByCarSample(cs);
+        RepairShop repairShop = repairShopService.getById(rs);
+        repairRepository.save(new Repair(o,repairShop,sb));
         session.removeAttribute("order");
         try {
@@ -62 +117 @@
     public void setHomeDelivery(@RequestParam String address, HttpServletResponse response, HttpSession session){
         // insert into delivery (delivery_status, delivery_address,id_user,id_order) values ('in progress','Aerodrom',4,1)
+        Order o = (Order) session.getAttribute("order");
+        List<Deliveryman> deliverymanList = deliverymanRepository.findAll().stream().filter(dm->dm.getAuthorities().contains(Role.ROLE_DELIVERYMAN)).toList();
+        int num = deliverymanList.size();
+        int deliverer =  (int) ((Math.random() * (num)));
+        Deliveryman dm = deliverymanList.get(deliverer);
+        deliveryRepository.save(new Delivery("in progress",address,dm,o));
         session.removeAttribute("order");
         try {

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

@@ -1 +1 @@
 package com.example.autopartz.controller;
 
-import com.example.autopartz.repository.OrdersForUserRepository;
-import com.example.autopartz.repository.RepairsForUserRepository;
-import com.example.autopartz.repository.ReviewsForUserRepository;
+import com.example.autopartz.model.CarSample;
+import com.example.autopartz.model.Client;
+import com.example.autopartz.model.ServiceBook;
+import com.example.autopartz.repository.*;
+import com.example.autopartz.service.CarService;
 import com.example.autopartz.service.UserService;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 @Controller
@@ -20 +25 @@
     private final ReviewsForUserRepository reviewsForUserRepository;
     private final UserService userService;
-    public UserController(OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository, UserService userService) {
+    private final CarService carService;
+    private final CarSampleRepository carSampleRepository;
+    private final ServiceBookRepository serviceBookRepository;
+    public UserController(OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository, UserService userService, CarService carService, CarSampleRepository carSampleRepository, ServiceBookRepository serviceBookRepository) {
         this.ordersForUserRepository = ordersForUserRepository;
         this.repairsForUserRepository = repairsForUserRepository;
         this.reviewsForUserRepository = reviewsForUserRepository;
         this.userService = userService;
+        this.carService = carService;
+        this.carSampleRepository = carSampleRepository;
+        this.serviceBookRepository = serviceBookRepository;
     }
     @GetMapping("orders")
@@ -47 +58 @@
         return "master-template";
     }
+    @GetMapping("/addCarSampleForUser")
+    public String addCarSampleForUser(Model model){
+        model.addAttribute("bodyContent","addCarSampleForUser");
+        model.addAttribute("cars",carService.findAll());
+        return "master-template";
+    }
+    @PostMapping("/addCarSampleForUser")
+    public void addCarSampleForUser(@RequestParam Integer vin, @RequestParam Integer year, @RequestParam Integer power,
+                                    @RequestParam Integer displacement, @RequestParam String fuel,
+                                    @RequestParam Integer km, @RequestParam Integer cartype,
+                                    HttpServletRequest request, HttpServletResponse response){
+        CarSample cs = new CarSample(vin,year,power,displacement,fuel,km, (Client) userService.findByUsername(request.getRemoteUser()),carService.findById(cartype));
+        carSampleRepository.save(cs);
+        serviceBookRepository.save(new ServiceBook(cs));
+        try {
+            response.sendRedirect("/");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }