From 040b519fdf02f20b1d9c044e242f055f81432833 Mon Sep 17 00:00:00 2001 From: Jin Geonwoo Date: Wed, 17 Jul 2024 06:53:26 +0900 Subject: [PATCH] =?UTF-8?q?[hotfix]=20=ED=82=A4=EC=9B=8C=EB=93=9C=20?= =?UTF-8?q?=ED=8F=AC=ED=95=A8=20=EC=9D=B8=EA=B8=B0=20=EB=A0=88=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=A1=B0=ED=9A=8C=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/impl/RecordQueryDslRepository.java | 10 +++------- 1 file changed, 3 insertions(+), 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 index fb2aaf10..453ff710 100644 --- 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 findAllByKeywordsOrderByPopularity(List 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())