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
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ public interface PolicyRepository extends JpaRepository<Policy, String>, JpaSpec
@EntityGraph(attributePaths = {"region"})
Optional<Policy> findById(String policyId);

// 추천된 정책 ID 목록을 기반으로 필터 없이 모든 정책을 조회
List<Policy> findByIdIn(List<String> policyIds);

// 추천된 정책 ID 목록 중, 지역/분야 조건에 맞는 정책만 필터링하여 조회
@Query(value = """
SELECT p.* FROM policies p
Expand Down
25 changes: 20 additions & 5 deletions src/main/java/com/example/withpeace/service/PolicyService.java
Original file line number Diff line number Diff line change
Expand Up @@ -371,11 +371,26 @@ private List<PolicyListResponseDto> getInteractionBasedRecommendations(User user
.map(Map.Entry::getKey)
.toList();

List<Policy> filteredRecommendedPolicies = policyRepository.findFilteredPoliciesByIdIn(
recommendedPolicyIds,
regionList, regionList.size(),
classificationList, classificationList.size()
).stream().limit(MAX_RECOMMENDATION_COUNT).toList();
List<Policy> filteredRecommendedPolicies;
boolean hasRegionFilter = !regionList.isEmpty();
boolean hasClassificationFilter = !classificationList.isEmpty();

if(!hasRegionFilter && !hasClassificationFilter) {
// 필터 조건이 없는 경우: 단순 ID 조회 (nativeQuery 아님)
filteredRecommendedPolicies = policyRepository.findByIdIn(recommendedPolicyIds)
.stream()
.limit(MAX_RECOMMENDATION_COUNT)
.toList();
} else {
// 필터 조건이 존재하는 경우: nativeQuery 기반 필터링 쿼리 사용
filteredRecommendedPolicies = policyRepository.findFilteredPoliciesByIdIn(
recommendedPolicyIds,
regionList, regionList.size(),
classificationList, classificationList.size()
).stream()
.limit(MAX_RECOMMENDATION_COUNT)
.toList();
}

// 사용자가 찜한 정책 ID 목록 조회
Set<String> favoritePolicyIds = getFavoritePolicyIdsFromEntities(user.getId(), filteredRecommendedPolicies);
Expand Down