Merge pull request #218 from Team-Smeme/fix_#217_unan

[FIX] Member, Badge Controller Response DTO 교체
Team-Smeme · Mar 5, 2024 · 1404e99 · 1404e99
2 parents 31d17c7 + 08279ee
commit 1404e99
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/smeem-api/src/main/java/com/smeem/api/badge/controller/BadgeController.java b/smeem-api/src/main/java/com/smeem/api/badge/controller/BadgeController.java
@@ -1,5 +1,6 @@
 package com.smeem.api.badge.controller;
 
+import com.smeem.api.badge.controller.dto.response.BadgeListResponse;
 import com.smeem.api.badge.service.BadgeService;
 import com.smeem.api.common.ApiResponseUtil;
 import com.smeem.api.common.BaseResponse;
@@ -24,7 +25,7 @@ public class BadgeController {
 
     @GetMapping
     public ResponseEntity<BaseResponse<?>> getBadges(Principal principal) {
-        val response = badgeService.getBadges(Util.getMemberId(principal));
+        val response = BadgeListResponse.from(badgeService.getBadges(Util.getMemberId(principal)));
         return ApiResponseUtil.success(SUCCESS_GET_BADGES, response);
     }
 

diff --git a/smeem-api/src/main/java/com/smeem/api/badge/controller/dto/response/BadgeListResponse.java b/smeem-api/src/main/java/com/smeem/api/badge/controller/dto/response/BadgeListResponse.java
@@ -1,5 +1,6 @@
 package com.smeem.api.badge.controller.dto.response;
 
+import com.smeem.api.badge.service.dto.response.BadgeListServiceResponse;
 import lombok.*;
 
 import java.util.List;
@@ -11,10 +12,11 @@ public record BadgeListResponse(
         List<BadgeTypeResponse> badgeTypes
 ) {
     public static BadgeListResponse from(
-            List<BadgeTypeResponse> response
+            BadgeListServiceResponse response
     ) {
         return BadgeListResponse.builder()
-                .badgeTypes(response)
+                .badgeTypes(response.badgeTypes().stream()
+                        .map(BadgeTypeResponse::from).toList())
                 .build();
     }
 }
diff --git a/smeem-api/src/main/java/com/smeem/api/member/controller/MemberController.java b/smeem-api/src/main/java/com/smeem/api/member/controller/MemberController.java
@@ -5,7 +5,9 @@
 import com.smeem.api.member.controller.dto.request.MemberPlanUpdateRequest;
 import com.smeem.api.member.controller.dto.request.MemberPushUpdateRequest;
 import com.smeem.api.member.controller.dto.request.MemberUpdateRequest;
+import com.smeem.api.member.controller.dto.response.MemberGetResponse;
 import com.smeem.api.member.controller.dto.response.MemberNameResponse;
+import com.smeem.api.member.controller.dto.response.MemberUpdateResponse;
 import com.smeem.api.member.service.MemberService;
 import com.smeem.api.member.service.dto.request.MemberPushUpdateServiceRequest;
 import com.smeem.api.member.service.dto.request.MemberUpdatePlanServiceRequest;
@@ -31,15 +33,15 @@ public class MemberController {
 
     @PatchMapping
     public ResponseEntity<BaseResponse<?>> updateProfile(Principal principal, @RequestBody MemberUpdateRequest request) {
-        val response = memberService.updateUserProfile(
+        val response = MemberUpdateResponse.from(memberService.updateUserProfile(
                 Util.getMemberId(principal),
-                MemberServiceUpdateUserProfileRequest.of(request));
+                MemberServiceUpdateUserProfileRequest.of(request)));
         return ApiResponseUtil.success(SUCCESS_UPDATE_USERNAME, response);
     }
 
     @GetMapping("/me")
     public ResponseEntity<BaseResponse<?>> getProfile(Principal principal) {
-        val response = memberService.getMemberProfile(Util.getMemberId(principal));
+        val response = MemberGetResponse.from(memberService.getMemberProfile(Util.getMemberId(principal)));
         return ApiResponseUtil.success(SUCCESS_GET_USER, response);
     }