diff --git a/rest/index.php b/rest/index.php
index ddf25f7faed24bbd113b1b29330306a60c3a5173..e8b18d1f979786c885dd9519a40dcc3aa2c31455 100755
--- a/rest/index.php
+++ b/rest/index.php
@@ -352,9 +352,9 @@ $app->get('/resources/{resId}/listInstance', \Entity\controllers\ListInstanceCon
$app->get('/resources/{resId}/visaCircuit', \Entity\controllers\ListInstanceController::class . ':getVisaCircuitByResId');
$app->get('/resources/{resId}/opinionCircuit', \Entity\controllers\ListInstanceController::class . ':getOpinionCircuitByResId');
$app->get('/resources/{resId}/availableCircuits', \Entity\controllers\ListTemplateController::class . ':getAvailableCircuitsByResId');
-$app->get('/resources/{resId}/linkedResources', \Resource\controllers\ResController::class . ':getLinkedResources');
-$app->post('/resources/{resId}/linkedResources', \Resource\controllers\ResController::class . ':linkResources');
-$app->delete('/resources/{resId}/linkedResources/{id}', \Resource\controllers\ResController::class . ':unlinkResources');
+$app->get('/resources/{resId}/linkedResources', \Resource\controllers\LinkController::class . ':getLinkedResources');
+$app->post('/resources/{resId}/linkedResources', \Resource\controllers\LinkController::class . ':linkResources');
+$app->delete('/resources/{resId}/linkedResources/{id}', \Resource\controllers\LinkController::class . ':unlinkResources');
$app->get('/res/{resId}/acknowledgementReceipt/{id}', \AcknowledgementReceipt\controllers\AcknowledgementReceiptController::class . ':getAcknowledgementReceipt');
$app->put('/res/resource/status', \Resource\controllers\ResController::class . ':updateStatus');
$app->post('/res/list', \Resource\controllers\ResController::class . ':getList');
diff --git a/src/app/resource/controllers/LinkController.php b/src/app/resource/controllers/LinkController.php
new file mode 100644
index 0000000000000000000000000000000000000000..e736dcd7a7a789fbee6e63b980fe6685dc9f9d96
--- /dev/null
+++ b/src/app/resource/controllers/LinkController.php
@@ -0,0 +1,143 @@
+<?php
+
+/**
+* Copyright Maarch since 2008 under licence GPLv3.
+* See LICENCE.txt file at the root folder for more details.
+* This file is part of Maarch software.
+*
+*/
+
+/**
+* @brief Link Controller
+* @author dev@maarch.org
+*/
+
+namespace Resource\controllers;
+
+use Entity\models\EntityModel;
+use Entity\models\ListInstanceModel;
+use Resource\models\ResModel;
+use Resource\models\ResourceContactModel;
+use Respect\Validation\Validator;
+use Slim\Http\Request;
+use Slim\Http\Response;
+use Status\models\StatusModel;
+use User\models\UserModel;
+
+class LinkController
+{
+ public function getLinkedResources(Request $request, Response $response, array $args)
+ {
+ if (!Validator::intVal()->validate($args['resId']) || !ResController::hasRightByResId(['resId' => [$args['resId']], 'userId' => $GLOBALS['id']])) {
+ return $response->withStatus(403)->withJson(['errors' => 'Resource out of perimeter']);
+ }
+
+ $resource = ResModel::getById(['resId' => $args['resId'], 'select' => ['linked_resources']]);
+ $linkedResourcesIds = json_decode($resource['linked_resources'], true);
+
+ $linkedResources = [];
+ if (!empty($linkedResourcesIds)) {
+ $linkedResources = ResModel::get([
+ 'select' => ['res_id as "resId"', 'subject', 'doc_date as "documentDate"', 'status', 'dest_user as "destUser"', 'destination', 'alt_identifier as chrono', 'category_id as "categoryId"'],
+ 'where' => ['res_id in (?)'],
+ 'data' => [$linkedResourcesIds]
+ ]);
+
+ foreach ($linkedResources as $key => $value) {
+ if (!empty($value['status'])) {
+ $status = StatusModel::getById(['id' => $value['status'], 'select' => ['label_status', 'img_filename']]);
+ $linkedResources[$key]['statusLabel'] = $status['label_status'];
+ $linkedResources[$key]['statusImage'] = $status['img_filename'];
+ }
+
+ if (!empty($value['destUser'])) {
+ $linkedResources[$key]['destUserLabel'] = UserModel::getLabelledUserById(['login' => $value['destUser']]);
+ }
+ if (!empty($value['destination'])) {
+ $linkedResources[$key]['destinationLabel'] = EntityModel::getByEntityId(['entityId' => $value['destination'], 'select' => ['short_label']])['short_label'];
+ }
+
+ $contacts = ResourceContactModel::get([
+ 'select' => ['item_id as id', 'type', 'mode'],
+ 'where' => ['res_id = ?'],
+ 'data' => [$value['resId']]
+ ]);
+
+ $linkedResources[$key]['senders'] = [];
+ $linkedResources[$key]['recipients'] = [];
+ foreach ($contacts as $contact) {
+ $linkedResources[$key]["{$contact['mode']}s"][] = $contact;
+ }
+
+ $linkedResources[$key]['visaCircuit'] = ListInstanceModel::get(['select' => ['item_id', 'item_mode'], 'where' => ['res_id = ?', 'difflist_type = ?'], 'data' => [$value['resId'], 'VISA_CIRCUIT']]);
+ foreach ($linkedResources[$key]['visaCircuit'] as $keyCircuit => $valueCircuit) {
+ $linkedResources[$key]['visaCircuit'][$keyCircuit]['userLabel'] = UserModel::getLabelledUserById(['login' => $valueCircuit['item_id']]);
+ }
+ }
+ }
+
+ return $response->withJson(['linkedResources' => $linkedResources]);
+ }
+
+ public function linkResources(Request $request, Response $response, array $args)
+ {
+ if (!Validator::intVal()->validate($args['resId']) || !ResController::hasRightByResId(['resId' => [$args['resId']], 'userId' => $GLOBALS['id']])) {
+ return $response->withStatus(403)->withJson(['errors' => 'Resource out of perimeter']);
+ }
+
+ $body = $request->getParsedBody();
+
+ if (!Validator::arrayType()->notEmpty()->validate($body['linkedResources'])) {
+ return $response->withStatus(403)->withJson(['errors' => 'Body linkedResources is empty or not an array']);
+ } elseif (!ResController::hasRightByResId(['resId' => $body['linkedResources'], 'userId' => $GLOBALS['id']])) {
+ return $response->withStatus(403)->withJson(['errors' => 'Body linkedResources out of perimeter']);
+ } elseif (in_array($args['resId'], $body['linkedResources'])) {
+ return $response->withStatus(403)->withJson(['errors' => 'Body linkedResources contains resource']);
+ }
+
+ $resource = ResModel::getById(['resId' => $args['resId'], 'select' => ['linked_resources']]);
+ $linkedResources = json_decode($resource['linked_resources'], true);
+ $linkedResources = array_merge($linkedResources, $body['linkedResources']);
+ $linkedResources = array_unique($linkedResources);
+ foreach ($linkedResources as $key => $value) {
+ $linkedResources[$key] = (string)$value;
+ }
+
+ ResModel::update([
+ 'set' => ['linked_resources' => json_encode($linkedResources)],
+ 'where' => ['res_id = ?'],
+ 'data' => [$args['resId']]
+ ]);
+ ResModel::update([
+ 'postSet' => ['linked_resources' => "jsonb_insert(linked_resources, '{0}', '\"{$args['resId']}\"')"],
+ 'where' => ['res_id in (?)', "(linked_resources @> ?) = false"],
+ 'data' => [$body['linkedResources'], "\"{$args['resId']}\""]
+ ]);
+
+ return $response->withStatus(204);
+ }
+
+ public function unlinkResources(Request $request, Response $response, array $args)
+ {
+ if (!Validator::intVal()->validate($args['resId']) || !ResController::hasRightByResId(['resId' => [$args['resId']], 'userId' => $GLOBALS['id']])) {
+ return $response->withStatus(403)->withJson(['errors' => 'Resource out of perimeter']);
+ }
+
+ if (!Validator::intVal()->validate($args['id']) || !ResController::hasRightByResId(['resId' => [$args['id']], 'userId' => $GLOBALS['id']])) {
+ return $response->withStatus(403)->withJson(['errors' => 'Resource to unlink out of perimeter']);
+ }
+
+ ResModel::update([
+ 'postSet' => ['linked_resources' => "linked_resources - '{$args['id']}'"],
+ 'where' => ['res_id = ?'],
+ 'data' => [$args['resId']]
+ ]);
+ ResModel::update([
+ 'postSet' => ['linked_resources' => "linked_resources - '{$args['resId']}'"],
+ 'where' => ['res_id = ?'],
+ 'data' => [$args['id']]
+ ]);
+
+ return $response->withStatus(204);
+ }
+}
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index 36fc5cb3d811e3d133f2591aea1d80973e551f16..fe6e186b33f55f0275c0ac8ceab1d13574751b92 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -677,111 +677,6 @@ class ResController
return $response->withJson(['isAllowed' => true]);
}
- public function getLinkedResources(Request $request, Response $response, array $args)
- {
- if (!Validator::intVal()->validate($args['resId']) || !ResController::hasRightByResId(['resId' => [$args['resId']], 'userId' => $GLOBALS['id']])) {
- return $response->withStatus(403)->withJson(['errors' => 'Resource out of perimeter']);
- }
-
- $resource = ResModel::getById(['resId' => $args['resId'], 'select' => ['linked_resources']]);
- $linkedResourcesIds = json_decode($resource['linked_resources'], true);
-
- $linkedResources = [];
- if (!empty($linkedResourcesIds)) {
- $linkedResources = ResModel::get([
- 'select' => ['res_id as "resId"', 'subject', 'doc_date as "documentDate"', 'status', 'dest_user as "destUser"', 'destination', 'alt_identifier as chrono', 'category_id as "categoryId"'],
- 'where' => ['res_id in (?)'],
- 'data' => [$linkedResourcesIds]
- ]);
-
- foreach ($linkedResources as $key => $value) {
- if (!empty($value['status'])) {
- $status = StatusModel::getById(['id' => $value['status'], 'select' => ['label_status', 'img_filename']]);
- $linkedResources[$key]['statusLabel'] = $status['label_status'];
- $linkedResources[$key]['statusImage'] = $status['img_filename'];
- }
-
- $contacts = ResourceContactModel::get([
- 'select' => ['item_id as id', 'type', 'mode'],
- 'where' => ['res_id = ?'],
- 'data' => [$value['resId']]
- ]);
-
- $linkedResources[$key]['senders'] = [];
- $linkedResources[$key]['recipients'] = [];
- foreach ($contacts as $contact) {
- $linkedResources[$key]["{$contact['mode']}s"][] = $contact;
- }
-
- $linkedResources[$key]['visaCircuit'] = ListInstanceModel::get(['select' => ['item_id', 'item_mode'], 'where' => ['res_id = ?', 'difflist_type = ?'], 'data' => [$value['resId'], 'VISA_CIRCUIT']]);
- }
- }
-
- return $response->withJson(['linkedResources' => $linkedResources]);
- }
-
- public function linkResources(Request $request, Response $response, array $args)
- {
- if (!Validator::intVal()->validate($args['resId']) || !ResController::hasRightByResId(['resId' => [$args['resId']], 'userId' => $GLOBALS['id']])) {
- return $response->withStatus(403)->withJson(['errors' => 'Resource out of perimeter']);
- }
-
- $body = $request->getParsedBody();
-
- if (!Validator::arrayType()->notEmpty()->validate($body['linkedResources'])) {
- return $response->withStatus(403)->withJson(['errors' => 'Body linkedResources is empty or not an array']);
- }
-
- if (!ResController::hasRightByResId(['resId' => $body['linkedResources'], 'userId' => $GLOBALS['id']])) {
- return $response->withStatus(403)->withJson(['errors' => 'Body linkedResources out of perimeter']);
- }
-
- $resource = ResModel::getById(['resId' => $args['resId'], 'select' => ['linked_resources']]);
- $linkedResources = json_decode($resource['linked_resources'], true);
- $linkedResources = array_merge($linkedResources, $body['linkedResources']);
- $linkedResources = array_unique($linkedResources);
- foreach ($linkedResources as $key => $value) {
- $linkedResources[$key] = (string)$value;
- }
-
- ResModel::update([
- 'set' => ['linked_resources' => json_encode($linkedResources)],
- 'where' => ['res_id = ?'],
- 'data' => [$args['resId']]
- ]);
- ResModel::update([
- 'postSet' => ['linked_resources' => "jsonb_insert(linked_resources, '{0}', '\"{$args['resId']}\"')"],
- 'where' => ['res_id in (?)', "(linked_resources @> ?) = false"],
- 'data' => [$body['linkedResources'], "\"{$args['resId']}\""]
- ]);
-
- return $response->withStatus(204);
- }
-
- public function unlinkResources(Request $request, Response $response, array $args)
- {
- if (!Validator::intVal()->validate($args['resId']) || !ResController::hasRightByResId(['resId' => [$args['resId']], 'userId' => $GLOBALS['id']])) {
- return $response->withStatus(403)->withJson(['errors' => 'Resource out of perimeter']);
- }
-
- if (!Validator::intVal()->validate($args['id']) || !ResController::hasRightByResId(['resId' => [$args['id']], 'userId' => $GLOBALS['id']])) {
- return $response->withStatus(403)->withJson(['errors' => 'Resource to unlink out of perimeter']);
- }
-
- ResModel::update([
- 'postSet' => ['linked_resources' => "linked_resources - '{$args['id']}'"],
- 'where' => ['res_id = ?'],
- 'data' => [$args['resId']]
- ]);
- ResModel::update([
- 'postSet' => ['linked_resources' => "linked_resources - '{$args['resId']}'"],
- 'where' => ['res_id = ?'],
- 'data' => [$args['id']]
- ]);
-
- return $response->withStatus(204);
- }
-
public static function getEncodedDocument(array $aArgs)
{
ValidatorModel::notEmpty($aArgs, ['resId']);