Merge pull request #98 from xdorro/minh

Minh

Author: mizhm

src/main/java/com/example/multikart/domain/dto/CategoryRequestDTO.java

@@ -10,6 +10,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class CategoryRequestDTO {
+    private Long categoryId;
     @NotBlank
     private String name;
 

src/main/java/com/example/multikart/domain/dto/CustomerRequestDTO.java

@@ -11,6 +11,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class CustomerRequestDTO {
+    private Long customerId;
     @NotBlank
     private String name;
 

src/main/java/com/example/multikart/domain/dto/PaymentRequestDTO.java

@@ -10,6 +10,7 @@
 @Setter
 @Builder
 public class PaymentRequestDTO {
+    private Long paymentId;
     @NotBlank
     private String name;
 

src/main/java/com/example/multikart/domain/dto/ProductRequestDTO.java

@@ -12,6 +12,7 @@
 @Setter
 @Builder
 public class ProductRequestDTO {
+    private Long productId;
     @NotBlank
     private String name;
     @NotBlank

src/main/java/com/example/multikart/domain/dto/SupplierRequestDTO.java

@@ -11,6 +11,7 @@
 @Setter
 @Builder
 public class SupplierRequestDTO {
+    private Long supplierId;
     @NotBlank
     private String name;
 

src/main/java/com/example/multikart/domain/dto/TransportRequestDTO.java

@@ -10,6 +10,7 @@
 @Setter
 @Builder
 public class TransportRequestDTO {
+    private Long transportId;
     @NotBlank
     private String name;
 

src/main/java/com/example/multikart/domain/dto/UnitRequestDTO.java

@@ -10,6 +10,7 @@
 @Setter
 @Builder
 public class UnitRequestDTO {
+    private Long unitId;
     @NotBlank
     private String name;
 

src/main/java/com/example/multikart/domain/dto/UserRequestDTO.java

@@ -11,6 +11,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class UserRequestDTO {
+    private Long userId;
     private Long roleId;
 
     @NotBlank

src/main/java/com/example/multikart/service/impl/CategoryServiceImpl.java

@@ -53,7 +53,7 @@ public String storeCategory(CategoryRequestDTO input, BindingResult result, Mode
             return "backend/category/create";
         }
 
-        var count = categoryRepository.findBySlugAndStatusNot(input.getSlug(), DefaultStatus.DELETED);
+        var count = categoryRepository.countBySlugAndStatusNot(input.getSlug().trim(), DefaultStatus.DELETED);
         if (count > 0) {
             result.rejectValue("slug", "", "Đường dẫn đã được sử dụng");
         }
@@ -96,13 +96,14 @@ public String updateCategory(Long id, CategoryRequestDTO input, BindingResult re
         }
 
         if (result.hasErrors()) {
+            input.setCategoryId(id);
             model.addAttribute("category", input);
 
-            return "backend/category/create";
+            return "backend/category/edit";
         }
 
         if (!category.getSlug().equals(input.getSlug())) {
-            var count = categoryRepository.countBySlugAndStatusNot(input.getSlug(), DefaultStatus.DELETED);
+            var count = categoryRepository.countBySlugAndStatusNot(input.getSlug().trim(), DefaultStatus.DELETED);
             if (count > 0) {
                 result.rejectValue("slug", "", "Đường dẫn đã được sử dụng");
             }
@@ -111,9 +112,10 @@ public String updateCategory(Long id, CategoryRequestDTO input, BindingResult re
         }
 
         if (result.hasErrors()) {
+            input.setCategoryId(id);
             model.addAttribute("category", input);
 
-            return "backend/category/create";
+            return "backend/category/edit";
         }
 
         category.setName(input.getName());

src/main/java/com/example/multikart/service/impl/CustomerServiceImpl.java

@@ -44,7 +44,7 @@ public String storeCustomer(CustomerRequestDTO input, BindingResult result, Mode
         }
 
         input.setPassword(bcryptPasswordEncoder.encode(input.getPassword()));
-        var count = customerRepository.countByEmailAndStatusNot(input.getEmail(), DefaultStatus.DELETED);
+        var count = customerRepository.countByEmailAndStatusNot(input.getEmail().trim(), DefaultStatus.DELETED);
         if (count > 0) {
             result.rejectValue("email", "email.required", "Email đã được sử dụng");
         }
@@ -86,17 +86,18 @@ public String updateCustomer(Long id, CustomerRequestDTO input, BindingResult re
         }
 
         if (result.hasErrors()) {
+            input.setCustomerId(id);
             model.addAttribute("customer", input);
 
-            return "backend/customer/create";
+            return "backend/customer/edit";
         }
 
         if (!input.getPassword().isEmpty()) {
             customer.setPassword(bcryptPasswordEncoder.encode(input.getPassword()));
         }
 
         if (!customer.getEmail().equals(input.getEmail())) {
-            var count = customerRepository.countByEmailAndStatusNot(input.getEmail(), DefaultStatus.DELETED);
+            var count = customerRepository.countByEmailAndStatusNot(input.getEmail().trim(), DefaultStatus.DELETED);
             if (count > 0) {
                 result.rejectValue("email", "email.required", "Email đã được sử dụng");
             }
@@ -105,9 +106,10 @@ public String updateCustomer(Long id, CustomerRequestDTO input, BindingResult re
         }
 
         if (result.hasErrors()) {
+            input.setCustomerId(id);
             model.addAttribute("customer", input);
 
-            return "backend/customer/create";
+            return "backend/customer/edit";
         }
 
         customer.setName(input.getName());