Merge pull request #125 from ohoraming/ohoraming/FE/FIX

Ohoraming/fe/fix
kkn1125 · Aug 9, 2022 · acb3af3 · acb3af3
2 parents a66e690 + 6ab5dab
commit acb3af3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/src/main/frontend/src/apis/cart/index.ts b/src/main/frontend/src/apis/cart/index.ts
@@ -24,7 +24,7 @@ const findCartById = (cid: string) => {
 
 const deleteCart = (cid: string) => {
   return axios
-    .get(`/api/cart/${cid}`)
+    .delete(`/api/cart/${cid}`)
     .then(handleReceiveData)
     .catch(handleReceiveError);
 };

diff --git a/src/main/frontend/src/apis/product/index.ts b/src/main/frontend/src/apis/product/index.ts
@@ -24,7 +24,7 @@ const findProductById = (pid: string) => {
 
 const deleteProduct = (pid: string) => {
   return axios
-    .get(`/api/product/${pid}`)
+    .delete(`/api/product/${pid}`)
     .then(handleReceiveData)
     .catch(handleReceiveError);
 };

diff --git a/src/main/java/com/narang/web/entity/Product.java b/src/main/java/com/narang/web/entity/Product.java
@@ -40,4 +40,17 @@ public class Product {
 
     @LastModifiedDate
     private LocalDateTime updates;
+
+    public Product replace(Product compare) {
+        this.setCategory(compare.getCategory() != null ? compare.getCategory() : this.getCategory());
+        this.setName(compare.getName() != null ? compare.getName() : this.getName());
+        this.setPrice(compare.getPrice() != null ? compare.getPrice() : this.getPrice());
+        this.setAmount(compare.getAmount() != null ? compare.getAmount() : this.getAmount());
+        this.setContent(compare.getContent() != null ? compare.getContent() : this.getContent());
+        this.setSeller(compare.getSeller() != null ? compare.getSeller() : this.getSeller());
+        this.setIsSoldOut(compare.getIsSoldOut() == true ? compare.getIsSoldOut() : this.getIsSoldOut());
+        return this;
+    }
 }
+
+
diff --git a/src/main/java/com/narang/web/restController/ProductRestController.java b/src/main/java/com/narang/web/restController/ProductRestController.java
@@ -54,13 +54,7 @@ public ResponseEntity<?> updateProduct(@PathVariable("pid") String id, @RequestB
         Optional<Product> productOptional = productRepository.findById(id);
         if (productOptional.isPresent()) {
             Product productToSave = productOptional.get();
-            productToSave.setCategory(product.getCategory() != null ? product.getCategory() : productToSave.getCategory());
-            productToSave.setName(product.getName() != null ? product.getName() : productToSave.getName());
-            productToSave.setPrice(product.getPrice() != null ? product.getPrice() : productToSave.getPrice());
-            productToSave.setAmount(product.getAmount() != null ? product.getAmount() : productToSave.getAmount());
-            productToSave.setContent(product.getContent() != null ? product.getContent() : productToSave.getContent());
-            productToSave.setSeller(product.getSeller() != null ? product.getSeller() : productToSave.getSeller());
-            productToSave.setIsSoldOut(product.getIsSoldOut() == true ? product.getIsSoldOut() : productToSave.getIsSoldOut());
+            productToSave.replace(product);
             productRepository.save(productToSave);
             return new ResponseEntity<>(productToSave, HttpStatus.OK);
         } else {