Changeset 2a552fe for src/main/java/com/example/autopartz/controller/HomeController.java

Timestamp:

07/26/23 19:26:35 (16 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Parents:

e02787e

Message:

Added transactional methods to secure the database integrity and refactoring

File:

• src/main/java/com/example/autopartz/controller/HomeController.java (modified) (7 diffs)

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

@@ -1 +1 @@
 package com.example.autopartz.controller;
 
-import com.example.autopartz.model.*;
 import com.example.autopartz.model.DTO.CurrentOrderDTO;
 import com.example.autopartz.model.DTO.OrderInfo;
+import com.example.autopartz.model.*;
 import com.example.autopartz.model.manytomany.OrderContainsPart;
 import com.example.autopartz.model.manytomany.PartIsInStockInWarehouse;
-import com.example.autopartz.model.manytomany.PartIsInStockInWarehouseId;
 import com.example.autopartz.model.views.DeliveriesInProgress;
 import com.example.autopartz.model.views.PartsForCarTypeAndCategory;
@@ -20 +19 @@
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
@@ -103 +101 @@
             int total = 0;
             List<OrderContainsPart> qList = orderContainsPartRepository.findAllByOrderid(o.getOrderid());
-            for (int i = 0; i < qList.size(); i++) {
-                int pr = qList.get(i).getQuantity_order()*
-                        priceService.findPriceForPart(partService.findById(qList.get(i).getPartid())).stream().findFirst().get().getAmount();
+            for (OrderContainsPart orderContainsPart : qList) {
+                int pr = orderContainsPart.getQuantity_order() *
+                        priceService.findPriceForPart(partService.findById(orderContainsPart.getPartid())).stream().findFirst().get().getAmount();
                 CurrentOrderDTO temp = new CurrentOrderDTO(
-                        partService.findById(qList.get(i).getPartid()).getName(),
-                        partService.findById(qList.get(i).getPartid()).getManufacturer().getName(),
-                        qList.get(i).getQuantity_order(),
+                        partService.findById(orderContainsPart.getPartid()).getName(),
+                        partService.findById(orderContainsPart.getPartid()).getManufacturer().getName(),
+                        orderContainsPart.getQuantity_order(),
                         pr);
                 list.add(temp);
-                total+=pr;
+                total += pr;
             }
             model.addAttribute("total",total);
@@ -188 +186 @@
     }
     @PostMapping("/finishRegister")
-    public void handleWarehousemanRegister(@RequestParam String location,Model model, HttpServletResponse response, HttpSession session){
+    public void handleWarehousemanRegister(@RequestParam String location, HttpServletResponse response, HttpSession session){
         System.out.println("here?");
         String username = (String) session.getAttribute("username");
@@ -243 +241 @@
     }
     @PostMapping("/finishDelivery/{id}")
-    public void finishDelivery(@PathVariable Integer id, Model model, HttpServletResponse response){
+    public void finishDelivery(@PathVariable Integer id, HttpServletResponse response){
         Delivery d = deliveryService.findByOrder(orderService.findById(id));
         d.setStatus("finished");
@@ -257 +255 @@
         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());
+        for (OrderContainsPart orderContainsPart : list) {
+            OrderInfo oi = new OrderInfo(partService.findById(orderContainsPart.getPartid()).getName(),
+                    orderContainsPart.getQuantity_order(), partService.findById(orderContainsPart.getPartid()).getManufacturer().getName());
             partList.add(oi);
         }
@@ -301 +299 @@
         Warehouse wh = whm.getWarehouse();
         Integer whId = wh.getId();
-        PartIsInStockInWarehouseId tmp = new PartIsInStockInWarehouseId(pId,whId);
-        PartIsInStockInWarehouse temp = partIsInStockInWarehouseRepository.findById(tmp).get();
-        temp.setQuantity(temp.getQuantity()+quantity);
-        partIsInStockInWarehouseRepository.save(temp);
+        partService.addPartToWarehouse(pId,quantity,whId);
         try {
             response.sendRedirect("/myWarehouseReport");