diff --git a/modules/export_seda/AdapterMaarchCourrier.php b/modules/export_seda/AdapterMaarchCourrier.php index 848795808351395a73a3f07309a2c9aaee28eacf..d0b3b093038caed8ebf76cde0595350f5f855926 100644 --- a/modules/export_seda/AdapterMaarchCourrier.php +++ b/modules/export_seda/AdapterMaarchCourrier.php @@ -14,7 +14,7 @@ class AdapterMaarchCourrier { $res = []; // [0] = url, [1] = header, [2] = cookie, [3] = data - $message = $this->db->getMessageByIdentifier($messageId); + $message = $this->db->getMessageByReference($messageId); $messageObject = json_decode($message->data); diff --git a/modules/sendmail/Controllers/ReceiveMessageExchangeController.php b/modules/sendmail/Controllers/ReceiveMessageExchangeController.php index a01f08ce3078817d94ace1f6d6566e63ef2d88f9..87c1b4d392ae6534692b7ae0af12a48f3a059d46 100644 --- a/modules/sendmail/Controllers/ReceiveMessageExchangeController.php +++ b/modules/sendmail/Controllers/ReceiveMessageExchangeController.php @@ -31,6 +31,7 @@ use Contact\models\ContactModel; require_once 'modules/export_seda/Controllers/ReceiveMessage.php'; require_once 'modules/export_seda/Controllers/SendMessage.php'; require_once 'modules/export_seda/RequestSeda.php'; +require_once 'modules/sendmail/Controllers/SendMessageExchangeController.php'; class ReceiveMessageExchangeController { @@ -460,7 +461,7 @@ class ReceiveMessageExchangeController $acknowledgementObject->TransferringAgency->OrganizationDescriptiveMetadata->UserIdentifier = $_SESSION['user']['UserId']; $acknowledgementObject->MessageIdentifier->value = $dataObject->MessageIdentifier->value . '_AckSent'; - $messageId = SendMessageExchangeController::saveMessageExchange(['dataObject' => $acknowledgementObject, 'res_id_master' => 0, 'type' => 'Acknowledgement', 'file_path' => $filePath]); + $messageId = \SendMessageExchangeController::saveMessageExchange(['dataObject' => $acknowledgementObject, 'res_id_master' => 0, 'type' => 'Acknowledgement', 'file_path' => $filePath]); $acknowledgementObject->DataObjectPackage = new \stdClass(); $acknowledgementObject->DataObjectPackage->DescriptiveMetadata = new \stdClass(); @@ -499,7 +500,7 @@ class ReceiveMessageExchangeController $filePath = $sendMessage->generateMessageFile($replyObject, "ArchiveTransferReply", $_SESSION['config']['tmppath']); $replyObject->MessageIdentifier->value = $dataObject->MessageIdentifier->value . '_ReplySent'; - $messageId = SendMessageExchangeController::saveMessageExchange(['dataObject' => $replyObject, 'res_id_master' => $aArgs['res_id_master'], 'type' => 'ArchiveTransferReply', 'file_path' => $filePath]); + $messageId = \SendMessageExchangeController::saveMessageExchange(['dataObject' => $replyObject, 'res_id_master' => $aArgs['res_id_master'], 'type' => 'ArchiveTransferReply', 'file_path' => $filePath]); $replyObject->MessageIdentifier->value = $dataObject->MessageIdentifier->value . '_Reply'; @@ -546,7 +547,7 @@ class ReceiveMessageExchangeController $messageExchange = $RequestSeda->getMessageByReference($dataObject->MessageRequestIdentifier->value); } - $messageId = SendMessageExchangeController::saveMessageExchange(['dataObject' => $dataObject, 'res_id_master' => $messageExchange->res_id_master, 'type' => $data['type']]); + $messageId = \SendMessageExchangeController::saveMessageExchange(['dataObject' => $dataObject, 'res_id_master' => $messageExchange->res_id_master, 'type' => $data['type']]); return $response->withJson([ "messageId" => $messageId diff --git a/rest/index.php b/rest/index.php index bd8a2d55f3fcd35595c354dd05213757fe2238e1..2ab3fdbff25d06d34ca89a5f9533245926b1dea8 100755 --- a/rest/index.php +++ b/rest/index.php @@ -305,4 +305,8 @@ $app->get('/administration/notifications/new', \Notification\controllers\Notific $app->get('/notifications/{id}', \Notification\controllers\NotificationController::class . ':getBySid'); $app->post('/scriptNotification', \Notification\controllers\NotificationScheduleController::class . ':createScriptNotification'); +$app->post('/saveNumericPackage', \Sendmail\Controllers\ReceiveMessageExchangeController::class . ':saveMessageExchange'); +$app->post('/saveMessageExchangeReturn', \Sendmail\Controllers\ReceiveMessageExchangeController::class . ':saveMessageExchangeReturn'); +$app->post('/saveMessageExchangeReview', \Sendmail\Controllers\MessageExchangeReviewController::class . ':saveMessageExchangeReview'); + $app->run();