From f9f1bc0938f9ea56a1e679266f7534285281c028 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Thu, 13 Feb 2020 00:37:23 +0100
Subject: [PATCH] FEAT #12072 TIME 0:10 Change returned data of get functions
in message exchange model
---
src/app/email/controllers/EmailController.php | 10 +++++-----
.../controllers/AdapterMaarchCourrierController.php | 11 +++++------
.../exportSeda/controllers/AdapterWSController.php | 6 +++---
.../controllers/MessageExchangeController.php | 3 +--
.../controllers/MessageExchangeReviewController.php | 2 +-
.../controllers/ReceiveMessageExchangeController.php | 4 +++-
.../models/MessageExchangeModelAbstract.php | 4 ++--
7 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/app/email/controllers/EmailController.php b/src/app/email/controllers/EmailController.php
index 112c09c34de..c93a62164d3 100644
--- a/src/app/email/controllers/EmailController.php
+++ b/src/app/email/controllers/EmailController.php
@@ -524,17 +524,17 @@ class EmailController
//zip M2M
if ($email['message_exchange_id']) {
$messageExchange = MessageExchangeModel::getMessageByIdentifier(['messageId' => $email['message_exchange_id'], 'select' => ['docserver_id','path','filename','fingerprint','reference']]);
- $docserver = DocserverModel::getByDocserverId(['docserverId' => $messageExchange[0]['docserver_id']]);
+ $docserver = DocserverModel::getByDocserverId(['docserverId' => $messageExchange['docserver_id']]);
$docserverType = DocserverTypeModel::getById(['id' => $docserver['docserver_type_id']]);
- $pathDirectory = str_replace('#', DIRECTORY_SEPARATOR, $messageExchange[0]['path']);
- $filePath = $docserver['path_template'] . $pathDirectory . $messageExchange[0]['filename'];
+ $pathDirectory = str_replace('#', DIRECTORY_SEPARATOR, $messageExchange['path']);
+ $filePath = $docserver['path_template'] . $pathDirectory . $messageExchange['filename'];
$fingerprint = StoreController::getFingerPrint([
'filePath' => $filePath,
'mode' => $docserverType['fingerprint_mode'],
]);
- if ($fingerprint != $messageExchange[0]['fingerprint']) {
+ if ($fingerprint != $messageExchange['fingerprint']) {
$email['document'] = (array)json_decode($email['document']);
return ['errors' => 'Pb with fingerprint of document. ResId master : ' . $email['document']['id']];
}
@@ -545,7 +545,7 @@ class EmailController
return ['errors' => 'Document not found on docserver'];
}
- $title = preg_replace(utf8_decode('@[\\/:*?"<>|]@i'), '_', substr($messageExchange[0]['reference'], 0, 30));
+ $title = preg_replace(utf8_decode('@[\\/:*?"<>|]@i'), '_', substr($messageExchange['reference'], 0, 30));
$phpmailer->addStringAttachment($fileContent, $title . '.zip');
}
diff --git a/src/app/external/exportSeda/controllers/AdapterMaarchCourrierController.php b/src/app/external/exportSeda/controllers/AdapterMaarchCourrierController.php
index 928be8b7c56..31f94e6af36 100755
--- a/src/app/external/exportSeda/controllers/AdapterMaarchCourrierController.php
+++ b/src/app/external/exportSeda/controllers/AdapterMaarchCourrierController.php
@@ -26,22 +26,21 @@ class AdapterMaarchCourrierController
$res = []; // [0] = url, [1] = header, [2] = cookie, [3] = data
$message = MessageExchangeModel::getMessageByReference(['reference' => $messageId]);
+ $messageObject = json_decode($message['data']);
- $messageObject = json_decode($message[0]['data']);
-
- $docserver = DocserverModel::getByDocserverId(['docserverId' => $message[0]['docserver_id']]);
+ $docserver = DocserverModel::getByDocserverId(['docserverId' => $message['docserver_id']]);
$docserverType = DocserverTypeModel::getById(
['id' => $docserver['docserver_type_id']]
);
- $pathDirectory = str_replace('#', DIRECTORY_SEPARATOR, $message[0]['path']);
- $filePath = $docserver['path_template'] . $pathDirectory . $message[0]['filename'];
+ $pathDirectory = str_replace('#', DIRECTORY_SEPARATOR, $message['path']);
+ $filePath = $docserver['path_template'] . $pathDirectory . $message['filename'];
$fingerprint = StoreController::getFingerPrint([
'filePath' => $filePath,
'mode' => $docserverType['fingerprint_mode'],
]);
- if ($fingerprint != $message[0]['fingerprint']) {
+ if ($fingerprint != $message['fingerprint']) {
echo _PB_WITH_FINGERPRINT_OF_DOCUMENT;
exit;
}
diff --git a/src/app/external/exportSeda/controllers/AdapterWSController.php b/src/app/external/exportSeda/controllers/AdapterWSController.php
index 0b44197c3b3..c9824b59961 100755
--- a/src/app/external/exportSeda/controllers/AdapterWSController.php
+++ b/src/app/external/exportSeda/controllers/AdapterWSController.php
@@ -21,13 +21,13 @@ class AdapterWSController
public function send($messageObject, $messageId, $type)
{
$message = MessageExchangeModel::getMessageByIdentifier(['messageId' => $messageId]);
- $res = TransferController::transfer('maarchcourrier', $message[0]['reference'], $type);
+ $res = TransferController::transfer('maarchcourrier', $message['reference'], $type);
if ($res['status'] == 1) {
- MessageExchangeModel::updateStatusMessage(['reference' => $message[0]['reference'], 'status' => 'E']);
+ MessageExchangeModel::updateStatusMessage(['reference' => $message['reference'], 'status' => 'E']);
return $res;
}
- MessageExchangeModel::updateStatusMessage(['reference' => $message[0]['reference'], 'status' => 'S']);
+ MessageExchangeModel::updateStatusMessage(['reference' => $message['reference'], 'status' => 'S']);
}
}
diff --git a/src/app/external/messageExchange/controllers/MessageExchangeController.php b/src/app/external/messageExchange/controllers/MessageExchangeController.php
index c6935ee7f1b..455814112a2 100644
--- a/src/app/external/messageExchange/controllers/MessageExchangeController.php
+++ b/src/app/external/messageExchange/controllers/MessageExchangeController.php
@@ -83,10 +83,9 @@ class MessageExchangeController
'messageId' => $args['id']
]);
- if (empty($message[0])) {
+ if (empty($message)) {
return $response->withStatus(404)->withJson(['errors' => 'Message not found']);
}
- $message = $message[0];
if (!ResController::hasRightByResId(['resId' => [$message['res_id_master']], 'userId' => $GLOBALS['id']])) {
return $response->withStatus(403)->withJson(['errors' => 'Document out of perimeter']);
diff --git a/src/app/external/messageExchange/controllers/MessageExchangeReviewController.php b/src/app/external/messageExchange/controllers/MessageExchangeReviewController.php
index 87987fcbb44..3aad8aceb08 100755
--- a/src/app/external/messageExchange/controllers/MessageExchangeReviewController.php
+++ b/src/app/external/messageExchange/controllers/MessageExchangeReviewController.php
@@ -77,7 +77,7 @@ class MessageExchangeReviewController
$reviewObject->UnitIdentifier->value = $messageExchangeData['external_id']['m2m'];
$messageExchangeReply = MessageExchangeModel::getMessageByReference(['reference' => $messageExchangeData['external_id']['m2m'].'_ReplySent']);
- $dataObject = json_decode($messageExchangeReply[0]['data']);
+ $dataObject = json_decode($messageExchangeReply['data']);
$reviewObject->OriginatingAgency = $dataObject->TransferringAgency;
$reviewObject->ArchivalAgency = $dataObject->ArchivalAgency;
diff --git a/src/app/external/messageExchange/controllers/ReceiveMessageExchangeController.php b/src/app/external/messageExchange/controllers/ReceiveMessageExchangeController.php
index bfaafe45a40..a120bd18a51 100755
--- a/src/app/external/messageExchange/controllers/ReceiveMessageExchangeController.php
+++ b/src/app/external/messageExchange/controllers/ReceiveMessageExchangeController.php
@@ -18,13 +18,15 @@ namespace MessageExchange\controllers;
use Basket\models\BasketModel;
use Contact\models\ContactModel;
use Entity\models\EntityModel;
+use ExportSeda\controllers\SendMessageController;
use Group\controllers\PrivilegeController;
use History\controllers\HistoryController;
+use MessageExchange\controllers\SendMessageExchangeController;
+use MessageExchange\models\MessageExchangeModel;
use Note\models\NoteModel;
use Resource\controllers\StoreController;
use Resource\models\ResModel;
use Resource\models\ResourceContactModel;
-use ExportSeda\controllers\SendMessageController;
use Slim\Http\Request;
use Slim\Http\Response;
use SrcCore\models\CoreConfigModel;
diff --git a/src/app/external/messageExchange/models/MessageExchangeModelAbstract.php b/src/app/external/messageExchange/models/MessageExchangeModelAbstract.php
index e9903b05275..cbe3569a82f 100755
--- a/src/app/external/messageExchange/models/MessageExchangeModelAbstract.php
+++ b/src/app/external/messageExchange/models/MessageExchangeModelAbstract.php
@@ -58,7 +58,7 @@ abstract class MessageExchangeModelAbstract
return [];
}
- return $aReturn;
+ return $aReturn[0];
}
public static function getMessageByIdentifier($aArgs = [])
@@ -78,7 +78,7 @@ abstract class MessageExchangeModelAbstract
return [];
}
- return $aReturn;
+ return $aReturn[0];
}
public static function updateStatusMessage(array $aArgs)
--
GitLab