summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Veyssier <julien-nc@posteo.net>2023-08-02 16:47:41 +0200
committerJulien Veyssier <julien-nc@posteo.net>2023-08-09 14:58:02 +0200
commit6eb18570c0822ed1d774c5243e153fd0ee406fd1 (patch)
tree9d29f5cdfba7cd6ae844669b2f3cae82cf1399d8
parent41918cc8b2e942a14c95dfadc9dffc65daf23f47 (diff)
downloadnextcloud-server-6eb18570c0822ed1d774c5243e153fd0ee406fd1.tar.gz
nextcloud-server-6eb18570c0822ed1d774c5243e153fd0ee406fd1.zip
start implementing ocs endpoint to get task list from user+appId+identifier
Signed-off-by: Julien Veyssier <julien-nc@posteo.net> (cherry picked from commit 9986e02097e5c82e1bb21ba3f897b14d82a50c15) Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
-rw-r--r--core/Controller/TextProcessingApiController.php32
-rw-r--r--core/routes.php1
-rw-r--r--lib/private/TextProcessing/Db/TaskMapper.php19
-rw-r--r--lib/private/TextProcessing/Manager.php19
-rw-r--r--lib/public/TextProcessing/IManager.php8
5 files changed, 78 insertions, 1 deletions
diff --git a/core/Controller/TextProcessingApiController.php b/core/Controller/TextProcessingApiController.php
index 9ed332644e1..0f4c8c40b29 100644
--- a/core/Controller/TextProcessingApiController.php
+++ b/core/Controller/TextProcessingApiController.php
@@ -134,4 +134,36 @@ class TextProcessingApiController extends \OCP\AppFramework\OCSController {
return new DataResponse(['message' => $this->l->t('Internal error')], Http::STATUS_INTERNAL_SERVER_ERROR);
}
}
+
+ /**
+ * This endpoint returns a list of tasks related with a specific appId and identifier
+ *
+ * @PublicPage
+ * @UserRateThrottle(limit=20, period=120)
+ *
+ * @param string $appId
+ * @param string|null $identifier
+ * @return DataResponse<Http::STATUS_OK, array{tasks: array{CoreTextProcessingTask}}, array{}>|DataResponse<Http::STATUS_INTERNAL_SERVER_ERROR, array{message: string}, array{}>
+ *
+ * 200: Task list returned
+ */
+ public function listTasksByApp(string $appId, ?string $identifier = null): DataResponse {
+ if ($this->userId === null) {
+ return new DataResponse([
+ 'tasks' => [],
+ ]);
+ }
+ try {
+ $tasks = $this->languageModelManager->getTasksByApp($this->userId, $appId, $identifier);
+ $json = array_map(static function (Task $task) {
+ return $task->jsonSerialize();
+ }, $tasks);
+
+ return new DataResponse([
+ 'tasks' => $json,
+ ]);
+ } catch (\RuntimeException $e) {
+ return new DataResponse(['message' => $this->l->t('Internal error')], Http::STATUS_INTERNAL_SERVER_ERROR);
+ }
+ }
}
diff --git a/core/routes.php b/core/routes.php
index 4790f32af32..90578ee6f0d 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -149,6 +149,7 @@ $application->registerRoutes($this, [
['root' => '/textprocessing', 'name' => 'TextProcessingApi#taskTypes', 'url' => '/tasktypes', 'verb' => 'GET'],
['root' => '/textprocessing', 'name' => 'TextProcessingApi#schedule', 'url' => '/schedule', 'verb' => 'POST'],
['root' => '/textprocessing', 'name' => 'TextProcessingApi#getTask', 'url' => '/task/{id}', 'verb' => 'GET'],
+ ['root' => '/textprocessing', 'name' => 'TextProcessingApi#listTasksByApp', 'url' => '/tasks/app/{appId}', 'verb' => 'GET'],
],
]);
diff --git a/lib/private/TextProcessing/Db/TaskMapper.php b/lib/private/TextProcessing/Db/TaskMapper.php
index 624efd042f7..cf78006d6d9 100644
--- a/lib/private/TextProcessing/Db/TaskMapper.php
+++ b/lib/private/TextProcessing/Db/TaskMapper.php
@@ -60,6 +60,25 @@ class TaskMapper extends QBMapper {
}
/**
+ * @param string $userId
+ * @param string $appId
+ * @param string|null $identifier
+ * @return array
+ * @throws Exception
+ */
+ public function findByApp(string $userId, string $appId, ?string $identifier = null): array {
+ $qb = $this->db->getQueryBuilder();
+ $qb->select(Task::$columns)
+ ->from($this->tableName)
+ ->where($qb->expr()->eq('app_id', $qb->createPositionalParameter($appId)))
+ ->andWhere($qb->expr()->eq('user_id', $qb->createPositionalParameter($userId)));
+ if ($identifier !== null) {
+ $qb->andWhere($qb->expr()->eq('identifier', $qb->createPositionalParameter($identifier)));
+ }
+ return $this->findEntities($qb);
+ }
+
+ /**
* @param int $timeout
* @return int the number of deleted tasks
* @throws Exception
diff --git a/lib/private/TextProcessing/Manager.php b/lib/private/TextProcessing/Manager.php
index 05e046a0049..da38dc876a7 100644
--- a/lib/private/TextProcessing/Manager.php
+++ b/lib/private/TextProcessing/Manager.php
@@ -192,7 +192,24 @@ class Manager implements IManager {
} catch (MultipleObjectsReturnedException $e) {
throw new RuntimeException('Could not uniquely identify task with given id', 0, $e);
} catch (Exception $e) {
- throw new RuntimeException('Failure while trying to find task by id: '.$e->getMessage(), 0, $e);
+ throw new RuntimeException('Failure while trying to find task by id: ' . $e->getMessage(), 0, $e);
+ }
+ }
+
+ /**
+ * @param string $userId
+ * @param string $appId
+ * @param string|null $identifier
+ * @return array
+ */
+ public function getTasksByApp(string $userId, string $appId, ?string $identifier = null): array {
+ try {
+ $taskEntities = $this->taskMapper->findByApp($userId, $appId, $identifier);
+ return array_map(static function (DbTask $taskEntity) {
+ return $taskEntity->toPublicTask();
+ }, $taskEntities);
+ } catch (Exception $e) {
+ throw new RuntimeException('Failure while trying to find tasks by appId and identifier: ' . $e->getMessage(), 0, $e);
}
}
}
diff --git a/lib/public/TextProcessing/IManager.php b/lib/public/TextProcessing/IManager.php
index 50d012eca68..c7b101ad510 100644
--- a/lib/public/TextProcessing/IManager.php
+++ b/lib/public/TextProcessing/IManager.php
@@ -80,4 +80,12 @@ interface IManager {
* @since 27.1.0
*/
public function getTask(int $id): Task;
+
+ /**
+ * @param string $userId
+ * @param string $appId
+ * @param string|null $identifier
+ * @return array
+ */
+ public function getTasksByApp(string $userId, string $appId, ?string $identifier = null): array;
}