diff --git a/app/Console/Migrations/V20231201101515.php b/app/Console/Migrations/V20231201101515.php deleted file mode 100644 index 0fbecd3f..00000000 --- a/app/Console/Migrations/V20231201101515.php +++ /dev/null @@ -1,87 +0,0 @@ -handleCourseUsers(); - $this->handleChapterUsers(); - } - - protected function handleCourseUsers() - { - $courseUsers = $this->findCourseUsers(); - - if ($courseUsers->count() == 0) return; - - $mappings = []; - - /** - * 只保留第一条记录 - */ - foreach ($courseUsers as $courseUser) { - $key = $courseUser->course_id . '-' . $courseUser->user_id; - if (!isset($mappings[$key])) { - $mappings[$key] = 1; - } else { - $courseUser->deleted = 1; - $courseUser->update(); - } - } - } - - protected function handleChapterUsers() - { - $chapterUsers = $this->findChapterUsers(); - - if ($chapterUsers->count() == 0) return; - - /** - * 只保留第一条记录 - */ - foreach ($chapterUsers as $chapterUser) { - $key = $chapterUser->chapter_id . '-' . $chapterUser->user_id; - if (!isset($mappings[$key])) { - $mappings[$key] = 1; - } else { - $chapterUser->deleted = 1; - $chapterUser->update(); - } - } - } - - /** - * @return ResultsetInterface|CourseUserModel[] - */ - protected function findCourseUsers() - { - return CourseUserModel::query() - ->where('deleted = 0') - ->orderBy('id DESC') - ->execute(); - } - - /** - * @return ResultsetInterface|ChapterUserModel[] - */ - protected function findChapterUsers() - { - return ChapterUserModel::query() - ->where('deleted = 0') - ->orderBy('id DESC') - ->execute(); - } - -} \ No newline at end of file diff --git a/app/Repos/TeacherConsult.php b/app/Repos/TeacherConsult.php index cc9025e2..8732b65b 100644 --- a/app/Repos/TeacherConsult.php +++ b/app/Repos/TeacherConsult.php @@ -9,7 +9,7 @@ namespace App\Repos; use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder; use App\Models\Consult as ConsultModel; -use App\Models\CourseUser as CourseUserModel; +use App\Models\Course as CourseModel; class TeacherConsult extends Repository { @@ -17,35 +17,34 @@ class TeacherConsult extends Repository public function paginate($where, $sort = 'latest', $page = 1, $limit = 15) { $builder = $this->modelsManager->createBuilder() - ->columns('c.*') - ->addFrom(ConsultModel::class, 'c') - ->join(CourseUserModel::class, 'c.course_id = cu.course_id', 'cu') + ->columns('consult.*') + ->addFrom(ConsultModel::class, 'consult') + ->join(CourseModel::class, 'consult.course_id = course.id', 'course') ->where('1 = 1'); - if (!empty($where['user_id'])) { - $builder->andWhere('cu.user_id = :user_id:', ['user_id' => $where['user_id']]); - $builder->andWhere('cu.role_type = :role_type:', ['role_type' => CourseUserModel::ROLE_TEACHER]); - $builder->andWhere('cu.deleted = 0'); + if (!empty($where['teacher_id'])) { + $builder->andWhere('course.teacher_id = :teacher_id:', ['teacher_id' => $where['teacher_id']]); + $builder->andWhere('course.published = 1'); + $builder->andWhere('course.deleted = 0'); } if (isset($where['replied'])) { if ($where['replied'] == 1) { - $builder->andWhere('c.reply_time > 0'); + $builder->andWhere('consult.reply_time > 0'); } else { - $builder->andWhere('c.reply_time = 0'); + $builder->andWhere('consult.reply_time = 0'); } } - $builder->andWhere('c.published = :published:', ['published' => ConsultModel::PUBLISH_APPROVED]); - - $builder->andWhere('c.deleted = 0'); + $builder->andWhere('consult.published = :published:', ['published' => ConsultModel::PUBLISH_APPROVED]); + $builder->andWhere('consult.deleted = 0'); switch ($sort) { case 'oldest': - $orderBy = 'c.id ASC'; + $orderBy = 'consult.id ASC'; break; default: - $orderBy = 'c.id DESC'; + $orderBy = 'consult.id DESC'; break; } diff --git a/app/Repos/TeacherCourse.php b/app/Repos/TeacherCourse.php deleted file mode 100644 index b74a1ac9..00000000 --- a/app/Repos/TeacherCourse.php +++ /dev/null @@ -1,39 +0,0 @@ -modelsManager->createBuilder() - ->columns('course.*') - ->addFrom(CourseModel::class, 'course') - ->join(CourseUserModel::class, 'course.id = cu.course_id', 'cu') - ->where('cu.user_id = :user_id:', ['user_id' => $userId]) - ->andWhere('cu.role_type = :role_type:', ['role_type' => CourseUserModel::ROLE_TEACHER]) - ->andWhere('course.published = 1') - ->andWhere('course.deleted = 0') - ->orderBy('cu.id DESC'); - - $pager = new PagerQueryBuilder([ - 'builder' => $builder, - 'page' => $page, - 'limit' => $limit, - ]); - - return $pager->paginate(); - } - -}