Merge pull request #75 from Tea-Bliss/dev

완성차 수정안되는 로직 수정

src/main/java/store/teabliss/basket/dto/BasketDto.java

@@ -9,7 +9,6 @@
 
 public class BasketDto {
 
-
 
     private String product;
 

src/main/java/store/teabliss/tea/controller/TeaController.java

@@ -102,7 +102,7 @@ public ResponseEntity<?> lowcost(@RequestParam("page") int page,@RequestParam("l
 
     }
 
-    @GetMapping("all")
+    @GetMapping("/all")
     @Operation(summary = "모두 조회", description = "모든 차를 조회하는 로직입니다.")
     public ResponseEntity<?> all(@RequestParam("page") int page,@RequestParam("limit") int limit ){
 
@@ -117,9 +117,9 @@ public ResponseEntity<?> all(@RequestParam("page") int page,@RequestParam("limit
 
 
     }
-    @GetMapping("findtea")
+    @GetMapping("/findtea/{id}")
     @Operation(summary = "티 상세 조회", description = "차 하나만 조회하는 로직")
-    public ResponseEntity<TeaSearchDto> responseid(@RequestParam("id") int id){
+    public ResponseEntity<TeaSearchDto> responseid(@PathVariable(name="id") int id){
 
 
         TeaSearchDto tea=teaService.find(id);
@@ -129,7 +129,7 @@ public ResponseEntity<TeaSearchDto> responseid(@RequestParam("id") int id){
 
     }
 
-    @GetMapping("category")
+    @GetMapping("/category")
     @Operation(summary = "카테고리 조회", description = "차 하나만 조회하는 로직")
     public ResponseEntity<?> category(@RequestParam("page") int page,@RequestParam("limit") int limit,@RequestParam("category") String categroy){
 
@@ -144,7 +144,7 @@ public ResponseEntity<?> category(@RequestParam("page") int page,@RequestParam("
         return ResponseEntity.ok(response);
     }
 
-    @GetMapping("season")
+    @GetMapping("/season")
     @Operation(summary = "시즌별 조회", description = "차 하나만 조회하는 로직")
     public ResponseEntity<?> season(@RequestParam("page") int page,@RequestParam("limit") int limit,@RequestParam("season") String season){
 
@@ -160,7 +160,7 @@ public ResponseEntity<?> season(@RequestParam("page") int page,@RequestParam("li
 
     }
 
-    @GetMapping("caffeine")
+    @GetMapping("/caffeine")
     @Operation(summary = "카페인 조회", description = "차 하나만 조회하는 로직")
     public ResponseEntity<?> caffeine(@RequestParam("page") int page,@RequestParam("limit") int limit,@RequestParam("caffeine") boolean caffeine){
 
@@ -174,7 +174,7 @@ public ResponseEntity<?> caffeine(@RequestParam("page") int page,@RequestParam("
 
     }
 
-    @DeleteMapping("delete/{id}")
+    @DeleteMapping("/delete/{id}")
     @Operation(summary = "완성차 삭제 ", description = "차 하나만 조회하는 로직")
     public ResponseEntity<?> teaDelete(@PathVariable(name="id") int id){
 
@@ -188,8 +188,7 @@ public ResponseEntity<?> teaDelete(@PathVariable(name="id") int id){
 
     @PatchMapping("patch/{id}")
     @Operation(summary = "완성차 수정 ", description = "차 하나만 조회하는 로직")
-    public ResponseEntity<?> teaPatch(@PathVariable(name="id") Long id,TeaPatchDto teaPatchDto){
-
+    public ResponseEntity<?> teaPatch(@PathVariable(name="id") Long id,@RequestBody TeaPatchDto teaPatchDto){
 
 
         boolean patch=teaService.patchtea(id,teaPatchDto);

src/main/java/store/teabliss/tea/dto/TeaDto.java

@@ -1,15 +1,13 @@
 package store.teabliss.tea.dto;
 
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotEmpty;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import java.sql.Timestamp;
+
 import java.util.ArrayList;
-import java.util.Date;
+
 
 @Getter
 @Setter

src/main/java/store/teabliss/tea/dto/TeaPatchDto.java

@@ -9,8 +9,6 @@
 @Setter
 public class TeaPatchDto {
 
-    private Long id ;
-
     private Long price;
     private String  category ;
 
@@ -19,6 +17,7 @@ public class TeaPatchDto {
     private boolean caffeine;
     private String description;
     private String img;
+
     private Long inventory ;
 
     private ArrayList<Long> ingredient;

src/main/java/store/teabliss/tea/entity/TeaFlavor.java

@@ -1,6 +1,7 @@
 package store.teabliss.tea.entity;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -9,6 +10,7 @@
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 public class TeaFlavor {
 
     private Long teaId;

src/main/java/store/teabliss/tea/entity/TeaIngredient.java

@@ -2,6 +2,7 @@
 
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -10,6 +11,7 @@
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 public class TeaIngredient {
 
     private Long teaId;

src/main/java/store/teabliss/tea/mapper/TeaMapper.java

@@ -49,11 +49,11 @@ public interface TeaMapper {
     List<Tea> caffeinesort(boolean caffeine);
 
     boolean deletetea(int id);
-    boolean patchtea(Long id, Tea tea);
+    boolean patchtea(Tea tea);
 
-    void updateIngredient(Long id,TeaIngredient teaIngredient);
+    void updateIngredient(TeaIngredient teaIngredient);
 
-    void updateFlavor(Long id,TeaFlavor teaFlavor);
+    void updateFlavor(TeaFlavor teaFlavor);
 
 
 

src/main/java/store/teabliss/tea/service/TeaService.java

@@ -348,7 +348,7 @@ public boolean deletetea(int id){
     public boolean patchtea(Long id,TeaPatchDto teaPatchDto){
 
         Tea updatetea = Tea.builder()
-                .id(teaPatchDto.getId())
+                .id(id)
                 .price(teaPatchDto.getPrice())
                 .category(teaPatchDto.getCategory())
                 .name(teaPatchDto.getName())
@@ -362,24 +362,28 @@ public boolean patchtea(Long id,TeaPatchDto teaPatchDto){
                 .build();
 
         List<Long> temp1=teaPatchDto.getIngredient();
+
         for (Long t1:temp1){
-            TeaIngredient teaingredient =new TeaIngredient();
-            teaingredient.setIngredientId(t1);
-            teaingredient.setTeaId(id);
-            teaMapper.updateIngredient(id,teaingredient);
+            TeaIngredient teaingredient =TeaIngredient.builder()
+                                    .ingredientId(t1)
+                                    .teaId(id)
+                                            .build();
+
+            teaMapper.updateIngredient(teaingredient);
         }
 
         List<Long> temp2=teaPatchDto.getFlavor();
 
         for (Long t2:temp2){
-            TeaFlavor teaflavor =new TeaFlavor();
-            teaflavor.setFlavor(t2);
-            teaflavor.setTeaId(id);
-            teaMapper.updateFlavor(id,teaflavor);
+            TeaFlavor teaflavor =TeaFlavor.builder()
+                    .flavor(t2)
+                    .teaId(id)
+                    .build();
+            teaMapper.updateFlavor(teaflavor);
         }
 
 
-        boolean result=teaMapper.patchtea(id,updatetea);
+        boolean result=teaMapper.patchtea(updatetea);
 
         return result;
     }

src/main/resources/mapper/TeaMapper.xml

@@ -28,25 +28,25 @@
     <select id="recommend">
         SELECT *
         FROM TEA
-        ORDER BY rate DESC, createDt
+        ORDER BY rate DESC, create_dt
     </select>
 
     <select id="sale">
         SELECT *
         FROM TEA
-        ORDER BY sale DESC, createDt
+        ORDER BY sale DESC, create_dt
     </select>
 
     <select id="topcost">
         SELECT *
         FROM TEA
-        ORDER BY price DESC, createDt
+        ORDER BY price DESC, create_dt
     </select>
 
     <select id="lowcost">
         SELECT *
         FROM TEA
-        ORDER BY price, createDt
+        ORDER BY price, create_dt
     </select>
 
     <select id="all">
@@ -121,7 +121,7 @@
             price=IFNULL(#{price}, price),
             category=IFNULL(#{category}, category),
             name=IFNULL(#{name}, name),
-            nameEng=IFNULL(#{nameEng}, nameEng),
+            name_eng=IFNULL(#{nameEng}, name_eng),
             caffeine=IFNULL(#{caffeine}, caffeine),
             description=IFNULL(#{description}, description),
             img=IFNULL(#{img}, img),
@@ -132,19 +132,18 @@
     <update id="updateIngredient" >
         UPDATE TEAINGREDIENT
         SET
-            ingredient_id=IFNULL(#{ingredientId},ingredientId)
+            ingredient_id=IFNULL(#{ingredientId},ingredient_id)
+        WHERE tea_id= #{teaId}
 
-        WHERE 1=1
-        AND id= #{id}
     </update>
 
-    <update id="updateFlavor" >
-        UPDATE TEAINGREDIENT
+    <update id="updateFlavor"  >
+        UPDATE TEAFLAVOR
         SET
-        flavor_id=IFNULL(#{flavorId},flavorId)
+        flavor_id=IFNULL(#{flavor},flavor_id)
 
         WHERE 1=1
-        AND id= #{id}
+        AND tea_id= #{teaId}
     </update>