refactor: 닉네임이 null인 사용자도 검색되도록 변경

Author: pizzazoa

src/main/java/org/devkor/apu/saerok_server/domain/user/core/repository/UserRepository.java

@@ -68,8 +68,6 @@ public List<User> searchActiveUsers(String nicknameQuery, Long idQuery, int offs
                 SELECT u FROM User u
                 WHERE u.deletedAt IS NULL
                   AND u.signupStatus <> :withdrawn
-                  AND u.nickname IS NOT NULL
-                  AND TRIM(u.nickname) <> ''
                 """;
         jpql += buildSearchPredicate(nicknameQuery, idQuery);
         jpql += " ORDER BY u.nickname ASC, u.id ASC";
@@ -89,8 +87,6 @@ public long countSearchActiveUsers(String nicknameQuery, Long idQuery) {
                 SELECT COUNT(u) FROM User u
                 WHERE u.deletedAt IS NULL
                   AND u.signupStatus <> :withdrawn
-                  AND u.nickname IS NOT NULL
-                  AND TRIM(u.nickname) <> ''
                 """;
         jpql += buildSearchPredicate(nicknameQuery, idQuery);
 
@@ -105,16 +101,17 @@ AND TRIM(u.nickname) <> ''
     private String buildSearchPredicate(String nicknameQuery, Long idQuery) {
         boolean hasNickname = nicknameQuery != null;
         boolean hasId = idQuery != null;
+        String nicknamePresent = "(u.nickname IS NOT NULL AND TRIM(u.nickname) <> '')";
         if (hasNickname && hasId) {
-            return " AND (u.nickname LIKE :nicknameQuery OR u.id = :idQuery)";
+            return " AND ((" + nicknamePresent + " AND u.nickname LIKE :nicknameQuery) OR u.id = :idQuery)";
         }
         if (hasNickname) {
-            return " AND u.nickname LIKE :nicknameQuery";
+            return " AND " + nicknamePresent + " AND u.nickname LIKE :nicknameQuery";
         }
         if (hasId) {
             return " AND u.id = :idQuery";
         }
-        return "";
+        return " AND " + nicknamePresent;
     }
 
     private void bindSearchParameters(Query query, String nicknameQuery, Long idQuery) {

src/test/java/org/devkor/apu/saerok_server/domain/user/core/repository/UserRepositoryTest.java

@@ -238,6 +238,44 @@ void searchActiveUsers_byIdOrNickname() {
         assertThat(repo.countSearchActiveUsers("or-", charlie.getId())).isEqualTo(3);
     }
 
+    @Test @DisplayName("searchActiveUsers - 닉네임 null인 활성 사용자도 ID로 검색됨")
+    void searchActiveUsers_byIdAllowsNullNickname() {
+        User profileRequired = user("profile-required@example.com", null);
+        profileRequired.setSignupStatus(SignupStatusType.PROFILE_REQUIRED);
+        em.flush(); em.clear();
+
+        List<User> users = repo.searchActiveUsers(null, profileRequired.getId(), 0, 20);
+
+        assertThat(users).extracting(User::getId).containsExactly(profileRequired.getId());
+        assertThat(repo.countSearchActiveUsers(null, profileRequired.getId())).isEqualTo(1);
+    }
+
+    @Test @DisplayName("searchActiveUsers - 닉네임 검색에는 null 닉네임 사용자 제외")
+    void searchActiveUsers_nicknameQueryExcludesNullNickname() {
+        User withNickname = user("with-nick@example.com", "with-nick-target");
+        withNickname.setSignupStatus(SignupStatusType.COMPLETED);
+        User noNickname = user("no-nick@example.com", null);
+        noNickname.setSignupStatus(SignupStatusType.PROFILE_REQUIRED);
+        em.flush(); em.clear();
+
+        List<User> users = repo.searchActiveUsers("nick-target", null, 0, 20);
+
+        assertThat(users).extracting(User::getNickname).containsExactly("with-nick-target");
+    }
+
+    @Test @DisplayName("searchActiveUsers - 쿼리 없을 때 닉네임 null 사용자 제외")
+    void searchActiveUsers_noQueryExcludesNullNickname() {
+        User withNickname = user("default-nick@example.com", "default-nick");
+        withNickname.setSignupStatus(SignupStatusType.COMPLETED);
+        User noNickname = user("default-no-nick@example.com", null);
+        noNickname.setSignupStatus(SignupStatusType.PROFILE_REQUIRED);
+        em.flush(); em.clear();
+
+        List<User> users = repo.searchActiveUsers(null, null, 0, 20);
+
+        assertThat(users).extracting(User::getNickname).containsExactly("default-nick");
+    }
+
     @Test @DisplayName("searchActiveUsers - 탈퇴/삭제 사용자는 ID 검색에서도 제외")
     void searchActiveUsers_byIdExcludesInactive() {
         User withdrawn = user("inactive-withdrawn@example.com", "withdrawn-user");