From 13873dcb0bf278c39c3ec639988b5abf44b49fdf Mon Sep 17 00:00:00 2001
From: koogua <xiaochong0302@gmail.com>
Date: Wed, 24 Aug 2022 12:03:58 +0800
Subject: [PATCH] =?UTF-8?q?sitemap=E6=9D=A1=E7=9B=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                      |  1 +
 app/Console/Tasks/SitemapTask.php | 27 +++++++++++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a59a261d..aa9b28a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - 更新自动安装脚本
 - 优化登录/注册/忘记密码页
 - 修复移动端首页课程缓存刷新
+- sitemap条目增加过滤条件
 
 ### [v1.5.7](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.7)(2022-08-18)
 
diff --git a/app/Console/Tasks/SitemapTask.php b/app/Console/Tasks/SitemapTask.php
index 68ad4e29..a9e3324e 100644
--- a/app/Console/Tasks/SitemapTask.php
+++ b/app/Console/Tasks/SitemapTask.php
@@ -39,6 +39,8 @@ class SitemapTask extends Task
 
         $filename = tmp_path('sitemap.xml');
 
+        echo '------ start sitemap task ------' . PHP_EOL;
+
         $this->addIndex();
         $this->addCourses();
         $this->addArticles();
@@ -50,6 +52,8 @@ class SitemapTask extends Task
         $this->addOthers();
 
         $this->sitemap->build($filename);
+
+        echo '------ end sitemap task ------' . PHP_EOL;
     }
 
     protected function getSiteUrl()
@@ -73,6 +77,7 @@ class SitemapTask extends Task
          */
         $courses = CourseModel::query()
             ->where('published = 1')
+            ->andWhere('deleted = 0')
             ->orderBy('id DESC')
             ->limit(500)
             ->execute();
@@ -92,6 +97,7 @@ class SitemapTask extends Task
          */
         $articles = ArticleModel::query()
             ->where('published = :published:', ['published' => ArticleModel::PUBLISH_APPROVED])
+            ->andWhere('deleted = 0')
             ->orderBy('id DESC')
             ->limit(500)
             ->execute();
@@ -111,6 +117,7 @@ class SitemapTask extends Task
          */
         $questions = QuestionModel::query()
             ->where('published = :published:', ['published' => QuestionModel::PUBLISH_APPROVED])
+            ->andWhere('deleted = 0')
             ->orderBy('id DESC')
             ->limit(500)
             ->execute();
@@ -128,7 +135,10 @@ class SitemapTask extends Task
         /**
          * @var Resultset|UserModel[] $teachers
          */
-        $teachers = UserModel::query()->where('edu_role = 2')->execute();
+        $teachers = UserModel::query()
+            ->where('edu_role = :edu_role:', ['edu_role' => UserModel::EDU_ROLE_TEACHER])
+            ->andWhere('deleted = 0')
+            ->execute();
 
         if ($teachers->count() == 0) return;
 
@@ -143,7 +153,10 @@ class SitemapTask extends Task
         /**
          * @var Resultset|TopicModel[] $topics
          */
-        $topics = TopicModel::query()->where('published = 1')->execute();
+        $topics = TopicModel::query()
+            ->where('published = 1')
+            ->andWhere('deleted = 0')
+            ->execute();
 
         if ($topics->count() == 0) return;
 
@@ -158,7 +171,10 @@ class SitemapTask extends Task
         /**
          * @var Resultset|PageModel[] $pages
          */
-        $pages = PageModel::query()->where('published = 1')->execute();
+        $pages = PageModel::query()
+            ->where('published = 1')
+            ->andWhere('deleted = 0')
+            ->execute();
 
         if ($pages->count() == 0) return;
 
@@ -173,7 +189,10 @@ class SitemapTask extends Task
         /**
          * @var Resultset|HelpModel[] $helps
          */
-        $helps = HelpModel::query()->where('published = 1')->execute();
+        $helps = HelpModel::query()
+            ->where('published = 1')
+            ->andWhere('deleted = 0')
+            ->execute();
 
         if ($helps->count() == 0) return;