Merge pull request #79 from Tea-Bliss/dev

[fix] 재료 쿼리 에러 수정

src/main/java/store/teabliss/ingredient/controller/IngredientController.java

@@ -5,6 +5,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import store.teabliss.ingredient.dto.IngredientCreateDto;
 import store.teabliss.ingredient.dto.IngredientRequestDto;
 import store.teabliss.ingredient.dto.IngredientResponse;
 import store.teabliss.ingredient.dto.IngredientResponseDto;
@@ -23,9 +24,9 @@ public class IngredientController {
     @PostMapping("")
     @Operation(summary = "차 재료 등록", description = "차 재료 등록 API")
     public ResponseEntity<IngredientResponse> createIngredient(
-            @RequestBody IngredientRequestDto ingredientRequestDto
+            @RequestBody IngredientCreateDto ingredientCreateDto
             ) {
-        Long id = ingredientService.createIngredient(ingredientRequestDto);
+        Long id = ingredientService.createIngredient(ingredientCreateDto);
 
         return ResponseEntity.ok(IngredientResponse.ok(id));
     }

src/main/java/store/teabliss/ingredient/dto/IngredientCreateDto.java

@@ -0,0 +1,27 @@
+package store.teabliss.ingredient.dto;
+
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
+public class IngredientCreateDto {
+
+    private String category;
+
+    private String name;
+
+    private String nameEng;
+
+    private int sale;
+
+    private int inventory;
+
+    private String saleStatus;
+
+    private String flavor;
+
+    private String explanation;
+
+    private String photo;
+}

src/main/java/store/teabliss/ingredient/service/IngredientService.java

@@ -3,6 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import store.teabliss.ingredient.dto.FlavorResponseDto;
+import store.teabliss.ingredient.dto.IngredientCreateDto;
 import store.teabliss.ingredient.dto.IngredientRequestDto;
 import store.teabliss.ingredient.dto.IngredientResponseDto;
 import store.teabliss.ingredient.entity.Flavor;
@@ -20,14 +21,17 @@ public class IngredientService {
     private final IngredientMapper ingredientMapper;
     private final FlavorMapper flavorMapper;
 
-    public Long createIngredient(IngredientRequestDto ingredientRequestDto) {
+    public Long createIngredient(IngredientCreateDto ingredientCreateDto) {
         Ingredient ingredient = Ingredient.builder()
-                .category(ingredientRequestDto.getCategory())
-                .name(ingredientRequestDto.getName())
-                .nameEng(ingredientRequestDto.getNameEng())
-                .flavor(ingredientRequestDto.getFlavor())
-                .explanation(ingredientRequestDto.getExplanation())
-                .photo(ingredientRequestDto.getPhoto())
+                .category(ingredientCreateDto.getCategory())
+                .name(ingredientCreateDto.getName())
+                .nameEng(ingredientCreateDto.getNameEng())
+                .sale(ingredientCreateDto.getSale())
+                .inventory(ingredientCreateDto.getInventory())
+                .saleStatus(ingredientCreateDto.getSaleStatus())
+                .flavor(ingredientCreateDto.getFlavor())
+                .explanation(ingredientCreateDto.getExplanation())
+                .photo(ingredientCreateDto.getPhoto())
                 .build();
 
         return ingredientMapper.createIngredient(ingredient);

src/main/resources/mapper/IngredientMapper.xml

@@ -35,6 +35,7 @@
                 explanation,
                 create_dt,
                 update_dt
+            FROM INGREDIENT
             WHERE 1=1
             <if test="category != null and category != ''">
             AND category = #{category}