rename task to project task, task_user to project_task_user, fix behavior

common/models/ProjectTask.php

@@ -24,16 +24,16 @@ use yii\helpers\ArrayHelper;
  * @property Project $project
  * @property UserCard $card
  * @property UserCard $cardIdCreator
- * @property TaskUser[] $taskUsers
+ * @property ProjectTaskUser[] $taskUsers
  */
-class Task extends ActiveRecord
+class ProjectTask extends ActiveRecord
 {
     /**
      * {@inheritdoc}
      */
     public static function tableName()
     {
-        return 'task';
+        return 'project_task';
     }
 
     public function behaviors()
@@ -123,7 +123,7 @@ class Task extends ActiveRecord
      */
     public function getTaskUsers()
     {
-        return $this->hasMany(TaskUser::className(), ['task_id' => 'id']);
+        return $this->hasMany(ProjectTaskUser::className(), ['task_id' => 'id']);
     }
 
     public static function usersByTaskArr($task_id): array

common/models/ProjectTaskUser.php

@@ -2,8 +2,6 @@
 
 namespace common\models;
 
-use Yii;
-use yii\base\InvalidConfigException;
 use yii\db\ActiveQuery;
 
 /**
@@ -14,16 +12,16 @@ use yii\db\ActiveQuery;
  * @property int $project_user_id
  *
  * @property ProjectUser $projectUser
- * @property Task $task
+ * @property ProjectTask $task
  */
-class TaskUser extends \yii\db\ActiveRecord
+class ProjectTaskUser extends \yii\db\ActiveRecord
 {
     /**
      * {@inheritdoc}
      */
     public static function tableName()
     {
-        return 'task_user';
+        return 'project_task_user';
     }
 
     /**
@@ -35,7 +33,7 @@ class TaskUser extends \yii\db\ActiveRecord
             [['task_id', 'project_user_id'], 'required'],
             ['project_user_id', 'unique', 'targetAttribute' => ['task_id', 'project_user_id'], 'message'=>'Уже закреплён(ы) за задачей'],
             [['project_user_id'], 'exist', 'skipOnError' => true, 'targetClass' => ProjectUser::className(), 'targetAttribute' => ['project_user_id' => 'id']],
-            [['task_id'], 'exist', 'skipOnError' => true, 'targetClass' => Task::className(), 'targetAttribute' => ['task_id' => 'id']],
+            [['task_id'], 'exist', 'skipOnError' => true, 'targetClass' => ProjectTask::className(), 'targetAttribute' => ['task_id' => 'id']],
         ];
     }
 
@@ -64,6 +62,6 @@ class TaskUser extends \yii\db\ActiveRecord
      */
     public function getTask()
     {
-        return $this->hasOne(Task::className(), ['id' => 'task_id']);
+        return $this->hasOne(ProjectTask::className(), ['id' => 'task_id']);
     }
 }

common/models/ProjectUser.php

@@ -18,7 +18,7 @@ use yii\helpers\ArrayHelper;
  * @property Project $project
  * @property UserCard $card
  * @property User $user
- * @property TaskUser[] $taskUsers
+ * @property ProjectTaskUser[] $taskUsers
  */
 class ProjectUser extends \yii\db\ActiveRecord
 {
@@ -88,7 +88,7 @@ class ProjectUser extends \yii\db\ActiveRecord
      */
     public function getTasks()
     {
-        return $this->hasMany(Task::className(), ['project_user_id' => 'id']);
+        return $this->hasMany(ProjectTask::className(), ['project_user_id' => 'id']);
     }
 
     /**
@@ -96,7 +96,7 @@ class ProjectUser extends \yii\db\ActiveRecord
      */
     public function getTasksByProject()
     {
-        return $this->hasMany(Task::className(), ['project_id' => 'project_id']);
+        return $this->hasMany(ProjectTask::className(), ['project_id' => 'project_id']);
     }
 
     /**
@@ -104,7 +104,7 @@ class ProjectUser extends \yii\db\ActiveRecord
      */
     public function getTaskUsers()
     {
-        return $this->hasMany(TaskUser::className(), ['project_user_id' => 'id']);
+        return $this->hasMany(ProjectTaskUser::className(), ['project_user_id' => 'id']);
     }
 
     public static function usersByProjectArr($project_id): array

common/services/TaskService.php

@@ -2,36 +2,36 @@
 
 namespace common\services;
 
-use common\models\Task;
+use common\models\ProjectTask;
 
 class TaskService
 {
     public static function createTask($taskParams)
     {
-        $task = new Task();
+        $task = new ProjectTask();
         $task->load($taskParams, '');
         $task->save();
         return $task;
     }
 
-    public static function getTask($task_id): ?Task
+    public static function getTask($task_id): ?ProjectTask
     {
-        return Task::findOne($task_id);
+        return ProjectTask::findOne($task_id);
     }
 
     public static function getTaskList($task_id): array
     {
-        return Task::find()->asArray()->all();
+        return ProjectTask::find()->asArray()->all();
     }
 
     public static function getTaskListByProject($project_id): array
     {
-        return Task::find()->where(['project_id' => $project_id])->asArray()->all();
+        return ProjectTask::find()->where(['project_id' => $project_id])->asArray()->all();
     }
 
-    public static function updateTask($task_params): ?Task
+    public static function updateTask($task_params): ?ProjectTask
     {
-        $modelTask = Task::findOne($task_params['task_id']);
+        $modelTask = ProjectTask::findOne($task_params['task_id']);
 
         $modelTask->load($task_params, '');
         $modelTask->save();
@@ -41,6 +41,6 @@ class TaskService
 
     public static function taskExists($task_id): bool
     {
-        return Task::find()->where(['id' => $task_id])->exists();
+        return ProjectTask::find()->where(['id' => $task_id])->exists();
     }
 }