refactor : 테이스팅 노트 sparkling 필드 추가

AdultOfNineteen · Oct 4, 2024 · 3809d9a · 3809d9a
1 parent 025f176
commit 3809d9a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/Winey-API/src/main/java/com/example/wineyapi/tastingNote/convertor/TastingNoteConvertor.java b/Winey-API/src/main/java/com/example/wineyapi/tastingNote/convertor/TastingNoteConvertor.java
@@ -35,6 +35,7 @@ public TastingNoteResponse.TasteAnalysisDTO TasteAnalysis(List<TastingNote> tast
         int alcoholSum = 0;
         int bodySum = 0;
         int tanninSum = 0;
+        int sparklingSum = 0;
         int finishSum = 0;
         int totalPrice = 0;
 
@@ -88,6 +89,7 @@ public TastingNoteResponse.TasteAnalysisDTO TasteAnalysis(List<TastingNote> tast
             alcoholSum += tastingNote.getAlcohol();
             bodySum += tastingNote.getBody();
             tanninSum += tastingNote.getTannins();
+            sparklingSum += tastingNote.getSparkling() != null ? tastingNote.getSparkling() : 0;
             finishSum += tastingNote.getFinish();
             totalPrice += tastingNote.getPrice() != null ? tastingNote.getPrice() : 0;
 
@@ -189,6 +191,7 @@ public int compare(Map.Entry<String, Integer> entry1, Map.Entry<String, Integer>
                         .alcohol(calculateAvg(alcoholSum, totalWineCnt))
                         .body(calculateAvg(bodySum, totalWineCnt))
                         .tannin(calculateAvg(tanninSum, totalWineCnt))
+                        .sparkling(calculateAvg(sparklingSum, totalWineCnt))
                         .finish(calculateAvg(finishSum, totalWineCnt))
                         .build())
                 .build();
@@ -238,6 +241,7 @@ public TastingNote CreateTastingNote(TastingNoteRequest.CreateTastingNoteDTO req
                 .vintage(request.getVintage())
                 .tannins(request.getTannin())
                 .finish(request.getFinish())
+                .sparkling(request.getSparkling())
                 .price(request.getPrice() != null ? request.getPrice() : 0)
                 .memo(request.getMemo())
                 .buyAgain(request.getBuyAgain())
@@ -353,6 +357,7 @@ private TastingNoteResponse.MyWineTaste MyWineTaste(TastingNote tastingNote) {
                 .alcohol(tastingNote.getAlcohol())
                 .body(tastingNote.getBody())
                 .tannin(tastingNote.getTannins())
+                .sparkling(tastingNote.getSparkling() != null ? Double.valueOf(tastingNote.getSparkling()) : 0)
                 .finish(tastingNote.getFinish())
                 .build();
     }
@@ -424,6 +429,10 @@ public void updateTastingNote(TastingNote tastingNote, TastingNoteRequest.Update
         tastingNote.setAlcohol(request.getAlcohol());
         tastingNote.setTannins(request.getTannin());
         tastingNote.setFinish(request.getFinish());
+        if (request.getSparkling() != null){
+            tastingNote.setSparkling(request.getSparkling());
+        }
+        tastingNote.setSparkling(request.getSparkling());
         tastingNote.setColor(request.getColor());
         tastingNote.setVintage(request.getVintage());
         Boolean isPublic = request.getIsPublic();

diff --git a/Winey-API/src/main/java/com/example/wineyapi/tastingNote/dto/TastingNoteRequest.java b/Winey-API/src/main/java/com/example/wineyapi/tastingNote/dto/TastingNoteRequest.java
@@ -69,6 +69,9 @@ public static class CreateTastingNoteDTO {
         @Schema(name="finish",description = "여운", required = true)
         private Integer finish;
 
+        @Schema(name = "sparkling", description = "탄산감", required = false)
+        private Integer sparkling;
+
         @NotNull(message = "느낌을 입력해주세요")
         @Schema(name ="memo",description = "느낌", required = true)
         private String memo;
@@ -142,6 +145,9 @@ public static class UpdateTastingNoteDTO {
         @Schema(name="tannin",description = "탄닌", required = true)
         private Integer tannin;
 
+        @Schema(name = "sparkling", description = "탄산감", required = false)
+        private Integer sparkling;
+
         @Min(value = 1 ,message = "1이상을 입력해주세요")
         @Max(value = 5 ,message = "5이하를 입력해주세요")
         @Schema(name="finish",description = "여운", required = true)

diff --git a/Winey-API/src/main/java/com/example/wineyapi/tastingNote/dto/TastingNoteResponse.java b/Winey-API/src/main/java/com/example/wineyapi/tastingNote/dto/TastingNoteResponse.java
@@ -154,6 +154,8 @@ public static class MyWineTaste{
 
         private double tannin;
 
+        private Double sparkling;
+
         private double finish;
     }
 
@@ -227,6 +229,8 @@ public static class Taste{
 
         private double tannin;
 
+        private Double sparkling;
+
         private double finish;
     }
 

diff --git a/Winey-Domain/src/main/generated/com/example/wineydomain/tastingNote/entity/QTastingNote.java b/Winey-Domain/src/main/generated/com/example/wineydomain/tastingNote/entity/QTastingNote.java
@@ -53,6 +53,8 @@ public class QTastingNote extends EntityPathBase<TastingNote> {
 
     public final ListPath<SmellKeywordTastingNote, QSmellKeywordTastingNote> smellKeywordTastingNote = this.<SmellKeywordTastingNote, QSmellKeywordTastingNote>createList("smellKeywordTastingNote", SmellKeywordTastingNote.class, QSmellKeywordTastingNote.class, PathInits.DIRECT2);
 
+    public final NumberPath<Integer> sparkling = createNumber("sparkling", Integer.class);
+
     public final NumberPath<Integer> starRating = createNumber("starRating", Integer.class);
 
     public final NumberPath<Integer> sweetness = createNumber("sweetness", Integer.class);

diff --git a/Winey-Domain/src/main/java/com/example/wineydomain/tastingNote/entity/TastingNote.java b/Winey-Domain/src/main/java/com/example/wineydomain/tastingNote/entity/TastingNote.java
@@ -84,6 +84,9 @@ public class TastingNote extends BaseEntity {
     @Column(name = "tannins")
     private Integer tannins;
 
+    @Column(name ="sparkling")
+    private Integer sparkling;
+
     /**
      * 여운
      */