Do not cache courses and topics (#62)

Co-authored-by: Tomasz Smolarek <[email protected]>
EscolaLMS · Jan 30, 2024 · 85731cf · 85731cf
1 parent f43d624
commit 85731cf
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/src/Metrics/AbstractCoursesMoneySpentMetric.php b/src/Metrics/AbstractCoursesMoneySpentMetric.php
@@ -23,7 +23,7 @@ public function calculate(?int $limit = null): Collection
  $productTable = (new Product())->getTable();
  $productProductableTable = (new ProductProductable())->getTable();
 
- $query = Course::selectRaw($courseTable . '.id, ' . $courseTable . '.title as label, SUM(' . $orderItemTable . '.quantity * ' . $orderItemTable . '.price) as value')
+ $query = Course::dontCache()->selectRaw($courseTable . '.id, ' . $courseTable . '.title as label, SUM(' . $orderItemTable . '.quantity * ' . $orderItemTable . '.price) as value')
  ->leftJoin($productProductableTable, fn (JoinClause $join) => $join->where($productProductableTable . '.productable_id', '=', DB::raw($courseTable . '.id'))->where($productProductableTable . '.productable_type', '=', (new Course)->getMorphClass()))
  ->leftJoin($productTable, fn (JoinClause $join) => $join->where($productTable . '.id', '=', DB::raw($productProductableTable . '.product_id')))
  ->leftJoin($orderItemTable, fn (JoinClause $join) => $join->where($orderItemTable . '.buyable_id', '=', DB::raw($productTable . '.id'))->where($orderItemTable . '.buyable_type', '=', (new Product())->getMorphClass()))

diff --git a/src/Metrics/AbstractCoursesPopularityMetric.php b/src/Metrics/AbstractCoursesPopularityMetric.php
@@ -10,7 +10,7 @@ abstract class AbstractCoursesPopularityMetric extends AbstractCoursesMetric
 {
  public function calculate(?int $limit = null): Collection
  {
- $query = Course::withCount(['users'])
+ $query = Course::dontCache()->withCount(['users'])
  ->orderBy('users_count', 'DESC')
  ->take($this->getLimit($limit));
 

diff --git a/src/Metrics/AbstractCoursesSecondsSpentMetric.php b/src/Metrics/AbstractCoursesSecondsSpentMetric.php
@@ -18,7 +18,7 @@ public function calculate(?int $limit = null): Collection
  $topicTable = (new Topic())->getTable();
  $courseProgressTable = (new CourseProgress())->getTable();
 
- $query = Course::selectRaw($courseTable . '.id, ' . $courseTable . '.title as label, SUM(' . $courseProgressTable . '.seconds) as value')
+ $query = Course::dontCache()->selectRaw($courseTable . '.id, ' . $courseTable . '.title as label, SUM(' . $courseProgressTable . '.seconds) as value')
  ->join($lessonTable, $courseTable . '.id', '=', $lessonTable . '.course_id')
  ->join($topicTable, $lessonTable . '.id', '=', $topicTable . '.lesson_id')
  ->join($courseProgressTable, $topicTable . '.id', '=', $courseProgressTable . '.topic_id')

diff --git a/src/Metrics/CoursesTopSellingMetric.php b/src/Metrics/CoursesTopSellingMetric.php
@@ -23,7 +23,7 @@ public function calculate(?int $limit = null): Collection
  $productTable = (new Product())->getTable();
  $productProductableTable = (new ProductProductable())->getTable();
 
- return Course::selectRaw($courseTable . '.id, ' . $courseTable . ".title as label, SUM(" . $orderItemTable . '.quantity) as value')
+ return Course::dontCache()->selectRaw($courseTable . '.id, ' . $courseTable . ".title as label, SUM(" . $orderItemTable . '.quantity) as value')
  ->leftJoin($productProductableTable, fn (JoinClause $join) => $join->where($productProductableTable . '.productable_id', '=', DB::raw($courseTable . '.id'))->where($productProductableTable . '.productable_type', '=', (new Course)->getMorphClass()))
  ->leftJoin($productTable, fn (JoinClause $join) => $join->where($productTable . '.id', '=', DB::raw($productProductableTable . '.product_id')))
  ->leftJoin($orderItemTable, fn (JoinClause $join) => $join->where($orderItemTable . '.buyable_id', '=', DB::raw($productTable . '.id'))->where($orderItemTable . '.buyable_type', '=', (new Product())->getMorphClass()))

diff --git a/src/Stats/Course/AverageTime.php b/src/Stats/Course/AverageTime.php
@@ -18,7 +18,7 @@ public function calculate(): int
  $courseProgressTable = (new CourseProgress())->getTable();
 
  /** @var Collection $results */
- $results = Course::selectRaw($courseTable . '.id, ' . $courseProgressTable . '.user_id, SUM(' . $courseProgressTable . '.seconds) as time')
+ $results = Course::dontCache()->selectRaw($courseTable . '.id, ' . $courseProgressTable . '.user_id, SUM(' . $courseProgressTable . '.seconds) as time')
  ->leftJoin($lessonTable, $courseTable . '.id', '=', $lessonTable . '.course_id')
  ->leftJoin($topicTable, $lessonTable . '.id', '=', $topicTable . '.lesson_id')
  ->leftJoin($courseProgressTable, $topicTable . '.id', '=', $courseProgressTable . '.topic_id')

diff --git a/src/Stats/Course/CourseUsersAndGroupsStat.php b/src/Stats/Course/CourseUsersAndGroupsStat.php
@@ -43,7 +43,7 @@ public function __construct(Course $course)
 
  protected function getGroupUsers(): \Illuminate\Support\Collection
  {
- return $this->formatGroupResult(Topic::query()
+ return $this->formatGroupResult(Topic::dontCache()
  ->select(
  $this->topicTable . '.id as topic_id',
  $this->topicTable . '.title as topic_title',

diff --git a/src/Stats/Course/FinishedTopics.php b/src/Stats/Course/FinishedTopics.php
@@ -55,7 +55,7 @@ public function calculate(): array
 
  private function getBaseQuery(): Builder
  {
- return Topic::query()
+ return Topic::dontCache()
  ->select(
  $this->topicTable . '.id as topic_id',
  $this->topicTable . '.title as topic_title',