Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Member, Badge Controller Response DTO 교체 #218

Merged
merged 2 commits into from
Mar 5, 2024
Merged

[FIX] Member, Badge Controller Response DTO 교체 #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a26094a
[FIX] MemberController Response DTO 교체
unanchoi Mar 3, 2024
08279ee
[FIX] Badge 목록 조회 API DTO 수정
unanchoi Mar 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion smeem-api/src/main/java/com/smeem/api/badge/controller/BadgeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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);
}

Expand Down
6 changes: 4 additions & 2 deletions smeem-api/src/main/java/com/smeem/api/badge/controller/dto/response/BadgeListResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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();
}
}
8 changes: 5 additions & 3 deletions smeem-api/src/main/java/com/smeem/api/member/controller/MemberController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}

Expand Down
Loading