Changeset ab952ab

Timestamp:

01/04/23 02:56:41 (18 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Children:

7d43957

Parents:

ae042f4

Message:

Fixed reviews, repairs, orders by logged user

Location:

src/main

Files:

• java/com/example/autopartz/config/WebSecurityConfig.java (modified) (1 diff)
• java/com/example/autopartz/controller/UserController.java (modified) (3 diffs)
• resources/templates/products.html (modified) (1 diff)

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

@@ -29 +29 @@
                 .authorizeRequests()
                 .antMatchers("/", "/products", "/services", "/filtered", "/login", "/register").permitAll()
-                .antMatchers("/orders/*","/repairs/*","/reviews/*","/part/*").hasRole("CLIENT")
+                .antMatchers("/orders","/repairs","/reviews","/part/*").hasRole("CLIENT")
                 .anyRequest()
                 .authenticated()

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

@@ -4 +4 @@
 import com.example.autopartz.repository.RepairsForUserRepository;
 import com.example.autopartz.repository.ReviewsForUserRepository;
+import com.example.autopartz.service.UserService;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -9 +10 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.servlet.http.HttpServletRequest;
 
 @Controller
@@ -16 +19 @@
     private final RepairsForUserRepository repairsForUserRepository;
     private final ReviewsForUserRepository reviewsForUserRepository;
-    public UserController(OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository) {
+    private final UserService userService;
+    public UserController(OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository, UserService userService) {
         this.ordersForUserRepository = ordersForUserRepository;
         this.repairsForUserRepository = repairsForUserRepository;
         this.reviewsForUserRepository = reviewsForUserRepository;
+        this.userService = userService;
     }
-    @GetMapping("orders/{id}")
-    public String getOrdersForUser(@PathVariable Integer id, Model model){
+    @GetMapping("orders")
+    public String getOrdersForUser(Model model, HttpServletRequest request){
+        Integer id = userService.findByUsername(request.getRemoteUser()).getID_user();
         model.addAttribute("userOrders",ordersForUserRepository.findAllByUserid(id));
         model.addAttribute("bodyContent","ordersForUser");
         return "master-template";
     }
-    @GetMapping("repairs/{id}")
-    public String getRepairsForUser(@PathVariable Integer id,Model model){
+    @GetMapping("repairs")
+    public String getRepairsForUser(Model model, HttpServletRequest request){
+        Integer id = userService.findByUsername(request.getRemoteUser()).getID_user();
         model.addAttribute("userRepairs",repairsForUserRepository.findAllByUserid(id));
         model.addAttribute("bodyContent","repairsForUser");
         return "master-template";
     }
-    @GetMapping("reviews/{id}")
-    public String getReviewsForUser(@PathVariable Integer id, Model model){
+    @GetMapping("reviews")
+    public String getReviewsForUser(Model model,HttpServletRequest request){
+        Integer id = userService.findByUsername(request.getRemoteUser()).getID_user();
         model.addAttribute("userReviews",reviewsForUserRepository.findAllByUserid(id));
         model.addAttribute("bodyContent","reviewsForUser");

src/main/resources/templates/products.html

@@ -1 +1 @@
 <div>
 <header>
-    <a th:href="${'/orders/4'}">Мои нарачки</a>
-    <a th:href="${'/repairs/4'}">Мои поправки</a>
-    <a th:href="${'/reviews/4'}">Мои критики</a>
+    <a th:href="${'/orders'}">Мои нарачки</a>
+    <a th:href="${'/repairs'}">Мои поправки</a>
+    <a th:href="${'/reviews'}">Мои критики</a>
 </header>
 <main>