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

Timestamp:

01/04/23 02:49:26 (21 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Children:

ab952ab

Parents:

6832924

Message:

Configured spring security, changed spring version

Location:

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

Files:

• HomeController.java (modified) (2 diffs)
• PartController.java (modified) (3 diffs)
• UserController.java (modified) (3 diffs)

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

@@ -14 +14 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
 
 @Controller
@@ -35 +37 @@
 
     @GetMapping()
-    public String getHomePage(Model model){
+    public String getHomePage(Model model, HttpServletRequest request){
         model.addAttribute("bodyContent","home");
+        model.addAttribute("user",request.getRemoteUser());
         return "master-template";
     }

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

@@ -5 +5 @@
 import com.example.autopartz.service.PriceService;
 import com.example.autopartz.service.RepairShopService;
-import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
@@ -24 +24 @@
     }
     @GetMapping("/{id}")
-    public String getPartPage(@PathVariable Long id, Model model){
+    public String getPartPage(@PathVariable Integer id, Model model){
         Part temp = partService.findById(id);
         Integer amount = priceService.findPriceForPart(temp).stream().findFirst().orElseThrow(RuntimeException::new).getAmount();
@@ -33 +33 @@
     }
     @GetMapping("/delivery/{id}")
-    public String getDeliveryPage(@PathVariable Long id, Model model){
+    public String getDeliveryPage(@PathVariable Integer id, Model model){
         model.addAttribute("repairShops",repairShopService.findAll());
         model.addAttribute("partId",id);

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

@@ -1 +1 @@
 package com.example.autopartz.controller;
 
-import com.example.autopartz.model.*;
-import com.example.autopartz.model.views.*;
-import com.example.autopartz.repository.*;
-import com.example.autopartz.service.UserService;
+import com.example.autopartz.repository.OrdersForUserRepository;
+import com.example.autopartz.repository.RepairsForUserRepository;
+import com.example.autopartz.repository.ReviewsForUserRepository;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
 @RequestMapping("/")
 public class UserController {
-    private final UserService userService;
     private final OrdersForUserRepository ordersForUserRepository;
     private final RepairsForUserRepository repairsForUserRepository;
     private final ReviewsForUserRepository reviewsForUserRepository;
-    public UserController(UserService userService, OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository) {
-        this.userService = userService;
+    public UserController(OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository) {
         this.ordersForUserRepository = ordersForUserRepository;
         this.repairsForUserRepository = repairsForUserRepository;
         this.reviewsForUserRepository = reviewsForUserRepository;
     }
-    @GetMapping("usersTest")
-    public List<User> getAllUsers(){
-        return userService.findAllUsers();
-    }
     @GetMapping("orders/{id}")
-    public String getOrdersForUser(@PathVariable Long id, Model model){
+    public String getOrdersForUser(@PathVariable Integer id, Model model){
         model.addAttribute("userOrders",ordersForUserRepository.findAllByUserid(id));
         model.addAttribute("bodyContent","ordersForUser");
@@ -35 +28 @@
     }
     @GetMapping("repairs/{id}")
-    public String getRepairsForUser(@PathVariable Long id,Model model){
+    public String getRepairsForUser(@PathVariable Integer id,Model model){
         model.addAttribute("userRepairs",repairsForUserRepository.findAllByUserid(id));
         model.addAttribute("bodyContent","repairsForUser");
@@ -41 +34 @@
     }
     @GetMapping("reviews/{id}")
-    public String getReviewsForUser(@PathVariable Long id, Model model){
+    public String getReviewsForUser(@PathVariable Integer id, Model model){
         model.addAttribute("userReviews",reviewsForUserRepository.findAllByUserid(id));
         model.addAttribute("bodyContent","reviewsForUser");