assignment-dev-08-FE-refactor : FE code refactor

springAssignmentSystem/README.md

@@ -56,6 +56,7 @@
 	- Part 30 : https://youtu.be/iYchh7v7P1Q?si=mDFJUFlhijuH83CN
 	- Part 31 : https://youtu.be/SOyfQCsOvO4?si=HsjKAdQBiflZHORp
 	- Part 32 : https://youtu.be/d_YH4TnLuhk?si=BmgFG1gWJvDLp5kO
+	- Part 33 : https://youtu.be/TbhJBqAiMGE?si=nIKaQMjUnpGcRjgw
 
 
 - Spring JWT

springAssignmentSystem/doc/progress.txt

@@ -103,4 +103,8 @@
 
 - 20231012
 		- https://youtu.be/d_YH4TnLuhk?si=BmgFG1gWJvDLp5kO
-			- progress : 16:22
+			- progress : 16:22
+
+- 20231015
+		- https://youtu.be/d_YH4TnLuhk?si=BmgFG1gWJvDLp5kO
+		- https://youtu.be/TbhJBqAiMGE?si=nIKaQMjUnpGcRjgw

springAssignmentSystem/frontend/frontend_app/src/AssignmentView/index.js

@@ -40,12 +40,21 @@ const AssignmentView = () => {
     console.log(assignment);
   }
 
-  function saveAssignment() {
+  function saveAssignment(status) {
     // call BE API save assignment
     // https://youtu.be/2XRQzR4y2yM?si=aiNeLhS3SXsU18HE&t=833
     // means when submit an assignment at the first time
-    if (assignment.status === assignmentStatuses[0].status) {
-      updateAssignment("status", assignmentStatuses[1].status);
+
+    // https://youtu.be/d_YH4TnLuhk?si=eYDtONFyA5U5hVZM&t=1134
+    // if (assignment.status === assignmentStatuses[0].status) {
+    //   updateAssignment("status", assignmentStatuses[1].status);
+    // } else {
+    //   // https://youtu.be/2XRQzR4y2yM?si=RDbtHpdUnVs8j7JE&t=1109
+    //   persist();
+    // }
+
+    if (status && assignment.status != status) {
+      updateAssignment("status", status);
     } else {
       // https://youtu.be/2XRQzR4y2yM?si=RDbtHpdUnVs8j7JE&t=1109
       persist();
@@ -216,7 +225,9 @@ const AssignmentView = () => {
             </Col>
           </Form.Group>
 
-          <Button onClick={() => saveAssignment()}>Submit Assignment</Button>
+          <Button onClick={() => saveAssignment("Submitted")}>
+            Submit Assignment
+          </Button>
         </>
       ) : (
         <></>

springAssignmentSystem/frontend/frontend_app/src/CodeReviewAssignmentView/index.js

@@ -51,12 +51,12 @@ const CodeReviewerAssignmentView = () => {
     // means when submit an assignment at the first time
     // https://youtu.be/SOyfQCsOvO4?si=Eu1z9CWZO0c-e3Zq&t=816
 
-    console.log(
-      "(saveAssignment) status =  " +
-        status +
-        ",  assignment = " +
-        JSON.stringify(assignment)
-    );
+    // console.log(
+    //   "(saveAssignment) status =  " +
+    //     status +
+    //     ",  assignment = " +
+    //     JSON.stringify(assignment)
+    // );
 
     if (status && assignment.status !== status) {
       updateAssignment("status", status);

springWarehouse/my_csv.csv

@@ -0,0 +1,2 @@
+John,Doe,38,Comment Data Another line of comment data
+Jane,"Doe, Jr.",19,"She said ""I'm being quoted"""

springWarehouse/sql/ddl/order.sql

@@ -8,13 +8,14 @@ CREATE TABLE IF NOT EXISTS orders (
     merchant_id int,
     product_id int,
     amount int,
+    status varchar(10),
     create_time datetime,
     update_time datetime
 );
 
 
-INSERT INTO orders(id, merchant_id, product_id, amount, create_time, update_time)
+INSERT INTO orders(id, merchant_id, product_id, amount, status, create_time, update_time)
 VALUES
-(uuid(), 1, 1, 1, now(), now()),
-(uuid(), 2, 2, 1, now(), now()),
-(uuid(), 1, 3, 1, now(), now());
+("213ac245-7a2a-453b-a4a7-149426b13f84", 1, 1, 1, "completed", now(), now()),
+("d42b3224-b715-46af-9294-3b2ecc6ccc7a", 2, 2, 1, "cancelled", now(), now()),
+(uuid(), 1, 3, 1, "pending", now(), now());

springWarehouse/sql/ddl/product.sql

@@ -9,14 +9,14 @@ CREATE TABLE IF NOT EXISTS product(
     type_id int not null,
     price int not null,
     merchant_id varchar(100),
-    product_status varchar(1) not null,
+    product_status  varchar(10),
     amount int DEFAULT 0,
     constraint FK_PRODUCT_TYPE FOREIGN KEY (type_id) references product_type(type_id)
 );
 
 -- DML
-INSERT INTO product(name, type_id, price, merchant_id, product_status)
+INSERT INTO product(name, type_id, price, merchant_id, amount, product_status)
 VALUES
-("i-phone", 2, 300, 1, "0"),
-("cookie2", 4, 10, 2, "0"),
-("soap", 1, 50, 1, "0");
+("i-phone", 2, 300, 1, 3, "on_board"),
+("cookie2", 4, 10, 2, 2, "new"),
+("soap", 1, 50, 1, 1, "off_board");

springWarehouse/src/main/java/com/yen/springWarehouse/bean/Order.java

@@ -0,0 +1,43 @@
+package com.yen.springWarehouse.bean;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("orders")
+public class Order implements Serializable {
+
+    private static final long serialVersionUID = 58533333369667604L;
+
+    // https://www.cnblogs.com/mark5/p/14268122.html
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    @TableField("merchant_id")
+    private Integer merchantId;
+
+    @TableField("product_id")
+    private Integer productId;
+
+    @TableField("amount")
+    private Integer amount;
+
+    @TableField("status")
+    private String status;
+
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+}

springWarehouse/src/main/java/com/yen/springWarehouse/controller/OrderController.java

@@ -0,0 +1,126 @@
+package com.yen.springWarehouse.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yen.springWarehouse.bean.Merchant;
+import com.yen.springWarehouse.bean.Order;
+import com.yen.springWarehouse.bean.Product;
+import com.yen.springWarehouse.enums.OrderStatus;
+import com.yen.springWarehouse.service.MerchantService;
+import com.yen.springWarehouse.service.OrderService;
+import com.yen.springWarehouse.service.ProductService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Controller
+@RequestMapping("/order")
+public class OrderController {
+
+    @Autowired
+    OrderService orderService;
+
+    @Autowired
+    MerchantService merchantService;
+
+    @Autowired
+    ProductService productService;
+
+    @GetMapping("/toInput")
+    public String input(Map<String, Object> map) {
+
+        map.put("merchantList", merchantService.list());
+        map.put("productList", productService.list());
+        //map.put("Order", new Order()); // TODO : check necessary ?
+        return "order/input_order";
+    }
+
+    @PostMapping("/create")
+    public String create(Order order) {
+
+        if (!orderService.updateProductWithOrder(order)){
+            log.error("order create failed");
+            return "redirect:/order/list";
+        }
+
+        order.setStatus(OrderStatus.Pending.getMsg());
+        order.setCreateTime(LocalDateTime.now());
+        log.info("(OrderController.create) Create new order : " + order.toString());
+        orderService.save(order);
+        return "redirect:/order/list";
+    }
+
+    @GetMapping("/list")
+    public String list(Map<String, Object> map, @RequestParam(value="pageNo", required=false, defaultValue="1") String pageNoStr) {
+
+        // TODO : refactor to pageUtil (a common method handle paging request)
+        int pageNo;
+
+        // check pageNo
+        pageNo = Integer.parseInt(pageNoStr);
+        if(pageNo < 1){
+            pageNo = 1;
+        }
+
+        /*
+         * 1st param：which page
+         * 2nd param : record count per page
+         */
+        log.info("pageNo = {}", pageNo);
+        Page<Order> page = new Page<>(pageNo,3);
+        QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
+        IPage<Order> iPage = orderService.page(page,
+                new LambdaQueryWrapper<Order>()
+                        .orderByAsc(Order::getId)
+        );
+        log.info("iPage.total = {}, iPage.getPages = {} iPage = {}",  iPage.getTotal(), iPage.getPages(), iPage);
+        map.put("page", iPage);
+
+        return "order/list_order";
+    }
+
+    // TODO : only allow cancel if order status is "uncompleted"
+    @PostMapping(value="/remove/{orderNo}")
+    public String remove(@PathVariable("orderNo") String orderNo) {
+
+        orderService.removeById(orderNo);
+        return "redirect:/order/list";
+    }
+
+    // TODO : only allow update if order status is "uncompleted"
+    @GetMapping(value="/preUpdate/{orderNo}")
+    public String preUpdate(@PathVariable("orderNo") String orderNo, Map<String, Object> map) {
+
+        Order order = orderService.getById(orderNo);
+        map.put("order" , order);
+        map.put("orderList", orderService.list());
+        return "order/update_order";
+    }
+
+    @PostMapping(value="/update")
+    public String update(Order order) {
+
+        log.info("update order as {}", order);
+        orderService.updateById(order);
+        return "redirect:/order/list";
+    }
+
+    // TODO : fix below
+    /**
+     *  download order data as csv
+     *  https://pdai.tech/md/spring/springboot/springboot-x-file-upload-download.html
+     */
+    @GetMapping(value="/download")
+    public void download(){
+        List<Order> orders = orderService.getAllOrders();
+    }
+
+}

springWarehouse/src/main/java/com/yen/springWarehouse/controller/ProductController.java

@@ -79,6 +79,7 @@ public String list(@RequestParam(value="pageNo", required=false, defaultValue="1
 
         Page<Product> page = productService.getProductPage(helper, pageNo, PAGE_SIZE);
         map.put("productTypeList", productTypeService.list());
+        map.put("merchantList", merchantService.list());
         map.put("page", page);
         map.put("helper", helper);
         log.info("(ProductController list) map = {}", map);

springWarehouse/src/main/java/com/yen/springWarehouse/dto/ProductDto.java

@@ -0,0 +1,29 @@
+package com.yen.springWarehouse.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProductDto {
+
+    private int id;
+
+    private String name;
+
+    private int typeId;
+
+    private int price;
+
+    private int merchantId;
+
+    private String productStatus;
+
+    private int amount;
+
+    private String productTypeName;
+
+    private String merchantName;
+}

springWarehouse/src/main/java/com/yen/springWarehouse/enums/OrderStatus.java

@@ -0,0 +1,28 @@
+package com.yen.springWarehouse.enums;
+
+public enum OrderStatus {
+
+    Completed(10000, "completed"),
+
+    Pending(10001, "pending"),
+
+    Cancelled(10002, "cancelled");
+
+
+    private int code;
+    private String msg;
+
+    OrderStatus(int code, String msg){
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public int getCode(){
+        return this.code;
+    }
+
+    public String getMsg(){
+        return this.msg;
+    }
+
+}

springWarehouse/src/main/java/com/yen/springWarehouse/enums/ProductStatus.java

@@ -0,0 +1,25 @@
+package com.yen.springWarehouse.enums;
+
+public enum ProductStatus {
+
+    New(20000, "new"),
+    onBoard(20001, "on_board"),
+    offBoard(20002, "off_board");
+
+    private int code;
+    private String msg;
+
+    ProductStatus(int code, String msg){
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public int getCode(){
+        return this.code;
+    }
+
+    public String getMsg(){
+        return this.msg;
+    }
+
+}