Skip to content

Commit b29e3b6

Browse files
authored
Merge pull request #75 from Block-Guard/refactor/#74/check-duplicated-email
[Refactor] 이메일 중복 API 수정
2 parents d70c772 + a889297 commit b29e3b6

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/main/java/com/blockguard/server/domain/auth/application/AuthService.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,13 @@ public RegisterResponse register(RegisterRequest registerRequest) {
6262

6363

6464
public CheckEmailDuplicatedResponse checkEmailDuplicated(CheckEmailDuplicatedRequest checkEmailDuplicatedRequest) {
65-
boolean isDuplicated = userRepository.findByEmail(checkEmailDuplicatedRequest.getEmail()).isPresent();
65+
Optional<User> user = userRepository.findAnyByEmail(checkEmailDuplicatedRequest.getEmail());
66+
boolean isDuplicated = user.isPresent();
67+
boolean isDeleted = user.map(User::getDeletedAt).isPresent();
68+
6669
return CheckEmailDuplicatedResponse.builder()
6770
.isDuplicated(isDuplicated)
71+
.isDeleted(isDeleted)
6872
.build();
6973
}
7074

src/main/java/com/blockguard/server/domain/user/dto/response/CheckEmailDuplicatedResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@
1111
@NoArgsConstructor
1212
public class CheckEmailDuplicatedResponse {
1313
private boolean isDuplicated;
14+
private boolean isDeleted;
1415
}

0 commit comments

Comments
 (0)