From e63daf47cd5d3d0580921c308aeab79f6354c567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B5=AC=ED=99=98=EC=A4=80/=EB=AA=A8=EA=B1=B4?= Date: Fri, 5 Apr 2024 12:13:33 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[REFACTOR]/#88-=20Member=20=EC=97=94?= =?UTF-8?q?=ED=8B=B0=ED=8B=B0=EC=9D=98=20=ED=95=84=EB=93=9C=EB=A5=BC=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=ED=95=98=EC=97=AC=20id=EC=99=80=20userName?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EA=B4=80=EB=A6=AC=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invitation/dto/InvitationRequestDTO.java | 6 +++--- .../domain/member/controller/MemberController.java | 2 +- .../domain/member/converter/MemberConverter.java | 14 ++++++++------ .../tree/domain/member/dto/MemberRequestDTO.java | 6 +++--- .../tree/domain/member/dto/MemberResponseDTO.java | 1 + .../example/tree/domain/member/entity/Member.java | 7 ++++--- .../domain/member/repository/MemberRepository.java | 3 +++ .../member/repository/RefreshTokenRepository.java | 2 +- .../member/service/MemberCommandService.java | 8 ++++---- .../domain/member/service/MemberQueryService.java | 8 ++++---- .../tree/domain/member/service/MemberService.java | 10 +++++----- .../notification/dto/NotificationRequestDTO.java | 2 +- .../notification/service/NotificationService.java | 8 ++++---- .../tree/domain/profile/dto/ProfileRequestDTO.java | 4 ++-- .../domain/profile/dto/ProfileResponseDTO.java | 2 +- .../profile/repository/ProfileRepository.java | 2 +- .../profile/service/ProfileQueryService.java | 2 +- .../tree/global/security/jwt/RefreshToken.java | 2 +- .../global/security/provider/TokenProvider.java | 2 +- 19 files changed, 49 insertions(+), 42 deletions(-) diff --git a/src/main/java/org/example/tree/domain/invitation/dto/InvitationRequestDTO.java b/src/main/java/org/example/tree/domain/invitation/dto/InvitationRequestDTO.java index 8a655bb..2751497 100644 --- a/src/main/java/org/example/tree/domain/invitation/dto/InvitationRequestDTO.java +++ b/src/main/java/org/example/tree/domain/invitation/dto/InvitationRequestDTO.java @@ -9,16 +9,16 @@ public class InvitationRequestDTO { @Getter public static class sendInvitation { - private String senderId; + private Long senderId; private Long treeId; private String phoneNumber; } @Getter public static class inviteMember { - private String senderId; + private Long senderId; private Long treeId; - private String targetUserId; + private Long targetUserId; } @Getter diff --git a/src/main/java/org/example/tree/domain/member/controller/MemberController.java b/src/main/java/org/example/tree/domain/member/controller/MemberController.java index 75ec906..73cbef1 100644 --- a/src/main/java/org/example/tree/domain/member/controller/MemberController.java +++ b/src/main/java/org/example/tree/domain/member/controller/MemberController.java @@ -16,7 +16,7 @@ public class MemberController { @PostMapping("/checkId") @Operation(summary = "아이디 중복 체크", description = "서비스에서 사용할 고유 ID를 중복 체크합니다.") public ApiResponse checkId( - @RequestBody final MemberRequestDTO.checkId request + @RequestBody final MemberRequestDTO.checkName request ) { return ApiResponse.onSuccess(memberService.checkId(request)); } diff --git a/src/main/java/org/example/tree/domain/member/converter/MemberConverter.java b/src/main/java/org/example/tree/domain/member/converter/MemberConverter.java index dfd9f5d..9208e1b 100644 --- a/src/main/java/org/example/tree/domain/member/converter/MemberConverter.java +++ b/src/main/java/org/example/tree/domain/member/converter/MemberConverter.java @@ -5,8 +5,8 @@ import org.example.tree.domain.member.dto.MemberResponseDTO; import org.example.tree.domain.member.entity.Member; import org.example.tree.domain.member.entity.MemberRole; +import org.example.tree.domain.member.entity.MemberStatus; import org.example.tree.domain.member.service.MemberQueryService; -import org.example.tree.domain.member.service.MemberService; import org.springframework.stereotype.Component; @Component @@ -28,25 +28,27 @@ public void init() { * @return Member */ public static Member toMemberSecurity(String id){ - return staticMemberQueryService.findById(id); + return staticMemberQueryService.findById(Long.valueOf(id)); } - public Member toMember (String id, String phone) { + public Member toMember (String userName, String phone) { return Member.builder() - .id(id) + .userName(userName) .phone(phone) .role(MemberRole.ROLE_USER) + .status(MemberStatus.ACTIVE) .build(); } - public MemberResponseDTO.checkId toCheckId(Boolean isDuplicate) { + public MemberResponseDTO.checkId toCheckName(Boolean isDuplicate) { return MemberResponseDTO.checkId.builder() .isDuplicate(isDuplicate) .build(); } - public MemberResponseDTO.registerMember toRegister(String accessToken, String refreshToken) { + public MemberResponseDTO.registerMember toRegister(Member member, String accessToken, String refreshToken) { return MemberResponseDTO.registerMember.builder() + .userId(member.getId()) .accessToken(accessToken) .refreshToken(refreshToken) .build(); diff --git a/src/main/java/org/example/tree/domain/member/dto/MemberRequestDTO.java b/src/main/java/org/example/tree/domain/member/dto/MemberRequestDTO.java index 08272fb..4f9e63b 100644 --- a/src/main/java/org/example/tree/domain/member/dto/MemberRequestDTO.java +++ b/src/main/java/org/example/tree/domain/member/dto/MemberRequestDTO.java @@ -8,14 +8,14 @@ public class MemberRequestDTO { @Getter - public static class checkId { - private String userId; + public static class checkName { + private String userName; } @Getter public static class registerMember { private String phoneNumber; - private String userId; + private String userName; } @Getter diff --git a/src/main/java/org/example/tree/domain/member/dto/MemberResponseDTO.java b/src/main/java/org/example/tree/domain/member/dto/MemberResponseDTO.java index 3eeb4ab..ffbb9f1 100644 --- a/src/main/java/org/example/tree/domain/member/dto/MemberResponseDTO.java +++ b/src/main/java/org/example/tree/domain/member/dto/MemberResponseDTO.java @@ -18,6 +18,7 @@ public static class checkId { @NoArgsConstructor @AllArgsConstructor public static class registerMember { + private Long userId; private String accessToken; private String refreshToken; } diff --git a/src/main/java/org/example/tree/domain/member/entity/Member.java b/src/main/java/org/example/tree/domain/member/entity/Member.java index 1a7d570..07afbdb 100644 --- a/src/main/java/org/example/tree/domain/member/entity/Member.java +++ b/src/main/java/org/example/tree/domain/member/entity/Member.java @@ -3,10 +3,8 @@ import jakarta.persistence.*; import lombok.*; import org.example.tree.common.BaseDateTimeEntity; -import org.example.tree.domain.post.entity.Post; import java.time.LocalDateTime; -import java.util.List; @Entity @Getter @@ -17,7 +15,10 @@ public class Member extends BaseDateTimeEntity { @Id - private String id; //고유 문자열 아이디(인스타그램 st.) + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String userName; //고유 문자열 아이디(인스타그램 st.) private String bio; diff --git a/src/main/java/org/example/tree/domain/member/repository/MemberRepository.java b/src/main/java/org/example/tree/domain/member/repository/MemberRepository.java index e949e5f..da38d89 100644 --- a/src/main/java/org/example/tree/domain/member/repository/MemberRepository.java +++ b/src/main/java/org/example/tree/domain/member/repository/MemberRepository.java @@ -7,4 +7,7 @@ public interface MemberRepository extends JpaRepository { Optional findByPhone(String phone); + + Optional findByUserName(String userName); + } diff --git a/src/main/java/org/example/tree/domain/member/repository/RefreshTokenRepository.java b/src/main/java/org/example/tree/domain/member/repository/RefreshTokenRepository.java index e98ed35..9fad0f3 100644 --- a/src/main/java/org/example/tree/domain/member/repository/RefreshTokenRepository.java +++ b/src/main/java/org/example/tree/domain/member/repository/RefreshTokenRepository.java @@ -8,5 +8,5 @@ @Repository public interface RefreshTokenRepository extends JpaRepository { - Optional findByMemberId(String memberId); + Optional findByMemberId(Long memberId); } diff --git a/src/main/java/org/example/tree/domain/member/service/MemberCommandService.java b/src/main/java/org/example/tree/domain/member/service/MemberCommandService.java index ddf1da1..dd44031 100644 --- a/src/main/java/org/example/tree/domain/member/service/MemberCommandService.java +++ b/src/main/java/org/example/tree/domain/member/service/MemberCommandService.java @@ -38,8 +38,8 @@ public Member register(Member member) { } public TokenDTO login(Member member) { - String accessToken = tokenProvider.createAccessToken(member.getId(), List.of(new SimpleGrantedAuthority(MemberRole.ROLE_USER.name()))); - String rawToken = tokenProvider.createRefreshToken(member.getId()); + String accessToken = tokenProvider.createAccessToken(String.valueOf(member.getId()), List.of(new SimpleGrantedAuthority(MemberRole.ROLE_USER.name()))); + String rawToken = tokenProvider.createRefreshToken(String.valueOf(member.getId())); RefreshToken refreshToken = RefreshToken.builder() .memberId(member.getId()) .token(rawToken) @@ -55,8 +55,8 @@ public TokenDTO reissue(Member member) { RefreshToken invalidToken = refreshTokenRepository.findByMemberId(member.getId()) .orElseThrow(() -> new GeneralException(GlobalErrorCode.REFRESH_TOKEN_NOT_FOUND)); refreshTokenRepository.delete(invalidToken); - String accessToken = tokenProvider.createAccessToken(member.getId(),List.of(new SimpleGrantedAuthority(MemberRole.ROLE_USER.name()))); - String rawToken = tokenProvider.createRefreshToken(member.getId()); + String accessToken = tokenProvider.createAccessToken(String.valueOf(member.getId()),List.of(new SimpleGrantedAuthority(MemberRole.ROLE_USER.name()))); + String rawToken = tokenProvider.createRefreshToken(String.valueOf(member.getId())); RefreshToken refreshToken = RefreshToken.builder() .memberId(member.getId()) .token(rawToken) diff --git a/src/main/java/org/example/tree/domain/member/service/MemberQueryService.java b/src/main/java/org/example/tree/domain/member/service/MemberQueryService.java index 77493b6..39d022b 100644 --- a/src/main/java/org/example/tree/domain/member/service/MemberQueryService.java +++ b/src/main/java/org/example/tree/domain/member/service/MemberQueryService.java @@ -16,11 +16,11 @@ public class MemberQueryService { private final MemberRepository memberRepository; private final TokenProvider jwtTokenProvider; - public Optional checkId(String id) { - return memberRepository.findById(id); + public Optional checkName(String userName) { + return memberRepository.findByUserName(userName); } - public Member findById(String id) { - return memberRepository.findById(id) + public Member findById(Long id) { + return memberRepository.findById(String.valueOf(id)) .orElseThrow(()->new GeneralException(GlobalErrorCode.MEMBER_NOT_FOUND)); } diff --git a/src/main/java/org/example/tree/domain/member/service/MemberService.java b/src/main/java/org/example/tree/domain/member/service/MemberService.java index 66c9b52..f08a46d 100644 --- a/src/main/java/org/example/tree/domain/member/service/MemberService.java +++ b/src/main/java/org/example/tree/domain/member/service/MemberService.java @@ -19,17 +19,17 @@ public class MemberService { private final MemberConverter memberConverter; @Transactional - public MemberResponseDTO.checkId checkId(MemberRequestDTO.checkId request) { - Optional optionalMember = memberQueryService.checkId(request.getUserId()); + public MemberResponseDTO.checkId checkId(MemberRequestDTO.checkName request) { + Optional optionalMember = memberQueryService.checkName(request.getUserName()); Boolean isDuplicate = optionalMember.isPresent(); - return memberConverter.toCheckId(isDuplicate); + return memberConverter.toCheckName(isDuplicate); } @Transactional public MemberResponseDTO.registerMember register(MemberRequestDTO.registerMember request) { - Member member = memberConverter.toMember(request.getUserId(), request.getPhoneNumber()); + Member member = memberConverter.toMember(request.getUserName(), request.getPhoneNumber()); Member savedMember =memberCommandService.register(member); TokenDTO savedToken = memberCommandService.login(savedMember); - return memberConverter.toRegister(savedToken.getAccessToken(), savedToken.getRefreshToken()); + return memberConverter.toRegister(savedMember, savedToken.getAccessToken(), savedToken.getRefreshToken()); } @Transactional diff --git a/src/main/java/org/example/tree/domain/notification/dto/NotificationRequestDTO.java b/src/main/java/org/example/tree/domain/notification/dto/NotificationRequestDTO.java index 381db18..4173bf2 100644 --- a/src/main/java/org/example/tree/domain/notification/dto/NotificationRequestDTO.java +++ b/src/main/java/org/example/tree/domain/notification/dto/NotificationRequestDTO.java @@ -14,6 +14,6 @@ public static class sendNotification { private String title; private String message; private NotificationType type; - private String receiverId; + private Long receiverId; } } diff --git a/src/main/java/org/example/tree/domain/notification/service/NotificationService.java b/src/main/java/org/example/tree/domain/notification/service/NotificationService.java index f464502..c2cb56e 100644 --- a/src/main/java/org/example/tree/domain/notification/service/NotificationService.java +++ b/src/main/java/org/example/tree/domain/notification/service/NotificationService.java @@ -28,28 +28,28 @@ public class NotificationService { private final MemberQueryService memberQueryService; @Transactional - public void sendNotification(String title, String message, NotificationType type, String receiverId) { + public void sendNotification(String title, String message, NotificationType type, Long receiverId) { Member receiver = memberQueryService.findById(receiverId); Notification notification = notificationConverter.toNotification(title, message, type, receiver); notificationCommandService.createNotification(notification); } @Transactional - public void commentNotification(Profile sender, Comment comment, String receiverId) { + public void commentNotification(Profile sender, Comment comment, Long receiverId) { Member receiver = memberQueryService.findById(receiverId); Notification notification = notificationConverter.toCommentNotification(sender, comment, receiver); notificationCommandService.createNotification(notification); } @Transactional - public void reactionNotification(Profile sender, Reaction reaction, String receiverId) { + public void reactionNotification(Profile sender, Reaction reaction, Long receiverId) { Member receiver = memberQueryService.findById(receiverId); Notification notification = notificationConverter.toReactionNotification(sender, reaction, receiver); notificationCommandService.createNotification(notification); } @Transactional - public void invitationNotification(Profile sender, Invitation invitation, String receiverId) { + public void invitationNotification(Profile sender, Invitation invitation, Long receiverId) { Member receiver = memberQueryService.findById(receiverId); Notification notification = notificationConverter.toInvitationNotification(sender, invitation, receiver); notificationCommandService.createNotification(notification); diff --git a/src/main/java/org/example/tree/domain/profile/dto/ProfileRequestDTO.java b/src/main/java/org/example/tree/domain/profile/dto/ProfileRequestDTO.java index 3ef43ad..7c6a24e 100644 --- a/src/main/java/org/example/tree/domain/profile/dto/ProfileRequestDTO.java +++ b/src/main/java/org/example/tree/domain/profile/dto/ProfileRequestDTO.java @@ -10,7 +10,7 @@ public class ProfileRequestDTO { @Getter public static class createProfile { private Long treeId; - private String userId; + private Long userId; private String memberName; private String profileImage; private String bio; @@ -20,7 +20,7 @@ public static class createProfile { @Getter public static class ownerProfile { private Long treeId; - private String userId; + private Long userId; private String memberName; private String profileImage; private String bio; diff --git a/src/main/java/org/example/tree/domain/profile/dto/ProfileResponseDTO.java b/src/main/java/org/example/tree/domain/profile/dto/ProfileResponseDTO.java index e93755c..cd0ec18 100644 --- a/src/main/java/org/example/tree/domain/profile/dto/ProfileResponseDTO.java +++ b/src/main/java/org/example/tree/domain/profile/dto/ProfileResponseDTO.java @@ -25,7 +25,7 @@ public static class createProfile { public static class getProfileDetails { private Long profileId; private List treeIds; - private String memberId; + private Long memberId; private String memberName; private String bio; private String profileImageUrl; diff --git a/src/main/java/org/example/tree/domain/profile/repository/ProfileRepository.java b/src/main/java/org/example/tree/domain/profile/repository/ProfileRepository.java index 2173834..65e9f94 100644 --- a/src/main/java/org/example/tree/domain/profile/repository/ProfileRepository.java +++ b/src/main/java/org/example/tree/domain/profile/repository/ProfileRepository.java @@ -16,7 +16,7 @@ public interface ProfileRepository extends JpaRepository { Optional findByMemberAndTree(Member member, Tree tree); - List findAllByMember_Id(String memberId); + List findAllByMember_Id(Long memberId); List findAllByTree(Tree tree); diff --git a/src/main/java/org/example/tree/domain/profile/service/ProfileQueryService.java b/src/main/java/org/example/tree/domain/profile/service/ProfileQueryService.java index 2ad7fcd..660496b 100644 --- a/src/main/java/org/example/tree/domain/profile/service/ProfileQueryService.java +++ b/src/main/java/org/example/tree/domain/profile/service/ProfileQueryService.java @@ -27,7 +27,7 @@ public Profile findById(Long profileId) { } public List findJoinedTree(Profile profile) { - String memberId = profile.getMember().getId(); + Long memberId = profile.getMember().getId(); List foundProfiles = profileRepository.findAllByMember_Id(memberId); return foundProfiles.stream() .map(foundProfile -> foundProfile.getTree().getId()) diff --git a/src/main/java/org/example/tree/global/security/jwt/RefreshToken.java b/src/main/java/org/example/tree/global/security/jwt/RefreshToken.java index bf173e9..15e3702 100644 --- a/src/main/java/org/example/tree/global/security/jwt/RefreshToken.java +++ b/src/main/java/org/example/tree/global/security/jwt/RefreshToken.java @@ -11,7 +11,7 @@ @Getter public class RefreshToken { @Id - private String memberId; + private Long memberId; private String token; } diff --git a/src/main/java/org/example/tree/global/security/provider/TokenProvider.java b/src/main/java/org/example/tree/global/security/provider/TokenProvider.java index 9c5622d..eeec6ff 100644 --- a/src/main/java/org/example/tree/global/security/provider/TokenProvider.java +++ b/src/main/java/org/example/tree/global/security/provider/TokenProvider.java @@ -125,7 +125,7 @@ public boolean validateRefreshToken(String refreshToken) { // 저장된 토큰과 비교 String memberId = getMemberIdFromToken(refreshToken); - Optional refreshTokenOptional = refreshTokenRepository.findByMemberId(memberId); + Optional refreshTokenOptional = refreshTokenRepository.findByMemberId(Long.valueOf(memberId)); if (!refreshTokenOptional.isPresent()) { log.warn("No matching refresh token found for email: {}", memberId); From 2d9efe2be823fa441096e7646a341ac09ae57c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B5=AC=ED=99=98=EC=A4=80/=EB=AA=A8=EA=B1=B4?= Date: Fri, 5 Apr 2024 12:28:32 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[REFACTOR]/#88-=EB=A9=94=EC=84=9C=EB=93=9C?= =?UTF-8?q?=20=EB=AA=85=20checkName=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tree/domain/member/controller/MemberController.java | 4 ++-- .../example/tree/domain/member/converter/MemberConverter.java | 4 ++-- .../org/example/tree/domain/member/dto/MemberResponseDTO.java | 2 +- .../org/example/tree/domain/member/service/MemberService.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/example/tree/domain/member/controller/MemberController.java b/src/main/java/org/example/tree/domain/member/controller/MemberController.java index 73cbef1..819490d 100644 --- a/src/main/java/org/example/tree/domain/member/controller/MemberController.java +++ b/src/main/java/org/example/tree/domain/member/controller/MemberController.java @@ -15,10 +15,10 @@ public class MemberController { private final MemberService memberService; @PostMapping("/checkId") @Operation(summary = "아이디 중복 체크", description = "서비스에서 사용할 고유 ID를 중복 체크합니다.") - public ApiResponse checkId( + public ApiResponse checkName( @RequestBody final MemberRequestDTO.checkName request ) { - return ApiResponse.onSuccess(memberService.checkId(request)); + return ApiResponse.onSuccess(memberService.checkName(request)); } @PostMapping("/register") @Operation(summary = "회원가입", description = "회원가입을 진행합니다.") diff --git a/src/main/java/org/example/tree/domain/member/converter/MemberConverter.java b/src/main/java/org/example/tree/domain/member/converter/MemberConverter.java index 9208e1b..1ce82ce 100644 --- a/src/main/java/org/example/tree/domain/member/converter/MemberConverter.java +++ b/src/main/java/org/example/tree/domain/member/converter/MemberConverter.java @@ -40,8 +40,8 @@ public Member toMember (String userName, String phone) { .build(); } - public MemberResponseDTO.checkId toCheckName(Boolean isDuplicate) { - return MemberResponseDTO.checkId.builder() + public MemberResponseDTO.checkName toCheckName(Boolean isDuplicate) { + return MemberResponseDTO.checkName.builder() .isDuplicate(isDuplicate) .build(); } diff --git a/src/main/java/org/example/tree/domain/member/dto/MemberResponseDTO.java b/src/main/java/org/example/tree/domain/member/dto/MemberResponseDTO.java index ffbb9f1..6471a0d 100644 --- a/src/main/java/org/example/tree/domain/member/dto/MemberResponseDTO.java +++ b/src/main/java/org/example/tree/domain/member/dto/MemberResponseDTO.java @@ -9,7 +9,7 @@ public class MemberResponseDTO { @Getter @NoArgsConstructor @AllArgsConstructor - public static class checkId { + public static class checkName { private Boolean isDuplicate; } diff --git a/src/main/java/org/example/tree/domain/member/service/MemberService.java b/src/main/java/org/example/tree/domain/member/service/MemberService.java index f08a46d..8832ad3 100644 --- a/src/main/java/org/example/tree/domain/member/service/MemberService.java +++ b/src/main/java/org/example/tree/domain/member/service/MemberService.java @@ -19,7 +19,7 @@ public class MemberService { private final MemberConverter memberConverter; @Transactional - public MemberResponseDTO.checkId checkId(MemberRequestDTO.checkName request) { + public MemberResponseDTO.checkName checkName(MemberRequestDTO.checkName request) { Optional optionalMember = memberQueryService.checkName(request.getUserName()); Boolean isDuplicate = optionalMember.isPresent(); return memberConverter.toCheckName(isDuplicate); From a633d60bea0640264ca0bcbdb65ffcb3df269242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B5=AC=ED=99=98=EC=A4=80/=EB=AA=A8=EA=B1=B4?= <120353547+koojun99@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:20:12 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=ED=95=B4=EA=B2=B0=20-=20?= =?UTF-8?q?MemberResponseDTO.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/example/tree/domain/member/dto/MemberResponseDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/example/tree/domain/member/dto/MemberResponseDTO.java b/src/main/java/org/example/tree/domain/member/dto/MemberResponseDTO.java index ca523f5..e851f0e 100644 --- a/src/main/java/org/example/tree/domain/member/dto/MemberResponseDTO.java +++ b/src/main/java/org/example/tree/domain/member/dto/MemberResponseDTO.java @@ -9,7 +9,7 @@ public class MemberResponseDTO { @Getter @NoArgsConstructor @AllArgsConstructor - public static class checkId { + public static class checkName { private Boolean isDuplicated; } From 808705148b0801d44c778e691bf03c9f72897080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B5=AC=ED=99=98=EC=A4=80/=EB=AA=A8=EA=B1=B4?= <120353547+koojun99@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:21:06 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=B6=A9=EB=8F=8C=ED=95=B4=EA=B2=B0=20-=20?= =?UTF-8?q?MemberConverter.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/tree/domain/member/converter/MemberConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/example/tree/domain/member/converter/MemberConverter.java b/src/main/java/org/example/tree/domain/member/converter/MemberConverter.java index 430707b..f68f230 100644 --- a/src/main/java/org/example/tree/domain/member/converter/MemberConverter.java +++ b/src/main/java/org/example/tree/domain/member/converter/MemberConverter.java @@ -40,8 +40,8 @@ public Member toMember (String userName, String phone) { .build(); } - public MemberResponseDTO.checkId toCheckId(Boolean isDuplicated) { - return MemberResponseDTO.checkId.builder() + public MemberResponseDTO.checkId toCheckName(Boolean isDuplicated) { + return MemberResponseDTO.checkName.builder() .isDuplicated(isDuplicated) .build(); }