Update ProgressService.php (#326)

* Update ProgressService.php * WIP
EscolaLMS · Nov 28, 2024 · 8140414 · 8140414
1 parent 3f3b07f
commit 8140414
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Services/ProgressService.php b/src/Services/ProgressService.php
@@ -235,7 +235,13 @@ private function filterForStartedCourses(Builder $query, int $userId): Builder
                             ->where('course_progress.user_id', $userId);
                     })
                     ->whereColumn('lessons.course_id', 'courses.id')
-                    ->where('course_progress.status', ProgressStatus::IN_PROGRESS);
+                    ->where('course_progress.status', ProgressStatus::IN_PROGRESS)
+                    ->orWhere(function (QueryBuilder $query) {
+                        $query->groupBy('topic.id')
+                            ->selectRaw('COUNT(CASE WHEN status = ? THEN 1 END) as completed_count', [ProgressStatus::COMPLETE])
+                            ->selectRaw('COUNT(CASE WHEN status = ? THEN 1 END) as in_completed_count', [ProgressStatus::INCOMPLETE])
+                            ->havingRaw('completed_count > 0 AND in_completed_count > 0');
+                    });
             });
     }