Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docs/convention/test-convention.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
- 현재 legacy 유지 대상:
- `com.techfork.domain.source`
- `com.techfork.domain.search`
- `com.techfork.domain.recommendation`
- 테스트만 먼저 `com.techfork.<context>`로 옮기지 않는다. production과 test의 root가 달라지면 IDE 탐색, package-private 접근, fixture 소유권 판단이 어긋날 수 있다.
- legacy slice를 이관할 때는 다음을 같은 작업 단위로 묶는다.
- production package 선언과 디렉터리 이동
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
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;
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.techfork.domain.recommendation.config;
package com.techfork.recommendation.config;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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<RecommendationHistory, Long> {
}
package com.techfork.recommendation.infrastructure;

import com.techfork.recommendation.domain.RecommendationHistory;
import org.springframework.data.jpa.repository.JpaRepository;

public interface RecommendationHistoryRepository extends JpaRepository<RecommendationHistory, Long> {
}
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.techfork.domain.recommendation.dto;
package com.techfork.recommendation.presentation.response;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.techfork.domain.recommendation.dto;
package com.techfork.recommendation.presentation.response;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Loading