diff --git a/docs/convention/test-convention.md b/docs/convention/test-convention.md index cd25d4a4..7a9de019 100644 --- a/docs/convention/test-convention.md +++ b/docs/convention/test-convention.md @@ -34,7 +34,6 @@ - 현재 legacy 유지 대상: - `com.techfork.domain.source` - `com.techfork.domain.search` - - `com.techfork.domain.recommendation` - 테스트만 먼저 `com.techfork.`로 옮기지 않는다. production과 test의 root가 달라지면 IDE 탐색, package-private 접근, fixture 소유권 판단이 어긋날 수 있다. - legacy slice를 이관할 때는 다음을 같은 작업 단위로 묶는다. - production package 선언과 디렉터리 이동 diff --git a/src/main/java/com/techfork/global/config/ElasticsearchCacheManager.java b/src/main/java/com/techfork/global/config/ElasticsearchCacheManager.java index 67706619..d2168c6c 100644 --- a/src/main/java/com/techfork/global/config/ElasticsearchCacheManager.java +++ b/src/main/java/com/techfork/global/config/ElasticsearchCacheManager.java @@ -4,7 +4,7 @@ import co.elastic.clients.elasticsearch._types.KnnSearch; import co.elastic.clients.json.JsonData; import com.techfork.post.domain.projection.PostDocument; -import com.techfork.domain.recommendation.config.RecommendationProperties; +import com.techfork.recommendation.config.RecommendationProperties; import com.techfork.personalization.infrastructure.PersonalizationProfileDocument; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/techfork/global/util/LinearTimeDecayStrategy.java b/src/main/java/com/techfork/global/util/LinearTimeDecayStrategy.java index 41e31934..260f75c6 100644 --- a/src/main/java/com/techfork/global/util/LinearTimeDecayStrategy.java +++ b/src/main/java/com/techfork/global/util/LinearTimeDecayStrategy.java @@ -1,6 +1,6 @@ package com.techfork.global.util; -import com.techfork.domain.recommendation.config.RecommendationProperties; +import com.techfork.recommendation.config.RecommendationProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/techfork/domain/recommendation/service/RecommendationCommandService.java b/src/main/java/com/techfork/recommendation/application/command/RecommendationCommandService.java similarity index 85% rename from src/main/java/com/techfork/domain/recommendation/service/RecommendationCommandService.java rename to src/main/java/com/techfork/recommendation/application/command/RecommendationCommandService.java index d8fe8556..bc6b3b20 100644 --- a/src/main/java/com/techfork/domain/recommendation/service/RecommendationCommandService.java +++ b/src/main/java/com/techfork/recommendation/application/command/RecommendationCommandService.java @@ -1,5 +1,6 @@ -package com.techfork.domain.recommendation.service; +package com.techfork.recommendation.application.command; +import com.techfork.recommendation.application.generation.RecommendationService; import com.techfork.useraccount.application.query.lookup.UserLookupService; import com.techfork.useraccount.domain.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/techfork/domain/recommendation/service/LlmRecommendationService.java b/src/main/java/com/techfork/recommendation/application/generation/LlmRecommendationService.java similarity index 94% rename from src/main/java/com/techfork/domain/recommendation/service/LlmRecommendationService.java rename to src/main/java/com/techfork/recommendation/application/generation/LlmRecommendationService.java index 25a2dc6c..e776cbcf 100644 --- a/src/main/java/com/techfork/domain/recommendation/service/LlmRecommendationService.java +++ b/src/main/java/com/techfork/recommendation/application/generation/LlmRecommendationService.java @@ -1,4 +1,4 @@ -package com.techfork.domain.recommendation.service; +package com.techfork.recommendation.application.generation; import co.elastic.clients.elasticsearch.ElasticsearchClient; import co.elastic.clients.elasticsearch._types.KnnSearch; @@ -6,13 +6,14 @@ import co.elastic.clients.elasticsearch.core.SearchResponse; import co.elastic.clients.elasticsearch.core.search.Hit; import com.techfork.activity.readpost.application.query.lookup.ReadPostLookupService; -import com.techfork.domain.recommendation.config.RecommendationProperties; -import com.techfork.domain.recommendation.entity.RecommendationHistory; -import com.techfork.domain.recommendation.entity.RecommendedPost; -import com.techfork.domain.recommendation.repository.RecommendationHistoryRepository; -import com.techfork.domain.recommendation.repository.RecommendedPostRepository; -import com.techfork.domain.recommendation.service.MmrService.MmrCandidate; -import com.techfork.domain.recommendation.service.MmrService.MmrResult; +import com.techfork.recommendation.application.ranking.MmrService; +import com.techfork.recommendation.application.ranking.MmrService.MmrCandidate; +import com.techfork.recommendation.application.ranking.MmrService.MmrResult; +import com.techfork.recommendation.config.RecommendationProperties; +import com.techfork.recommendation.domain.RecommendationHistory; +import com.techfork.recommendation.domain.RecommendedPost; +import com.techfork.recommendation.infrastructure.RecommendationHistoryRepository; +import com.techfork.recommendation.infrastructure.RecommendedPostRepository; import com.techfork.global.elasticsearch.query.VectorQueryBuilder; import com.techfork.global.util.RrfScorer; import com.techfork.global.util.TimeDecayStrategy; diff --git a/src/main/java/com/techfork/domain/recommendation/service/RecommendationService.java b/src/main/java/com/techfork/recommendation/application/generation/RecommendationService.java similarity index 94% rename from src/main/java/com/techfork/domain/recommendation/service/RecommendationService.java rename to src/main/java/com/techfork/recommendation/application/generation/RecommendationService.java index b57be76f..ab9336c7 100644 --- a/src/main/java/com/techfork/domain/recommendation/service/RecommendationService.java +++ b/src/main/java/com/techfork/recommendation/application/generation/RecommendationService.java @@ -1,4 +1,4 @@ -package com.techfork.domain.recommendation.service; +package com.techfork.recommendation.application.generation; import com.techfork.useraccount.domain.User; import java.util.List; diff --git a/src/main/java/com/techfork/domain/recommendation/listener/PersonalizedProfileGeneratedEventListener.java b/src/main/java/com/techfork/recommendation/application/listener/PersonalizedProfileGeneratedEventListener.java similarity index 91% rename from src/main/java/com/techfork/domain/recommendation/listener/PersonalizedProfileGeneratedEventListener.java rename to src/main/java/com/techfork/recommendation/application/listener/PersonalizedProfileGeneratedEventListener.java index 945e7433..51d52aad 100644 --- a/src/main/java/com/techfork/domain/recommendation/listener/PersonalizedProfileGeneratedEventListener.java +++ b/src/main/java/com/techfork/recommendation/application/listener/PersonalizedProfileGeneratedEventListener.java @@ -1,6 +1,6 @@ -package com.techfork.domain.recommendation.listener; +package com.techfork.recommendation.application.listener; -import com.techfork.domain.recommendation.service.RecommendationService; +import com.techfork.recommendation.application.generation.RecommendationService; import com.techfork.personalization.application.event.PersonalizedProfileGeneratedEvent; import com.techfork.useraccount.application.query.lookup.UserLookupService; import com.techfork.useraccount.domain.User; diff --git a/src/main/java/com/techfork/domain/recommendation/service/RecommendationQueryService.java b/src/main/java/com/techfork/recommendation/application/query/RecommendationQueryService.java similarity index 83% rename from src/main/java/com/techfork/domain/recommendation/service/RecommendationQueryService.java rename to src/main/java/com/techfork/recommendation/application/query/RecommendationQueryService.java index a8b9c478..0a9da2f9 100644 --- a/src/main/java/com/techfork/domain/recommendation/service/RecommendationQueryService.java +++ b/src/main/java/com/techfork/recommendation/application/query/RecommendationQueryService.java @@ -1,11 +1,11 @@ -package com.techfork.domain.recommendation.service; +package com.techfork.recommendation.application.query; import com.techfork.activity.bookmark.application.query.lookup.BookmarkLookupService; -import com.techfork.domain.recommendation.converter.RecommendationConverter; -import com.techfork.domain.recommendation.dto.RecommendationListResponse; -import com.techfork.domain.recommendation.dto.RecommendedPostDto; -import com.techfork.domain.recommendation.entity.RecommendedPost; -import com.techfork.domain.recommendation.repository.RecommendedPostRepository; +import com.techfork.recommendation.presentation.RecommendationConverter; +import com.techfork.recommendation.presentation.response.RecommendationListResponse; +import com.techfork.recommendation.presentation.response.RecommendedPostDto; +import com.techfork.recommendation.domain.RecommendedPost; +import com.techfork.recommendation.infrastructure.RecommendedPostRepository; import com.techfork.useraccount.application.query.lookup.UserLookupService; import com.techfork.useraccount.domain.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/techfork/domain/recommendation/service/MmrService.java b/src/main/java/com/techfork/recommendation/application/ranking/MmrService.java similarity index 96% rename from src/main/java/com/techfork/domain/recommendation/service/MmrService.java rename to src/main/java/com/techfork/recommendation/application/ranking/MmrService.java index 3b393d61..63493829 100644 --- a/src/main/java/com/techfork/domain/recommendation/service/MmrService.java +++ b/src/main/java/com/techfork/recommendation/application/ranking/MmrService.java @@ -1,6 +1,6 @@ -package com.techfork.domain.recommendation.service; +package com.techfork.recommendation.application.ranking; -import com.techfork.domain.recommendation.config.RecommendationProperties; +import com.techfork.recommendation.config.RecommendationProperties; import com.techfork.global.util.VectorUtil; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/techfork/domain/recommendation/scheduler/RecommendationScheduler.java b/src/main/java/com/techfork/recommendation/application/scheduler/RecommendationScheduler.java similarity index 91% rename from src/main/java/com/techfork/domain/recommendation/scheduler/RecommendationScheduler.java rename to src/main/java/com/techfork/recommendation/application/scheduler/RecommendationScheduler.java index c5c54c63..7032713e 100644 --- a/src/main/java/com/techfork/domain/recommendation/scheduler/RecommendationScheduler.java +++ b/src/main/java/com/techfork/recommendation/application/scheduler/RecommendationScheduler.java @@ -1,7 +1,7 @@ -package com.techfork.domain.recommendation.scheduler; +package com.techfork.recommendation.application.scheduler; -import com.techfork.domain.recommendation.config.RecommendationProperties; -import com.techfork.domain.recommendation.service.RecommendationService; +import com.techfork.recommendation.config.RecommendationProperties; +import com.techfork.recommendation.application.generation.RecommendationService; import com.techfork.useraccount.application.query.lookup.UserLookupService; import com.techfork.useraccount.domain.User; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/techfork/domain/recommendation/config/RecommendationProperties.java b/src/main/java/com/techfork/recommendation/config/RecommendationProperties.java similarity index 92% rename from src/main/java/com/techfork/domain/recommendation/config/RecommendationProperties.java rename to src/main/java/com/techfork/recommendation/config/RecommendationProperties.java index 15d6a996..0f14feae 100644 --- a/src/main/java/com/techfork/domain/recommendation/config/RecommendationProperties.java +++ b/src/main/java/com/techfork/recommendation/config/RecommendationProperties.java @@ -1,4 +1,4 @@ -package com.techfork.domain.recommendation.config; +package com.techfork.recommendation.config; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/techfork/domain/recommendation/entity/RecommendationHistory.java b/src/main/java/com/techfork/recommendation/domain/RecommendationHistory.java similarity index 98% rename from src/main/java/com/techfork/domain/recommendation/entity/RecommendationHistory.java rename to src/main/java/com/techfork/recommendation/domain/RecommendationHistory.java index 4e356f23..2505bc24 100644 --- a/src/main/java/com/techfork/domain/recommendation/entity/RecommendationHistory.java +++ b/src/main/java/com/techfork/recommendation/domain/RecommendationHistory.java @@ -1,4 +1,4 @@ -package com.techfork.domain.recommendation.entity; +package com.techfork.recommendation.domain; import com.techfork.post.domain.Post; import com.techfork.useraccount.domain.User; diff --git a/src/main/java/com/techfork/domain/recommendation/entity/RecommendedPost.java b/src/main/java/com/techfork/recommendation/domain/RecommendedPost.java similarity index 97% rename from src/main/java/com/techfork/domain/recommendation/entity/RecommendedPost.java rename to src/main/java/com/techfork/recommendation/domain/RecommendedPost.java index d301980c..75a00abd 100644 --- a/src/main/java/com/techfork/domain/recommendation/entity/RecommendedPost.java +++ b/src/main/java/com/techfork/recommendation/domain/RecommendedPost.java @@ -1,4 +1,4 @@ -package com.techfork.domain.recommendation.entity; +package com.techfork.recommendation.domain; import com.techfork.post.domain.Post; import com.techfork.useraccount.domain.User; diff --git a/src/main/java/com/techfork/domain/recommendation/repository/RecommendationHistoryRepository.java b/src/main/java/com/techfork/recommendation/infrastructure/RecommendationHistoryRepository.java similarity index 55% rename from src/main/java/com/techfork/domain/recommendation/repository/RecommendationHistoryRepository.java rename to src/main/java/com/techfork/recommendation/infrastructure/RecommendationHistoryRepository.java index fde2e74e..14722b1a 100644 --- a/src/main/java/com/techfork/domain/recommendation/repository/RecommendationHistoryRepository.java +++ b/src/main/java/com/techfork/recommendation/infrastructure/RecommendationHistoryRepository.java @@ -1,7 +1,7 @@ -package com.techfork.domain.recommendation.repository; - -import com.techfork.domain.recommendation.entity.RecommendationHistory; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface RecommendationHistoryRepository extends JpaRepository { -} +package com.techfork.recommendation.infrastructure; + +import com.techfork.recommendation.domain.RecommendationHistory; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface RecommendationHistoryRepository extends JpaRepository { +} diff --git a/src/main/java/com/techfork/domain/recommendation/repository/RecommendedPostRepository.java b/src/main/java/com/techfork/recommendation/infrastructure/RecommendedPostRepository.java similarity index 87% rename from src/main/java/com/techfork/domain/recommendation/repository/RecommendedPostRepository.java rename to src/main/java/com/techfork/recommendation/infrastructure/RecommendedPostRepository.java index ef17949f..44aefd32 100644 --- a/src/main/java/com/techfork/domain/recommendation/repository/RecommendedPostRepository.java +++ b/src/main/java/com/techfork/recommendation/infrastructure/RecommendedPostRepository.java @@ -1,6 +1,6 @@ -package com.techfork.domain.recommendation.repository; +package com.techfork.recommendation.infrastructure; -import com.techfork.domain.recommendation.entity.RecommendedPost; +import com.techfork.recommendation.domain.RecommendedPost; import com.techfork.useraccount.domain.User; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; diff --git a/src/main/java/com/techfork/domain/recommendation/config/RecommendationConfig.java b/src/main/java/com/techfork/recommendation/infrastructure/config/RecommendationConfig.java similarity index 94% rename from src/main/java/com/techfork/domain/recommendation/config/RecommendationConfig.java rename to src/main/java/com/techfork/recommendation/infrastructure/config/RecommendationConfig.java index 57ff9bb4..38c1a00d 100644 --- a/src/main/java/com/techfork/domain/recommendation/config/RecommendationConfig.java +++ b/src/main/java/com/techfork/recommendation/infrastructure/config/RecommendationConfig.java @@ -1,4 +1,4 @@ -package com.techfork.domain.recommendation.config; +package com.techfork.recommendation.infrastructure.config; import com.techfork.global.filter.MdcTaskDecorator; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/techfork/domain/recommendation/controller/RecommendationController.java b/src/main/java/com/techfork/recommendation/presentation/RecommendationController.java similarity index 86% rename from src/main/java/com/techfork/domain/recommendation/controller/RecommendationController.java rename to src/main/java/com/techfork/recommendation/presentation/RecommendationController.java index 99a5b2d9..a0eb7a44 100644 --- a/src/main/java/com/techfork/domain/recommendation/controller/RecommendationController.java +++ b/src/main/java/com/techfork/recommendation/presentation/RecommendationController.java @@ -1,8 +1,8 @@ -package com.techfork.domain.recommendation.controller; +package com.techfork.recommendation.presentation; -import com.techfork.domain.recommendation.dto.RecommendationListResponse; -import com.techfork.domain.recommendation.service.RecommendationCommandService; -import com.techfork.domain.recommendation.service.RecommendationQueryService; +import com.techfork.recommendation.presentation.response.RecommendationListResponse; +import com.techfork.recommendation.application.command.RecommendationCommandService; +import com.techfork.recommendation.application.query.RecommendationQueryService; import com.techfork.global.common.code.SuccessCode; import com.techfork.global.response.BaseResponse; import com.techfork.auth.security.oauth.UserPrincipal; diff --git a/src/main/java/com/techfork/domain/recommendation/converter/RecommendationConverter.java b/src/main/java/com/techfork/recommendation/presentation/RecommendationConverter.java similarity index 88% rename from src/main/java/com/techfork/domain/recommendation/converter/RecommendationConverter.java rename to src/main/java/com/techfork/recommendation/presentation/RecommendationConverter.java index b49479bf..9afb63e0 100644 --- a/src/main/java/com/techfork/domain/recommendation/converter/RecommendationConverter.java +++ b/src/main/java/com/techfork/recommendation/presentation/RecommendationConverter.java @@ -1,10 +1,10 @@ -package com.techfork.domain.recommendation.converter; +package com.techfork.recommendation.presentation; import com.techfork.post.domain.Post; import com.techfork.post.domain.PostKeyword; -import com.techfork.domain.recommendation.dto.RecommendationListResponse; -import com.techfork.domain.recommendation.dto.RecommendedPostDto; -import com.techfork.domain.recommendation.entity.RecommendedPost; +import com.techfork.recommendation.presentation.response.RecommendationListResponse; +import com.techfork.recommendation.presentation.response.RecommendedPostDto; +import com.techfork.recommendation.domain.RecommendedPost; import com.techfork.global.util.CloudflareThirdPartyThumbnailOptimizer; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/techfork/domain/recommendation/dto/RecommendationListResponse.java b/src/main/java/com/techfork/recommendation/presentation/response/RecommendationListResponse.java similarity index 75% rename from src/main/java/com/techfork/domain/recommendation/dto/RecommendationListResponse.java rename to src/main/java/com/techfork/recommendation/presentation/response/RecommendationListResponse.java index db1e3a53..a8168118 100644 --- a/src/main/java/com/techfork/domain/recommendation/dto/RecommendationListResponse.java +++ b/src/main/java/com/techfork/recommendation/presentation/response/RecommendationListResponse.java @@ -1,4 +1,4 @@ -package com.techfork.domain.recommendation.dto; +package com.techfork.recommendation.presentation.response; import lombok.Builder; diff --git a/src/main/java/com/techfork/domain/recommendation/dto/RecommendedPostDto.java b/src/main/java/com/techfork/recommendation/presentation/response/RecommendedPostDto.java similarity index 91% rename from src/main/java/com/techfork/domain/recommendation/dto/RecommendedPostDto.java rename to src/main/java/com/techfork/recommendation/presentation/response/RecommendedPostDto.java index e9ecdb8b..c62e7847 100644 --- a/src/main/java/com/techfork/domain/recommendation/dto/RecommendedPostDto.java +++ b/src/main/java/com/techfork/recommendation/presentation/response/RecommendedPostDto.java @@ -1,4 +1,4 @@ -package com.techfork.domain.recommendation.dto; +package com.techfork.recommendation.presentation.response; import lombok.Builder; diff --git a/src/test/java/com/techfork/evaluation/recommendation/KValueComparisonTest.java b/src/test/java/com/techfork/evaluation/recommendation/KValueComparisonTest.java index cb82b66c..92a70b63 100644 --- a/src/test/java/com/techfork/evaluation/recommendation/KValueComparisonTest.java +++ b/src/test/java/com/techfork/evaluation/recommendation/KValueComparisonTest.java @@ -1,6 +1,6 @@ package com.techfork.evaluation.recommendation; -import com.techfork.domain.recommendation.config.RecommendationProperties; +import com.techfork.recommendation.config.RecommendationProperties; import com.techfork.useraccount.domain.User; import lombok.Builder; import lombok.Getter; diff --git a/src/test/java/com/techfork/evaluation/recommendation/LambdaOptimizationTest.java b/src/test/java/com/techfork/evaluation/recommendation/LambdaOptimizationTest.java index f40d1f5e..dcdcdf29 100644 --- a/src/test/java/com/techfork/evaluation/recommendation/LambdaOptimizationTest.java +++ b/src/test/java/com/techfork/evaluation/recommendation/LambdaOptimizationTest.java @@ -1,6 +1,6 @@ package com.techfork.evaluation.recommendation; -import com.techfork.domain.recommendation.config.RecommendationProperties; +import com.techfork.recommendation.config.RecommendationProperties; import com.techfork.useraccount.domain.User; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/techfork/evaluation/recommendation/MmrCandidateSizeComparisonTest.java b/src/test/java/com/techfork/evaluation/recommendation/MmrCandidateSizeComparisonTest.java index 0195e368..54df61cb 100644 --- a/src/test/java/com/techfork/evaluation/recommendation/MmrCandidateSizeComparisonTest.java +++ b/src/test/java/com/techfork/evaluation/recommendation/MmrCandidateSizeComparisonTest.java @@ -1,6 +1,6 @@ package com.techfork.evaluation.recommendation; -import com.techfork.domain.recommendation.config.RecommendationProperties; +import com.techfork.recommendation.config.RecommendationProperties; import com.techfork.useraccount.domain.User; import lombok.Builder; import lombok.Getter; diff --git a/src/test/java/com/techfork/evaluation/recommendation/RecommendationEvaluationService.java b/src/test/java/com/techfork/evaluation/recommendation/RecommendationEvaluationService.java index fd0c6fa3..43cb6fdf 100644 --- a/src/test/java/com/techfork/evaluation/recommendation/RecommendationEvaluationService.java +++ b/src/test/java/com/techfork/evaluation/recommendation/RecommendationEvaluationService.java @@ -7,14 +7,14 @@ import co.elastic.clients.elasticsearch._types.KnnSearch; import com.techfork.activity.readpost.application.query.lookup.ReadPostLookupService; import com.techfork.post.domain.projection.PostDocument; -import com.techfork.domain.recommendation.config.RecommendationProperties; -import com.techfork.domain.recommendation.entity.RecommendedPost; -import com.techfork.domain.recommendation.repository.RecommendationHistoryRepository; -import com.techfork.domain.recommendation.repository.RecommendedPostRepository; -import com.techfork.domain.recommendation.service.LlmRecommendationService; -import com.techfork.domain.recommendation.service.MmrService; -import com.techfork.domain.recommendation.service.MmrService.MmrCandidate; -import com.techfork.domain.recommendation.service.MmrService.MmrResult; +import com.techfork.recommendation.config.RecommendationProperties; +import com.techfork.recommendation.domain.RecommendedPost; +import com.techfork.recommendation.infrastructure.RecommendationHistoryRepository; +import com.techfork.recommendation.infrastructure.RecommendedPostRepository; +import com.techfork.recommendation.application.generation.LlmRecommendationService; +import com.techfork.recommendation.application.ranking.MmrService; +import com.techfork.recommendation.application.ranking.MmrService.MmrCandidate; +import com.techfork.recommendation.application.ranking.MmrService.MmrResult; import com.techfork.global.util.RrfScorer; import com.techfork.personalization.infrastructure.PersonalizationProfileDocument; import com.techfork.personalization.application.query.lookup.PersonalizationProfileLookupService; diff --git a/src/test/java/com/techfork/evaluation/recommendation/RecommendationTestBase.java b/src/test/java/com/techfork/evaluation/recommendation/RecommendationTestBase.java index 2b2b98e3..463f65df 100644 --- a/src/test/java/com/techfork/evaluation/recommendation/RecommendationTestBase.java +++ b/src/test/java/com/techfork/evaluation/recommendation/RecommendationTestBase.java @@ -3,7 +3,7 @@ import co.elastic.clients.elasticsearch.ElasticsearchClient; import com.techfork.activity.readpost.infrastructure.ReadPostRepository; import com.techfork.post.infrastructure.PostDocumentRepository; -import com.techfork.domain.recommendation.config.RecommendationProperties; +import com.techfork.recommendation.config.RecommendationProperties; import com.techfork.evaluation.recommendation.util.EvaluationFixtureLoader; import com.techfork.useraccount.domain.User; import com.techfork.global.common.IntegrationTestBase; diff --git a/src/test/java/com/techfork/personalization/integration/PersonalizedProfileGeneratedAfterCommitIntegrationTest.java b/src/test/java/com/techfork/personalization/integration/PersonalizedProfileGeneratedAfterCommitIntegrationTest.java index 18c04f28..e2ce2399 100644 --- a/src/test/java/com/techfork/personalization/integration/PersonalizedProfileGeneratedAfterCommitIntegrationTest.java +++ b/src/test/java/com/techfork/personalization/integration/PersonalizedProfileGeneratedAfterCommitIntegrationTest.java @@ -1,7 +1,7 @@ package com.techfork.personalization.integration; -import com.techfork.domain.recommendation.listener.PersonalizedProfileGeneratedEventListener; -import com.techfork.domain.recommendation.service.RecommendationService; +import com.techfork.recommendation.application.listener.PersonalizedProfileGeneratedEventListener; +import com.techfork.recommendation.application.generation.RecommendationService; import com.techfork.personalization.application.event.PersonalizedProfileGeneratedEvent; import com.techfork.useraccount.application.query.lookup.UserLookupService; import com.techfork.useraccount.domain.User; diff --git a/src/test/java/com/techfork/domain/recommendation/service/RecommendationCommandServiceTest.java b/src/test/java/com/techfork/recommendation/application/command/RecommendationCommandServiceTest.java similarity index 92% rename from src/test/java/com/techfork/domain/recommendation/service/RecommendationCommandServiceTest.java rename to src/test/java/com/techfork/recommendation/application/command/RecommendationCommandServiceTest.java index 6d2338d9..1ef89c63 100644 --- a/src/test/java/com/techfork/domain/recommendation/service/RecommendationCommandServiceTest.java +++ b/src/test/java/com/techfork/recommendation/application/command/RecommendationCommandServiceTest.java @@ -1,5 +1,6 @@ -package com.techfork.domain.recommendation.service; +package com.techfork.recommendation.application.command; +import com.techfork.recommendation.application.generation.RecommendationService; import com.techfork.useraccount.application.query.lookup.UserLookupService; import com.techfork.useraccount.domain.User; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/techfork/domain/recommendation/service/LlmRecommendationServiceTest.java b/src/test/java/com/techfork/recommendation/application/generation/LlmRecommendationServiceTest.java similarity index 97% rename from src/test/java/com/techfork/domain/recommendation/service/LlmRecommendationServiceTest.java rename to src/test/java/com/techfork/recommendation/application/generation/LlmRecommendationServiceTest.java index 8dc9918a..82abb2d5 100644 --- a/src/test/java/com/techfork/domain/recommendation/service/LlmRecommendationServiceTest.java +++ b/src/test/java/com/techfork/recommendation/application/generation/LlmRecommendationServiceTest.java @@ -1,4 +1,4 @@ -package com.techfork.domain.recommendation.service; +package com.techfork.recommendation.application.generation; import co.elastic.clients.elasticsearch.ElasticsearchClient; import co.elastic.clients.elasticsearch._types.query_dsl.Query; @@ -7,12 +7,13 @@ import co.elastic.clients.elasticsearch.core.search.Hit; import co.elastic.clients.util.ObjectBuilder; import com.techfork.activity.readpost.application.query.lookup.ReadPostLookupService; +import com.techfork.recommendation.application.ranking.MmrService; import com.techfork.global.elasticsearch.query.VectorQueryBuilder; import com.techfork.post.domain.projection.PostDocument; import com.techfork.post.fixture.PostDocumentFixture; -import com.techfork.domain.recommendation.config.RecommendationProperties; -import com.techfork.domain.recommendation.repository.RecommendedPostRepository; -import com.techfork.domain.recommendation.repository.RecommendationHistoryRepository; +import com.techfork.recommendation.config.RecommendationProperties; +import com.techfork.recommendation.infrastructure.RecommendedPostRepository; +import com.techfork.recommendation.infrastructure.RecommendationHistoryRepository; import com.techfork.post.domain.Post; import com.techfork.global.util.TimeDecayStrategy; import com.techfork.personalization.application.query.lookup.PersonalizationProfileLookupItem; diff --git a/src/test/java/com/techfork/domain/recommendation/listener/PersonalizedProfileGeneratedEventListenerTest.java b/src/test/java/com/techfork/recommendation/application/listener/PersonalizedProfileGeneratedEventListenerTest.java similarity index 97% rename from src/test/java/com/techfork/domain/recommendation/listener/PersonalizedProfileGeneratedEventListenerTest.java rename to src/test/java/com/techfork/recommendation/application/listener/PersonalizedProfileGeneratedEventListenerTest.java index 73e1899f..1201d1e4 100644 --- a/src/test/java/com/techfork/domain/recommendation/listener/PersonalizedProfileGeneratedEventListenerTest.java +++ b/src/test/java/com/techfork/recommendation/application/listener/PersonalizedProfileGeneratedEventListenerTest.java @@ -1,6 +1,6 @@ -package com.techfork.domain.recommendation.listener; +package com.techfork.recommendation.application.listener; -import com.techfork.domain.recommendation.service.RecommendationService; +import com.techfork.recommendation.application.generation.RecommendationService; import com.techfork.personalization.application.event.PersonalizedProfileGeneratedEvent; import com.techfork.useraccount.application.query.lookup.UserLookupService; import com.techfork.useraccount.domain.User; diff --git a/src/test/java/com/techfork/domain/recommendation/service/RecommendationQueryServiceTest.java b/src/test/java/com/techfork/recommendation/application/query/RecommendationQueryServiceTest.java similarity index 94% rename from src/test/java/com/techfork/domain/recommendation/service/RecommendationQueryServiceTest.java rename to src/test/java/com/techfork/recommendation/application/query/RecommendationQueryServiceTest.java index 5a3b1a3e..747ed94a 100644 --- a/src/test/java/com/techfork/domain/recommendation/service/RecommendationQueryServiceTest.java +++ b/src/test/java/com/techfork/recommendation/application/query/RecommendationQueryServiceTest.java @@ -1,12 +1,12 @@ -package com.techfork.domain.recommendation.service; +package com.techfork.recommendation.application.query; import com.techfork.activity.bookmark.application.query.lookup.BookmarkLookupService; import com.techfork.post.domain.Post; -import com.techfork.domain.recommendation.converter.RecommendationConverter; -import com.techfork.domain.recommendation.dto.RecommendationListResponse; -import com.techfork.domain.recommendation.dto.RecommendedPostDto; -import com.techfork.domain.recommendation.entity.RecommendedPost; -import com.techfork.domain.recommendation.repository.RecommendedPostRepository; +import com.techfork.recommendation.presentation.RecommendationConverter; +import com.techfork.recommendation.presentation.response.RecommendationListResponse; +import com.techfork.recommendation.presentation.response.RecommendedPostDto; +import com.techfork.recommendation.domain.RecommendedPost; +import com.techfork.recommendation.infrastructure.RecommendedPostRepository; import com.techfork.domain.source.entity.TechBlog; import com.techfork.useraccount.application.query.lookup.UserLookupService; import com.techfork.useraccount.domain.User; @@ -25,7 +25,7 @@ import static com.techfork.post.fixture.PostFixture.createPost; import static com.techfork.post.fixture.PostFixture.DEFAULT_PUBLISHED_AT; -import static com.techfork.domain.recommendation.fixture.RecommendedPostFixture.recommendedPost; +import static com.techfork.recommendation.fixture.RecommendedPostFixture.recommendedPost; import static com.techfork.domain.source.fixture.TechBlogFixture.createTechBlog; import static com.techfork.useraccount.fixture.UserFixture.socialUser; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/techfork/domain/recommendation/service/MmrServiceTest.java b/src/test/java/com/techfork/recommendation/application/ranking/MmrServiceTest.java similarity index 97% rename from src/test/java/com/techfork/domain/recommendation/service/MmrServiceTest.java rename to src/test/java/com/techfork/recommendation/application/ranking/MmrServiceTest.java index a511d573..210dd656 100644 --- a/src/test/java/com/techfork/domain/recommendation/service/MmrServiceTest.java +++ b/src/test/java/com/techfork/recommendation/application/ranking/MmrServiceTest.java @@ -1,6 +1,6 @@ -package com.techfork.domain.recommendation.service; +package com.techfork.recommendation.application.ranking; -import com.techfork.domain.recommendation.config.RecommendationProperties; +import com.techfork.recommendation.config.RecommendationProperties; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/techfork/domain/recommendation/scheduler/RecommendationSchedulerTest.java b/src/test/java/com/techfork/recommendation/application/scheduler/RecommendationSchedulerTest.java similarity index 95% rename from src/test/java/com/techfork/domain/recommendation/scheduler/RecommendationSchedulerTest.java rename to src/test/java/com/techfork/recommendation/application/scheduler/RecommendationSchedulerTest.java index 1070ead6..9599f08c 100644 --- a/src/test/java/com/techfork/domain/recommendation/scheduler/RecommendationSchedulerTest.java +++ b/src/test/java/com/techfork/recommendation/application/scheduler/RecommendationSchedulerTest.java @@ -1,7 +1,7 @@ -package com.techfork.domain.recommendation.scheduler; +package com.techfork.recommendation.application.scheduler; -import com.techfork.domain.recommendation.config.RecommendationProperties; -import com.techfork.domain.recommendation.service.RecommendationService; +import com.techfork.recommendation.config.RecommendationProperties; +import com.techfork.recommendation.application.generation.RecommendationService; import com.techfork.useraccount.application.query.lookup.UserLookupService; import com.techfork.useraccount.domain.User; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/techfork/domain/recommendation/entity/RecommendationHistoryTest.java b/src/test/java/com/techfork/recommendation/domain/RecommendationHistoryTest.java similarity index 95% rename from src/test/java/com/techfork/domain/recommendation/entity/RecommendationHistoryTest.java rename to src/test/java/com/techfork/recommendation/domain/RecommendationHistoryTest.java index d94e1aa7..c0ff4d34 100644 --- a/src/test/java/com/techfork/domain/recommendation/entity/RecommendationHistoryTest.java +++ b/src/test/java/com/techfork/recommendation/domain/RecommendationHistoryTest.java @@ -1,4 +1,4 @@ -package com.techfork.domain.recommendation.entity; +package com.techfork.recommendation.domain; import com.techfork.post.domain.Post; import com.techfork.useraccount.domain.User; @@ -9,7 +9,7 @@ import java.time.LocalDateTime; import static com.techfork.post.fixture.PostFixture.createPost; -import static com.techfork.domain.recommendation.fixture.RecommendedPostFixture.recommendedPost; +import static com.techfork.recommendation.fixture.RecommendedPostFixture.recommendedPost; import static com.techfork.domain.source.fixture.TechBlogFixture.createTechBlog; import static com.techfork.useraccount.fixture.UserFixture.socialUser; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/techfork/domain/recommendation/fixture/RecommendedPostFixture.java b/src/test/java/com/techfork/recommendation/fixture/RecommendedPostFixture.java similarity index 86% rename from src/test/java/com/techfork/domain/recommendation/fixture/RecommendedPostFixture.java rename to src/test/java/com/techfork/recommendation/fixture/RecommendedPostFixture.java index c652bd0c..d06bf246 100644 --- a/src/test/java/com/techfork/domain/recommendation/fixture/RecommendedPostFixture.java +++ b/src/test/java/com/techfork/recommendation/fixture/RecommendedPostFixture.java @@ -1,6 +1,6 @@ -package com.techfork.domain.recommendation.fixture; +package com.techfork.recommendation.fixture; -import com.techfork.domain.recommendation.entity.RecommendedPost; +import com.techfork.recommendation.domain.RecommendedPost; import com.techfork.post.domain.Post; import com.techfork.useraccount.domain.User; diff --git a/src/test/java/com/techfork/domain/recommendation/repository/RecommendedPostRepositoryTest.java b/src/test/java/com/techfork/recommendation/infrastructure/RecommendedPostRepositoryTest.java similarity index 96% rename from src/test/java/com/techfork/domain/recommendation/repository/RecommendedPostRepositoryTest.java rename to src/test/java/com/techfork/recommendation/infrastructure/RecommendedPostRepositoryTest.java index 7cf62f76..27b8a11f 100644 --- a/src/test/java/com/techfork/domain/recommendation/repository/RecommendedPostRepositoryTest.java +++ b/src/test/java/com/techfork/recommendation/infrastructure/RecommendedPostRepositoryTest.java @@ -1,6 +1,6 @@ -package com.techfork.domain.recommendation.repository; +package com.techfork.recommendation.infrastructure; -import com.techfork.domain.recommendation.entity.RecommendedPost; +import com.techfork.recommendation.domain.RecommendedPost; import com.techfork.domain.source.entity.TechBlog; import com.techfork.domain.source.repository.TechBlogRepository; import com.techfork.post.domain.Post; @@ -21,7 +21,7 @@ import java.util.List; import static com.techfork.post.fixture.PostFixture.createPost; -import static com.techfork.domain.recommendation.fixture.RecommendedPostFixture.recommendedPost; +import static com.techfork.recommendation.fixture.RecommendedPostFixture.recommendedPost; import static com.techfork.domain.source.fixture.TechBlogFixture.createTechBlog; import static com.techfork.useraccount.fixture.UserFixture.socialUser; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/techfork/domain/recommendation/integration/RecommendationIntegrationTest.java b/src/test/java/com/techfork/recommendation/integration/RecommendationIntegrationTest.java similarity index 97% rename from src/test/java/com/techfork/domain/recommendation/integration/RecommendationIntegrationTest.java rename to src/test/java/com/techfork/recommendation/integration/RecommendationIntegrationTest.java index 0606847b..4784dfc0 100644 --- a/src/test/java/com/techfork/domain/recommendation/integration/RecommendationIntegrationTest.java +++ b/src/test/java/com/techfork/recommendation/integration/RecommendationIntegrationTest.java @@ -1,12 +1,12 @@ -package com.techfork.domain.recommendation.integration; +package com.techfork.recommendation.integration; import com.techfork.activity.bookmark.domain.Bookmark; import com.techfork.activity.bookmark.fixture.BookmarkFixture; import com.techfork.activity.bookmark.infrastructure.BookmarkRepository; import com.techfork.auth.security.jwt.JwtDTO; import com.techfork.auth.security.jwt.JwtUtil; -import com.techfork.domain.recommendation.entity.RecommendedPost; -import com.techfork.domain.recommendation.repository.RecommendedPostRepository; +import com.techfork.recommendation.domain.RecommendedPost; +import com.techfork.recommendation.infrastructure.RecommendedPostRepository; import com.techfork.domain.source.entity.TechBlog; import com.techfork.domain.source.repository.TechBlogRepository; import com.techfork.global.common.MySqlRedisIntegrationTestBase; @@ -29,7 +29,7 @@ import static com.techfork.useraccount.fixture.UserFixture.activeUser; import static com.techfork.post.fixture.PostFixture.DEFAULT_PUBLISHED_AT; import static com.techfork.post.fixture.PostFixture.createPost; -import static com.techfork.domain.recommendation.fixture.RecommendedPostFixture.recommendedPost; +import static com.techfork.recommendation.fixture.RecommendedPostFixture.recommendedPost; import static com.techfork.domain.source.fixture.TechBlogFixture.createTechBlog; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; diff --git a/src/test/java/com/techfork/domain/recommendation/converter/RecommendationConverterTest.java b/src/test/java/com/techfork/recommendation/presentation/RecommendationConverterTest.java similarity index 89% rename from src/test/java/com/techfork/domain/recommendation/converter/RecommendationConverterTest.java rename to src/test/java/com/techfork/recommendation/presentation/RecommendationConverterTest.java index 6a65944c..4ba29be4 100644 --- a/src/test/java/com/techfork/domain/recommendation/converter/RecommendationConverterTest.java +++ b/src/test/java/com/techfork/recommendation/presentation/RecommendationConverterTest.java @@ -1,8 +1,8 @@ -package com.techfork.domain.recommendation.converter; +package com.techfork.recommendation.presentation; import com.techfork.post.domain.Post; -import com.techfork.domain.recommendation.dto.RecommendedPostDto; -import com.techfork.domain.recommendation.entity.RecommendedPost; +import com.techfork.recommendation.presentation.response.RecommendedPostDto; +import com.techfork.recommendation.domain.RecommendedPost; import com.techfork.domain.source.entity.TechBlog; import com.techfork.useraccount.domain.User; import com.techfork.global.util.CloudflareThirdPartyThumbnailOptimizer; @@ -13,7 +13,7 @@ import java.time.LocalDateTime; import static com.techfork.post.fixture.PostFixture.createPost; -import static com.techfork.domain.recommendation.fixture.RecommendedPostFixture.recommendedPost; +import static com.techfork.recommendation.fixture.RecommendedPostFixture.recommendedPost; import static com.techfork.domain.source.fixture.TechBlogFixture.createTechBlog; import static com.techfork.useraccount.fixture.UserFixture.socialUser; import static org.assertj.core.api.Assertions.assertThat;