[hotfix] 키워드 포함 인기 레코드 조회 문제 해결

Team-Recordy · Jul 16, 2024 · 040b519 · 040b519
1 parent 6be3cb2
commit 040b519
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/main/java/org/recordy/server/record/repository/impl/RecordQueryDslRepository.java b/src/main/java/org/recordy/server/record/repository/impl/RecordQueryDslRepository.java
@@ -56,15 +56,11 @@ public Slice<RecordEntity> findAllByKeywordsOrderByPopularity(List<KeywordEntity
 
         List<RecordEntity> recordEntities = jpaQueryFactory
                 .selectFrom(recordEntity)
-                .leftJoin(recordEntity.bookmarks, bookmarkEntity)
-                .leftJoin(recordEntity.views, viewEntity)
+                .leftJoin(recordEntity.bookmarks, bookmarkEntity).on(bookmarkEntity.createdAt.after(sevenDaysAgo))
+                .leftJoin(recordEntity.views, viewEntity).on(viewEntity.createdAt.after(sevenDaysAgo))
                 .join(recordEntity.uploads, uploadEntity)
                 .join(uploadEntity.keyword, keywordEntity)
-                .where(
-                        bookmarkEntity.createdAt.after(sevenDaysAgo)
-                                .or(viewEntity.createdAt.after(sevenDaysAgo)),
-                        keywordEntity.in(keywords)
-                )
+                .where(keywordEntity.in(keywords))
                 .groupBy(recordEntity.id)
                 .orderBy(bookmarkEntity.count().multiply(2).add(viewEntity.count()).desc())
                 .offset(pageable.getOffset())