refactor: package 구조 변경

leebs0521 · leebs0521 · commit 799d26c24a8c · 2024-12-16T17:22:01.000+09:00
diff --git a/src/main/java/com/somemore/develop/controller/TokenGenerateMachine.java b/src/main/java/com/somemore/develop/controller/TokenGenerateMachine.java
@@ -1,4 +1,4 @@
-package com.somemore.global.develop.controller;
+package com.somemore.develop.controller;
 
 import com.somemore.global.auth.jwt.domain.EncodedToken;
 import com.somemore.global.auth.jwt.domain.TokenType;
diff --git a/src/main/java/com/somemore/notification/event/converter/NotificationMessageConverter.java b/src/main/java/com/somemore/notification/event/converter/NotificationMessageConverter.java
@@ -4,7 +4,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.somemore.community.event.CommentAddedEvent;
-import com.somemore.facade.event.VolunteerReviewRequestEvent;
+import com.somemore.volunteerapply.event.VolunteerReviewRequestEvent;
 import com.somemore.interestcenter.event.domain.InterestCenterCreateRecruitBoardEvent;
 import com.somemore.notification.domain.Notification;
 import com.somemore.notification.domain.NotificationSubType;
diff --git a/src/main/java/com/somemore/volunteer/service/VolunteerQueryService.java b/src/main/java/com/somemore/volunteer/service/VolunteerQueryService.java
@@ -2,7 +2,6 @@
 
 import static com.somemore.global.exception.ExceptionMessage.NOT_EXISTS_VOLUNTEER;
 
-import com.somemore.facade.validator.VolunteerDetailAccessValidator;
 import com.somemore.global.exception.BadRequestException;
 import com.somemore.volunteer.domain.Volunteer;
 import com.somemore.volunteer.domain.VolunteerDetail;
@@ -13,6 +12,7 @@
 import com.somemore.volunteer.repository.mapper.VolunteerOverviewForRankingByHours;
 import com.somemore.volunteer.repository.mapper.VolunteerSimpleInfo;
 import com.somemore.volunteer.usecase.VolunteerQueryUseCase;
+import com.somemore.volunteer.validator.VolunteerDetailAccessValidator;
 import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/somemore/volunteer/validator/VolunteerDetailAccessValidator.java b/src/main/java/com/somemore/volunteer/validator/VolunteerDetailAccessValidator.java
@@ -1,4 +1,4 @@
-package com.somemore.facade.validator;
+package com.somemore.volunteer.validator;
 
 import java.util.UUID;
 
diff --git a/src/main/java/com/somemore/volunteer/validator/VolunteerDetailAccessValidatorImpl.java b/src/main/java/com/somemore/volunteer/validator/VolunteerDetailAccessValidatorImpl.java
@@ -1,4 +1,4 @@
-package com.somemore.facade.validator;
+package com.somemore.volunteer.validator;
 
 import com.somemore.global.exception.BadRequestException;
 import com.somemore.recruitboard.usecase.query.RecruitBoardQueryUseCase;
@@ -34,4 +34,4 @@ public void validateByCenterId(UUID centerId, UUID targetVolunteerId) {
 
         throw new BadRequestException(UNAUTHORIZED_VOLUNTEER_DETAIL);
     }
-}
+}
diff --git a/src/main/java/com/somemore/volunteerapply/controller/CenterVolunteerApplyCommandApiController.java b/src/main/java/com/somemore/volunteerapply/controller/CenterVolunteerApplyCommandApiController.java
@@ -1,7 +1,7 @@
 package com.somemore.volunteerapply.controller;
 
 import com.somemore.global.auth.annotation.CurrentUser;
-import com.somemore.facade.volunteerapply.SettleVolunteerApplyFacadeUseCase;
+import com.somemore.volunteerapply.usecase.SettleVolunteerApplyFacadeUseCase;
 import com.somemore.global.common.response.ApiResponse;
 import com.somemore.volunteerapply.dto.request.VolunteerApplySettleRequestDto;
 import com.somemore.volunteerapply.usecase.ApproveVolunteerApplyUseCase;
diff --git a/src/main/java/com/somemore/volunteerapply/controller/VolunteerApplyQueryApiController.java b/src/main/java/com/somemore/volunteerapply/controller/VolunteerApplyQueryApiController.java
@@ -3,7 +3,7 @@
 import static org.springframework.data.domain.Sort.Direction.DESC;
 
 import com.somemore.global.auth.annotation.CurrentUser;
-import com.somemore.facade.volunteerapply.VolunteerApplyQueryFacadeUseCase;
+import com.somemore.volunteerapply.usecase.VolunteerApplyQueryFacadeUseCase;
 import com.somemore.global.common.response.ApiResponse;
 import com.somemore.global.exception.BadRequestException;
 import com.somemore.volunteerapply.domain.ApplyStatus;
diff --git a/src/main/java/com/somemore/volunteerapply/event/VolunteerReviewRequestEvent.java b/src/main/java/com/somemore/volunteerapply/event/VolunteerReviewRequestEvent.java
@@ -1,4 +1,4 @@
-package com.somemore.facade.event;
+package com.somemore.volunteerapply.event;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/com/somemore/volunteerapply/service/SettleVolunteerApplyFacadeService.java b/src/main/java/com/somemore/volunteerapply/service/SettleVolunteerApplyFacadeService.java
@@ -1,10 +1,10 @@
-package com.somemore.facade.volunteerapply;
+package com.somemore.volunteerapply.service;
 
 import static com.somemore.global.exception.ExceptionMessage.RECRUIT_BOARD_ID_MISMATCH;
 import static com.somemore.global.exception.ExceptionMessage.UNAUTHORIZED_RECRUIT_BOARD;
 import static com.somemore.global.exception.ExceptionMessage.VOLUNTEER_APPLY_LIST_MISMATCH;
 
-import com.somemore.facade.event.VolunteerReviewRequestEvent;
+import com.somemore.volunteerapply.event.VolunteerReviewRequestEvent;
 import com.somemore.global.common.event.ServerEventPublisher;
 import com.somemore.global.common.event.ServerEventType;
 import com.somemore.global.exception.BadRequestException;
@@ -14,6 +14,7 @@
 import com.somemore.volunteer.usecase.UpdateVolunteerUseCase;
 import com.somemore.volunteerapply.domain.VolunteerApply;
 import com.somemore.volunteerapply.dto.request.VolunteerApplySettleRequestDto;
+import com.somemore.volunteerapply.usecase.SettleVolunteerApplyFacadeUseCase;
 import com.somemore.volunteerapply.usecase.VolunteerApplyQueryUseCase;
 import java.util.List;
 import java.util.UUID;
diff --git a/src/main/java/com/somemore/volunteerapply/service/VolunteerApplyQueryFacadeService.java b/src/main/java/com/somemore/volunteerapply/service/VolunteerApplyQueryFacadeService.java
@@ -1,4 +1,4 @@
-package com.somemore.facade.volunteerapply;
+package com.somemore.volunteerapply.service;
 
 import static com.somemore.global.exception.ExceptionMessage.UNAUTHORIZED_RECRUIT_BOARD;
 
@@ -11,6 +11,7 @@
 import com.somemore.volunteerapply.dto.condition.VolunteerApplySearchCondition;
 import com.somemore.volunteerapply.dto.response.VolunteerApplyRecruitInfoResponseDto;
 import com.somemore.volunteerapply.dto.response.VolunteerApplyVolunteerInfoResponseDto;
+import com.somemore.volunteerapply.usecase.VolunteerApplyQueryFacadeUseCase;
 import com.somemore.volunteerapply.usecase.VolunteerApplyQueryUseCase;
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/somemore/volunteerapply/usecase/SettleVolunteerApplyFacadeUseCase.java b/src/main/java/com/somemore/volunteerapply/usecase/SettleVolunteerApplyFacadeUseCase.java
@@ -1,4 +1,4 @@
-package com.somemore.facade.volunteerapply;
+package com.somemore.volunteerapply.usecase;
 
 import com.somemore.volunteerapply.dto.request.VolunteerApplySettleRequestDto;
 import java.util.UUID;
diff --git a/src/main/java/com/somemore/volunteerapply/usecase/VolunteerApplyQueryFacadeUseCase.java b/src/main/java/com/somemore/volunteerapply/usecase/VolunteerApplyQueryFacadeUseCase.java
@@ -1,4 +1,4 @@
-package com.somemore.facade.volunteerapply;
+package com.somemore.volunteerapply.usecase;
 
 import com.somemore.volunteerapply.dto.condition.VolunteerApplySearchCondition;
 import com.somemore.volunteerapply.dto.response.VolunteerApplyRecruitInfoResponseDto;
diff --git a/src/test/java/com/somemore/support/annotation/CustomSecurityContextFactory.java b/src/test/java/com/somemore/support/annotation/CustomSecurityContextFactory.java
@@ -1,6 +1,5 @@
-package com.somemore.support;
+package com.somemore.support.annotation;
 
-import com.somemore.support.annotation.WithMockCustomUser;
 import java.util.Collections;
 import java.util.UUID;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/src/test/java/com/somemore/support/annotation/WithMockCustomUser.java b/src/test/java/com/somemore/support/annotation/WithMockCustomUser.java
@@ -1,6 +1,5 @@
 package com.somemore.support.annotation;
 
-import com.somemore.support.CustomSecurityContextFactory;
 import org.springframework.security.test.context.support.WithSecurityContext;
 
 import java.lang.annotation.Retention;
diff --git a/src/test/java/com/somemore/volunteer/validator/VolunteerDetailAccessValidatorImplTest.java b/src/test/java/com/somemore/volunteer/validator/VolunteerDetailAccessValidatorImplTest.java
@@ -1,24 +1,23 @@
-package com.somemore.facade.validator;
+package com.somemore.volunteer.validator;
+
+import static com.somemore.global.exception.ExceptionMessage.UNAUTHORIZED_VOLUNTEER_DETAIL;
+import static com.somemore.support.fixture.RecruitBoardFixture.createRecruitBoard;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import com.somemore.support.IntegrationTestSupport;
 import com.somemore.global.exception.BadRequestException;
 import com.somemore.recruitboard.domain.RecruitBoard;
 import com.somemore.recruitboard.repository.RecruitBoardRepository;
+import com.somemore.support.IntegrationTestSupport;
 import com.somemore.volunteerapply.domain.ApplyStatus;
 import com.somemore.volunteerapply.domain.VolunteerApply;
 import com.somemore.volunteerapply.repository.VolunteerApplyRepository;
+import java.util.UUID;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.UUID;
-
-import static com.somemore.support.fixture.RecruitBoardFixture.createRecruitBoard;
-import static com.somemore.global.exception.ExceptionMessage.UNAUTHORIZED_VOLUNTEER_DETAIL;
-import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
 @Transactional
 class VolunteerDetailAccessValidatorImplTest extends IntegrationTestSupport {
 
@@ -43,15 +42,18 @@ void validateByCenterIdThrowsExceptionWhenVolunteerNotLinked() {
         UUID unrelatedVolunteerId = UUID.randomUUID();
         UUID relatedVolunteerId = UUID.randomUUID();
 
-        VolunteerApply volunteerApply = createVolunteerApply(recruitBoard.getId(), relatedVolunteerId);
+        VolunteerApply volunteerApply = createVolunteerApply(recruitBoard.getId(),
+                relatedVolunteerId);
         volunteerApplyRepository.save(volunteerApply);
 
         // when
         // then
-        assertThatCode(() -> volunteerDetailAccessValidatorImpl.validateByCenterId(centerId, relatedVolunteerId))
+        assertThatCode(() -> volunteerDetailAccessValidatorImpl.validateByCenterId(centerId,
+                relatedVolunteerId))
                 .doesNotThrowAnyException();
 
-        assertThatThrownBy(() -> volunteerDetailAccessValidatorImpl.validateByCenterId(centerId, unrelatedVolunteerId))
+        assertThatThrownBy(() -> volunteerDetailAccessValidatorImpl.validateByCenterId(centerId,
+                unrelatedVolunteerId))
                 .isInstanceOf(BadRequestException.class)
                 .hasMessage(UNAUTHORIZED_VOLUNTEER_DETAIL.getMessage());
     }
diff --git a/src/test/java/com/somemore/volunteerapply/controller/CenterVolunteerApplyCommandApiControllerTest.java b/src/test/java/com/somemore/volunteerapply/controller/CenterVolunteerApplyCommandApiControllerTest.java
@@ -11,7 +11,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.somemore.support.ControllerTestSupport;
 import com.somemore.support.annotation.WithMockCustomUser;
-import com.somemore.facade.volunteerapply.SettleVolunteerApplyFacadeUseCase;
+import com.somemore.volunteerapply.usecase.SettleVolunteerApplyFacadeUseCase;
 import com.somemore.volunteerapply.dto.request.VolunteerApplySettleRequestDto;
 import com.somemore.volunteerapply.usecase.ApproveVolunteerApplyUseCase;
 import com.somemore.volunteerapply.usecase.RejectVolunteerApplyUseCase;
diff --git a/src/test/java/com/somemore/volunteerapply/controller/VolunteerApplyQueryApiControllerTest.java b/src/test/java/com/somemore/volunteerapply/controller/VolunteerApplyQueryApiControllerTest.java
@@ -15,7 +15,7 @@
 import com.somemore.volunteerapply.dto.response.VolunteerApplyResponseDto;
 import com.somemore.volunteerapply.dto.response.VolunteerApplySummaryResponseDto;
 import com.somemore.volunteerapply.dto.response.VolunteerApplyVolunteerInfoResponseDto;
-import com.somemore.facade.volunteerapply.VolunteerApplyQueryFacadeUseCase;
+import com.somemore.volunteerapply.usecase.VolunteerApplyQueryFacadeUseCase;
 import com.somemore.volunteerapply.usecase.VolunteerApplyQueryUseCase;
 import java.util.Collections;
 import java.util.UUID;
diff --git a/src/test/java/com/somemore/volunteerapply/service/SettleVolunteerApplyFacadeServiceTest.java b/src/test/java/com/somemore/volunteerapply/service/SettleVolunteerApplyFacadeServiceTest.java
@@ -1,19 +1,19 @@
-package com.somemore.facade.volunteerapply;
+package com.somemore.volunteerapply.service;
 
 import static com.somemore.global.auth.oauth.OAuthProvider.NAVER;
-import static com.somemore.support.fixture.RecruitBoardFixture.createCompletedRecruitBoard;
 import static com.somemore.global.exception.ExceptionMessage.RECRUIT_BOARD_ID_MISMATCH;
 import static com.somemore.global.exception.ExceptionMessage.UNAUTHORIZED_RECRUIT_BOARD;
 import static com.somemore.global.exception.ExceptionMessage.VOLUNTEER_APPLY_LIST_MISMATCH;
 import static com.somemore.recruitboard.domain.VolunteerCategory.COUNSELING;
+import static com.somemore.support.fixture.RecruitBoardFixture.createCompletedRecruitBoard;
 import static com.somemore.volunteerapply.domain.ApplyStatus.APPROVED;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import com.somemore.support.IntegrationTestSupport;
 import com.somemore.global.exception.BadRequestException;
 import com.somemore.recruitboard.domain.RecruitBoard;
 import com.somemore.recruitboard.repository.RecruitBoardRepository;
+import com.somemore.support.IntegrationTestSupport;
 import com.somemore.volunteer.domain.Volunteer;
 import com.somemore.volunteer.repository.VolunteerRepository;
 import com.somemore.volunteerapply.domain.VolunteerApply;
diff --git a/src/test/java/com/somemore/volunteerapply/service/VolunteerApplyQueryFacadeServiceTest.java b/src/test/java/com/somemore/volunteerapply/service/VolunteerApplyQueryFacadeServiceTest.java
@@ -1,13 +1,13 @@
-package com.somemore.facade.volunteerapply;
+package com.somemore.volunteerapply.service;
 
 import static com.somemore.global.auth.oauth.OAuthProvider.NAVER;
 import static com.somemore.support.fixture.RecruitBoardFixture.createRecruitBoard;
 import static com.somemore.volunteerapply.domain.ApplyStatus.APPROVED;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.somemore.support.IntegrationTestSupport;
 import com.somemore.recruitboard.domain.RecruitBoard;
 import com.somemore.recruitboard.repository.RecruitBoardRepository;
+import com.somemore.support.IntegrationTestSupport;
 import com.somemore.volunteer.domain.Volunteer;
 import com.somemore.volunteer.domain.VolunteerDetail;
 import com.somemore.volunteer.dto.request.VolunteerRegisterRequestDto;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.somemore.global.develop.controller;`
	`1`	`+package com.somemore.develop.controller;`
`2`	`2`
`3`	`3`	`import com.somemore.global.auth.jwt.domain.EncodedToken;`
`4`	`4`	`import com.somemore.global.auth.jwt.domain.TokenType;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.somemore.facade.validator;`
	`1`	`+package com.somemore.volunteer.validator;`
`2`	`2`
`3`	`3`	`import java.util.UUID;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.somemore.facade.event;`
	`1`	`+package com.somemore.volunteerapply.event;`
`2`	`2`
`3`	`3`	`import com.fasterxml.jackson.annotation.JsonCreator;`
`4`	`4`	`import com.fasterxml.jackson.annotation.JsonProperty;`