Merge pull request #56 from FlouD-2024/mypage

Fix: 닉네임 중복 체크
FlouD-2024 · Mar 20, 2024 · de2a6d2 · de2a6d2
2 parents 163d00b + 6a547ec
commit de2a6d2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/floud/demo/domain/Users.java b/src/main/java/floud/demo/domain/Users.java
@@ -31,11 +31,11 @@ public class Users extends BaseTimeEntity {
     private String email;
 
     @Column(length = 500)
-    @ColumnDefault("''") //디폴트 빈 문자열 설정
+    @ColumnDefault(" ") //디폴트 빈 문자열 설정
     private String introduction;
 
     @Column(length = 500)
-    @ColumnDefault("''") //디폴트 빈 문자열 설정
+    @ColumnDefault(" ") //디폴트 빈 문자열 설정
     private String memo;
 
     @OneToMany(mappedBy = "users", fetch = FetchType.LAZY)

diff --git a/src/main/java/floud/demo/service/MemoirService.java b/src/main/java/floud/demo/service/MemoirService.java
@@ -40,6 +40,7 @@ public ApiResponse<?> createMemoir(String authorizationHeader, MemoirCreateReque
 
         //Check whether user posts today's memoir
         LocalDate now = LocalDate.now();
+        log.debug(now.toString());
         if(memoirRepository.existsByUserAndCreatedAtBetween(users.getId(), now))
             return ApiResponse.failure(Error.MEMOIR_ALREADY_EXIST);
 

diff --git a/src/main/java/floud/demo/service/MyPageService.java b/src/main/java/floud/demo/service/MyPageService.java
@@ -52,6 +52,8 @@ public ApiResponse<?> getMyPage(String authorizationHeader){
 
     @Transactional
     public ApiResponse<?> checkDuplicatedName(String authorizationHeader, String nickname){
+        if(authService.findUserByToken(authorizationHeader).getNickname().equals(nickname))
+            return ApiResponse.success(Success.CHECK_NICKNAME_DUPLICATED, Map.of("isDuplicated", false));
         return ApiResponse.success(Success.CHECK_NICKNAME_DUPLICATED, Map.of("isDuplicated", checkNicknameDuplicated(nickname)));
     }