[ADD] Null 처리 추가

smeem-api/src/main/java/com/smeem/api/member/api/dto/response/MemberGetResponse.java

@@ -1,12 +1,14 @@
 package com.smeem.api.member.api.dto.response;
 
-
 import com.smeem.api.badge.api.dto.response.BadgeResponse;
 import com.smeem.api.member.service.dto.response.MemberGetServiceResponse;
-import lombok.AccessLevel;
+import com.smeem.api.member.service.dto.response.MemberGetServiceResponse.PlanServiceResponse;
 import lombok.Builder;
 
-@Builder(access = AccessLevel.PRIVATE)
+import static java.util.Objects.nonNull;
+import static lombok.AccessLevel.PRIVATE;
+
+@Builder(access = PRIVATE)
 public record MemberGetResponse(
         String username,
         String target,
@@ -34,4 +36,20 @@ public static MemberGetResponse from(MemberGetServiceResponse response) {
                 .trainingPlan(PlanResponse.from(response.trainingPlan()))
                 .build();
     }
+
+    @Builder(access = PRIVATE)
+    private record PlanResponse(
+            long id,
+            String content
+    ) {
+
+        private static PlanResponse from(PlanServiceResponse response) {
+            return nonNull(response)
+                    ? PlanResponse.builder()
+                        .id(response.id())
+                        .content(response.content())
+                        .build()
+                    : null;
+        }
+    }
 }

smeem-api/src/main/java/com/smeem/api/member/service/MemberService.java

@@ -68,14 +68,8 @@ public MemberUpdateServiceResponse updateUserProfile(final MemberServiceUpdateUs
     public MemberGetServiceResponse getMemberProfile(final long memberId) {
         val member = memberFinder.findById(memberId);
         val goal = goalService.getByType(GoalGetServiceRequest.of(member.getGoal()));
-        val trainingTimes = trainingTimeService.getAllByMember(member);
-        val trainingPlan = member.getPlan();
-
-        return MemberGetServiceResponse.of(
-                goal,
-                member,
-                trainingPlan,
-                BadgeServiceResponse.of(memberBadgeService.getBadgeByMemberId(memberId)));
+        val badge = BadgeServiceResponse.of(memberBadgeService.getBadgeByMemberId(memberId));
+        return MemberGetServiceResponse.of(goal, member, badge);
     }
 
     @Transactional

smeem-api/src/main/java/com/smeem/api/member/service/dto/response/MemberGetServiceResponse.java

@@ -15,9 +15,9 @@
 import java.util.stream.Collectors;
 
 import static com.smeem.common.code.failure.TrainingTimeFailureCode.NOT_SET_TRAINING_TIME;
+import static java.util.Objects.nonNull;
 import static lombok.AccessLevel.PRIVATE;
 
-
 @Builder(access = PRIVATE)
 public record MemberGetServiceResponse(
         String username,
@@ -31,13 +31,7 @@ public record MemberGetServiceResponse(
         PlanServiceResponse trainingPlan
 ) {
 
-    public static MemberGetServiceResponse of(
-            GoalGetServiceResponse goal,
-            Member member,
-            Plan trainingPlan,
-            BadgeServiceResponse badge
-    ) {
-
+    public static MemberGetServiceResponse of(GoalGetServiceResponse goal, Member member, BadgeServiceResponse badge) {
         return MemberGetServiceResponse.builder()
                 .username(member.getUsername())
                 .goalType(member.getGoal())
@@ -47,7 +41,7 @@ public static MemberGetServiceResponse of(
                 .hasPushAlarm(member.isHasPushAlarm())
                 .trainingTime(generateTrainingTimeResponse(member.getTrainingTimes()))
                 .badge(badge)
-                .trainingPlan(PlanServiceResponse.of(trainingPlan))
+                .trainingPlan(PlanServiceResponse.of(member))
                 .build();
     }
 
@@ -74,4 +68,22 @@ private static TrainingTime getOneTrainingTime(List<TrainingTime> trainingTimes)
                 () -> new TrainingTimeException(NOT_SET_TRAINING_TIME));
     }
 
+    @Builder(access = PRIVATE)
+    public record PlanServiceResponse(
+            long id,
+            String content
+    ) {
+
+        private static PlanServiceResponse of(Member member) {
+            return nonNull(member.getPlan()) ? PlanServiceResponse.of(member.getPlan()) : null;
+        }
+
+        private static PlanServiceResponse of(Plan plan) {
+            return PlanServiceResponse.builder()
+                    .id(plan.getId())
+                    .content(plan.getContent())
+                    .build();
+        }
+    }
+
 }