diff --git a/src/main/java/store/teabliss/basket/dto/BasketDto.java b/src/main/java/store/teabliss/basket/dto/BasketDto.java index 7237158..e8b4223 100644 --- a/src/main/java/store/teabliss/basket/dto/BasketDto.java +++ b/src/main/java/store/teabliss/basket/dto/BasketDto.java @@ -9,7 +9,6 @@ public class BasketDto { - private String product; diff --git a/src/main/java/store/teabliss/tea/controller/TeaController.java b/src/main/java/store/teabliss/tea/controller/TeaController.java index f8c9c54..bda09c8 100644 --- a/src/main/java/store/teabliss/tea/controller/TeaController.java +++ b/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 responseid(@RequestParam("id") int id){ + public ResponseEntity responseid(@PathVariable(name="id") int id){ TeaSearchDto tea=teaService.find(id); @@ -129,7 +129,7 @@ public ResponseEntity 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); diff --git a/src/main/java/store/teabliss/tea/dto/TeaDto.java b/src/main/java/store/teabliss/tea/dto/TeaDto.java index 99b6495..4ade985 100644 --- a/src/main/java/store/teabliss/tea/dto/TeaDto.java +++ b/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 diff --git a/src/main/java/store/teabliss/tea/dto/TeaPatchDto.java b/src/main/java/store/teabliss/tea/dto/TeaPatchDto.java index 73f25d9..edfd430 100644 --- a/src/main/java/store/teabliss/tea/dto/TeaPatchDto.java +++ b/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 ingredient; diff --git a/src/main/java/store/teabliss/tea/entity/TeaFlavor.java b/src/main/java/store/teabliss/tea/entity/TeaFlavor.java index 755152f..b1ed003 100644 --- a/src/main/java/store/teabliss/tea/entity/TeaFlavor.java +++ b/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; diff --git a/src/main/java/store/teabliss/tea/entity/TeaIngredient.java b/src/main/java/store/teabliss/tea/entity/TeaIngredient.java index a9d6d65..7a98d41 100644 --- a/src/main/java/store/teabliss/tea/entity/TeaIngredient.java +++ b/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; diff --git a/src/main/java/store/teabliss/tea/mapper/TeaMapper.java b/src/main/java/store/teabliss/tea/mapper/TeaMapper.java index dfe78f4..9cfd5ba 100644 --- a/src/main/java/store/teabliss/tea/mapper/TeaMapper.java +++ b/src/main/java/store/teabliss/tea/mapper/TeaMapper.java @@ -49,11 +49,11 @@ public interface TeaMapper { List 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); diff --git a/src/main/java/store/teabliss/tea/service/TeaService.java b/src/main/java/store/teabliss/tea/service/TeaService.java index 373c04d..33c4d56 100644 --- a/src/main/java/store/teabliss/tea/service/TeaService.java +++ b/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 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 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; } diff --git a/src/main/resources/mapper/TeaMapper.xml b/src/main/resources/mapper/TeaMapper.xml index d447231..fccdd05 100644 --- a/src/main/resources/mapper/TeaMapper.xml +++ b/src/main/resources/mapper/TeaMapper.xml @@ -28,25 +28,25 @@