apuc/guild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
iIronside
2023-01-18 15:30:38 +03:00
parent c9ce085289
commit 8b2bb7468c
29 changed files with 169 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/modules/api/controllers/TaskController.php
View File

@ -2,7 +2,7 @@
namespace frontend\modules\api\controllers;
use common\models\Task;
use common\models\ProjectTask;
use common\services\TaskService;
use Yii;
use yii\base\InvalidConfigException;
@ -25,7 +25,7 @@ class TaskController extends ApiController
* @throws InvalidConfigException
* @throws ServerErrorHttpException
*/
public function actionCreateTask(): Task
public function actionCreateTask(): ProjectTask
{
$taskModel = TaskService::createTask(Yii::$app->getRequest()->getBodyParams());
if ($taskModel->errors) {
@ -59,7 +59,7 @@ class TaskController extends ApiController
/**
* @throws NotFoundHttpException
*/
public function actionGetTask($task_id): Task
public function actionGetTask($task_id): ProjectTask
{
if (empty($task_id) or !is_numeric($task_id)) {
throw new NotFoundHttpException('Incorrect task ID');
@ -78,7 +78,7 @@ class TaskController extends ApiController
* @throws ServerErrorHttpException
* @throws NotFoundHttpException
*/
public function actionUpdate(): ?Task
public function actionUpdate(): ?ProjectTask
{
$params = Yii::$app->request->getBodyParams();
if (empty ($params['task_id']) or !TaskService::taskExists($params['task_id'])) {

6
frontend/modules/api/controllers/TaskUserController.php
View File

@ -2,7 +2,7 @@
namespace frontend\modules\api\controllers;
use common\models\TaskUser;
use common\models\ProjectTaskUser;
use Yii;
use yii\filters\auth\HttpBearerAuth;
use yii\rest\Controller;
@ -21,7 +21,7 @@ class TaskUserController extends ApiController
public function actionSetTaskUser()
{
$taskUserModel = new TaskUser();
$taskUserModel = new ProjectTaskUser();
$params = Yii::$app->request->post();
$taskUserModel->attributes = $params;
@ -57,6 +57,6 @@ class TaskUserController extends ApiController
private function findUsers($project_id): array
{
return TaskUser::find()->where(['task_id' => $project_id])->all();
return ProjectTaskUser::find()->where(['task_id' => $project_id])->all();
}
}