Merge pull request #223 from Team-Smeme/sohyeon_#222

[ADD] 목표 제목 추가
Team-Smeme · Mar 8, 2024 · d3d85f6 · d3d85f6
2 parents 6f48524 + b7dc49c
commit d3d85f6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/smeem-api/src/main/java/com/smeem/api/goal/controller/dto/response/GoalGetResponse.java b/smeem-api/src/main/java/com/smeem/api/goal/controller/dto/response/GoalGetResponse.java
@@ -8,13 +8,15 @@
 @Builder(access = PRIVATE)
 public record GoalGetResponse(
         String name,
+        String title,
         String way,
         String detail
 ) {
 
     public static GoalGetResponse from(GoalGetServiceResponse response) {
         return GoalGetResponse.builder()
-                .name(response.goalType())
+                .name(response.goalType().name())
+                .title(response.goalType().getDescription())
                 .way(response.way())
                 .detail(response.detail())
                 .build();

diff --git a/smeem-api/src/main/java/com/smeem/api/goal/service/dto/response/GoalGetServiceResponse.java b/smeem-api/src/main/java/com/smeem/api/goal/service/dto/response/GoalGetServiceResponse.java
@@ -1,20 +1,21 @@
 package com.smeem.api.goal.service.dto.response;
 
 import com.smeem.domain.goal.model.Goal;
+import com.smeem.domain.goal.model.GoalType;
 import lombok.Builder;
 
 import static lombok.AccessLevel.PRIVATE;
 
 @Builder(access = PRIVATE)
 public record GoalGetServiceResponse(
-        String goalType,
+        GoalType goalType,
         String way,
         String detail
 ) {
 
     public static GoalGetServiceResponse of(Goal goal) {
         return GoalGetServiceResponse.builder()
-                .goalType(goal.getType().name())
+                .goalType(goal.getType())
                 .way(goal.getWay())
                 .detail(goal.getDetail())
                 .build();

diff --git a/smeem-api/src/main/java/com/smeem/api/member/controller/dto/response/MemberGetResponse.java b/smeem-api/src/main/java/com/smeem/api/member/controller/dto/response/MemberGetResponse.java
@@ -10,6 +10,7 @@
 public record MemberGetResponse(
         String username,
         String target,
+        String title,
         String way,
         String detail,
         String targetLang,
@@ -21,7 +22,8 @@ public record MemberGetResponse(
     public static MemberGetResponse from(MemberGetServiceResponse response) {
         return MemberGetResponse.builder()
                 .username(response.username())
-                .target(response.target())
+                .target(response.goalType().name())
+                .title(response.goalType().getDescription())
                 .way(response.way())
                 .detail(response.detail())
                 .targetLang(response.targetLangType().toString())

diff --git a/...api/src/main/java/com/smeem/api/member/service/dto/response/MemberGetServiceResponse.java b/...api/src/main/java/com/smeem/api/member/service/dto/response/MemberGetServiceResponse.java
@@ -2,6 +2,7 @@
 
 import com.smeem.api.badge.service.dto.response.BadgeServiceResponse;
 import com.smeem.api.goal.service.dto.response.GoalGetServiceResponse;
+import com.smeem.domain.goal.model.GoalType;
 import com.smeem.domain.member.model.LangType;
 import com.smeem.domain.member.model.Member;
 import lombok.Builder;
@@ -12,7 +13,7 @@
 @Builder(access = PRIVATE)
 public record MemberGetServiceResponse(
         String username,
-        String target,
+        GoalType goalType,
         String way,
         String detail,
         LangType targetLangType,
@@ -29,7 +30,7 @@ public static MemberGetServiceResponse of(
     )  {
         return MemberGetServiceResponse.builder()
                 .username(member.getUsername())
-                .target(goal.goalType())
+                .goalType(goal.goalType())
                 .way(goal.way())
                 .detail(goal.detail())
                 .targetLangType(member.getTargetLang())