diff --git a/build.gradle b/build.gradle index 7ff60787..ae767362 100644 --- a/build.gradle +++ b/build.gradle @@ -96,7 +96,7 @@ def excludeCoverage = [ '**/request/**', '**/response/*Response*', '**/query/support/*Support*', - '**/domain/*Repository*', + '**/domain/**Repository*', '**/auth/infrastructure/oauth/*/**', '**/auth/presentation/OauthController*', '**/common/domain/CommonDomainModel*', @@ -146,7 +146,7 @@ jacocoTestCoverageVerification { '*.request.*', '*.response.*Response*', '*.query.support.*Support', - '*.domain.*Repository', + '*.domain.**Repository', '*.auth.infrastructure.oauth.*.*', '*.OauthController', '*.common.domain.CommonDomainModel*', diff --git a/src/main/java/com/mallang/subscribe/application/BlogSubscribeService.java b/src/main/java/com/mallang/blog/application/BlogSubscribeService.java similarity index 76% rename from src/main/java/com/mallang/subscribe/application/BlogSubscribeService.java rename to src/main/java/com/mallang/blog/application/BlogSubscribeService.java index b2af36f7..901e8ae8 100644 --- a/src/main/java/com/mallang/subscribe/application/BlogSubscribeService.java +++ b/src/main/java/com/mallang/blog/application/BlogSubscribeService.java @@ -1,15 +1,15 @@ -package com.mallang.subscribe.application; +package com.mallang.blog.application; import com.mallang.auth.domain.Member; import com.mallang.auth.domain.MemberRepository; +import com.mallang.blog.application.command.BlogSubscribeCommand; +import com.mallang.blog.application.command.BlogUnsubscribeCommand; import com.mallang.blog.domain.Blog; import com.mallang.blog.domain.BlogRepository; -import com.mallang.subscribe.application.command.BlogSubscribeCommand; -import com.mallang.subscribe.application.command.BlogUnsubscribeCommand; -import com.mallang.subscribe.domain.BlogSubscribe; -import com.mallang.subscribe.domain.BlogSubscribeRepository; -import com.mallang.subscribe.domain.BlogSubscribeValidator; -import com.mallang.subscribe.exception.UnsubscribeUnsubscribedBlogException; +import com.mallang.blog.domain.subscribe.BlogSubscribe; +import com.mallang.blog.domain.subscribe.BlogSubscribeRepository; +import com.mallang.blog.domain.subscribe.BlogSubscribeValidator; +import com.mallang.blog.exception.UnsubscribeUnsubscribedBlogException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/mallang/subscribe/application/command/BlogSubscribeCommand.java b/src/main/java/com/mallang/blog/application/command/BlogSubscribeCommand.java similarity index 63% rename from src/main/java/com/mallang/subscribe/application/command/BlogSubscribeCommand.java rename to src/main/java/com/mallang/blog/application/command/BlogSubscribeCommand.java index ce45abc2..47fded4e 100644 --- a/src/main/java/com/mallang/subscribe/application/command/BlogSubscribeCommand.java +++ b/src/main/java/com/mallang/blog/application/command/BlogSubscribeCommand.java @@ -1,4 +1,4 @@ -package com.mallang.subscribe.application.command; +package com.mallang.blog.application.command; public record BlogSubscribeCommand( Long subscriberId, diff --git a/src/main/java/com/mallang/subscribe/application/command/BlogUnsubscribeCommand.java b/src/main/java/com/mallang/blog/application/command/BlogUnsubscribeCommand.java similarity index 64% rename from src/main/java/com/mallang/subscribe/application/command/BlogUnsubscribeCommand.java rename to src/main/java/com/mallang/blog/application/command/BlogUnsubscribeCommand.java index 48ed4b6b..2989c289 100644 --- a/src/main/java/com/mallang/subscribe/application/command/BlogUnsubscribeCommand.java +++ b/src/main/java/com/mallang/blog/application/command/BlogUnsubscribeCommand.java @@ -1,4 +1,4 @@ -package com.mallang.subscribe.application.command; +package com.mallang.blog.application.command; public record BlogUnsubscribeCommand( Long subscriberId, diff --git a/src/main/java/com/mallang/subscribe/domain/BlogSubscribe.java b/src/main/java/com/mallang/blog/domain/subscribe/BlogSubscribe.java similarity index 95% rename from src/main/java/com/mallang/subscribe/domain/BlogSubscribe.java rename to src/main/java/com/mallang/blog/domain/subscribe/BlogSubscribe.java index 133758fe..0af24ec8 100644 --- a/src/main/java/com/mallang/subscribe/domain/BlogSubscribe.java +++ b/src/main/java/com/mallang/blog/domain/subscribe/BlogSubscribe.java @@ -1,4 +1,4 @@ -package com.mallang.subscribe.domain; +package com.mallang.blog.domain.subscribe; import com.mallang.auth.domain.Member; import com.mallang.blog.domain.Blog; diff --git a/src/main/java/com/mallang/subscribe/domain/BlogSubscribeRepository.java b/src/main/java/com/mallang/blog/domain/subscribe/BlogSubscribeRepository.java similarity index 83% rename from src/main/java/com/mallang/subscribe/domain/BlogSubscribeRepository.java rename to src/main/java/com/mallang/blog/domain/subscribe/BlogSubscribeRepository.java index 64a8d7e3..fad26a02 100644 --- a/src/main/java/com/mallang/subscribe/domain/BlogSubscribeRepository.java +++ b/src/main/java/com/mallang/blog/domain/subscribe/BlogSubscribeRepository.java @@ -1,8 +1,8 @@ -package com.mallang.subscribe.domain; +package com.mallang.blog.domain.subscribe; import com.mallang.auth.domain.Member; import com.mallang.blog.domain.Blog; -import com.mallang.subscribe.exception.NotFoundBlogSubscribeException; +import com.mallang.blog.exception.NotFoundBlogSubscribeException; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/mallang/subscribe/domain/BlogSubscribeValidator.java b/src/main/java/com/mallang/blog/domain/subscribe/BlogSubscribeValidator.java similarity index 79% rename from src/main/java/com/mallang/subscribe/domain/BlogSubscribeValidator.java rename to src/main/java/com/mallang/blog/domain/subscribe/BlogSubscribeValidator.java index d061ffd5..0f37fb6f 100644 --- a/src/main/java/com/mallang/subscribe/domain/BlogSubscribeValidator.java +++ b/src/main/java/com/mallang/blog/domain/subscribe/BlogSubscribeValidator.java @@ -1,7 +1,7 @@ -package com.mallang.subscribe.domain; +package com.mallang.blog.domain.subscribe; -import com.mallang.subscribe.exception.AlreadySubscribedException; -import com.mallang.subscribe.exception.SelfSubscribeException; +import com.mallang.blog.exception.AlreadySubscribedException; +import com.mallang.blog.exception.SelfSubscribeException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/mallang/subscribe/exception/AlreadySubscribedException.java b/src/main/java/com/mallang/blog/exception/AlreadySubscribedException.java similarity index 89% rename from src/main/java/com/mallang/subscribe/exception/AlreadySubscribedException.java rename to src/main/java/com/mallang/blog/exception/AlreadySubscribedException.java index d0cbc5f6..63cbea9f 100644 --- a/src/main/java/com/mallang/subscribe/exception/AlreadySubscribedException.java +++ b/src/main/java/com/mallang/blog/exception/AlreadySubscribedException.java @@ -1,4 +1,4 @@ -package com.mallang.subscribe.exception; +package com.mallang.blog.exception; import com.mallang.common.execption.ErrorCode; import com.mallang.common.execption.MallangLogException; diff --git a/src/main/java/com/mallang/subscribe/exception/NotFoundBlogSubscribeException.java b/src/main/java/com/mallang/blog/exception/NotFoundBlogSubscribeException.java similarity index 90% rename from src/main/java/com/mallang/subscribe/exception/NotFoundBlogSubscribeException.java rename to src/main/java/com/mallang/blog/exception/NotFoundBlogSubscribeException.java index 6b3decb3..c62126ea 100644 --- a/src/main/java/com/mallang/subscribe/exception/NotFoundBlogSubscribeException.java +++ b/src/main/java/com/mallang/blog/exception/NotFoundBlogSubscribeException.java @@ -1,4 +1,4 @@ -package com.mallang.subscribe.exception; +package com.mallang.blog.exception; import com.mallang.common.execption.ErrorCode; import com.mallang.common.execption.MallangLogException; diff --git a/src/main/java/com/mallang/subscribe/exception/SelfSubscribeException.java b/src/main/java/com/mallang/blog/exception/SelfSubscribeException.java similarity index 90% rename from src/main/java/com/mallang/subscribe/exception/SelfSubscribeException.java rename to src/main/java/com/mallang/blog/exception/SelfSubscribeException.java index 88e9bf7c..5ee6348f 100644 --- a/src/main/java/com/mallang/subscribe/exception/SelfSubscribeException.java +++ b/src/main/java/com/mallang/blog/exception/SelfSubscribeException.java @@ -1,4 +1,4 @@ -package com.mallang.subscribe.exception; +package com.mallang.blog.exception; import com.mallang.common.execption.ErrorCode; import com.mallang.common.execption.MallangLogException; diff --git a/src/main/java/com/mallang/subscribe/exception/UnsubscribeUnsubscribedBlogException.java b/src/main/java/com/mallang/blog/exception/UnsubscribeUnsubscribedBlogException.java similarity index 91% rename from src/main/java/com/mallang/subscribe/exception/UnsubscribeUnsubscribedBlogException.java rename to src/main/java/com/mallang/blog/exception/UnsubscribeUnsubscribedBlogException.java index d0b75cd7..6a15b256 100644 --- a/src/main/java/com/mallang/subscribe/exception/UnsubscribeUnsubscribedBlogException.java +++ b/src/main/java/com/mallang/blog/exception/UnsubscribeUnsubscribedBlogException.java @@ -1,4 +1,4 @@ -package com.mallang.subscribe.exception; +package com.mallang.blog.exception; import com.mallang.common.execption.ErrorCode; import com.mallang.common.execption.MallangLogException; diff --git a/src/main/java/com/mallang/subscribe/presentation/BlogSubscribeController.java b/src/main/java/com/mallang/blog/presentation/BlogSubscribeController.java similarity index 84% rename from src/main/java/com/mallang/subscribe/presentation/BlogSubscribeController.java rename to src/main/java/com/mallang/blog/presentation/BlogSubscribeController.java index 39f0d574..1241b0fc 100644 --- a/src/main/java/com/mallang/subscribe/presentation/BlogSubscribeController.java +++ b/src/main/java/com/mallang/blog/presentation/BlogSubscribeController.java @@ -1,13 +1,13 @@ -package com.mallang.subscribe.presentation; +package com.mallang.blog.presentation; import com.mallang.auth.presentation.support.Auth; +import com.mallang.blog.application.BlogSubscribeService; +import com.mallang.blog.presentation.request.BlogSubscribeRequest; +import com.mallang.blog.presentation.request.BlogUnsubscribeRequest; +import com.mallang.blog.query.BlogSubscribeQueryService; +import com.mallang.blog.query.response.SubscriberResponse; +import com.mallang.blog.query.response.SubscribingBlogResponse; import com.mallang.common.presentation.PageResponse; -import com.mallang.subscribe.application.BlogSubscribeService; -import com.mallang.subscribe.presentation.request.BlogSubscribeRequest; -import com.mallang.subscribe.presentation.request.BlogUnsubscribeRequest; -import com.mallang.subscribe.query.BlogSubscribeQueryService; -import com.mallang.subscribe.query.response.SubscriberResponse; -import com.mallang.subscribe.query.response.SubscribingBlogResponse; import java.net.URI; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/mallang/subscribe/presentation/request/BlogSubscribeRequest.java b/src/main/java/com/mallang/blog/presentation/request/BlogSubscribeRequest.java similarity index 61% rename from src/main/java/com/mallang/subscribe/presentation/request/BlogSubscribeRequest.java rename to src/main/java/com/mallang/blog/presentation/request/BlogSubscribeRequest.java index 6d45c91f..4b3bfbf5 100644 --- a/src/main/java/com/mallang/subscribe/presentation/request/BlogSubscribeRequest.java +++ b/src/main/java/com/mallang/blog/presentation/request/BlogSubscribeRequest.java @@ -1,6 +1,6 @@ -package com.mallang.subscribe.presentation.request; +package com.mallang.blog.presentation.request; -import com.mallang.subscribe.application.command.BlogSubscribeCommand; +import com.mallang.blog.application.command.BlogSubscribeCommand; public record BlogSubscribeRequest( Long blogId diff --git a/src/main/java/com/mallang/subscribe/presentation/request/BlogUnsubscribeRequest.java b/src/main/java/com/mallang/blog/presentation/request/BlogUnsubscribeRequest.java similarity index 61% rename from src/main/java/com/mallang/subscribe/presentation/request/BlogUnsubscribeRequest.java rename to src/main/java/com/mallang/blog/presentation/request/BlogUnsubscribeRequest.java index 219d3d9e..4fb05e0f 100644 --- a/src/main/java/com/mallang/subscribe/presentation/request/BlogUnsubscribeRequest.java +++ b/src/main/java/com/mallang/blog/presentation/request/BlogUnsubscribeRequest.java @@ -1,6 +1,6 @@ -package com.mallang.subscribe.presentation.request; +package com.mallang.blog.presentation.request; -import com.mallang.subscribe.application.command.BlogUnsubscribeCommand; +import com.mallang.blog.application.command.BlogUnsubscribeCommand; public record BlogUnsubscribeRequest( Long blogId diff --git a/src/main/java/com/mallang/subscribe/query/BlogSubscribeQueryService.java b/src/main/java/com/mallang/blog/query/BlogSubscribeQueryService.java similarity index 74% rename from src/main/java/com/mallang/subscribe/query/BlogSubscribeQueryService.java rename to src/main/java/com/mallang/blog/query/BlogSubscribeQueryService.java index feb6e3e0..fd9d3760 100644 --- a/src/main/java/com/mallang/subscribe/query/BlogSubscribeQueryService.java +++ b/src/main/java/com/mallang/blog/query/BlogSubscribeQueryService.java @@ -1,9 +1,9 @@ -package com.mallang.subscribe.query; +package com.mallang.blog.query; -import com.mallang.subscribe.query.dao.SubscriberDao; -import com.mallang.subscribe.query.dao.SubscribingBlogDao; -import com.mallang.subscribe.query.response.SubscriberResponse; -import com.mallang.subscribe.query.response.SubscribingBlogResponse; +import com.mallang.blog.query.dao.SubscriberDao; +import com.mallang.blog.query.dao.SubscribingBlogDao; +import com.mallang.blog.query.response.SubscriberResponse; +import com.mallang.blog.query.response.SubscribingBlogResponse; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/com/mallang/subscribe/query/dao/SubscriberDao.java b/src/main/java/com/mallang/blog/query/dao/SubscriberDao.java similarity index 86% rename from src/main/java/com/mallang/subscribe/query/dao/SubscriberDao.java rename to src/main/java/com/mallang/blog/query/dao/SubscriberDao.java index d9df6221..64d1295c 100644 --- a/src/main/java/com/mallang/subscribe/query/dao/SubscriberDao.java +++ b/src/main/java/com/mallang/blog/query/dao/SubscriberDao.java @@ -1,10 +1,10 @@ -package com.mallang.subscribe.query.dao; +package com.mallang.blog.query.dao; import static com.mallang.auth.domain.QMember.member; -import static com.mallang.subscribe.domain.QBlogSubscribe.blogSubscribe; +import static com.mallang.blog.domain.subscribe.QBlogSubscribe.blogSubscribe; -import com.mallang.subscribe.domain.BlogSubscribe; -import com.mallang.subscribe.query.response.SubscriberResponse; +import com.mallang.blog.domain.subscribe.BlogSubscribe; +import com.mallang.blog.query.response.SubscriberResponse; import com.querydsl.jpa.impl.JPAQuery; import com.querydsl.jpa.impl.JPAQueryFactory; import java.util.List; diff --git a/src/main/java/com/mallang/subscribe/query/dao/SubscribingBlogDao.java b/src/main/java/com/mallang/blog/query/dao/SubscribingBlogDao.java similarity index 87% rename from src/main/java/com/mallang/subscribe/query/dao/SubscribingBlogDao.java rename to src/main/java/com/mallang/blog/query/dao/SubscribingBlogDao.java index c6a62719..49ead983 100644 --- a/src/main/java/com/mallang/subscribe/query/dao/SubscribingBlogDao.java +++ b/src/main/java/com/mallang/blog/query/dao/SubscribingBlogDao.java @@ -1,11 +1,11 @@ -package com.mallang.subscribe.query.dao; +package com.mallang.blog.query.dao; import static com.mallang.auth.domain.QMember.member; import static com.mallang.blog.domain.QBlog.blog; -import static com.mallang.subscribe.domain.QBlogSubscribe.blogSubscribe; +import static com.mallang.blog.domain.subscribe.QBlogSubscribe.blogSubscribe; -import com.mallang.subscribe.domain.BlogSubscribe; -import com.mallang.subscribe.query.response.SubscribingBlogResponse; +import com.mallang.blog.domain.subscribe.BlogSubscribe; +import com.mallang.blog.query.response.SubscribingBlogResponse; import com.querydsl.jpa.impl.JPAQuery; import com.querydsl.jpa.impl.JPAQueryFactory; import java.util.List; diff --git a/src/main/java/com/mallang/subscribe/query/response/SubscriberResponse.java b/src/main/java/com/mallang/blog/query/response/SubscriberResponse.java similarity index 88% rename from src/main/java/com/mallang/subscribe/query/response/SubscriberResponse.java rename to src/main/java/com/mallang/blog/query/response/SubscriberResponse.java index 1d716e7c..f8256bc5 100644 --- a/src/main/java/com/mallang/subscribe/query/response/SubscriberResponse.java +++ b/src/main/java/com/mallang/blog/query/response/SubscriberResponse.java @@ -1,7 +1,7 @@ -package com.mallang.subscribe.query.response; +package com.mallang.blog.query.response; import com.mallang.auth.domain.Member; -import com.mallang.subscribe.domain.BlogSubscribe; +import com.mallang.blog.domain.subscribe.BlogSubscribe; import java.time.LocalDateTime; import lombok.Builder; diff --git a/src/main/java/com/mallang/subscribe/query/response/SubscribingBlogResponse.java b/src/main/java/com/mallang/blog/query/response/SubscribingBlogResponse.java similarity index 90% rename from src/main/java/com/mallang/subscribe/query/response/SubscribingBlogResponse.java rename to src/main/java/com/mallang/blog/query/response/SubscribingBlogResponse.java index 6fdc5ff3..fa3687af 100644 --- a/src/main/java/com/mallang/subscribe/query/response/SubscribingBlogResponse.java +++ b/src/main/java/com/mallang/blog/query/response/SubscribingBlogResponse.java @@ -1,8 +1,8 @@ -package com.mallang.subscribe.query.response; +package com.mallang.blog.query.response; import com.mallang.auth.domain.Member; import com.mallang.blog.domain.Blog; -import com.mallang.subscribe.domain.BlogSubscribe; +import com.mallang.blog.domain.subscribe.BlogSubscribe; import java.time.LocalDateTime; import lombok.Builder; diff --git a/src/test/java/com/mallang/acceptance/subsribe/BlogSubscribeAcceptanceSteps.java b/src/test/java/com/mallang/acceptance/blog/subsribe/BlogSubscribeAcceptanceSteps.java similarity index 89% rename from src/test/java/com/mallang/acceptance/subsribe/BlogSubscribeAcceptanceSteps.java rename to src/test/java/com/mallang/acceptance/blog/subsribe/BlogSubscribeAcceptanceSteps.java index 8fce7125..b2e01cd3 100644 --- a/src/test/java/com/mallang/acceptance/subsribe/BlogSubscribeAcceptanceSteps.java +++ b/src/test/java/com/mallang/acceptance/blog/subsribe/BlogSubscribeAcceptanceSteps.java @@ -1,13 +1,13 @@ -package com.mallang.acceptance.subsribe; +package com.mallang.acceptance.blog.subsribe; import static com.mallang.acceptance.AcceptanceSteps.given; import static org.assertj.core.api.Assertions.assertThat; +import com.mallang.blog.presentation.request.BlogSubscribeRequest; +import com.mallang.blog.presentation.request.BlogUnsubscribeRequest; +import com.mallang.blog.query.response.SubscriberResponse; +import com.mallang.blog.query.response.SubscribingBlogResponse; import com.mallang.common.presentation.PageResponse; -import com.mallang.subscribe.presentation.request.BlogSubscribeRequest; -import com.mallang.subscribe.presentation.request.BlogUnsubscribeRequest; -import com.mallang.subscribe.query.response.SubscriberResponse; -import com.mallang.subscribe.query.response.SubscribingBlogResponse; import io.restassured.common.mapper.TypeRef; import io.restassured.response.ExtractableResponse; import io.restassured.response.Response; diff --git a/src/test/java/com/mallang/acceptance/subsribe/BlogSubscribeAcceptanceTest.java b/src/test/java/com/mallang/acceptance/blog/subsribe/BlogSubscribeAcceptanceTest.java similarity index 88% rename from src/test/java/com/mallang/acceptance/subsribe/BlogSubscribeAcceptanceTest.java rename to src/test/java/com/mallang/acceptance/blog/subsribe/BlogSubscribeAcceptanceTest.java index 711cbc27..f7d6f231 100644 --- a/src/test/java/com/mallang/acceptance/subsribe/BlogSubscribeAcceptanceTest.java +++ b/src/test/java/com/mallang/acceptance/blog/subsribe/BlogSubscribeAcceptanceTest.java @@ -1,4 +1,4 @@ -package com.mallang.acceptance.subsribe; +package com.mallang.acceptance.blog.subsribe; import static com.mallang.acceptance.AcceptanceSteps.본문_없음; import static com.mallang.acceptance.AcceptanceSteps.생성됨; @@ -9,12 +9,12 @@ import static com.mallang.acceptance.auth.MemberAcceptanceSteps.내_정보_조회_요청; import static com.mallang.acceptance.auth.MemberAcceptanceSteps.회원_정보_조회_결과_데이터; import static com.mallang.acceptance.blog.BlogAcceptanceSteps.블로그_개설; -import static com.mallang.acceptance.subsribe.BlogSubscribeAcceptanceSteps.구독중인_블로그_조회_결과_검증; -import static com.mallang.acceptance.subsribe.BlogSubscribeAcceptanceSteps.블로그_구독_요청; -import static com.mallang.acceptance.subsribe.BlogSubscribeAcceptanceSteps.블로그_구독_취소_요청; -import static com.mallang.acceptance.subsribe.BlogSubscribeAcceptanceSteps.블로그_구독자_조회_결과_검증; -import static com.mallang.acceptance.subsribe.BlogSubscribeAcceptanceSteps.특정_블로그를_구독중인_구독자_조회_요청; -import static com.mallang.acceptance.subsribe.BlogSubscribeAcceptanceSteps.특정_회원이_구독중인_블로그_조회_요청; +import static com.mallang.acceptance.blog.subsribe.BlogSubscribeAcceptanceSteps.구독중인_블로그_조회_결과_검증; +import static com.mallang.acceptance.blog.subsribe.BlogSubscribeAcceptanceSteps.블로그_구독_요청; +import static com.mallang.acceptance.blog.subsribe.BlogSubscribeAcceptanceSteps.블로그_구독_취소_요청; +import static com.mallang.acceptance.blog.subsribe.BlogSubscribeAcceptanceSteps.블로그_구독자_조회_결과_검증; +import static com.mallang.acceptance.blog.subsribe.BlogSubscribeAcceptanceSteps.특정_블로그를_구독중인_구독자_조회_요청; +import static com.mallang.acceptance.blog.subsribe.BlogSubscribeAcceptanceSteps.특정_회원이_구독중인_블로그_조회_요청; import com.mallang.acceptance.AcceptanceTest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/mallang/subscribe/application/BlogSubscribeServiceTest.java b/src/test/java/com/mallang/blog/application/BlogSubscribeServiceTest.java similarity index 88% rename from src/test/java/com/mallang/subscribe/application/BlogSubscribeServiceTest.java rename to src/test/java/com/mallang/blog/application/BlogSubscribeServiceTest.java index 08642e7e..73897061 100644 --- a/src/test/java/com/mallang/subscribe/application/BlogSubscribeServiceTest.java +++ b/src/test/java/com/mallang/blog/application/BlogSubscribeServiceTest.java @@ -1,14 +1,14 @@ -package com.mallang.subscribe.application; +package com.mallang.blog.application; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import com.mallang.blog.application.command.BlogSubscribeCommand; +import com.mallang.blog.application.command.BlogUnsubscribeCommand; +import com.mallang.blog.exception.AlreadySubscribedException; +import com.mallang.blog.exception.SelfSubscribeException; +import com.mallang.blog.exception.UnsubscribeUnsubscribedBlogException; import com.mallang.common.ServiceTest; -import com.mallang.subscribe.application.command.BlogSubscribeCommand; -import com.mallang.subscribe.application.command.BlogUnsubscribeCommand; -import com.mallang.subscribe.exception.AlreadySubscribedException; -import com.mallang.subscribe.exception.SelfSubscribeException; -import com.mallang.subscribe.exception.UnsubscribeUnsubscribedBlogException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/src/test/java/com/mallang/subscribe/domain/BlogSubscribeTest.java b/src/test/java/com/mallang/blog/domain/subscribe/BlogSubscribeTest.java similarity index 93% rename from src/test/java/com/mallang/subscribe/domain/BlogSubscribeTest.java rename to src/test/java/com/mallang/blog/domain/subscribe/BlogSubscribeTest.java index 14e56772..0d5455d4 100644 --- a/src/test/java/com/mallang/subscribe/domain/BlogSubscribeTest.java +++ b/src/test/java/com/mallang/blog/domain/subscribe/BlogSubscribeTest.java @@ -1,4 +1,4 @@ -package com.mallang.subscribe.domain; +package com.mallang.blog.domain.subscribe; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -8,8 +8,8 @@ import com.mallang.auth.MemberFixture; import com.mallang.auth.domain.Member; import com.mallang.blog.domain.Blog; -import com.mallang.subscribe.exception.AlreadySubscribedException; -import com.mallang.subscribe.exception.SelfSubscribeException; +import com.mallang.blog.exception.AlreadySubscribedException; +import com.mallang.blog.exception.SelfSubscribeException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/src/test/java/com/mallang/subscribe/domain/BlogSubscribeValidatorTest.java b/src/test/java/com/mallang/blog/domain/subscribe/BlogSubscribeValidatorTest.java similarity index 94% rename from src/test/java/com/mallang/subscribe/domain/BlogSubscribeValidatorTest.java rename to src/test/java/com/mallang/blog/domain/subscribe/BlogSubscribeValidatorTest.java index 86bec764..155765d0 100644 --- a/src/test/java/com/mallang/subscribe/domain/BlogSubscribeValidatorTest.java +++ b/src/test/java/com/mallang/blog/domain/subscribe/BlogSubscribeValidatorTest.java @@ -1,4 +1,4 @@ -package com.mallang.subscribe.domain; +package com.mallang.blog.domain.subscribe; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -9,8 +9,8 @@ import com.mallang.auth.MemberFixture; import com.mallang.auth.domain.Member; import com.mallang.blog.domain.Blog; -import com.mallang.subscribe.exception.AlreadySubscribedException; -import com.mallang.subscribe.exception.SelfSubscribeException; +import com.mallang.blog.exception.AlreadySubscribedException; +import com.mallang.blog.exception.SelfSubscribeException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayNameGeneration; import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores; diff --git a/src/test/java/com/mallang/subscribe/query/dao/SubscriberDaoTest.java b/src/test/java/com/mallang/blog/query/dao/SubscriberDaoTest.java similarity index 92% rename from src/test/java/com/mallang/subscribe/query/dao/SubscriberDaoTest.java rename to src/test/java/com/mallang/blog/query/dao/SubscriberDaoTest.java index ca344368..f28ad3a1 100644 --- a/src/test/java/com/mallang/subscribe/query/dao/SubscriberDaoTest.java +++ b/src/test/java/com/mallang/blog/query/dao/SubscriberDaoTest.java @@ -1,10 +1,10 @@ -package com.mallang.subscribe.query.dao; +package com.mallang.blog.query.dao; import static org.assertj.core.api.Assertions.assertThat; +import com.mallang.blog.application.command.BlogSubscribeCommand; +import com.mallang.blog.query.response.SubscriberResponse; import com.mallang.common.ServiceTest; -import com.mallang.subscribe.application.command.BlogSubscribeCommand; -import com.mallang.subscribe.query.response.SubscriberResponse; import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/src/test/java/com/mallang/subscribe/query/dao/SubscribingBlogDaoTest.java b/src/test/java/com/mallang/blog/query/dao/SubscribingBlogDaoTest.java similarity index 89% rename from src/test/java/com/mallang/subscribe/query/dao/SubscribingBlogDaoTest.java rename to src/test/java/com/mallang/blog/query/dao/SubscribingBlogDaoTest.java index 1f4489b6..daa7169f 100644 --- a/src/test/java/com/mallang/subscribe/query/dao/SubscribingBlogDaoTest.java +++ b/src/test/java/com/mallang/blog/query/dao/SubscribingBlogDaoTest.java @@ -1,10 +1,10 @@ -package com.mallang.subscribe.query.dao; +package com.mallang.blog.query.dao; import static org.assertj.core.api.Assertions.assertThat; +import com.mallang.blog.application.command.BlogSubscribeCommand; +import com.mallang.blog.query.response.SubscribingBlogResponse; import com.mallang.common.ServiceTest; -import com.mallang.subscribe.application.command.BlogSubscribeCommand; -import com.mallang.subscribe.query.response.SubscribingBlogResponse; import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayNameGeneration; diff --git a/src/test/java/com/mallang/common/ServiceTest.java b/src/test/java/com/mallang/common/ServiceTest.java index 4705d08b..daf7807c 100644 --- a/src/test/java/com/mallang/common/ServiceTest.java +++ b/src/test/java/com/mallang/common/ServiceTest.java @@ -9,9 +9,13 @@ import com.mallang.auth.query.dao.MemberDao; import com.mallang.blog.application.AboutService; import com.mallang.blog.application.BlogService; +import com.mallang.blog.application.BlogSubscribeService; import com.mallang.blog.application.command.OpenBlogCommand; import com.mallang.blog.domain.AboutRepository; import com.mallang.blog.domain.BlogRepository; +import com.mallang.blog.domain.subscribe.BlogSubscribeRepository; +import com.mallang.blog.query.dao.SubscriberDao; +import com.mallang.blog.query.dao.SubscribingBlogDao; import com.mallang.category.application.CategoryService; import com.mallang.category.domain.CategoryRepository; import com.mallang.category.query.CategoryQueryService; @@ -39,10 +43,6 @@ import com.mallang.post.query.PostQueryService; import com.mallang.post.query.PostStarQueryService; import com.mallang.post.query.dao.PostSearchDao; -import com.mallang.subscribe.application.BlogSubscribeService; -import com.mallang.subscribe.domain.BlogSubscribeRepository; -import com.mallang.subscribe.query.dao.SubscriberDao; -import com.mallang.subscribe.query.dao.SubscribingBlogDao; import java.util.Arrays; import java.util.Collections; import java.util.List;