Changeset 60de3eb for src/main/java

Timestamp:

01/03/23 23:03:00 (23 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Children:

6832924

Parents:

feffc2f

Message:

Added master template and added filtering parts by car and category

Location:

src/main/java/com/example/autopartz

Files:

• controller/HomeController.java (modified) (3 diffs)
• controller/PartController.java (modified) (2 diffs)
• controller/UserController.java (modified) (2 diffs)
• model/Car.java (modified) (1 diff)
• model/Category.java (modified) (2 diffs)
• model/views/PartsForCarTypeAndCategory.java (modified) (1 diff)
• repository/CarRepository.java (added)
• repository/CategoryRepository.java (added)
• service/CarService.java (added)
• service/CategoryService.java (added)
• service/impl/CarServiceImpl.java (added)
• service/impl/CategoryServiceImpl.java (added)

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

@@ -2 +2 @@
 
 import com.example.autopartz.model.User;
+import com.example.autopartz.repository.PartsForCarTypeAndCategoryRepository;
+import com.example.autopartz.service.CarService;
+import com.example.autopartz.service.CategoryService;
 import com.example.autopartz.service.LoginService;
 import com.example.autopartz.service.PartService;
@@ -16 +19 @@
     private final LoginService loginService;
     private final PartService partService;
+    private final PartsForCarTypeAndCategoryRepository partsForCarTypeAndCategoryRepository;
+    private final CarService carService;
+    private final CategoryService categoryService;
 
-    public HomeController(LoginService loginService, PartService partService) {
+    public HomeController(LoginService loginService, PartService partService, PartsForCarTypeAndCategoryRepository partsForCarTypeAndCategoryRepository, CarService carService, CategoryService categoryService) {
         this.loginService = loginService;
         this.partService = partService;
+        this.partsForCarTypeAndCategoryRepository = partsForCarTypeAndCategoryRepository;
+        this.carService = carService;
+        this.categoryService = categoryService;
     }
 
@@ -25 +34 @@
     public String getHomePage(Model model){
         model.addAttribute("parts",partService.findAll());
-        return "homepage";
+        model.addAttribute("cars",carService.findAll());
+        model.addAttribute("categories",categoryService.findAll());
+        model.addAttribute("bodyContent","homepage");
+        return "master-template";
+    }
+    @GetMapping("/filtered")
+    public String getPartsForCarTypeAndCategory(@RequestParam String cartype, @RequestParam String category, Model model){
+        model.addAttribute("filtered", partsForCarTypeAndCategoryRepository.findAllByCartypeAndCategory(cartype,category));
+        model.addAttribute("bodyContent","filteredParts");
+        return "master-template";
     }
     @GetMapping("/login")
-    public String getLoginPage(){
-        return "login";
+    public String getLoginPage(Model model){
+        model.addAttribute("bodyContent","login");
+        return "master-template";
     }
     @GetMapping("/register")
-    public String getRegisterPage(){
-        return "register";
+    public String getRegisterPage(Model model){
+        model.addAttribute("bodyContent","register");
+        return "master-template";
     }
     @PostMapping("/login")
     public void handleLogin(@RequestParam String username, @RequestParam String password){
         User u = loginService.login(username,password);
+        System.out.println(u.getName_user());
     }
     @PostMapping("/register")

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

@@ -29 +29 @@
         model.addAttribute("part",temp);
         model.addAttribute("amount",amount);
-        return "partinfo";
+        model.addAttribute("bodyContent","partinfo");
+        return "master-template";
     }
     @GetMapping("/delivery/{id}")
@@ -35 +36 @@
         model.addAttribute("repairShops",repairShopService.findAll());
         model.addAttribute("partId",id);
-        return "deliveryForPart";
+        model.addAttribute("bodyContent","deliveryForPart");
+        return "master-template";
     }
     @PostMapping("/repairshopdelivery")

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

@@ -16 +16 @@
     private final UserService userService;
     private final RepairShopReviewSummaryRepository repairShopReviewSummaryRepository;
-    private final PartsForCarTypeAndCategoryRepository partsForCarTypeAndCategoryRepository;
 
     private final OrdersForUserRepository ordersForUserRepository;
     private final RepairsForUserRepository repairsForUserRepository;
     private final ReviewsForUserRepository reviewsForUserRepository;
-    public UserController(UserService userService, RepairShopReviewSummaryRepository repairShopReviewSummaryRepository, PartsForCarTypeAndCategoryRepository partsForCarTypeAndCategoryRepository, OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository) {
+    public UserController(UserService userService, RepairShopReviewSummaryRepository repairShopReviewSummaryRepository, OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository) {
         this.userService = userService;
         this.repairShopReviewSummaryRepository = repairShopReviewSummaryRepository;
-        this.partsForCarTypeAndCategoryRepository = partsForCarTypeAndCategoryRepository;
         this.ordersForUserRepository = ordersForUserRepository;
         this.repairsForUserRepository = repairsForUserRepository;
@@ -37 +35 @@
         return userService.findAllUsers();
     }
-    @GetMapping("parts")
-    public List<PartsForCarTypeAndCategory> getPartsForCarTypeAndCategory(@RequestParam String cartype, @RequestParam String category){
-        return partsForCarTypeAndCategoryRepository.findAllByCartypeAndCategory(cartype,category);
-    }
     @GetMapping("orders/{id}")
     public String getOrdersForUser(@PathVariable Long id, Model model){
         model.addAttribute("userOrders",ordersForUserRepository.findAllByUserid(id));
-        return "ordersForUser";
+        model.addAttribute("bodyContent","ordersForUser");
+        return "master-template";
     }
     @GetMapping("repairs/{id}")
     public String getRepairsForUser(@PathVariable Long id,Model model){
         model.addAttribute("userRepairs",repairsForUserRepository.findAllByUserid(id));
-        return "repairsForUser";
+        model.addAttribute("bodyContent","repairsForUser");
+        return "master-template";
     }
     @GetMapping("reviews/{id}")
     public String getReviewsForUser(@PathVariable Long id, Model model){
         model.addAttribute("userReviews",reviewsForUserRepository.findAllByUserid(id));
-        return "reviewsForUser";
+        model.addAttribute("bodyContent","reviewsForUser");
+        return "master-template";
     }
 }

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

@@ -18 +18 @@
     Integer in_production_since;
     Integer in_production_till;
-    String car_type;
+    @Column(name = "car_type")
+    String cartype;
     @ManyToOne
     @JoinColumn(name = "id_car_manufacturer")

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.Hibernate;
@@ -18 +15 @@
     @Id
     Long ID_category;
-    String category_name;
+    @Column(name = "category_name")
+    String cname;
     @ManyToOne
     @JoinColumn(name = "id_parent_category")

src/main/java/com/example/autopartz/model/views/PartsForCarTypeAndCategory.java

@@ -25 +25 @@
     String cartype;
     String category;
+    String pmname;
 }