Skip to content

Commit 548a0d0

Browse files
committed
Rename(#41): Dto 클래스 이름 명확히 변경
Dto의 의도가 명확하지 않다는 피드백을 반영하여 아래와 같이 변경했습니다. - MemberDto -> MemberSaveDto - SocialMemberDto -> SocialMemberSaveDto
1 parent 527dc9d commit 548a0d0

File tree

10 files changed

+47
-47
lines changed

10 files changed

+47
-47
lines changed

application/wypl-core/src/main/java/com/wypl/wyplcore/auth/service/AuthServiceImpl.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import com.wypl.googleoauthclient.exception.GoogleOAuthErrorCode;
1414
import com.wypl.googleoauthclient.exception.GoogleOAuthException;
1515
import com.wypl.jpamemberdomain.member.OauthProvider;
16-
import com.wypl.jpamemberdomain.member.data.MemberDto;
17-
import com.wypl.jpamemberdomain.member.data.SocialMemberDto;
16+
import com.wypl.jpamemberdomain.member.data.MemberSaveDto;
17+
import com.wypl.jpamemberdomain.member.data.SocialMemberSaveDto;
1818
import com.wypl.jpamemberdomain.member.repository.MemberRepository;
1919
import com.wypl.jpamemberdomain.member.repository.SocialMemberRepository;
2020
import com.wypl.jpamemberdomain.member.utils.SocialMemberRepositoryUtils;
@@ -87,19 +87,19 @@ private long findMemberIdAfterSaveMember(String accessToken, GoogleUserInfoRespo
8787
if (isNewMember(googleUserInfoResponse)) {
8888
LocalDate birthday = googleOAuthClient.fetchBirthday(accessToken);
8989

90-
MemberDto memberDto = MemberDto.builder()
90+
MemberSaveDto memberSaveDto = MemberSaveDto.builder()
9191
.email(googleUserInfoResponse.email())
9292
.birthday(birthday)
9393
.nickname(googleUserInfoResponse.name())
9494
.profileImage(googleUserInfoResponse.picture())
9595
.build();
9696

97-
SocialMemberDto socialMemberDto = SocialMemberDto.builder()
97+
SocialMemberSaveDto socialMemberSaveDto = SocialMemberSaveDto.builder()
9898
.oauthProvider(OauthProvider.GOOGLE)
9999
.oauthId(googleUserInfoResponse.id())
100100
.build();
101101

102-
return authDomainService.saveAuthData(memberDto, socialMemberDto);
102+
return authDomainService.saveAuthData(memberSaveDto, socialMemberSaveDto);
103103
}
104104

105105
return SocialMemberRepositoryUtils.getSocialMember(socialMemberRepository, googleUserInfoResponse.id()).getId();

application/wypl-core/src/test/java/com/wypl/wyplcore/auth/service/AuthServiceImplTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import com.wypl.googleoauthclient.exception.GoogleOAuthErrorCode;
2828
import com.wypl.googleoauthclient.exception.GoogleOAuthException;
2929
import com.wypl.jpamemberdomain.member.OauthProvider;
30-
import com.wypl.jpamemberdomain.member.data.MemberDto;
31-
import com.wypl.jpamemberdomain.member.data.SocialMemberDto;
30+
import com.wypl.jpamemberdomain.member.data.MemberSaveDto;
31+
import com.wypl.jpamemberdomain.member.data.SocialMemberSaveDto;
3232
import com.wypl.jpamemberdomain.member.domain.SocialMember;
3333
import com.wypl.jpamemberdomain.member.repository.MemberRepository;
3434
import com.wypl.jpamemberdomain.member.repository.SocialMemberRepository;
@@ -117,7 +117,7 @@ void signUpTest() {
117117
given(googleOAuthClient.fetchBirthday(anyString()))
118118
.willReturn(LocalDate.now());
119119

120-
given(authDomainService.saveAuthData(any(MemberDto.class), any(SocialMemberDto.class)))
120+
given(authDomainService.saveAuthData(any(MemberSaveDto.class), any(SocialMemberSaveDto.class)))
121121
.willReturn(2L);
122122

123123
// When

domain/auth-domain/src/main/java/com/wypl/authdomain/auth/service/AuthDomainServiceImpl.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import org.springframework.stereotype.Service;
44
import org.springframework.transaction.annotation.Transactional;
55

6-
import com.wypl.jpamemberdomain.member.data.MemberDto;
7-
import com.wypl.jpamemberdomain.member.data.SocialMemberDto;
6+
import com.wypl.jpamemberdomain.member.data.MemberSaveDto;
7+
import com.wypl.jpamemberdomain.member.data.SocialMemberSaveDto;
88
import com.wypl.jpamemberdomain.member.domain.Member;
99
import com.wypl.jpamemberdomain.member.domain.SocialMember;
1010
import com.wypl.jpamemberdomain.member.repository.MemberRepository;
@@ -22,9 +22,9 @@ public class AuthDomainServiceImpl {
2222
private final TokenRepository tokenRepository;
2323

2424
@Transactional
25-
public long saveAuthData(MemberDto memberDto, SocialMemberDto socialMemberDto) {
26-
Member newMember = memberRepository.save(Member.of(memberDto));
27-
SocialMember socialMember = socialMemberRepository.save(SocialMember.of(newMember, socialMemberDto));
25+
public long saveAuthData(MemberSaveDto memberSaveDto, SocialMemberSaveDto socialMemberSaveDto) {
26+
Member newMember = memberRepository.save(Member.of(memberSaveDto));
27+
SocialMember socialMember = socialMemberRepository.save(SocialMember.of(newMember, socialMemberSaveDto));
2828
return socialMember.getId();
2929
}
3030

domain/auth-domain/src/test/java/com/wypl/authdomain/auth/service/AuthDomainServiceImplTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
import com.wypl.authdomain.auth.service.fixture.MemberFixture;
1818
import com.wypl.jpamemberdomain.member.OauthProvider;
19-
import com.wypl.jpamemberdomain.member.data.MemberDto;
20-
import com.wypl.jpamemberdomain.member.data.SocialMemberDto;
19+
import com.wypl.jpamemberdomain.member.data.MemberSaveDto;
20+
import com.wypl.jpamemberdomain.member.data.SocialMemberSaveDto;
2121
import com.wypl.jpamemberdomain.member.domain.Member;
2222
import com.wypl.jpamemberdomain.member.domain.SocialMember;
2323
import com.wypl.jpamemberdomain.member.repository.MemberRepository;
@@ -40,14 +40,14 @@ class AuthDomainServiceImplTest {
4040
@EnumSource
4141
void saveAuthDateTest(MemberFixture fixture) {
4242
// Given
43-
MemberDto memberDtoMock = MemberDto.builder()
43+
MemberSaveDto memberSaveDtoMock = MemberSaveDto.builder()
4444
.email("email")
4545
.nickname("nickname")
4646
.birthday(LocalDate.of(1999, 1, 15))
4747
.profileImage("profileImage")
4848
.build();
4949

50-
SocialMemberDto socialMemberDtoMock = SocialMemberDto.builder()
50+
SocialMemberSaveDto socialMemberSaveDtoMock = SocialMemberSaveDto.builder()
5151
.oauthProvider(OauthProvider.GOOGLE)
5252
.oauthId("oauthId")
5353
.build();
@@ -63,7 +63,7 @@ void saveAuthDateTest(MemberFixture fixture) {
6363
.willReturn(socialMemberMock);
6464

6565
// When
66-
long result = authDomainService.saveAuthData(memberDtoMock, socialMemberDtoMock);
66+
long result = authDomainService.saveAuthData(memberSaveDtoMock, socialMemberSaveDtoMock);
6767

6868
// Then
6969
assertThat(result).isEqualTo(socialMemberMock.getId());

domain/jpa-member-domain/src/main/java/com/wypl/jpamemberdomain/member/data/MemberDto.java domain/jpa-member-domain/src/main/java/com/wypl/jpamemberdomain/member/data/MemberSaveDto.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
@Builder
99
@Getter
10-
public class MemberDto {
10+
public class MemberSaveDto {
1111
String email;
1212
String nickname;
1313
LocalDate birthday;

domain/jpa-member-domain/src/main/java/com/wypl/jpamemberdomain/member/data/SocialMemberDto.java domain/jpa-member-domain/src/main/java/com/wypl/jpamemberdomain/member/data/SocialMemberSaveDto.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
@Getter
99
@Builder
10-
public class SocialMemberDto {
10+
public class SocialMemberSaveDto {
1111
OauthProvider oauthProvider;
1212
String oauthId;
1313
}

domain/jpa-member-domain/src/main/java/com/wypl/jpamemberdomain/member/domain/Member.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.wypl.common.Color;
66
import com.wypl.jpacommon.JpaBaseEntity;
77
import com.wypl.jpamemberdomain.member.TimeZone;
8-
import com.wypl.jpamemberdomain.member.data.MemberDto;
8+
import com.wypl.jpamemberdomain.member.data.MemberSaveDto;
99

1010
import jakarta.persistence.Column;
1111
import jakarta.persistence.Entity;
@@ -57,12 +57,12 @@ public class Member extends JpaBaseEntity {
5757
// @OneToMany(mappedBy = "member")
5858
// private List<MemberCalendar> memberCalendars;
5959

60-
public static Member of(MemberDto memberDto) {
60+
public static Member of(MemberSaveDto memberSaveDto) {
6161
return Member.builder()
62-
.email(memberDto.getEmail())
63-
.nickname(memberDto.getNickname())
64-
.birthday(memberDto.getBirthday())
65-
.profileImage(memberDto.getProfileImage())
62+
.email(memberSaveDto.getEmail())
63+
.nickname(memberSaveDto.getNickname())
64+
.birthday(memberSaveDto.getBirthday())
65+
.profileImage(memberSaveDto.getProfileImage())
6666
.color(Color.labelBrown)
6767
.timeZone(TimeZone.KOREA)
6868
.build();

domain/jpa-member-domain/src/main/java/com/wypl/jpamemberdomain/member/domain/SocialMember.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.wypl.jpamemberdomain.member.domain;
22

33
import com.wypl.jpamemberdomain.member.OauthProvider;
4-
import com.wypl.jpamemberdomain.member.data.SocialMemberDto;
4+
import com.wypl.jpamemberdomain.member.data.SocialMemberSaveDto;
55

66
import jakarta.persistence.Column;
77
import jakarta.persistence.Entity;
@@ -42,11 +42,11 @@ public class SocialMember {
4242
@Column(name = "oauth_id", nullable = false)
4343
private String oauthId;
4444

45-
public static SocialMember of(Member member, SocialMemberDto socialMemberDto) {
45+
public static SocialMember of(Member member, SocialMemberSaveDto socialMemberSaveDto) {
4646
return SocialMember.builder()
4747
.member(member)
48-
.oauthProvider(socialMemberDto.getOauthProvider())
49-
.oauthId(socialMemberDto.getOauthId())
48+
.oauthProvider(socialMemberSaveDto.getOauthProvider())
49+
.oauthId(socialMemberSaveDto.getOauthId())
5050
.build();
5151
}
5252
}

domain/jpa-member-domain/src/test/java/com/wypl/jpamemberdomain/MemberRepositoryTest.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
1313
import org.springframework.dao.DataIntegrityViolationException;
1414

15-
import com.wypl.jpamemberdomain.member.data.MemberDto;
15+
import com.wypl.jpamemberdomain.member.data.MemberSaveDto;
1616
import com.wypl.jpamemberdomain.member.domain.Member;
1717
import com.wypl.jpamemberdomain.member.repository.MemberRepository;
1818

@@ -24,19 +24,19 @@ public class MemberRepositoryTest {
2424
@DisplayName("Member를 저장한다.")
2525
@Nested
2626
class memberSaveTest {
27-
private MemberDto memberDtoMock;
27+
private MemberSaveDto memberSaveDtoMock;
2828
private Member member;
2929

3030
@BeforeEach
3131
void beforeEach() {
32-
memberDtoMock = MemberDto.builder()
32+
memberSaveDtoMock = MemberSaveDto.builder()
3333
.email("email")
3434
.nickname("nickname")
3535
.birthday(LocalDate.of(1999, 1, 15))
3636
.profileImage("profileImage")
3737
.build();
3838

39-
member = Member.of(memberDtoMock);
39+
member = Member.of(memberSaveDtoMock);
4040
}
4141

4242
@DisplayName("Member를 성공적으로 저장한다.")
@@ -48,17 +48,17 @@ void saveSuccessTest() {
4848

4949
// Then
5050
assertThat(result.getMemberId()).isEqualTo(findMember.getMemberId());
51-
assertThat(result.getEmail()).isEqualTo(memberDtoMock.getEmail());
52-
assertThat(result.getNickname()).isEqualTo(memberDtoMock.getNickname());
53-
assertThat(result.getBirthday()).isEqualTo(memberDtoMock.getBirthday());
54-
assertThat(result.getProfileImage()).isEqualTo(memberDtoMock.getProfileImage());
51+
assertThat(result.getEmail()).isEqualTo(memberSaveDtoMock.getEmail());
52+
assertThat(result.getNickname()).isEqualTo(memberSaveDtoMock.getNickname());
53+
assertThat(result.getBirthday()).isEqualTo(memberSaveDtoMock.getBirthday());
54+
assertThat(result.getProfileImage()).isEqualTo(memberSaveDtoMock.getProfileImage());
5555
}
5656

5757
@DisplayName("중복된 Member 저장에 실패한다.")
5858
@Test
5959
void duplicatedMemberSaveTest() {
6060
// Given
61-
Member duplicatedMember = Member.of(memberDtoMock);
61+
Member duplicatedMember = Member.of(memberSaveDtoMock);
6262

6363
// When
6464
memberRepository.save(member);

domain/jpa-member-domain/src/test/java/com/wypl/jpamemberdomain/SocialMemberRepositoryTest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import org.springframework.dao.DuplicateKeyException;
1414

1515
import com.wypl.jpamemberdomain.member.OauthProvider;
16-
import com.wypl.jpamemberdomain.member.data.MemberDto;
17-
import com.wypl.jpamemberdomain.member.data.SocialMemberDto;
16+
import com.wypl.jpamemberdomain.member.data.MemberSaveDto;
17+
import com.wypl.jpamemberdomain.member.data.SocialMemberSaveDto;
1818
import com.wypl.jpamemberdomain.member.domain.Member;
1919
import com.wypl.jpamemberdomain.member.domain.SocialMember;
2020
import com.wypl.jpamemberdomain.member.repository.SocialMemberRepository;
@@ -27,27 +27,27 @@ public class SocialMemberRepositoryTest {
2727
@DisplayName("SocialMember를 저장한다.")
2828
@Nested
2929
class socialMemberSaveTest {
30-
private SocialMemberDto socialMemberDtoMock;
30+
private SocialMemberSaveDto socialMemberSaveDtoMock;
3131
private Member member;
3232
private SocialMember socialMember;
3333

3434
@BeforeEach
3535
void beforeEach() {
36-
MemberDto memberDtoMock = MemberDto.builder()
36+
MemberSaveDto memberSaveDtoMock = MemberSaveDto.builder()
3737
.email("email")
3838
.nickname("nickname")
3939
.birthday(LocalDate.of(1999, 1, 15))
4040
.profileImage("profileImage")
4141
.build();
4242

43-
socialMemberDtoMock = SocialMemberDto.builder()
43+
socialMemberSaveDtoMock = SocialMemberSaveDto.builder()
4444
.oauthProvider(OauthProvider.GOOGLE)
4545
.oauthId("oauthId")
4646
.build();
4747

48-
member = Member.of(memberDtoMock);
48+
member = Member.of(memberSaveDtoMock);
4949

50-
socialMember = SocialMember.of(member, socialMemberDtoMock);
50+
socialMember = SocialMember.of(member, socialMemberSaveDtoMock);
5151
}
5252

5353
@DisplayName("SocialMember를 성공적으로 저장한다.")
@@ -65,7 +65,7 @@ void saveSuccessTest() {
6565
@Test
6666
void duplicatedMemberSaveTest() {
6767
// Given
68-
SocialMember duplicatedSocialMember = SocialMember.of(member, socialMemberDtoMock);
68+
SocialMember duplicatedSocialMember = SocialMember.of(member, socialMemberSaveDtoMock);
6969

7070
// When
7171
socialMemberRepository.save(socialMember);

0 commit comments

Comments
 (0)