summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/Api/Procedure/TaskMetadataProcedure.php38
-rw-r--r--app/Api/Procedure/TaskProcedure.php27
-rw-r--r--app/ServiceProvider/ApiProvider.php2
-rw-r--r--tests/integration/TaskMetadataProcedureTest.php45
-rw-r--r--tests/integration/TaskProcedureTest.php38
5 files changed, 86 insertions, 64 deletions
diff --git a/app/Api/Procedure/TaskMetadataProcedure.php b/app/Api/Procedure/TaskMetadataProcedure.php
new file mode 100644
index 00000000..169482f5
--- /dev/null
+++ b/app/Api/Procedure/TaskMetadataProcedure.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Kanboard\Api\Procedure;
+
+use Kanboard\Api\Authorization\TaskAuthorization;
+
+/**
+ * Class TaskMetadataProcedure
+ *
+ * @package Kanboard\Api\Procedure
+ * @author Frederic Guillot
+ */
+class TaskMetadataProcedure extends BaseProcedure
+{
+ public function getTaskMetadata($task_id)
+ {
+ TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getTask', $task_id);
+ return $this->taskMetadataModel->getAll($task_id);
+ }
+
+ public function getTaskMetadataByName($task_id, $name)
+ {
+ TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getTask', $task_id);
+ return $this->taskMetadataModel->get($task_id, $name);
+ }
+
+ public function saveTaskMetadata($task_id, array $values)
+ {
+ TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateTask', $task_id);
+ return $this->taskMetadataModel->save($task_id, $values);
+ }
+
+ public function removeTaskMetadata($task_id, $name)
+ {
+ TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateTask', $task_id);
+ return $this->taskMetadataModel->remove($task_id, $name);
+ }
+}
diff --git a/app/Api/Procedure/TaskProcedure.php b/app/Api/Procedure/TaskProcedure.php
index 59075b13..ee9242d1 100644
--- a/app/Api/Procedure/TaskProcedure.php
+++ b/app/Api/Procedure/TaskProcedure.php
@@ -6,7 +6,6 @@ use Kanboard\Api\Authorization\ProjectAuthorization;
use Kanboard\Api\Authorization\TaskAuthorization;
use Kanboard\Filter\TaskProjectFilter;
use Kanboard\Model\TaskModel;
-use Kanboard\Model\TaskMetadataModel;
/**
* Task API controller
@@ -16,30 +15,6 @@ use Kanboard\Model\TaskMetadataModel;
*/
class TaskProcedure extends BaseProcedure
{
- public function getTaskMetadata($task_id)
- {
- TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getTask', $task_id);
- return $this->taskMetadataModel->getAll($task_id);
- }
-
- public function getTaskMetadataByName($task_id, $name)
- {
- TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'getTask', $task_id);
- return $this->taskMetadataModel->get($task_id, $name);
- }
-
- public function saveTaskMetadata($task_id, array $values)
- {
- TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateTask', $task_id);
- return $this->taskMetadataModel->save($task_id, $values);
- }
-
- public function removeTaskMetadata($task_id, $name)
- {
- TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateTask', $task_id);
- return $this->taskMetadataModel->remove($task_id, $name);
- }
-
public function searchTasks($project_id, $query)
{
ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'searchTasks', $project_id);
@@ -117,7 +92,7 @@ class TaskProcedure extends BaseProcedure
$recurrence_basedate = 0, $reference = '')
{
ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'createTask', $project_id);
-
+
if ($owner_id !== 0 && ! $this->projectPermissionModel->isAssignable($project_id, $owner_id)) {
return false;
}
diff --git a/app/ServiceProvider/ApiProvider.php b/app/ServiceProvider/ApiProvider.php
index 5cf6231c..d5d1f260 100644
--- a/app/ServiceProvider/ApiProvider.php
+++ b/app/ServiceProvider/ApiProvider.php
@@ -22,6 +22,7 @@ use Kanboard\Api\Procedure\ProjectPermissionProcedure;
use Kanboard\Api\Procedure\SubtaskProcedure;
use Kanboard\Api\Procedure\SubtaskTimeTrackingProcedure;
use Kanboard\Api\Procedure\SwimlaneProcedure;
+use Kanboard\Api\Procedure\TaskMetadataProcedure;
use Kanboard\Api\Procedure\TaskProcedure;
use Kanboard\Api\Procedure\TaskLinkProcedure;
use Kanboard\Api\Procedure\UserProcedure;
@@ -69,6 +70,7 @@ class ApiProvider implements ServiceProviderInterface
->withObject(new TaskProcedure($container))
->withObject(new TaskLinkProcedure($container))
->withObject(new TaskExternalLinkProcedure($container))
+ ->withObject(new TaskMetadataProcedure($container))
->withObject(new UserProcedure($container))
->withObject(new GroupProcedure($container))
->withObject(new GroupMemberProcedure($container))
diff --git a/tests/integration/TaskMetadataProcedureTest.php b/tests/integration/TaskMetadataProcedureTest.php
new file mode 100644
index 00000000..9b9b2f39
--- /dev/null
+++ b/tests/integration/TaskMetadataProcedureTest.php
@@ -0,0 +1,45 @@
+<?php
+
+require_once __DIR__.'/BaseProcedureTest.php';
+
+class TaskMetadataProcedureTest extends BaseProcedureTest
+{
+ protected $projectName = 'My project to test tasks metadata';
+ protected $metaKey = 'MyTestMetaKey';
+
+ public function testAll()
+ {
+ $this->assertCreateTeamProject();
+ $this->assertCreateTask();
+ $this->assertSaveTaskMetadata();
+ $this->assertGetTaskMetadata();
+ $this->assertGetTaskMetadataByName();
+ $this->assertRemoveTaskMetadata();
+ }
+
+ public function assertSaveTaskMetadata()
+ {
+ $this->assertTrue($this->app->saveTaskMetadata($this->taskId, array($this->metaKey => 'metaValue1')));
+ }
+
+ public function assertGetTaskMetadata()
+ {
+ $metaData = $this->app->getTaskMetadata(($this->taskId));
+ $this->assertArrayHasKey($this->metaKey, $metaData);
+ $this->assertEquals('metaValue1', $metaData[$this->metaKey]);
+ }
+
+ public function assertGetTaskMetadataByName()
+ {
+ $metaValue = $this->app->getTaskMetadataByName($this->taskId, $this->metaKey);
+ $this->assertEquals('metaValue1', $metaValue, 'Did not return correct metadata value');
+ }
+
+ public function assertRemoveTaskMetadata()
+ {
+ $result = $this->app->removeTaskMetadata($this->taskId, $this->metaKey);
+ $this->assertTrue($result, 'Did not remove metakey with success');
+ $metaValue = $this->app->getTaskMetadataByName($this->taskId, $this->metaKey);
+ $this->assertEquals('', $metaValue, 'Did not return an empty string due to metadata being deleted');
+ }
+}
diff --git a/tests/integration/TaskProcedureTest.php b/tests/integration/TaskProcedureTest.php
index 8b3e622c..f456ae52 100644
--- a/tests/integration/TaskProcedureTest.php
+++ b/tests/integration/TaskProcedureTest.php
@@ -5,7 +5,6 @@ require_once __DIR__.'/BaseProcedureTest.php';
class TaskProcedureTest extends BaseProcedureTest
{
protected $projectName = 'My project to test tasks';
- protected $metaKey = 'MyTestMetaKey';
public function testAll()
{
@@ -16,43 +15,6 @@ class TaskProcedureTest extends BaseProcedureTest
$this->assertGetTaskByReference();
$this->assertGetAllTasks();
$this->assertOpenCloseTask();
- $this->assertSaveTaskMetadata();
- $this->assertGetTaskMetadata();
- $this->assertGetTaskMetadataByName();
- $this->assertRemoveTaskMetadata();
- }
-
- public function assertSaveTaskMetadata()
- {
- $createMetaKey = $this->app->saveTaskMetadata($this->taskId, array($this->metaKey => 'metaValue1'));
- $this->assertTrue($createMetaKey);
- }
-
- public function assertGetTaskMetadata()
- {
- $createMetaKey = $this->app->saveTaskMetadata($this->taskId, array($this->metaKey => 'metaValue1'));
- $this->assertTrue($createMetaKey,'Did not create metakey with success');
- $metaData = $this->app->getTaskMetadata(($this->taskId));
- $this->assertArrayHasKey($this->metaKey, $metaData);
- $this->assertEquals('metaValue1', $metaData[$this->metaKey]);
- }
-
- public function assertGetTaskMetadataByName()
- {
- $createMetaKey = $this->app->saveTaskMetadata($this->taskId, array($this->metaKey => 'metaValue1'));
- $this->assertTrue($createMetaKey,'Did not create metakey with success');
- $metaValue = $this->app->getTaskMetadataByName($this->taskId,$this->metaKey);
- $this->assertEquals('metaValue1', $metaValue, 'Did not return correct metadata value');
- }
-
- public function assertRemoveTaskMetadata()
- {
- $createMetaKey = $this->app->saveTaskMetadata($this->taskId, array($this->metaKey => 'metaValue1'));
- $this->assertTrue($createMetaKey,'Did not create metakey with success');
- $metaValue = $this->app->removeTaskMetadata($this->taskId,$this->metaKey);
- $this->assertTrue($metaValue,'Did not remove metakey with success');
- $metaValue = $this->app->getTaskMetadataByName($this->taskId,$this->metaKey);
- $this->assertEquals('',$metaValue,'Did not return an empty string due to metadata being deleted');
}
public function assertUpdateTask()
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-27 16:05:48 +0000