From 74b9b02caa624877e89f1cefe22441376e5b32fc Mon Sep 17 00:00:00 2001
From: Thuan ngo <thuanngo3072002@gmail.com>
Date: Thu, 3 Jul 2025 21:39:53 +0700
Subject: [PATCH] fix CourseRepository findByMultiquery

---
 .../domain/course/CourseRepository.java       | 55 ++++++++++++-------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/backend/elearning/domain/course/CourseRepository.java b/src/main/java/com/backend/elearning/domain/course/CourseRepository.java
index 248def3e..47982481 100644
--- a/src/main/java/com/backend/elearning/domain/course/CourseRepository.java
+++ b/src/main/java/com/backend/elearning/domain/course/CourseRepository.java
@@ -152,25 +152,42 @@ Page<Course> findAllCustomByRoleAndStatus(Pageable pageable, @Param("email") Str
 
 
     @Query(value = """
-        select c
-        from Course c
-        join fetch c.category cat
-        left join fetch cat.parent p
-        join fetch c.topic t
-        join fetch c.user u
-        left join fetch c.reviews
-        where (:level IS NULL or c.level in :level)
-        and (:free IS NULL or c.free in :free)
-        and (:categoryName IS NULL or cat.name = :categoryName or p.name = :categoryName)
-        and (:topicId IS NULL or t.id = :topicId)
-        and (:ratingStar IS NULL or
-             (select avg(r.ratingStar)
-              from Review r
-              join r.course rc 
-              where rc.id = c.id 
-              group by rc.id) >= :ratingStar)
-        and c.status = 'PUBLISHED'
-    """)
+    select c
+    from Course c
+    join fetch c.category cat
+    left join fetch cat.parent p
+    join fetch c.topic t
+    join fetch c.user u
+    where (:level IS NULL or c.level in :level)
+      and (:free IS NULL or c.free in :free)
+      and (:categoryName IS NULL or cat.name = :categoryName or p.name = :categoryName)
+      and (:topicId IS NULL or t.id = :topicId)
+      and (:ratingStar IS NULL or coalesce((
+           select avg(r.ratingStar)
+           from Review r 
+           where r.course.id = c.id
+      ), 0) >= :ratingStar)
+      and c.status = 'PUBLISHED'
+    """,
+            countQuery = """
+    select count(c)
+    from Course c
+    join c.category cat
+    left join cat.parent p
+    join c.topic t
+    join c.user u
+    where (:level IS NULL or c.level in :level)
+      and (:free IS NULL or c.free in :free)
+      and (:categoryName IS NULL or cat.name = :categoryName or p.name = :categoryName)
+      and (:topicId IS NULL or t.id = :topicId)
+      and (:ratingStar IS NULL or coalesce((
+           select avg(r.ratingStar)
+           from Review r 
+           where r.course.id = c.id
+      ), 0) >= :ratingStar)
+      and c.status = 'PUBLISHED'
+    """
+    )
     Page<Course> findByMultiQuery(Pageable pageable,
                                   @Param("ratingStar") Float ratingStar,
                                   @Param("level") String[] level,