fix: 主任务被删除或归档时子任务应该也同步

Dereck-Ting · Jan 6, 2022 · 24287c0 · 24287c0
1 parent c930e4d
commit 24287c0
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 5 deletions.
diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php
@@ -799,6 +799,11 @@ public function archivedTask($archived_at, $isAuto = false)
                 $this->addLog($logText, $userid);
                 $this->pushMsg('archived');
             }
+            self::whereParentId($this->id)->update([
+                'archived_at' => $this->archived_at,
+                'archived_userid' => $this->archived_userid,
+                'archived_follow' => $this->archived_follow,
+            ]);
             $this->save();
         });
         return true;
@@ -814,12 +819,11 @@ public function deleteTask($pushMsg = true)
         AbstractModel::transaction(function () {
             if ($this->dialog_id) {
                 $dialog = WebSocketDialog::find($this->dialog_id);
-                if ($dialog) {
-                    $dialog->deleteDialog();
-                }
+                $dialog?->deleteDialog();
             }
-            $this->delete();
+            self::whereParentId($this->id)->delete();
             $this->addLog("删除{任务}：" . $this->name);
+            $this->delete();
         });
         if ($pushMsg) {
             $this->pushMsg('delete');

diff --git a/database/migrations/2022_01_06_132023_project_tasks_update_subtask_time.php b/database/migrations/2022_01_06_132023_project_tasks_update_subtask_time.php
@@ -6,7 +6,7 @@
 class ProjectTasksUpdateSubtaskTime extends Migration
 {
     /**
-     * Run the migrations.
+     * 子任务同步主任务（任务时间）
      *
      * @return void
      */

diff --git a/database/migrations/2022_01_06_164034_project_tasks_update_subtask_archived_delete.php b/database/migrations/2022_01_06_164034_project_tasks_update_subtask_archived_delete.php
@@ -0,0 +1,51 @@
+<?php
+
+use App\Models\ProjectTask;
+use Illuminate\Database\Migrations\Migration;
+
+class ProjectTasksUpdateSubtaskArchivedDelete extends Migration
+{
+    /**
+     * 子任务同步主任务（归档、删除）
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // 归档
+        ProjectTask::whereParentId(0)
+            ->whereNotNull('archived_at')
+            ->chunkById(100, function ($lists) {
+                /** @var ProjectTask $task */
+                foreach ($lists as $task) {
+                    ProjectTask::whereParentId($task->id)->update([
+                        'archived_at' => $task->archived_at,
+                        'archived_userid' => $task->archived_userid,
+                        'archived_follow' => $task->archived_follow,
+                    ]);
+                }
+            });
+
+        // 删除
+        ProjectTask::onlyTrashed()
+            ->whereParentId(0)
+            ->chunkById(100, function ($lists) {
+                /** @var ProjectTask $task */
+                foreach ($lists as $task) {
+                    ProjectTask::whereParentId($task->id)->update([
+                        'deleted_at' => $task->deleted_at,
+                    ]);
+                }
+            });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}