Changeset 4d67d70 for src/main/java/com/example

Timestamp:

01/07/23 01:51:16 (23 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Children:

ed7ef92

Parents:

89865ae

Message:

Final touches

Location:

src/main/java/com/example/autopartz

Files:

• config/WebSecurityConfig.java (modified) (1 diff)
• controller/AdminController.java (modified) (3 diffs)
• controller/HomeController.java (modified) (5 diffs)
• model/Category.java (modified) (2 diffs)
• model/Part.java (modified) (2 diffs)
• model/PartManufacturer.java (modified) (2 diffs)
• model/Price.java (modified) (3 diffs)
• model/Warehouse.java (modified) (2 diffs)
• model/manytomany/PartIsAppropriateForCar.java (added)
• model/manytomany/PartIsAppropriateForCarId.java (added)
• model/manytomany/PartIsFromCategory.java (added)
• model/manytomany/PartIsFromCategoryId.java (added)
• model/manytomany/PartIsInStockInWarehouse.java (modified) (3 diffs)
• model/manytomany/PartIsInStockInWarehouseId.java (modified) (1 diff)
• model/views/WarehousemanReport.java (added)
• model/views/WarehousemanReportId.java (added)
• repository/PartIsAppropriateForCarRepository.java (added)
• repository/PartIsFromCategoryRepository.java (added)
• repository/PartManufacturerRepository.java (added)
• repository/PartRepository.java (modified) (1 diff)
• repository/WarehouseRepository.java (modified) (1 diff)
• repository/WarehousemanReportRepository.java (added)
• repository/WarehousemanRepository.java (modified) (1 diff)
• service/PriceService.java (modified) (1 diff)
• service/impl/PriceServiceImpl.java (modified) (1 diff)

src/main/java/com/example/autopartz/config/WebSecurityConfig.java

@@ -30 +30 @@
                 .antMatchers("/", "/products", "/services", "/filtered", "/login", "/register","/registerWarehouseman","/finishRegister","/test/*","/access_denied","/carCategoryReport","/partManufacturersReport","/mostPurchasedPart").permitAll()
                 .antMatchers("/orders","/repairs","/reviews","/part/*","/currentOrder","/addCarSampleForUser","/repairs/addReview/*").hasRole("CLIENT")
-                .antMatchers("/viewUsers","/approve/*").hasRole("ADMIN")
+                .antMatchers("/viewUsers","/approve/*","/addPart").hasRole("ADMIN")
+                .antMatchers("/myWarehouseReport","myWarehouse").hasRole("WAREHOUSEMAN")
                 .anyRequest()
                 .authenticated()

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.model.*;
+import com.example.autopartz.model.manytomany.PartIsAppropriateForCar;
+import com.example.autopartz.model.manytomany.PartIsFromCategory;
+import com.example.autopartz.model.manytomany.PartIsInStockInWarehouse;
+import com.example.autopartz.repository.*;
+import com.example.autopartz.service.PriceService;
 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.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
@@ -25 +23 @@
 public class AdminController {
     private final UserService userService;
+    private final PartIsFromCategoryRepository partIsFromCategoryRepository;
+    private final PartIsAppropriateForCarRepository partIsAppropriateForCarRepository;
     private final WarehousemanRepository warehousemanRepository;
+    private final PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository;
     private final DeliverymanRepository deliverymanRepository;
+    private final CategoryRepository categoryRepository;
+    private final PartRepository partRepository;
+    private final WarehouseRepository warehouseRepository;
+    private final CarRepository carRepository;
+    private final PartManufacturerRepository partManufacturerRepository;
+    private final PriceService priceService;
 
-    public AdminController(UserService userService, WarehousemanRepository warehousemanRepository, DeliverymanRepository deliverymanRepository) {
+    public AdminController(UserService userService, PartIsFromCategoryRepository partIsFromCategoryRepository, PartIsAppropriateForCarRepository partIsAppropriateForCarRepository, WarehousemanRepository warehousemanRepository, PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository, DeliverymanRepository deliverymanRepository, CategoryRepository categoryRepository, PartRepository partRepository, WarehouseRepository warehouseRepository, CarRepository carRepository, PartManufacturerRepository partManufacturerRepository, PriceService priceService) {
         this.userService = userService;
+        this.partIsFromCategoryRepository = partIsFromCategoryRepository;
+        this.partIsAppropriateForCarRepository = partIsAppropriateForCarRepository;
         this.warehousemanRepository = warehousemanRepository;
+        this.partIsInStockInWarehouseRepository = partIsInStockInWarehouseRepository;
         this.deliverymanRepository = deliverymanRepository;
+        this.categoryRepository = categoryRepository;
+        this.partRepository = partRepository;
+        this.warehouseRepository = warehouseRepository;
+        this.carRepository = carRepository;
+        this.partManufacturerRepository = partManufacturerRepository;
+        this.priceService = priceService;
     }
 
@@ -66 +82 @@
         }
     }
+    @GetMapping("/addPart")
+    public String addPart(Model model){
+        model.addAttribute("categories",categoryRepository.findAll());
+        model.addAttribute("warehouses",warehouseRepository.findAll());
+        model.addAttribute("cars",carRepository.findAll());
+        model.addAttribute("manufacturers",partManufacturerRepository.findAll());
+        model.addAttribute("bodyContent","addPart");
+        return "master-template";
+    }
+    @PostMapping("/addPart")
+    public void addPart(@RequestParam String name, @RequestParam(required = false) String description,
+                        @RequestParam Integer manufacturer, @RequestParam List<Car> cars,
+                        @RequestParam List<Category> categories, @RequestParam Integer warehouse,
+                        @RequestParam Integer quantity, @RequestParam Integer amount, HttpServletResponse response){
+        // Part(String name, String description, PartManufacturer manufacturer, List<Category> categoryList, List<Warehouse> warehouseList, List<Car> carList) {
+        Part newPart = new Part(name, description==null ? "" : description, partManufacturerRepository.findById(manufacturer).get(),
+                categories, List.of(warehouseRepository.findById(warehouse).get()),cars);
+        partRepository.save(newPart);
+        priceService.save(new Price(amount, LocalDate.now(),newPart));
+        partIsInStockInWarehouseRepository.save(new PartIsInStockInWarehouse(newPart.getId(),warehouse,quantity));
+        for (Category c:categories
+             ) {
+            partIsFromCategoryRepository.save(new PartIsFromCategory(newPart.getId(),c.getId()));
+        }
+        for (Car car:cars){
+            partIsAppropriateForCarRepository.save(new PartIsAppropriateForCar(newPart.getId(),car.getId()));
+        }
+        try {
+            response.sendRedirect("/");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

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

@@ -6 +6 @@
 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;
@@ -42 +43 @@
     private final MostPurchasedPartRepository mostPurchasedPartRepository;
     private final PriceService priceService;
+    private final WarehousemanReportRepository warehousemanReportRepository;
+    private final PartRepository partRepository;
     public HomeController(LoginService loginService, PartService partService, PartsForCarTypeAndCategoryRepository partsForCarTypeAndCategoryRepository, CarService carService, CategoryService categoryService, RepairShopReviewSummaryRepository repairShopReviewSummaryRepository, WarehouseRepository warehouseRepository,
-                          OrderContainsPartRepository orderContainsPartRepository, OrderService orderService, UserService userService, DeliveriesInProgressRepository deliveriesInProgressRepository, DeliveryService deliveryService, PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository, CarCategoryReportRepository carCategoryReportRepository, PartManufacturersReportRepository partManufacturersReportRepository, MostPurchasedPartRepository mostPurchasedPartRepository, PriceService priceService) {
+                          OrderContainsPartRepository orderContainsPartRepository, OrderService orderService, UserService userService, DeliveriesInProgressRepository deliveriesInProgressRepository, DeliveryService deliveryService, PartIsInStockInWarehouseRepository partIsInStockInWarehouseRepository, CarCategoryReportRepository carCategoryReportRepository, PartManufacturersReportRepository partManufacturersReportRepository, MostPurchasedPartRepository mostPurchasedPartRepository, PriceService priceService, WarehousemanReportRepository warehousemanReportRepository, PartRepository partRepository) {
         this.loginService = loginService;
         this.partService = partService;
@@ -61 +64 @@
         this.mostPurchasedPartRepository = mostPurchasedPartRepository;
         this.priceService = priceService;
+        this.warehousemanReportRepository = warehousemanReportRepository;
+        this.partRepository = partRepository;
     }
 
@@ -201 +206 @@
         Warehouseman whm = (Warehouseman) userService.findByUsername(request.getRemoteUser());
         Warehouse warehouse = whm.getWarehouse();
-        List<PartIsInStockInWarehouse> partIsInStockInWarehouseList = partIsInStockInWarehouseRepository.findAllByWarehouseid(warehouse.getID_warehouse());
+        List<PartIsInStockInWarehouse> partIsInStockInWarehouseList = partIsInStockInWarehouseRepository.findAllByWarehouseid(warehouse.getId());
         model.addAttribute("bodyContent","myWarehouse");
         model.addAttribute("warehouse",warehouse);
@@ -274 +279 @@
         return "master-template";
     }
+    @GetMapping("/myWarehouseReport")
+    public String getMyWarehouseReport(Model model, HttpServletRequest request){
+        Warehouseman whm = (Warehouseman) userService.findByUsername(request.getRemoteUser());
+        Warehouse wh = whm.getWarehouse();
+        Integer whId = wh.getId();
+        model.addAttribute("data", warehousemanReportRepository.findByWid(whId));
+        model.addAttribute("bodyContent","myWarehouseReport");
+        return "master-template";
+    }
+    @PostMapping("/myWarehouse/{pname}")
+    public void addPartToWarehouse(@PathVariable String pname,@RequestParam Integer quantity, HttpServletRequest request, HttpServletResponse response){
+        Integer pId = partRepository.findAllByName(pname).stream().findFirst().get().getId();
+        Warehouseman whm = (Warehouseman) userService.findByUsername(request.getRemoteUser());
+        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);
+        try {
+            response.sendRedirect("/myWarehouseReport");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

src/main/java/com/example/autopartz/model/Category.java

@@ -17 +17 @@
 public class Category {
     @Id
-    Integer ID_category;
+    @Column(name = "id_category")
+    Integer id;
     @Column(name = "category_name")
     String cname;
@@ -29 +30 @@
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         Category category = (Category) o;
-        return ID_category != null && Objects.equals(ID_category, category.ID_category);
+        return id != null && Objects.equals(id, category.id);
     }
 

src/main/java/com/example/autopartz/model/Part.java

@@ -18 +18 @@
 public class Part {
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "ID_part")
     Integer id;
@@ -46 +47 @@
     List<Car> carList;
 
+    public Part(String name, String description, PartManufacturer manufacturer, List<Category> categoryList, List<Warehouse> warehouseList, List<Car> carList) {
+        this.name = name;
+        this.description = description;
+        this.manufacturer = manufacturer;
+        this.categoryList = categoryList;
+        this.warehouseList = warehouseList;
+        this.carList = carList;
+    }
+
     @Override
     public boolean equals(Object o) {

src/main/java/com/example/autopartz/model/PartManufacturer.java

@@ -21 +21 @@
 public class PartManufacturer {
     @Id
-    Integer ID_part_manufacturer;
+    @Column(name = "id_part_manufacturer")
+    Integer id;
     @Column(name = "pm_name")
     String name;
@@ -31 +32 @@
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         PartManufacturer that = (PartManufacturer) o;
-        return ID_part_manufacturer != null && Objects.equals(ID_part_manufacturer, that.ID_part_manufacturer);
+        return id != null && Objects.equals(id, that.id);
     }
 

src/main/java/com/example/autopartz/model/Price.java

@@ -7 +7 @@
 import org.hibernate.Hibernate;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import javax.persistence.*;
 import java.time.LocalDate;
 import java.util.Objects;
@@ -21 +18 @@
 public class Price {
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     Integer ID_price;
     Integer amount;
@@ -28 +26 @@
     @JoinColumn(name = "id_part")
     Part part;
+
+    public Price(Integer amount, LocalDate price_from, Part part) {
+        this.amount = amount;
+        this.price_from = price_from;
+        this.part = part;
+    }
 
     @Override

src/main/java/com/example/autopartz/model/Warehouse.java

@@ -19 +19 @@
 public class Warehouse {
     @Id
-    Integer ID_warehouse;
+    @Column(name = "id_warehouse")
+    Integer id;
     @Column(name = "warehouse_location")
     String location;
@@ -28 +29 @@
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         Warehouse warehouse = (Warehouse) o;
-        return ID_warehouse != null && Objects.equals(ID_warehouse, warehouse.ID_warehouse);
+        return id != null && Objects.equals(id, warehouse.id);
     }
 

src/main/java/com/example/autopartz/model/manytomany/PartIsInStockInWarehouse.java

@@ -1 +1 @@
 package com.example.autopartz.model.manytomany;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 import javax.persistence.*;
@@ -12 +9 @@
 @Setter
 @ToString
-@RequiredArgsConstructor
+@NoArgsConstructor
 @Table(name = "`part_is_in_stock_in_warehouse`")
 @IdClass(PartIsInStockInWarehouseId.class)
@@ -24 +21 @@
     @Column(name = "quantity_warehouse")
     Integer quantity;
+
+    public PartIsInStockInWarehouse(Integer partid, Integer warehouseid, Integer quantity) {
+        this.partid = partid;
+        this.warehouseid = warehouseid;
+        this.quantity = quantity;
+    }
 }

src/main/java/com/example/autopartz/model/manytomany/PartIsInStockInWarehouseId.java

@@ -9 +9 @@
     Integer partid;
     Integer warehouseid;
+
+    public PartIsInStockInWarehouseId(Integer pId, Integer whId) {
+        this.partid = pId;
+        this.warehouseid = whId;
+    }
+
+    public PartIsInStockInWarehouseId() {
+    }
 }

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

@@ -5 +5 @@
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface PartRepository extends JpaRepository<Part,Integer> {
+    List<Part> findAllByName(String name);
 }

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

@@ -8 +8 @@
 public interface WarehouseRepository extends JpaRepository<Warehouse,Integer> {
     List<Warehouse> findAllByLocation(String location);
+    List<Warehouse> findAllById(Integer id);
 }

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

@@ -1 +1 @@
 package com.example.autopartz.repository;
 
+import com.example.autopartz.model.Warehouse;
 import com.example.autopartz.model.Warehouseman;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface WarehousemanRepository extends JpaRepository<Warehouseman,Integer> {
+    List<Warehouseman> findAllByWarehouse(Warehouse warehouse);
 }

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

@@ -8 +8 @@
 public interface PriceService {
     List<Price> findPriceForPart(Part part);
+    void save(Price p);
 }

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

@@ -22 +22 @@
         return priceRepository.findAllByPart(part);
     }
+
+    @Override
+    public void save(Price p) {
+        priceRepository.save(p);
+    }
 }