Merge pull request #69 from xdorro/dev

Merge dev v1.0.2

Author: anhnmt

.gitignore

@@ -36,7 +36,6 @@ out/
 ### VS Code ###
 .vscode/
 
-/uploads
 /logs
 application-dev.yml
 application-local.yml

Documents/1. Tài liệu phân tích thiết kế.docx

@@ -1,12 +1,28 @@
 package com.example.multikart.common;
 
 import com.example.multikart.domain.dto.CartDTO;
+import com.example.multikart.domain.model.Customer;
+import com.example.multikart.domain.model.User;
 
 import javax.servlet.http.HttpSession;
+import java.text.Normalizer;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
+import java.util.regex.Pattern;
 
 public class Utils {
+
+    private static final Pattern NONLATIN = Pattern.compile("[^\\w-]");
+    private static final Pattern WHITESPACE = Pattern.compile("[\\s]");
+
+    public static String toSlug(String input) {
+        String nowhitespace = WHITESPACE.matcher(input).replaceAll("-");
+        String normalized = Normalizer.normalize(nowhitespace, Normalizer.Form.NFD);
+        String slug = NONLATIN.matcher(normalized).replaceAll("");
+        return slug.toLowerCase(Locale.ENGLISH);
+    }
+
     public static boolean checkExistCart(List<CartDTO> carts, long id) {
         return carts.stream().anyMatch(c -> c.getProductId().equals(id));
     }
@@ -24,4 +40,22 @@ public static float getTotalPriceCart(List<CartDTO> carts) {
         var total = 0.0f;
         return carts.stream().map(cart -> cart.getPrice() * cart.getQuantity()).reduce(total, Float::sum);
     }
+
+    public static Customer getCustomerSession(HttpSession session) {
+        var customer = (Customer) session.getAttribute("customer");
+        if (DataUtils.isNullOrEmpty(customer)) {
+            return new Customer();
+        }
+
+        return customer;
+    }
+
+    public static User getUserSession(HttpSession session) {
+        var user = (User) session.getAttribute("user");
+        if (DataUtils.isNullOrEmpty(user)) {
+            return new User();
+        }
+
+        return user;
+    }
 }

Documents/phan_ra_qtv.png

@@ -24,7 +24,14 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
         log.info("User : {}", user);
 
         if (DataUtils.isNullOrEmpty(user)) {
-            response.sendRedirect(request.getContextPath() + "/dashboard/login");
+            var url = request.getContextPath() + "/dashboard/login";
+
+            String referer = request.getHeader("Referer");
+            if (!DataUtils.isNullOrEmpty(referer)) {
+                url += "?redirect=" + referer;
+            }
+
+            response.sendRedirect(url);
             return false;
         }
 

src/main/java/com/example/multikart/common/Utils.java

@@ -26,8 +26,8 @@ public String login(Model model) {
     }
 
     @PostMapping("/dashboard/login")
-    public String postLogin(@Valid @ModelAttribute("user") UserLoginRequestDTO input, HttpSession session, BindingResult result, Model model) {
-        return authService.backendPostLogin(input, session, result, model);
+    public String postLogin(@RequestParam(value = "redirect", required = false) String referer, @Valid @ModelAttribute("user") UserLoginRequestDTO input, HttpSession session, BindingResult result, Model model) {
+        return authService.backendPostLogin(referer, input, session, result, model);
     }
 
     @PostMapping("/dashboard/logout")
@@ -75,8 +75,13 @@ public String frontendPostLogin(@Valid @ModelAttribute("customer") UserRegisterR
     }
 
     @GetMapping("/profile")
-    public String frontendProfile(HttpSession session, Model model) {
-        return authService.frontendProfile(session, model);
+    public String frontendProfile(HttpSession session, Model model, RedirectAttributes redirect) {
+        return authService.frontendProfile(session, model, redirect);
+    }
+
+    @PostMapping("/profile")
+    public String frontendPostProfile(@Valid @ModelAttribute("customer") UserProfileRequestDTO input, HttpSession session, BindingResult result, Model model, RedirectAttributes redirect) {
+        return authService.frontendPostProfile(input, session, result, model, redirect);
     }
 
 }

src/main/java/com/example/multikart/common/interceptor/AdminInterceptor.java

@@ -1,11 +1,16 @@
 package com.example.multikart.controller;
 
+import com.example.multikart.domain.dto.CheckoutRequestDTO;
 import com.example.multikart.service.CheckoutService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpSession;
 
@@ -20,4 +25,9 @@ public String view(HttpSession session, Model model) {
         return checkoutService.view(session, model);
     }
 
+    @PostMapping
+    public String checkout(@ModelAttribute("checkout") CheckoutRequestDTO input, BindingResult result, HttpSession session, Model model, RedirectAttributes redirect) {
+        return checkoutService.checkout(input, result, session, model, redirect);
+    }
+
 }

src/main/java/com/example/multikart/controller/AuthController.java

@@ -9,19 +9,31 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import javax.servlet.http.HttpSession;
+
 @Controller
-@RequestMapping("/dashboard/orders")
+@RequestMapping("/")
 public class OrderController {
     @Autowired
     private OrderService orderService;
 
-    @GetMapping
+    @GetMapping("/dashboard/orders")
     public String index(Model model) {
         return orderService.findAllOrders(model);
     }
 
-    @GetMapping("/{id}")
+    @GetMapping("/dashboard/orders/{id}")
     public String view(@PathVariable("id") Long id, Model model, RedirectAttributes redirect) {
         return orderService.viewOrder(id, model, redirect);
     }
+
+    @GetMapping("/orders")
+    public String frontendListOrder(HttpSession session, Model model, RedirectAttributes redirect) {
+        return orderService.frontendListOrder(session, model, redirect);
+    }
+
+    @GetMapping("/orders/{id}")
+    public String frontendViewOrder(@PathVariable("id") Long id, HttpSession session, Model model, RedirectAttributes redirect) {
+        return orderService.frontendViewOrder(id, session, model, redirect);
+    }
 }

src/main/java/com/example/multikart/controller/CheckoutController.java

@@ -28,4 +28,13 @@ public CartDTO(Product product, Integer number) {
         quantity = number;
         price = product.getExportPrice();
     }
+
+    public CartDTO(ItemProductDTO product, Integer number) {
+        productId = product.getProductId();
+        name = product.getName();
+        slug = product.getSlug();
+        image = product.getImage();
+        quantity = number;
+        price = product.getExportPrice();
+    }
 }

src/main/java/com/example/multikart/controller/OrderController.java

@@ -0,0 +1,37 @@
+package com.example.multikart.domain.dto;
+
+import lombok.*;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CheckoutRequestDTO {
+    @NotBlank
+    private String name;
+
+    private Long customerId;
+
+    private String phone;
+
+    @Email
+    private String email;
+
+    private String provinceId;
+
+    private String districtId;
+
+    private String wardId;
+
+    private String address;
+
+    private String description;
+
+    private Long paymentId;
+
+    private Long transportId;
+}