From 109ce852a6a6e5db6bda935cd14a05173c6a5ec3 Mon Sep 17 00:00:00 2001 From: j-yong99 Date: Thu, 2 May 2024 16:42:10 +0900 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=EA=B0=90=EC=A0=95=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20API=20=EB=8F=85=EC=8A=A4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moment/core/domain/receipt/Receipt.java | 4 ++ .../core/dto/request/ReceiptRequestDTO.java | 2 + .../moment/core/service/ReceiptService.java | 8 ++- .../src/main/resources/static/docs/index.html | 64 +++++++++++-------- .../scheduler/service/CardViewService.java | 20 +++--- 5 files changed, 59 insertions(+), 39 deletions(-) diff --git a/backend/moment/moment-server/core/src/main/java/com/moment/core/domain/receipt/Receipt.java b/backend/moment/moment-server/core/src/main/java/com/moment/core/domain/receipt/Receipt.java index 683dda0bb7..95f55dff1e 100644 --- a/backend/moment/moment-server/core/src/main/java/com/moment/core/domain/receipt/Receipt.java +++ b/backend/moment/moment-server/core/src/main/java/com/moment/core/domain/receipt/Receipt.java @@ -70,6 +70,10 @@ public class Receipt extends BaseEntity { @Column(name = "neutral") private Float neutral; + // disgust + @Column(name = "disgust") + private Float disgust; + @Column(name = "receipt_theme_type", nullable = false) private String receiptThemeType; } diff --git a/backend/moment/moment-server/core/src/main/java/com/moment/core/dto/request/ReceiptRequestDTO.java b/backend/moment/moment-server/core/src/main/java/com/moment/core/dto/request/ReceiptRequestDTO.java index 6f21423cc8..96a8fc3b99 100644 --- a/backend/moment/moment-server/core/src/main/java/com/moment/core/dto/request/ReceiptRequestDTO.java +++ b/backend/moment/moment-server/core/src/main/java/com/moment/core/dto/request/ReceiptRequestDTO.java @@ -55,6 +55,8 @@ public static class getReceipt { private Float neutral; + private Float disgust; + private String receiptThemeType; } diff --git a/backend/moment/moment-server/core/src/main/java/com/moment/core/service/ReceiptService.java b/backend/moment/moment-server/core/src/main/java/com/moment/core/service/ReceiptService.java index 568a7dd9c2..d75262dc8a 100644 --- a/backend/moment/moment-server/core/src/main/java/com/moment/core/service/ReceiptService.java +++ b/backend/moment/moment-server/core/src/main/java/com/moment/core/service/ReceiptService.java @@ -74,6 +74,7 @@ private ReceiptRequestDTO.getReceipt mapToReceiptDTO(Receipt receipt) { .sad(receipt.getSad()) .angry(receipt.getAngry()) .neutral(receipt.getNeutral()) + .disgust(receipt.getDisgust()) .receiptThemeType(receipt.getReceiptThemeType()) .build(); } @@ -98,10 +99,12 @@ public Map getCardViewCount(Trip trip) { Float sad = 0f; Float angry = 0f; Float neutral = 0f; + Float disgust = 0f; emotionMap.put("happy", 0f); emotionMap.put("sad", 0f); emotionMap.put("angry", 0f); emotionMap.put("neutral", 0f); + emotionMap.put("disgust", 0f); emotionMap.put("total", 0f); int cardViewCount = 0; for (TripFile tripFile : tripFiles) { @@ -111,6 +114,7 @@ public Map getCardViewCount(Trip trip) { happy += cardView.getHappy(); sad += cardView.getSad(); angry += cardView.getAngry(); + disgust += cardView.getDisgust(); neutral += cardView.getNeutral(); } } @@ -142,7 +146,8 @@ public void createReceipt(Long userId, ReceiptRequestDTO.createReceipt createRec float sad = map.get("sad"); float angry = map.get("angry"); float neutral = map.get("neutral"); - float total = happy + sad + angry + neutral; + float disgust = map.get("disgust"); + float total = happy + sad + angry + neutral + disgust; // 영수증 생성 Receipt receipt = Receipt.builder() @@ -159,6 +164,7 @@ public void createReceipt(Long userId, ReceiptRequestDTO.createReceipt createRec .sad(sad / total) .angry(angry / total) .neutral(neutral / total) + .disgust(disgust / total) .receiptThemeType(createReceipt.getReceiptThemeType()) .build(); diff --git a/backend/moment/moment-server/gateway/src/main/resources/static/docs/index.html b/backend/moment/moment-server/gateway/src/main/resources/static/docs/index.html index 3cf452938a..3b76eb9fd4 100644 --- a/backend/moment/moment-server/gateway/src/main/resources/static/docs/index.html +++ b/backend/moment/moment-server/gateway/src/main/resources/static/docs/index.html @@ -757,7 +757,7 @@

@@ -2847,8 +2847,8 @@ 

{
-  "startDate" : "2024-05-01",
-  "endDate" : "2024-05-02",
+  "startDate" : "2024-05-02",
+  "endDate" : "2024-05-03",
   "tripName" : "test"
 }
@@ -3013,22 +3013,22 @@

@@ -3156,8 +3156,8 @@ 

{
   "tripId" : 1,
-  "startDate" : "2024-05-01",
-  "endDate" : "2024-05-02",
+  "startDate" : "2024-05-02",
+  "endDate" : "2024-05-03",
   "tripName" : "test"
 }
@@ -3823,7 +3823,7 @@ 

HTTP/1.1 200 OK
 Content-Type: application/json
-Content-Length: 1724
+Content-Length: 1793
 
 {
   "status" : 200,
@@ -3847,6 +3847,7 @@ 
중립적인 감정 비율

 
 
+
data.receiptList[].disgust

+
Number

+
역겨운 감정 비율

+
+
 
data.receiptList[].receiptThemeType

 
String

 
영수증 테마 타입

@@ -4189,19 +4197,19 @@