From a26094a42fc25a0b47ccba2c1335efe2c09f9fb8 Mon Sep 17 00:00:00 2001 From: unanchoi Date: Sun, 3 Mar 2024 23:55:27 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[FIX]=20MemberController=20Response=20DTO?= =?UTF-8?q?=20=EA=B5=90=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/smeem/api/member/controller/MemberController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 index bbeb41fe..21c7a276 100644 --- 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> 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> 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); } From 08279ee22dfaa58eb9c185587f5005f693479a28 Mon Sep 17 00:00:00 2001 From: unanchoi Date: Mon, 4 Mar 2024 00:00:16 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[FIX]=20Badge=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20API=20DTO=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/smeem/api/badge/controller/BadgeController.java | 3 ++- .../badge/controller/dto/response/BadgeListResponse.java | 6 ++++-- 2 files changed, 6 insertions(+), 3 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 index 44d1c872..8b45deaf 100644 --- 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> 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 index 654b4c87..c4cdf4d4 100644 --- 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 badgeTypes ) { public static BadgeListResponse from( - List response + BadgeListServiceResponse response ) { return BadgeListResponse.builder() - .badgeTypes(response) + .badgeTypes(response.badgeTypes().stream() + .map(BadgeTypeResponse::from).toList()) .build(); } } \ No newline at end of file