Merge pull request #108 from HowMuchPay/feature101

[feature -106] : 지인의 경조사 상세조회 getAcEventDisplayNameWithDetail 추가
HowMuchPay · Oct 12, 2023 · b38f4e3 · b38f4e3
2 parents 494dbf1 + 5fbf0ff
commit b38f4e3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/com/example/howmuch/domain/entity/AcEvent.java b/src/main/java/com/example/howmuch/domain/entity/AcEvent.java
@@ -131,4 +131,14 @@ public String getAcEventDisplayName() {
         }
         return eventDisplayName;
     }
+
+    public String getAcEventDisplayNameWithDetail(){
+        String eventDisplayName;
+        if (eventCategory == EventCategory.ETC && eventName != null) {
+            eventDisplayName = eventName;
+        } else {
+            eventDisplayName = eventCategory.getCategoryName();
+        }
+        return eventDisplayName;
+    }
 }
diff --git a/src/main/java/com/example/howmuch/dto/event/GetAcEventsResponseDto.java b/src/main/java/com/example/howmuch/dto/event/GetAcEventsResponseDto.java
@@ -38,7 +38,7 @@ public static GetAcEventsResponseDto of(AcEvent acEvent, int dDay) {
             .payAmount(acEvent.getPayAmount())
             .eventCategory(acEvent.getEventCategory().getValue())
             .acType(acEvent.getAcquaintanceType().getValue())
-            .acEventDisplayName(acEvent.getAcEventDisplayName())
+            .acEventDisplayName(acEvent.getAcEventDisplayNameWithDetail())
             .eventTime(acEvent.getEventTime())
             .build();
     }