From 14f025b8d0cf0c1a73dfe5dec97f61b84acb947f Mon Sep 17 00:00:00 2001
From: Thunder <htn10a2@gmail.com>
Date: Wed, 6 Mar 2024 10:44:08 +0700
Subject: [PATCH] Fix error check product quantity

---
 .../management/order/AddProductIntoOrder.java | 36 ++++++++++++++-----
 .../order/add-product-into-order.jsp          | 10 ++++--
 .../view/jsp/management/order/order.jsp       |  1 +
 .../view/jsp/others/login/forgot-password.jsp |  1 +
 .../webapp/view/jsp/others/login/login.jsp    |  1 +
 .../view/jsp/others/login/new-password.jsp    |  1 +
 src/main/webapp/view/jsp/others/login/otp.jsp |  1 +
 7 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/hardingadonis/saledock/controller/management/order/AddProductIntoOrder.java b/src/main/java/io/hardingadonis/saledock/controller/management/order/AddProductIntoOrder.java
index 48066b2..1559fdd 100644
--- a/src/main/java/io/hardingadonis/saledock/controller/management/order/AddProductIntoOrder.java
+++ b/src/main/java/io/hardingadonis/saledock/controller/management/order/AddProductIntoOrder.java
@@ -37,25 +37,34 @@ 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);
 
         Optional<Product> product = Singleton.productDAO.getByID(productId);
 
@@ -96,4 +105,13 @@ private boolean checkCusIdParam(String customerIdParam) {
         }
         return true;
     }
+    
+    private boolean isInteger(String param){
+        try {
+            Integer.parseInt(param);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
 }
diff --git a/src/main/webapp/view/jsp/management/order/add-product-into-order.jsp b/src/main/webapp/view/jsp/management/order/add-product-into-order.jsp
index 717bae0..d68df65 100644
--- a/src/main/webapp/view/jsp/management/order/add-product-into-order.jsp
+++ b/src/main/webapp/view/jsp/management/order/add-product-into-order.jsp
@@ -46,9 +46,14 @@
                                                         Chưa nhập tên sản phẩm. Vui lòng kiểm tra lại.
                                                     </div>
                                                 </c:when>
-                                                <c:when test="${requestScope.message eq 'productNotExist'}">
+                                                <c:when test="${requestScope.message eq 'notInputProductQuantity'}">
+                                                    <div class="alert alert-danger text-center" role="alert">
+                                                        Chưa nhập số lượng sản phẩm. Vui lòng kiểm tra lại.
+                                                    </div>
+                                                </c:when>
+                                                <c:when test="${requestScope.message eq 'productQuantityNotExist'}">
                                                     <div class="alert alert-danger text-center" role="alert">
-                                                        Chưa nhập số lượng sản phẩm cần mua. Vui lòng kiểm tra lại.
+                                                        Nhập sai định dạng số lượng sản phẩm. Vui lòng kiểm tra lại.
                                                     </div>
                                                 </c:when>
                                                 <c:when test="${requestScope.message eq 'missingCustomer'}">
@@ -119,6 +124,7 @@
             <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
             <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
             <script src="<%=request.getContextPath()%>/view/assets/js/validate/validator.js"></script>
+            <script src="<%=request.getContextPath()%>/view/assets/js/alert-timeout.js"></script>
 
             <!--Danh sach goi y-->
             <script>
diff --git a/src/main/webapp/view/jsp/management/order/order.jsp b/src/main/webapp/view/jsp/management/order/order.jsp
index 4c4b0c0..868c46f 100644
--- a/src/main/webapp/view/jsp/management/order/order.jsp
+++ b/src/main/webapp/view/jsp/management/order/order.jsp
@@ -124,6 +124,7 @@
         <script src="<%=request.getContextPath()%>/view/assets/js/bootstrap.min.js"></script>
         <script src="<%=request.getContextPath()%>/view/assets/js/bs-init.js"></script>
         <script src="<%=request.getContextPath()%>/view/assets/js/theme.js"></script>
+        <script src="<%=request.getContextPath()%>/view/assets/js/alert-timeout.js"></script>
     </body>
 
 </html>
diff --git a/src/main/webapp/view/jsp/others/login/forgot-password.jsp b/src/main/webapp/view/jsp/others/login/forgot-password.jsp
index c4d7736..4740434 100644
--- a/src/main/webapp/view/jsp/others/login/forgot-password.jsp
+++ b/src/main/webapp/view/jsp/others/login/forgot-password.jsp
@@ -59,6 +59,7 @@
         <script src="<%=request.getContextPath()%>/view/assets/js/bs-init.js"></script>
         <script src="<%=request.getContextPath()%>/view/assets/js/theme.js"></script>
         <script src="<%=request.getContextPath()%>/view/assets/js/validate/validator.js"></script>
+        <script src="<%=request.getContextPath()%>/view/assets/js/alert-timeout.js"></script>
 
         <!--Validate Forgot Password-->
         <script>
diff --git a/src/main/webapp/view/jsp/others/login/login.jsp b/src/main/webapp/view/jsp/others/login/login.jsp
index 705e60e..7b49056 100644
--- a/src/main/webapp/view/jsp/others/login/login.jsp
+++ b/src/main/webapp/view/jsp/others/login/login.jsp
@@ -82,6 +82,7 @@
             <script src="<%=request.getContextPath()%>/view/assets/js/bs-init.js"></script>
             <script src="<%=request.getContextPath()%>/view/assets/js/theme.js"></script>
             <script src="<%=request.getContextPath()%>/view/assets/js/validate/validator.js"></script>
+            <script src="<%=request.getContextPath()%>/view/assets/js/alert-timeout.js"></script>
 
             <!--Validate Login-->
             <script>
diff --git a/src/main/webapp/view/jsp/others/login/new-password.jsp b/src/main/webapp/view/jsp/others/login/new-password.jsp
index de28132..2b48516 100644
--- a/src/main/webapp/view/jsp/others/login/new-password.jsp
+++ b/src/main/webapp/view/jsp/others/login/new-password.jsp
@@ -72,6 +72,7 @@
         <script src="<%=request.getContextPath()%>/view/assets/js/bs-init.js"></script>
         <script src="<%=request.getContextPath()%>/view/assets/js/theme.js"></script>
         <script src="<%=request.getContextPath()%>/view/assets/js/validate/validator.js"></script>
+        <script src="<%=request.getContextPath()%>/view/assets/js/alert-timeout.js"></script>
 
         <!--Validate Forgot Password-->
         <script>
diff --git a/src/main/webapp/view/jsp/others/login/otp.jsp b/src/main/webapp/view/jsp/others/login/otp.jsp
index b3b83fa..aacac62 100644
--- a/src/main/webapp/view/jsp/others/login/otp.jsp
+++ b/src/main/webapp/view/jsp/others/login/otp.jsp
@@ -59,6 +59,7 @@
         <script src="<%=request.getContextPath()%>/view/assets/js/bs-init.js"></script>
         <script src="<%=request.getContextPath()%>/view/assets/js/theme.js"></script>
         <script src="<%=request.getContextPath()%>/view/assets/js/validate/validator.js"></script>
+        <script src="<%=request.getContextPath()%>/view/assets/js/alert-timeout.js"></script>
 
         <!--Validate Forgot Password-->
         <script>