Changeset d4b888e for src

Timestamp:

01/06/23 15:26:00 (23 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Children:

9dcbf44

Parents:

f484b14

Message:

Added full functionality for adding review

Location:

src/main

Files:

• java/com/example/autopartz/config/WebSecurityConfig.java (modified) (1 diff)
• java/com/example/autopartz/controller/PartController.java (modified) (2 diffs)
• java/com/example/autopartz/controller/UserController.java (modified) (5 diffs)
• java/com/example/autopartz/model/Repair.java (modified) (3 diffs)
• java/com/example/autopartz/model/Review.java (modified) (3 diffs)
• java/com/example/autopartz/model/views/RepairsForUser.java (modified) (1 diff)
• java/com/example/autopartz/repository/RepairRepository.java (modified) (1 diff)
• java/com/example/autopartz/repository/RepairsForUserRepository.java (modified) (1 diff)
• java/com/example/autopartz/repository/ReviewRepository.java (added)
• java/com/example/autopartz/service/OrderService.java (modified) (1 diff)
• java/com/example/autopartz/service/RepairService.java (added)
• java/com/example/autopartz/service/impl/OrderServiceImpl.java (modified) (1 diff)
• java/com/example/autopartz/service/impl/RepairServiceImpl.java (added)
• resources/templates/addReviewPage.html (added)
• resources/templates/repairsForUser.html (modified) (1 diff)

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

@@ -29 +29 @@
                 .authorizeRequests()
                 .antMatchers("/", "/products", "/services", "/filtered", "/login", "/register","/registerWarehouseman","/finishRegister","/test/*","/access_denied").permitAll()
-                .antMatchers("/orders","/repairs","/reviews","/part/*","/currentOrder","/addCarSampleForUser").hasRole("CLIENT")
+                .antMatchers("/orders","/repairs","/reviews","/part/*","/currentOrder","/addCarSampleForUser","/repairs/addReview/*").hasRole("CLIENT")
                 .antMatchers("/viewUsers","/approve/*").hasRole("ADMIN")
                 .anyRequest()

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

@@ -103 +103 @@
     public void chooseRepairShop(@RequestParam Integer rs,HttpSession session, HttpServletResponse response){
         Order o = (Order) session.getAttribute("order");
-        CarSample cs = (CarSample)session.getAttribute("car");
+        CarSample cs = carSampleRepository.findById((Integer)session.getAttribute("carVin")).get();
         ServiceBook sb = serviceBookRepository.findByCarSample(cs);
         RepairShop repairShop = repairShopService.getById(rs);
         repairRepository.save(new Repair(o,repairShop,sb));
+//        o.setOrder_status("finished");
+//        orderService.save(o);
         session.removeAttribute("order");
         try {
@@ -123 +125 @@
         Deliveryman dm = deliverymanList.get(deliverer);
         deliveryRepository.save(new Delivery("in progress",address,dm,o));
+//        o.setOrder_status("finished");
+//        orderService.save(o);
         session.removeAttribute("order");
         try {

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

@@ -1 +1 @@
 package com.example.autopartz.controller;
 
-import com.example.autopartz.model.CarSample;
-import com.example.autopartz.model.Client;
-import com.example.autopartz.model.ServiceBook;
+import com.example.autopartz.model.*;
+import com.example.autopartz.model.views.RepairsForUser;
 import com.example.autopartz.repository.*;
 import com.example.autopartz.service.CarService;
+import com.example.autopartz.service.RepairService;
 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.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 @Controller
@@ -28 +27 @@
     private final CarSampleRepository carSampleRepository;
     private final ServiceBookRepository serviceBookRepository;
-    public UserController(OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository, UserService userService, CarService carService, CarSampleRepository carSampleRepository, ServiceBookRepository serviceBookRepository) {
+    private final RepairService repairService;
+    private final ReviewRepository reviewRepository;
+    private final RepairRepository repairRepository;
+    private final OrderRepository orderRepository;
+
+    public UserController(OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository, UserService userService, CarService carService, CarSampleRepository carSampleRepository, ServiceBookRepository serviceBookRepository, RepairService repairService, ReviewRepository reviewRepository,
+                          RepairRepository repairRepository,
+                          OrderRepository orderRepository) {
         this.ordersForUserRepository = ordersForUserRepository;
         this.repairsForUserRepository = repairsForUserRepository;
@@ -36 +42 @@
         this.carSampleRepository = carSampleRepository;
         this.serviceBookRepository = serviceBookRepository;
+        this.repairService = repairService;
+        this.reviewRepository = reviewRepository;
+        this.repairRepository = repairRepository;
+        this.orderRepository = orderRepository;
     }
     @GetMapping("orders")
@@ -48 +58 @@
         Integer id = userService.findByUsername(request.getRemoteUser()).getId();
         model.addAttribute("userRepairs",repairsForUserRepository.findAllByUserid(id));
+        List<Boolean> hasReview = new ArrayList<>(100);
+        for (int i = 0; i < orderRepository.findAll().size(); i++) {
+            hasReview.add(false);
+        }
+        for(RepairsForUser rfu: repairsForUserRepository.findAll()){
+            if(reviewRepository.findByRepair(repairService.findById(rfu.getRepairid()))==null){
+                hasReview.set(rfu.getRepairid(),false);
+            }
+            else {
+                hasReview.set(rfu.getRepairid(),true);
+            }
+        }
+        model.addAttribute("hasReview", hasReview);
         model.addAttribute("bodyContent","repairsForUser");
         return "master-template";
@@ -78 +101 @@
         }
     }
+    @GetMapping("/repairs/addReview/{id}")
+    public String addReviewFor(@PathVariable Integer id, Model model){
+        model.addAttribute("bodyContent","addReviewPage");
+        model.addAttribute("repair", repairService.findById(id));
+        return "master-template";
+    }
+    @PostMapping("/repairs/addReview/{id}")
+    public void addReview(@PathVariable Integer id, @RequestParam Integer rating, @RequestParam(required = false) String comment,
+                          Model model, HttpServletResponse response, HttpServletRequest request){
+        Client client = (Client) userService.findByUsername(request.getRemoteUser());
+        Repair repair = repairService.findById(id);
+        reviewRepository.save(new Review(rating,
+                comment==null ? "" : comment, repair,client));
+        try {
+            response.sendRedirect("/repairs");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

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

@@ -18 +18 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    Integer ID_repair;
+    @Column(name = "ID_repair")
+    Integer id;
     @OneToOne
     @JoinColumn(name = "id_order")
@@ -34 +35 @@
         this.serviceBook = serviceBook;
     }
-
     @Override
     public boolean equals(Object o) {
@@ -40 +40 @@
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         Repair repair = (Repair) o;
-        return ID_repair != null && Objects.equals(ID_repair, repair.ID_repair);
+        return id != null && Objects.equals(id, repair.id);
     }
 

src/main/java/com/example/autopartz/model/Review.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.util.Objects;
 
@@ -20 +17 @@
 public class Review {
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     Integer ID_review;
     Integer review_rating;
@@ -29 +27 @@
     @JoinColumn(name = "id_user")
     Client client;
+
+    public Review(Integer review_rating, String review_comment, Repair repair, Client client) {
+        this.review_rating = review_rating;
+        this.review_comment = review_comment;
+        this.repair = repair;
+        this.client = client;
+    }
 
     @Override

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

@@ -23 +23 @@
 @Immutable
 @Table(name = "`repairs_for_user`")
-@IdClass(OrdersForUserId.class)
 public class RepairsForUser implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
     @Id
+    Integer repairid;
     Integer userid;
-    @Id
     LocalDateTime orderdate;
-    @Id
-    String partname;
     Integer orderid;
     String rsname;

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

@@ -4 +4 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface RepairRepository extends JpaRepository<Repair,Integer> {
+    List<Repair> findAllById(Integer id);
 }

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

@@ -9 +9 @@
 
 @Repository
-public interface RepairsForUserRepository extends JpaRepository<RepairsForUser, OrdersForUserId> {
+public interface RepairsForUserRepository extends JpaRepository<RepairsForUser, Integer> {
     List<RepairsForUser> findAllByUserid(Integer userid);
 }

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

@@ -10 +10 @@
     Order create(Client user);
     Order findById(Integer id);
+    void save(Order o);
 }
 

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

@@ -30 +30 @@
         return orderRepository.findById(id).get();
     }
+
+    @Override
+    public void save(Order o) {
+        orderRepository.save(o);
+    }
 }

src/main/resources/templates/repairsForUser.html

@@ -4 +4 @@
   <thead>
   <tr>
+    <th>Број на поправка</th>
     <th>Датум на нарачка</th>
-    <th>Нарачан дел</th>
     <th>Број на нарачка</th>
     <th>Име на сервис</th>
+    <th>Додај критика</th>
   </tr>
   </thead>
   <tbody>
   <tr th:each="repair : ${userRepairs}">
+    <td th:text="${repair.getRepairid()}"></td>
     <td th:text="${repair.getOrderdate}"></td>
-    <td th:text="${repair.getPartname()}"></td>
     <td th:text="${repair.getOrderid()}"></td>
     <td th:text="${repair.getRsname()}"></td>
+    <td>
+      <div th:if="${!hasReview.get(repair.getRepairid())}">
+      <form th:action="@{'/repairs/addReview/{id}' (id=${repair.getRepairid()}) }">
+      <button type="submit">Додај критика</button>
+      </form>
+      </div>
+      <div th:if="${hasReview.get(repair.getRepairid())}">
+        Веќе има критика
+      </div>
+    </td>
   </tr>
   </tbody>