swagger tasks

common/models/Project.php

@@ -106,7 +106,7 @@ class Project extends \yii\db\ActiveRecord
      */
     public function getColumns()
     {
-        return $this->hasMany(ProjectColumn::class, ['project_id' => 'id'])->with('tasks');
+        return $this->hasMany(ProjectColumn::class, ['project_id' => 'id'])->with('tasks')->where(['status' => ProjectColumn::STATUS_ACTIVE]);
     }
 
     /**

common/models/ProjectColumn.php

@@ -123,6 +123,6 @@ class ProjectColumn extends \yii\db\ActiveRecord
      */
     public function getTasks()
     {
-        return $this->hasMany(ProjectTask::class, ['column_id' => 'id'])->with('taskUsers');
+        return $this->hasMany(ProjectTask::class, ['column_id' => 'id'])->with('taskUsers')->where(['status' => ProjectTask::STATUS_ACTIVE]);
     }
 }

common/models/ProjectTask.php

@@ -28,6 +28,8 @@ use yii\helpers\ArrayHelper;
  */
 class ProjectTask extends ActiveRecord
 {
+    const STATUS_ACTIVE = 1;
+    const STATUS_DISABLE = 0;
     /**
      * {@inheritdoc}
      */
@@ -103,6 +105,17 @@ class ProjectTask extends ActiveRecord
         ];
     }
 
+    /**
+     * @return string[]
+     */
+    public static function getStatus(): array
+    {
+        return [
+            self::STATUS_ACTIVE => 'Активен',
+            self::STATUS_DISABLE => 'Выключен'
+        ];
+    }
+
     public function beforeDelete()
     {
         foreach ($this->taskUsers as $taskUser) {

common/services/TaskService.php

@@ -2,7 +2,10 @@
 
 namespace common\services;
 
+use common\classes\Debug;
 use common\models\ProjectTask;
+use common\models\ProjectTaskUser;
+use common\models\ProjectUser;
 
 class TaskService
 {
@@ -31,7 +34,8 @@ class TaskService
 
     public static function getTaskListByUser($user_id): array
     {
-        return ProjectTask::find()->where(['user_id' => $user_id])->all();
+        $taskIdList = ProjectTaskUser::find()->where(['user_id' => $user_id])->select('task_id')->column();
+        return ProjectTask::find()->where([ 'IN', 'id', $taskIdList])->orWhere(['user_id' => $user_id])->all();
     }
 
     public static function updateTask($task_params): ?ProjectTask