Changeset 9dcbf44 for src/main/java/com

Timestamp:

01/06/23 19:17:05 (23 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Children:

cab5859

Parents:

d4b888e

Message:

Added full functionality for changing delivery status,
added bootstrap for some pages

Location:

src/main/java/com/example/autopartz

Files:

• controller/HomeController.java (modified) (6 diffs)
• model/DTO/OrderInfo.java (added)
• model/views/DeliveriesInProgress.java (added)
• repository/DeliveriesInProgressRepository.java (added)
• repository/DeliveryRepository.java (modified) (2 diffs)
• service/DeliveryService.java (modified) (2 diffs)
• service/impl/DeliveryServiceImpl.java (modified) (2 diffs)

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

@@ -2 +2 @@
 
 import com.example.autopartz.model.*;
+import com.example.autopartz.model.DTO.OrderInfo;
+import com.example.autopartz.model.manytomany.OrderContainsPart;
 import com.example.autopartz.model.manytomany.PartIsInStockInWarehouse;
+import com.example.autopartz.model.views.DeliveriesInProgress;
+import com.example.autopartz.model.views.PartsForCarTypeAndCategory;
 import com.example.autopartz.repository.*;
 import com.example.autopartz.service.*;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -16 +17 @@
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -32 +34 @@
     private final OrderService orderService;
     private final UserService userService;
+    private final DeliveriesInProgressRepository deliveriesInProgressRepository;
     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, UserService userService, DeliveryService deliveryService, PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository) {
+                          OrderContainsPartRepository orderContainsPartRepository, OrderService orderService, UserService userService, DeliveriesInProgressRepository deliveriesInProgressRepository, DeliveryService deliveryService, PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository) {
         this.loginService = loginService;
         this.partService = partService;
@@ -46 +49 @@
         this.orderService = orderService;
         this.userService = userService;
+        this.deliveriesInProgressRepository = deliveriesInProgressRepository;
         this.deliveryService = deliveryService;
         this.partIsInStockInWarehouseRepository = partIsInStockInWarehouseRepository;
@@ -87 +91 @@
     @GetMapping("/filtered")
     public String getPartsForCarTypeAndCategory(@RequestParam String cartype, @RequestParam String category, Model model){
-        model.addAttribute("filtered", partsForCarTypeAndCategoryRepository.findAllByCartypeAndCategory(cartype,category));
+        List<PartsForCarTypeAndCategory> tmp = partsForCarTypeAndCategoryRepository.findAllByCartypeAndCategory(cartype,category);
+        if(tmp.size()==0){
+            model.addAttribute("hasError",true);
+            model.addAttribute("error","Не постојат такви производи, обидете се повторно");
+        }
+        else {
+            model.addAttribute("hasError",false);
+            model.addAttribute("filtered", tmp);
+        }
         model.addAttribute("bodyContent","filteredParts");
         return "master-template";
@@ -179 +191 @@
         return "master-template";
     }
+    @GetMapping("myNextDeliveries")
+    public String myNextDeliveries(Model model, HttpServletRequest request){
+        Deliveryman dm = (Deliveryman) userService.findByUsername(request.getRemoteUser());
+        List<DeliveriesInProgress> ldip = deliveriesInProgressRepository.findAllByUserid(dm.getId());
+        if(ldip.size()==0){
+            model.addAttribute("hasError",true);
+            model.addAttribute("error","Сите достави се завршени");
+        }
+        else {
+            model.addAttribute("hasError",false);
+            model.addAttribute("deliveries", deliveriesInProgressRepository.findAllByUserid(dm.getId()));
+        }
+        model.addAttribute("bodyContent","myNextDeliveries");
+        return "master-template";
+    }
+    @PostMapping("/finishDelivery/{id}")
+    public void finishDelivery(@PathVariable Integer id, Model model, HttpServletResponse response){
+        Delivery d = deliveryService.findByOrder(orderService.findById(id));
+        d.setStatus("finished");
+        deliveryService.update(d);
+        try {
+            response.sendRedirect("/myDeliveries");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    @GetMapping("/order/{id}")
+    public String getOrderInfo(@PathVariable Integer id, Model model){
+        List<OrderContainsPart> list = orderContainsPartRepository.findAllByOrderid(id);
+        List<OrderInfo> partList = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            OrderInfo oi = new OrderInfo(partService.findById(list.get(i).getPartid()).getName(),
+                    list.get(i).getQuantity_order(),partService.findById(list.get(i).getPartid()).getManufacturer().getName());
+            partList.add(oi);
+        }
+        model.addAttribute("parts",partList);
+        model.addAttribute("o",orderService.findById(id));
+        model.addAttribute("bodyContent","orderInfo");
+        return "master-template";
+    }
 }

src/main/java/com/example/autopartz/repository/DeliveryRepository.java

@@ -3 +3 @@
 import com.example.autopartz.model.Delivery;
 import com.example.autopartz.model.Deliveryman;
+import com.example.autopartz.model.Order;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
@@ -11 +12 @@
 public interface DeliveryRepository extends JpaRepository<Delivery,Integer> {
     List<Delivery> findAllByDeliveryman(Deliveryman deliveryman);
+    List<Delivery> findAllByOrder(Order order);
 }

src/main/java/com/example/autopartz/service/DeliveryService.java

@@ -3 +3 @@
 import com.example.autopartz.model.Delivery;
 import com.example.autopartz.model.Deliveryman;
+import com.example.autopartz.model.Order;
 
 import java.util.List;
@@ -8 +9 @@
 public interface DeliveryService {
     List<Delivery> findAllByDeliverer(Deliveryman dm);
+    Delivery findById(Integer id);
+    void update(Delivery d);
+    Delivery findByOrder(Order o);
 }

src/main/java/com/example/autopartz/service/impl/DeliveryServiceImpl.java

@@ -3 +3 @@
 import com.example.autopartz.model.Delivery;
 import com.example.autopartz.model.Deliveryman;
+import com.example.autopartz.model.Order;
 import com.example.autopartz.repository.DeliveryRepository;
 import com.example.autopartz.service.DeliveryService;
@@ -21 +22 @@
         return deliveryRepository.findAllByDeliveryman(dm);
     }
+
+    @Override
+    public Delivery findById(Integer id) {
+        return deliveryRepository.findById(id).get();
+    }
+
+    @Override
+    public void update(Delivery d) {
+        deliveryRepository.save(d);
+    }
+
+    @Override
+    public Delivery findByOrder(Order o) {
+        return deliveryRepository.findAllByOrder(o).stream().findFirst().orElseThrow(RuntimeException::new);
+    }
 }