Release version 0.9.0

get_version.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 major_version=0
-minor_version=7
+minor_version=8
 path_version=0
 
 echo "$major_version.$minor_version.$path_version"

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>io.hardingadonis</groupId>
     <artifactId>saledock</artifactId>
-    <version>0.7.0</version>
+    <version>0.8.0</version>
     <packaging>war</packaging>
 
     <name>Sale Dock - v${project.version}</name>

src/main/java/io/hardingadonis/saledock/controller/management/customer/AddCustomerServlet.java

@@ -6,6 +6,7 @@
 import jakarta.servlet.*;
 import jakarta.servlet.annotation.*;
 import jakarta.servlet.http.*;
+import java.sql.SQLException;
 
 @WebServlet(name = "AddCustomerServlet", urlPatterns = {"/add-customer"})
 public class AddCustomerServlet extends HttpServlet {
@@ -30,18 +31,35 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         String address = request.getParameter("address");
         String email = request.getParameter("email");
 
-        if (name.length() > 0 && code.length() > 0 && address.length() > 0 && email.length() > 0) {
+        try {
+            if (name.length() > 0 && code.length() > 0 && address.length() > 0 && email.length() > 0) {
+                Customer customer = new Customer();
+                customer.setName(name);
+                customer.setCode(code);
+                customer.setAddress(address);
+                customer.setEmail(email);
+                Singleton.customerDAO.save(customer);
+
+                response.sendRedirect(request.getContextPath() + "/customer");
+                return;
+            }
+        } catch (Exception e) {
             Customer customer = new Customer();
             customer.setName(name);
-            customer.setCode(code);
             customer.setAddress(address);
-            customer.setEmail(email);
-            Singleton.customerDAO.save(customer);
+            StringBuilder message = new StringBuilder("Tạo khách hàng không thành công: ");
+            if (e.getMessage().contains(code)) {
+                message.append("Không được trùng mã khách hàng.");
+            }
+            if (e.getMessage().contains(email)) {
+                message.append("Không được trùng email.");
+            }
+            request.setAttribute("error", message.toString());
+            request.setAttribute("appendCustomer", customer);
+            RequestDispatcher requestDispatcher = request.getRequestDispatcher("/view/jsp/management/customer/add-customer.jsp");
+            requestDispatcher.forward(request, response);
 
-            response.sendRedirect(request.getContextPath() + "/customer");
-            return;
         }
 
-        response.sendRedirect(request.getContextPath() + "/add-customer");
     }
 }

src/main/java/io/hardingadonis/saledock/controller/management/customer/CustomerServlet.java

@@ -20,10 +20,13 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         int pageNumber = 1;
         int pageSize = 10;
 
-        // Get the requested page number
-        String pageStr = request.getParameter("page");
-        if (pageStr != null) {
-            pageNumber = Integer.parseInt(pageStr);
+        if (request.getParameter("page") != null) {
+            try {
+                pageNumber = Integer.parseInt(request.getParameter("page"));
+            } catch (Exception e) {
+                response.sendRedirect("./error-404");
+                return;
+            }
         }
 
         List<Customer> customers = Singleton.customerDAO.pagination((pageNumber - 1) * pageSize, pageSize);
@@ -38,7 +41,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         request.setAttribute("totalPages", totalPages);
         request.setAttribute("pageSize", pageSize);
         request.setAttribute("page", "customer");
-
 
         request.getRequestDispatcher("/view/jsp/management/customer/customer.jsp").forward(request, response);
     }

src/main/java/io/hardingadonis/saledock/controller/management/customer/UpdateCustomerServlet.java

@@ -58,11 +58,11 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
         Integer id_customer = Integer.valueOf(id);
         Customer customer = Singleton.customerDAO.getByID(id_customer).get();
-        if (!name.isEmpty()) {
-            customer.setName(name);
+        if (!name.trim().isEmpty()) {
+            customer.setName(name.trim());
         }
-        if (!address.isEmpty()) {
-            customer.setAddress(address);
+        if (!address.trim().isEmpty()) {
+            customer.setAddress(address.trim());
         }
         Singleton.customerDAO.save(customer);
         response.sendRedirect(request.getContextPath() + "/customer-detail?id="+id);

src/main/java/io/hardingadonis/saledock/controller/management/order/AddProductIntoOrder.java

@@ -37,24 +37,39 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         }
 
         String productIdParam = request.getParameter("productId");
+        String productQuantityParam = request.getParameter("productQuantity");
 
         if (productIdParam == null || productIdParam.isEmpty()) {
-            request.setAttribute("message", "productNotExist");
+            request.setAttribute("message", "notInputProduct");
             this.doGet(request, response);
             return;
         }
-
-        Integer productId = Integer.parseInt(productIdParam);
-        Integer productQuantity = Integer.parseInt(request.getParameter("productQuantity"));
-
-        if (productId == null) {
-            request.setAttribute("message", "notInputProduct");
+
+        if (productQuantityParam == null || productQuantityParam.isEmpty()) {
+            request.setAttribute("message", "notInputProductQuantity");
             this.doGet(request, response);
+            return;
         }
 
-        if (productQuantity == null) {
-            request.setAttribute("message", "notInputProduct");
+        if (!isInteger(productIdParam)) {
+            request.setAttribute("message", "productNotExist");
+            this.doGet(request, response);
+            return;
+        }
+
+        if (!isInteger(productQuantityParam)) {
+            request.setAttribute("message", "productQuantityNotExist");
+            this.doGet(request, response);
+            return;
+        }
+
+        Integer productId = Integer.parseInt(productIdParam);
+        Integer productQuantity = Integer.parseInt(productQuantityParam);
+
+        if(productQuantity <= 0){
+            request.setAttribute("message", "productQuantityNotPositive");
             this.doGet(request, response);
+            return;
         }
 
         Optional<Product> product = Singleton.productDAO.getByID(productId);
@@ -96,4 +111,13 @@ private boolean checkCusIdParam(String customerIdParam) {
         }
         return true;
     }
+
+    private boolean isInteger(String param){
+        try {
+            Integer.parseInt(param);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
 }

src/main/java/io/hardingadonis/saledock/controller/management/order/OrderServlet.java

@@ -7,11 +7,10 @@
 import jakarta.servlet.http.*;
 import java.io.*;
 import java.util.*;
-import java.util.stream.*;
 
 @WebServlet(name = "OrderServlet", urlPatterns = {"/order"})
 public class OrderServlet extends HttpServlet {
-    
+
     final static int LIMIT = 10;
 
     @Override
@@ -22,20 +21,37 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
         List<Order> orders = Singleton.orderDAO.getAll();
         int count = Singleton.orderDAO.count();
-
-        int pageNum = getInteger(request.getParameter("page"));
+
+        String pageNumParam = request.getParameter("page");
+        int pageNum = 0;
+
+        if (pageNumParam == null || pageNumParam.isEmpty()) {
+            pageNum = 1;
+        } else {
+            try {
+                pageNum = Integer.parseInt(pageNumParam);
+            } catch (NumberFormatException e) {
+                response.sendRedirect("./error-404");
+                return;
+            }
+        }
+
+        if (pageNum < 0) {
+            response.sendRedirect("./error-404");
+            return;
+        }
+
         int offset = pageNum;
-
-        if (offset == -1){
-            offset = 0;
+
+        if (offset == 0) {
             pageNum = 1;
         } else {
-            offset = (offset - 1)*LIMIT;
+            offset = (offset - 1) * LIMIT;
         }
-        
-        List<Order> orderPaging = Singleton.orderDAO.pagination(offset, LIMIT);      
+
+        List<Order> orderPaging = Singleton.orderDAO.pagination(offset, LIMIT);
         int total = Singleton.orderDAO.totalPages(LIMIT);
-        
+
         request.setAttribute("numOfOrder", count);
         request.setAttribute("currentPage", pageNum);
         request.setAttribute("totalPage", total);
@@ -50,15 +66,4 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     protected void doPost(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
     }
-
-    private static int getInteger(String parameter){
-        if (parameter == null) {
-            return -1;
-        }
-        try {
-            return Integer.parseInt(parameter);
-        } catch (NumberFormatException e) {
-            return -1;
-        }
-    }
 }

src/main/java/io/hardingadonis/saledock/controller/management/order/UpdateOrderServlet.java

@@ -10,6 +10,7 @@
 
 @WebServlet(name = "UpdateOrderServlet", urlPatterns = {"/update-order"})
 public class UpdateOrderServlet extends HttpServlet {
+
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
@@ -43,26 +44,27 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         String ID = request.getParameter("id");
         Order order = Singleton.orderDAO.getByID(Integer.valueOf(ID)).orElse(null);
 
-        
+
         String status = request.getParameter("status");
-
-
-        if (status != null && !status.equals(order.getStatus()) ) {
-
-            order.setStatus(Order.Status.valueOf(status));
-            Singleton.orderDAO.save(order);
+        String note = request.getParameter("note");
 
-             response.sendRedirect("./order");
-            return;
-        }
-        else {
-            response.sendRedirect("./order");
-            return;
+        if (status != null && !status.equals(order.getStatus())) {
+
+            order.setStatus(Order.Status.valueOf(status));
+
+        } 
+        if(!note.trim().isEmpty()){
+            order.setNote(note.trim());
         }
+        Singleton.orderDAO.save(order);
+
+            response.sendRedirect(request.getContextPath() + "/order-detail?id=" + ID);
 
+//        else {
+//            response.sendRedirect(request.getContextPath() + "/order-detail?id=" + ID);
+//            return;
+//        }
+
     }
-
-
-
-
+
 }

src/main/java/io/hardingadonis/saledock/controller/management/product/UpdateProductServlet.java

@@ -71,10 +71,10 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             return;
         }
         Integer idP = Integer.valueOf(pId);
-        String productName = request.getParameter("productName");
+        String productName = request.getParameter("productName").trim();
         String productDescription = request.getParameter("productDescription");
-        double price = Double.parseDouble(request.getParameter("price"));
-        
+        String productPrice = request.getParameter("price");
+
         Part part = request.getPart("imageUpload");
         String imgURL = null;
         if (part.getSize() > 0) {
@@ -88,16 +88,28 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             part.write(realPath + "/" + fileName);
         }
 
-
         Product product = Singleton.productDAO.getByID(idP).get();
-        product.setPrice(price);
-        product.setName(productName);
-        product.setImageURL(imgURL);
-        product.setDescription(productDescription);
+        if (!productName.isEmpty()) {
+            product.setName(productName);
+        }
+        if (!productPrice.isEmpty()) {
+            product.setPrice(Double.parseDouble(productPrice));
+        }
+        if (imgURL != null) {
+            product.setImageURL(imgURL);
+        }
+        if (!productDescription.isEmpty()) {
+            product.setDescription(productDescription);
+        }
+
+        if (productDescription.trim().length() > 0) {
+            product.setDescription(productDescription.trim());
+
+        }
 
         Singleton.productDAO.save(product);
 
-        response.sendRedirect("./product");
+        response.sendRedirect("./product-detail?id=" + idP);
     }
 
 }