chore: sonarqube 이슈 해결

prgrms-web-devcourse-final-project · Jan 24, 2025 · ce7df37 · ce7df37
1 parent 364217e
commit ce7df37
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 49 deletions.
diff --git a/...java/com/somemore/domains/volunteerapply/controller/VolunteerApplyQueryApiController.java b/...java/com/somemore/domains/volunteerapply/controller/VolunteerApplyQueryApiController.java
@@ -8,7 +8,6 @@
 import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyWithReviewStatusResponseDto;
 import com.somemore.domains.volunteerapply.usecase.VolunteerApplyQueryFacadeUseCase;
 import com.somemore.domains.volunteerapply.usecase.VolunteerApplyQueryUseCase;
-import com.somemore.global.auth.annotation.CurrentUser;
 import com.somemore.global.auth.annotation.RoleId;
 import com.somemore.global.common.response.ApiResponse;
 import com.somemore.global.exception.NoSuchElementException;

diff --git a/...a/com/somemore/user/repository/usercommonattribute/UserCommonAttributeRepositoryImpl.java b/...a/com/somemore/user/repository/usercommonattribute/UserCommonAttributeRepositoryImpl.java
@@ -52,7 +52,7 @@ public List<UserCommonAttribute> findAllByUserIds(List<UUID> userIds) {
         return queryFactory
                 .selectFrom(userCommonAttribute)
                 .where(
-                        InUserIds(userIds),
+                        inUserIds(userIds),
                         isNotDeleted())
                 .fetch();
     }
@@ -65,7 +65,7 @@ private static BooleanExpression isNotDeleted() {
         return userCommonAttribute.deleted.eq(false);
     }
 
-    private static BooleanExpression InUserIds(List<UUID> userIds) {
+    private static BooleanExpression inUserIds(List<UUID> userIds) {
         return userCommonAttribute.userId.in(userIds);
     }
 

diff --git a/src/main/java/com/somemore/volunteer/repository/NEWVolunteerRepositoryImpl.java b/src/main/java/com/somemore/volunteer/repository/NEWVolunteerRepositoryImpl.java
@@ -61,7 +61,7 @@ public List<VolunteerNickname> findNicknamesByIds(List<UUID> ids) {
                         volunteer.nickname))
                 .from(volunteer)
                 .where(
-                        InIds(ids),
+                        inIds(ids),
                         isNotDeleted()
                 )
                 .fetch();
@@ -76,7 +76,7 @@ public List<VolunteerNicknameAndId> findVolunteerNicknameAndIdsByIds(List<UUID>
                         volunteer.nickname))
                 .from(volunteer)
                 .where(
-                        InIds(ids),
+                        inIds(ids),
                         isNotDeleted()
                 )
                 .fetch();
@@ -86,7 +86,7 @@ private static BooleanExpression isNotDeleted() {
         return volunteer.deleted.eq(false);
     }
 
-    private static BooleanExpression InIds(List<UUID> ids) {
+    private static BooleanExpression inIds(List<UUID> ids) {
         return volunteer.id.in(ids);
     }
 }
diff --git a/src/test/java/com/somemore/domains/volunteer/repository/VolunteerRepositoryImplTest.java b/src/test/java/com/somemore/domains/volunteer/repository/VolunteerRepositoryImplTest.java
@@ -1,7 +1,6 @@
 package com.somemore.domains.volunteer.repository;
 
 import com.somemore.domains.volunteer.domain.Volunteer;
-import com.somemore.domains.volunteer.dto.request.VolunteerRegisterRequestDto;
 import com.somemore.domains.volunteer.repository.mapper.VolunteerOverviewForRankingByHours;
 import com.somemore.support.IntegrationTestSupport;
 import org.assertj.core.api.AssertionsForClassTypes;
@@ -187,10 +186,4 @@ private void createVolunteerAndUpdateVolunteerStats(int i) {
         volunteerRepository.save(volunteer);
     }
 
-    private static VolunteerRegisterRequestDto createVolunteerRegisterRequestDto(String name) {
-        return new VolunteerRegisterRequestDto(
-                NAVER, "naver", name, "email", "M", "1111", "1111",
-                "010-0000-0000");
-    }
-
 }
diff --git a/src/test/java/com/somemore/domains/volunteer/service/VolunteerQueryServiceTest.java b/src/test/java/com/somemore/domains/volunteer/service/VolunteerQueryServiceTest.java
@@ -1,8 +1,6 @@
 package com.somemore.domains.volunteer.service;
 
 import com.somemore.domains.volunteer.domain.Volunteer;
-import com.somemore.domains.volunteer.domain.VolunteerDetail;
-import com.somemore.domains.volunteer.dto.request.VolunteerRegisterRequestDto;
 import com.somemore.domains.volunteer.dto.response.VolunteerRankingResponseDto;
 import com.somemore.domains.volunteer.repository.VolunteerRepository;
 import com.somemore.global.auth.oauth.domain.OAuthProvider;
@@ -178,21 +176,4 @@ void validateNonExistentVolunteer() {
         assertEquals(NOT_EXISTS_VOLUNTEER.getMessage(), exception.getMessage());
     }
 
-    private static VolunteerDetail createVolunteerDetail(UUID volunteerId) {
-
-        VolunteerRegisterRequestDto volunteerRegisterRequestDto =
-                new VolunteerRegisterRequestDto(
-                        OAuthProvider.NAVER,
-                        "example-oauth-id",
-                        "making",
-                        "making@example.com",
-                        "male",
-                        "06-08",
-                        "1998",
-                        "010-1234-5678"
-                );
-
-        return VolunteerDetail.of(volunteerRegisterRequestDto, volunteerId);
-    }
-
 }
diff --git a/...ava/com/somemore/domains/volunteerapply/service/VolunteerApplyQueryFacadeServiceTest.java b/...ava/com/somemore/domains/volunteerapply/service/VolunteerApplyQueryFacadeServiceTest.java
@@ -1,29 +1,16 @@
 package com.somemore.domains.volunteerapply.service;
 
-import static com.somemore.domains.volunteerapply.domain.ApplyStatus.APPROVED;
-import static com.somemore.global.auth.oauth.domain.OAuthProvider.NAVER;
-import static com.somemore.support.fixture.RecruitBoardFixture.createRecruitBoard;
-import static org.assertj.core.api.Assertions.assertThat;
-
 import com.somemore.domains.recruitboard.domain.RecruitBoard;
 import com.somemore.domains.recruitboard.repository.RecruitBoardRepository;
 import com.somemore.domains.review.domain.Review;
 import com.somemore.domains.review.repository.ReviewRepository;
-import com.somemore.domains.volunteer.domain.Volunteer;
-import com.somemore.domains.volunteer.domain.VolunteerDetail;
-import com.somemore.domains.volunteer.dto.request.VolunteerRegisterRequestDto;
-import com.somemore.domains.volunteer.repository.VolunteerDetailRepository;
-import com.somemore.domains.volunteer.repository.VolunteerRepository;
 import com.somemore.domains.volunteerapply.domain.VolunteerApply;
 import com.somemore.domains.volunteerapply.dto.condition.VolunteerApplySearchCondition;
 import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyRecruitInfoResponseDto;
 import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyVolunteerInfoResponseDto;
 import com.somemore.domains.volunteerapply.dto.response.VolunteerApplyWithReviewStatusResponseDto;
 import com.somemore.domains.volunteerapply.repository.VolunteerApplyRepository;
 import com.somemore.support.IntegrationTestSupport;
-import java.util.List;
-import java.util.UUID;
-
 import com.somemore.user.domain.UserCommonAttribute;
 import com.somemore.user.domain.UserRole;
 import com.somemore.user.repository.usercommonattribute.UserCommonAttributeRepository;
@@ -37,6 +24,13 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.UUID;
+
+import static com.somemore.domains.volunteerapply.domain.ApplyStatus.APPROVED;
+import static com.somemore.support.fixture.RecruitBoardFixture.createRecruitBoard;
+import static org.assertj.core.api.Assertions.assertThat;
+
 @Transactional
 class VolunteerApplyQueryFacadeServiceTest extends IntegrationTestSupport {
 

diff --git a/...m/somemore/user/repository/usercommonattribute/UserCommonAttributeRepositoryImplTest.java b/...m/somemore/user/repository/usercommonattribute/UserCommonAttributeRepositoryImplTest.java
@@ -3,7 +3,6 @@
 import com.somemore.global.imageupload.service.ImageUploadService;
 import com.somemore.support.IntegrationTestSupport;
 import com.somemore.user.domain.UserCommonAttribute;
-import com.somemore.user.domain.UserRole;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +59,7 @@ void findAllByUserIds() {
         List<UserCommonAttribute> result = userCommonAttributeRepository.findAllByUserIds(userIds);
 
         // then
-        assertThat(result.size()).isEqualTo(3);
+        assertThat(result).hasSize(3);
         assertThat(result)
                 .extracting(UserCommonAttribute::getUserId)
                 .containsExactlyInAnyOrder(one.getUserId(), two.getUserId(), three.getUserId());

diff --git a/src/test/java/com/somemore/user/service/UserQueryServiceTest.java b/src/test/java/com/somemore/user/service/UserQueryServiceTest.java
@@ -40,7 +40,7 @@ void setup() {
         UserAuthInfo userAuthInfo = UserAuthInfo.createForOAuth(OAuthProvider.NAVER);
 
         user = userRepository.save(User.of(userAuthInfo, UserRole.VOLUNTEER));
-        userCommonAttribute = userCommonAttributeRepository.save(UserCommonAttribute.createDefault(user.getId(),UserRole.VOLUNTEER));
+        userCommonAttribute = userCommonAttributeRepository.save(UserCommonAttribute.createDefault(user.getId(), UserRole.VOLUNTEER));
     }
 
 
@@ -131,7 +131,7 @@ void findAllByUserIds() {
         List<UserCommonAttribute> result = userQueryService.getAllByUserIds(userIds);
 
         // then
-        assertThat(result.size()).isEqualTo(3);
+        assertThat(result).hasSize(3);
         assertThat(result)
                 .extracting(UserCommonAttribute::getUserId)
                 .containsExactlyInAnyOrder(one.getUserId(), two.getUserId(), three.getUserId());