Skip to content

Commit

Permalink
refactor: 회원 정보 DTO (#162)
Browse files Browse the repository at this point in the history
  • Loading branch information
char-yb authored Aug 19, 2024
1 parent b26be86 commit ebebd1a
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.depromeet.stonebed.domain.member.api;

import com.depromeet.stonebed.domain.member.application.MemberService;
import com.depromeet.stonebed.domain.member.domain.Member;
import com.depromeet.stonebed.domain.member.dto.request.MemberProfileUpdateRequest;
import com.depromeet.stonebed.domain.member.dto.request.NicknameCheckRequest;
import com.depromeet.stonebed.domain.member.dto.response.MemberInfoResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
Expand All @@ -26,7 +26,7 @@ public class MemberController {

@Operation(summary = "내 정보 조회", description = "내 정보를 조회하는 API입니다.")
@GetMapping("/me")
public Member memberInfo() {
public MemberInfoResponse memberInfo() {
return memberService.findMemberInfo();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.depromeet.stonebed.domain.member.domain.Profile;
import com.depromeet.stonebed.domain.member.dto.request.MemberProfileUpdateRequest;
import com.depromeet.stonebed.domain.member.dto.request.NicknameCheckRequest;
import com.depromeet.stonebed.domain.member.dto.response.MemberInfoResponse;
import com.depromeet.stonebed.global.util.MemberUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
Expand All @@ -17,8 +18,9 @@ public class MemberService {
private final MemberUtil memberUtil;

@Transactional(readOnly = true)
public Member findMemberInfo() {
return memberUtil.getCurrentMember();
public MemberInfoResponse findMemberInfo() {
Member currentMember = memberUtil.getCurrentMember();
return MemberInfoResponse.from(currentMember);
}

@Transactional(readOnly = true)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.depromeet.stonebed.domain.member.dto.response;

import com.depromeet.stonebed.domain.member.domain.Member;
import com.depromeet.stonebed.domain.member.domain.RaisePet;
import io.swagger.v3.oas.annotations.media.Schema;

public record MemberInfoResponse(
@Schema(description = "회원 ID", example = "1") Long memberId,
@Schema(description = "회원 닉네임", example = "닉네임") String nickname,
@Schema(description = "회원 프로필 이미지 URL", example = "https://example.com/profile.jpg")
String profileImageUrl,
@Schema(description = "회원의 반려동물", example = "DOG") RaisePet raisePet) {
public static MemberInfoResponse from(Member member) {
return new MemberInfoResponse(
member.getId(),
member.getProfile().getNickname(),
member.getProfile().getProfileImageUrl(),
member.getRaisePet());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.depromeet.stonebed.domain.member.domain.Profile;
import com.depromeet.stonebed.domain.member.dto.request.MemberProfileUpdateRequest;
import com.depromeet.stonebed.domain.member.dto.request.NicknameCheckRequest;
import com.depromeet.stonebed.domain.member.dto.response.MemberInfoResponse;
import com.depromeet.stonebed.global.util.MemberUtil;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand All @@ -31,11 +32,14 @@ class MemberServiceTest extends FixtureMonkeySetUp {
when(memberUtil.getCurrentMember()).thenReturn(member);

// when
Member result = memberService.findMemberInfo();
MemberInfoResponse result = memberService.findMemberInfo();

// then
assertNotNull(result);
assertEquals(member, result);
assertEquals(member.getId(), result.memberId());
assertEquals(member.getProfile().getNickname(), result.nickname());
assertEquals(member.getProfile().getProfileImageUrl(), result.profileImageUrl());
assertEquals(member.getRaisePet(), result.raisePet());
verify(memberUtil).getCurrentMember();
}

Expand Down

0 comments on commit ebebd1a

Please sign in to comment.