diff --git a/server/src/main/java/server/haengdong/application/BillActionService.java b/server/src/main/java/server/haengdong/application/BillActionService.java index 0c62c133f..272eee7e8 100644 --- a/server/src/main/java/server/haengdong/application/BillActionService.java +++ b/server/src/main/java/server/haengdong/application/BillActionService.java @@ -5,12 +5,12 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import server.haengdong.application.request.BillActionAppRequest; -import server.haengdong.domain.Action; -import server.haengdong.domain.BillAction; -import server.haengdong.domain.Event; -import server.haengdong.persistence.ActionRepository; -import server.haengdong.persistence.BillActionRepository; -import server.haengdong.persistence.EventRepository; +import server.haengdong.domain.action.Action; +import server.haengdong.domain.action.BillAction; +import server.haengdong.domain.event.Event; +import server.haengdong.domain.action.ActionRepository; +import server.haengdong.domain.action.BillActionRepository; +import server.haengdong.domain.event.EventRepository; @RequiredArgsConstructor @Transactional(readOnly = true) diff --git a/server/src/main/java/server/haengdong/application/EventService.java b/server/src/main/java/server/haengdong/application/EventService.java index 6a5304e32..5fc9cd01c 100644 --- a/server/src/main/java/server/haengdong/application/EventService.java +++ b/server/src/main/java/server/haengdong/application/EventService.java @@ -4,9 +4,9 @@ import org.springframework.stereotype.Service; import server.haengdong.application.request.EventAppRequest; import server.haengdong.application.response.EventAppResponse; -import server.haengdong.domain.Event; -import server.haengdong.domain.EventTokenProvider; -import server.haengdong.persistence.EventRepository; +import server.haengdong.domain.event.Event; +import server.haengdong.domain.event.EventTokenProvider; +import server.haengdong.domain.event.EventRepository; @RequiredArgsConstructor @Service diff --git a/server/src/main/java/server/haengdong/application/MemberActionFactory.java b/server/src/main/java/server/haengdong/application/MemberActionFactory.java index d583967a0..46fd9ed1a 100644 --- a/server/src/main/java/server/haengdong/application/MemberActionFactory.java +++ b/server/src/main/java/server/haengdong/application/MemberActionFactory.java @@ -7,10 +7,10 @@ import org.springframework.stereotype.Component; import server.haengdong.application.request.MemberActionSaveAppRequest; import server.haengdong.application.request.MemberActionsSaveAppRequest; -import server.haengdong.domain.Action; -import server.haengdong.domain.MemberAction; -import server.haengdong.domain.MemberActionStatus; -import server.haengdong.domain.MemberGroupIdProvider; +import server.haengdong.domain.action.Action; +import server.haengdong.domain.action.MemberAction; +import server.haengdong.domain.action.MemberActionStatus; +import server.haengdong.domain.action.MemberGroupIdProvider; @RequiredArgsConstructor @Component diff --git a/server/src/main/java/server/haengdong/application/MemberActionService.java b/server/src/main/java/server/haengdong/application/MemberActionService.java index 491981b06..1acc88b03 100644 --- a/server/src/main/java/server/haengdong/application/MemberActionService.java +++ b/server/src/main/java/server/haengdong/application/MemberActionService.java @@ -5,12 +5,12 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import server.haengdong.application.request.MemberActionsSaveAppRequest; -import server.haengdong.domain.Action; -import server.haengdong.domain.Event; -import server.haengdong.domain.MemberAction; -import server.haengdong.persistence.ActionRepository; -import server.haengdong.persistence.EventRepository; -import server.haengdong.persistence.MemberActionRepository; +import server.haengdong.domain.action.Action; +import server.haengdong.domain.event.Event; +import server.haengdong.domain.action.MemberAction; +import server.haengdong.domain.action.ActionRepository; +import server.haengdong.domain.event.EventRepository; +import server.haengdong.domain.action.MemberActionRepository; @RequiredArgsConstructor @Transactional(readOnly = true) diff --git a/server/src/main/java/server/haengdong/application/request/BillActionAppRequest.java b/server/src/main/java/server/haengdong/application/request/BillActionAppRequest.java index 33c335737..acd0149f9 100644 --- a/server/src/main/java/server/haengdong/application/request/BillActionAppRequest.java +++ b/server/src/main/java/server/haengdong/application/request/BillActionAppRequest.java @@ -1,7 +1,7 @@ package server.haengdong.application.request; -import server.haengdong.domain.Action; -import server.haengdong.domain.BillAction; +import server.haengdong.domain.action.Action; +import server.haengdong.domain.action.BillAction; public record BillActionAppRequest( String title, diff --git a/server/src/main/java/server/haengdong/application/request/EventAppRequest.java b/server/src/main/java/server/haengdong/application/request/EventAppRequest.java index 8db47eba9..1eea6adf4 100644 --- a/server/src/main/java/server/haengdong/application/request/EventAppRequest.java +++ b/server/src/main/java/server/haengdong/application/request/EventAppRequest.java @@ -1,6 +1,6 @@ package server.haengdong.application.request; -import server.haengdong.domain.Event; +import server.haengdong.domain.event.Event; public record EventAppRequest(String name) { diff --git a/server/src/main/java/server/haengdong/application/request/MemberActionSaveAppRequest.java b/server/src/main/java/server/haengdong/application/request/MemberActionSaveAppRequest.java index a7c90efe4..f7f8d8fc2 100644 --- a/server/src/main/java/server/haengdong/application/request/MemberActionSaveAppRequest.java +++ b/server/src/main/java/server/haengdong/application/request/MemberActionSaveAppRequest.java @@ -1,8 +1,8 @@ package server.haengdong.application.request; -import server.haengdong.domain.Action; -import server.haengdong.domain.MemberAction; -import server.haengdong.domain.MemberActionStatus; +import server.haengdong.domain.action.Action; +import server.haengdong.domain.action.MemberAction; +import server.haengdong.domain.action.MemberActionStatus; public record MemberActionSaveAppRequest(String name, String status) { diff --git a/server/src/main/java/server/haengdong/application/response/EventAppResponse.java b/server/src/main/java/server/haengdong/application/response/EventAppResponse.java index 37b63dec2..f331d0011 100644 --- a/server/src/main/java/server/haengdong/application/response/EventAppResponse.java +++ b/server/src/main/java/server/haengdong/application/response/EventAppResponse.java @@ -1,6 +1,6 @@ package server.haengdong.application.response; -import server.haengdong.domain.Event; +import server.haengdong.domain.event.Event; public record EventAppResponse(String token) { diff --git a/server/src/main/java/server/haengdong/domain/Action.java b/server/src/main/java/server/haengdong/domain/action/Action.java similarity index 91% rename from server/src/main/java/server/haengdong/domain/Action.java rename to server/src/main/java/server/haengdong/domain/action/Action.java index be294dac3..11f91fc38 100644 --- a/server/src/main/java/server/haengdong/domain/Action.java +++ b/server/src/main/java/server/haengdong/domain/action/Action.java @@ -1,4 +1,4 @@ -package server.haengdong.domain; +package server.haengdong.domain.action; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -9,6 +9,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; +import server.haengdong.domain.event.Event; @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) diff --git a/server/src/main/java/server/haengdong/persistence/ActionRepository.java b/server/src/main/java/server/haengdong/domain/action/ActionRepository.java similarity index 83% rename from server/src/main/java/server/haengdong/persistence/ActionRepository.java rename to server/src/main/java/server/haengdong/domain/action/ActionRepository.java index 7b7b838d2..c2138e42f 100644 --- a/server/src/main/java/server/haengdong/persistence/ActionRepository.java +++ b/server/src/main/java/server/haengdong/domain/action/ActionRepository.java @@ -1,12 +1,11 @@ -package server.haengdong.persistence; +package server.haengdong.domain.action; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import server.haengdong.domain.Action; -import server.haengdong.domain.Event; +import server.haengdong.domain.event.Event; @Repository public interface ActionRepository extends JpaRepository { diff --git a/server/src/main/java/server/haengdong/domain/BillAction.java b/server/src/main/java/server/haengdong/domain/action/BillAction.java similarity index 97% rename from server/src/main/java/server/haengdong/domain/BillAction.java rename to server/src/main/java/server/haengdong/domain/action/BillAction.java index 557715e4b..503715fa1 100644 --- a/server/src/main/java/server/haengdong/domain/BillAction.java +++ b/server/src/main/java/server/haengdong/domain/action/BillAction.java @@ -1,4 +1,4 @@ -package server.haengdong.domain; +package server.haengdong.domain.action; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; diff --git a/server/src/main/java/server/haengdong/persistence/BillActionRepository.java b/server/src/main/java/server/haengdong/domain/action/BillActionRepository.java similarity index 76% rename from server/src/main/java/server/haengdong/persistence/BillActionRepository.java rename to server/src/main/java/server/haengdong/domain/action/BillActionRepository.java index 03db3056e..1ad7416aa 100644 --- a/server/src/main/java/server/haengdong/persistence/BillActionRepository.java +++ b/server/src/main/java/server/haengdong/domain/action/BillActionRepository.java @@ -1,11 +1,10 @@ -package server.haengdong.persistence; +package server.haengdong.domain.action; import java.util.List; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import server.haengdong.domain.BillAction; -import server.haengdong.domain.Event; +import server.haengdong.domain.event.Event; @Repository public interface BillActionRepository extends JpaRepository { diff --git a/server/src/main/java/server/haengdong/domain/MemberAction.java b/server/src/main/java/server/haengdong/domain/action/MemberAction.java similarity index 97% rename from server/src/main/java/server/haengdong/domain/MemberAction.java rename to server/src/main/java/server/haengdong/domain/action/MemberAction.java index eb8d8fdec..6e5f0d805 100644 --- a/server/src/main/java/server/haengdong/domain/MemberAction.java +++ b/server/src/main/java/server/haengdong/domain/action/MemberAction.java @@ -1,4 +1,4 @@ -package server.haengdong.domain; +package server.haengdong.domain.action; import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; diff --git a/server/src/main/java/server/haengdong/persistence/MemberActionRepository.java b/server/src/main/java/server/haengdong/domain/action/MemberActionRepository.java similarity index 80% rename from server/src/main/java/server/haengdong/persistence/MemberActionRepository.java rename to server/src/main/java/server/haengdong/domain/action/MemberActionRepository.java index 97d06618b..6c4769e61 100644 --- a/server/src/main/java/server/haengdong/persistence/MemberActionRepository.java +++ b/server/src/main/java/server/haengdong/domain/action/MemberActionRepository.java @@ -1,12 +1,11 @@ -package server.haengdong.persistence; +package server.haengdong.domain.action; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import server.haengdong.domain.Event; -import server.haengdong.domain.MemberAction; +import server.haengdong.domain.event.Event; @Repository public interface MemberActionRepository extends JpaRepository { diff --git a/server/src/main/java/server/haengdong/domain/MemberActionStatus.java b/server/src/main/java/server/haengdong/domain/action/MemberActionStatus.java similarity index 90% rename from server/src/main/java/server/haengdong/domain/MemberActionStatus.java rename to server/src/main/java/server/haengdong/domain/action/MemberActionStatus.java index 6172bdb4d..afcb31337 100644 --- a/server/src/main/java/server/haengdong/domain/MemberActionStatus.java +++ b/server/src/main/java/server/haengdong/domain/action/MemberActionStatus.java @@ -1,4 +1,4 @@ -package server.haengdong.domain; +package server.haengdong.domain.action; import java.util.Arrays; diff --git a/server/src/main/java/server/haengdong/domain/MemberGroupIdProvider.java b/server/src/main/java/server/haengdong/domain/action/MemberGroupIdProvider.java similarity index 82% rename from server/src/main/java/server/haengdong/domain/MemberGroupIdProvider.java rename to server/src/main/java/server/haengdong/domain/action/MemberGroupIdProvider.java index c4166e2be..9e32bd733 100644 --- a/server/src/main/java/server/haengdong/domain/MemberGroupIdProvider.java +++ b/server/src/main/java/server/haengdong/domain/action/MemberGroupIdProvider.java @@ -1,4 +1,4 @@ -package server.haengdong.domain; +package server.haengdong.domain.action; import org.springframework.stereotype.Component; diff --git a/server/src/main/java/server/haengdong/domain/Event.java b/server/src/main/java/server/haengdong/domain/event/Event.java similarity index 93% rename from server/src/main/java/server/haengdong/domain/Event.java rename to server/src/main/java/server/haengdong/domain/event/Event.java index 8c24edc4d..c6877e1a6 100644 --- a/server/src/main/java/server/haengdong/domain/Event.java +++ b/server/src/main/java/server/haengdong/domain/event/Event.java @@ -1,4 +1,4 @@ -package server.haengdong.domain; +package server.haengdong.domain.event; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/server/src/main/java/server/haengdong/persistence/EventRepository.java b/server/src/main/java/server/haengdong/domain/event/EventRepository.java similarity index 78% rename from server/src/main/java/server/haengdong/persistence/EventRepository.java rename to server/src/main/java/server/haengdong/domain/event/EventRepository.java index 5c08ca98c..6038c368b 100644 --- a/server/src/main/java/server/haengdong/persistence/EventRepository.java +++ b/server/src/main/java/server/haengdong/domain/event/EventRepository.java @@ -1,9 +1,8 @@ -package server.haengdong.persistence; +package server.haengdong.domain.event; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import server.haengdong.domain.Event; @Repository public interface EventRepository extends JpaRepository { diff --git a/server/src/main/java/server/haengdong/domain/EventStep.java b/server/src/main/java/server/haengdong/domain/event/EventStep.java similarity index 94% rename from server/src/main/java/server/haengdong/domain/EventStep.java rename to server/src/main/java/server/haengdong/domain/event/EventStep.java index b25035fa5..297abdb66 100644 --- a/server/src/main/java/server/haengdong/domain/EventStep.java +++ b/server/src/main/java/server/haengdong/domain/event/EventStep.java @@ -1,4 +1,4 @@ -package server.haengdong.domain; +package server.haengdong.domain.event; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/server/src/main/java/server/haengdong/domain/EventTokenProvider.java b/server/src/main/java/server/haengdong/domain/event/EventTokenProvider.java similarity index 84% rename from server/src/main/java/server/haengdong/domain/EventTokenProvider.java rename to server/src/main/java/server/haengdong/domain/event/EventTokenProvider.java index 54d455f35..6450f0dcf 100644 --- a/server/src/main/java/server/haengdong/domain/EventTokenProvider.java +++ b/server/src/main/java/server/haengdong/domain/event/EventTokenProvider.java @@ -1,4 +1,4 @@ -package server.haengdong.domain; +package server.haengdong.domain.event; import java.util.UUID; import org.springframework.stereotype.Component; diff --git a/server/src/test/java/server/haengdong/application/BillActionServiceTest.java b/server/src/test/java/server/haengdong/application/BillActionServiceTest.java index df19b9e63..178e850e3 100644 --- a/server/src/test/java/server/haengdong/application/BillActionServiceTest.java +++ b/server/src/test/java/server/haengdong/application/BillActionServiceTest.java @@ -10,10 +10,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import server.haengdong.application.request.BillActionAppRequest; -import server.haengdong.domain.BillAction; -import server.haengdong.domain.Event; -import server.haengdong.persistence.BillActionRepository; -import server.haengdong.persistence.EventRepository; +import server.haengdong.domain.action.BillAction; +import server.haengdong.domain.event.Event; +import server.haengdong.domain.action.BillActionRepository; +import server.haengdong.domain.event.EventRepository; @SpringBootTest class BillActionServiceTest { diff --git a/server/src/test/java/server/haengdong/application/EventServiceTest.java b/server/src/test/java/server/haengdong/application/EventServiceTest.java index 5fef04b81..12a5a08a5 100644 --- a/server/src/test/java/server/haengdong/application/EventServiceTest.java +++ b/server/src/test/java/server/haengdong/application/EventServiceTest.java @@ -11,7 +11,7 @@ import org.springframework.boot.test.mock.mockito.MockBean; import server.haengdong.application.request.EventAppRequest; import server.haengdong.application.response.EventAppResponse; -import server.haengdong.domain.EventTokenProvider; +import server.haengdong.domain.event.EventTokenProvider; @SpringBootTest class EventServiceTest { diff --git a/server/src/test/java/server/haengdong/application/MemberActionFactoryTest.java b/server/src/test/java/server/haengdong/application/MemberActionFactoryTest.java index a0ac9916f..b8251a307 100644 --- a/server/src/test/java/server/haengdong/application/MemberActionFactoryTest.java +++ b/server/src/test/java/server/haengdong/application/MemberActionFactoryTest.java @@ -13,13 +13,13 @@ import org.springframework.boot.test.context.SpringBootTest; import server.haengdong.application.request.MemberActionSaveAppRequest; import server.haengdong.application.request.MemberActionsSaveAppRequest; -import server.haengdong.domain.Action; -import server.haengdong.domain.Event; -import server.haengdong.domain.MemberAction; -import server.haengdong.domain.MemberActionStatus; -import server.haengdong.persistence.ActionRepository; -import server.haengdong.persistence.EventRepository; -import server.haengdong.persistence.MemberActionRepository; +import server.haengdong.domain.action.Action; +import server.haengdong.domain.event.Event; +import server.haengdong.domain.action.MemberAction; +import server.haengdong.domain.action.MemberActionStatus; +import server.haengdong.domain.action.ActionRepository; +import server.haengdong.domain.event.EventRepository; +import server.haengdong.domain.action.MemberActionRepository; @SpringBootTest class MemberActionFactoryTest { diff --git a/server/src/test/java/server/haengdong/application/MemberActionServiceTest.java b/server/src/test/java/server/haengdong/application/MemberActionServiceTest.java index 73a7c3d9d..73a1f5376 100644 --- a/server/src/test/java/server/haengdong/application/MemberActionServiceTest.java +++ b/server/src/test/java/server/haengdong/application/MemberActionServiceTest.java @@ -10,13 +10,13 @@ import org.springframework.boot.test.context.SpringBootTest; import server.haengdong.application.request.MemberActionSaveAppRequest; import server.haengdong.application.request.MemberActionsSaveAppRequest; -import server.haengdong.domain.Action; -import server.haengdong.domain.Event; -import server.haengdong.domain.MemberAction; -import server.haengdong.domain.MemberActionStatus; -import server.haengdong.persistence.ActionRepository; -import server.haengdong.persistence.EventRepository; -import server.haengdong.persistence.MemberActionRepository; +import server.haengdong.domain.action.Action; +import server.haengdong.domain.event.Event; +import server.haengdong.domain.action.MemberAction; +import server.haengdong.domain.action.MemberActionStatus; +import server.haengdong.domain.action.ActionRepository; +import server.haengdong.domain.event.EventRepository; +import server.haengdong.domain.action.MemberActionRepository; @SpringBootTest class MemberActionServiceTest { diff --git a/server/src/test/java/server/haengdong/domain/ActionTest.java b/server/src/test/java/server/haengdong/domain/action/ActionTest.java similarity index 89% rename from server/src/test/java/server/haengdong/domain/ActionTest.java rename to server/src/test/java/server/haengdong/domain/action/ActionTest.java index a699fb04a..199a4f628 100644 --- a/server/src/test/java/server/haengdong/domain/ActionTest.java +++ b/server/src/test/java/server/haengdong/domain/action/ActionTest.java @@ -1,9 +1,10 @@ -package server.haengdong.domain; +package server.haengdong.domain.action; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import server.haengdong.domain.event.Event; class ActionTest { diff --git a/server/src/test/java/server/haengdong/domain/BillActionTest.java b/server/src/test/java/server/haengdong/domain/action/BillActionTest.java similarity index 96% rename from server/src/test/java/server/haengdong/domain/BillActionTest.java rename to server/src/test/java/server/haengdong/domain/action/BillActionTest.java index 5789f8c94..d179ca6eb 100644 --- a/server/src/test/java/server/haengdong/domain/BillActionTest.java +++ b/server/src/test/java/server/haengdong/domain/action/BillActionTest.java @@ -1,4 +1,4 @@ -package server.haengdong.domain; +package server.haengdong.domain.action; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -8,6 +8,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import server.haengdong.domain.event.Event; class BillActionTest {