From 1dfff4ba5a8f4ac91da77c2a6ace18176d6873f9 Mon Sep 17 00:00:00 2001
From: Alexandre Morin <alexandre.morin@maarch.org>
Date: Wed, 14 Mar 2018 18:07:19 +0100
Subject: [PATCH] FEAT #202 fusion M2M refactoring
---
modules/export_seda/AdapterMaarchCourrier.php | 15 +++++++-----
modules/export_seda/Controllers/AdapterWS.php | 3 ++-
modules/export_seda/Purge.php | 2 +-
modules/export_seda/RequestSeda.php | 6 ++---
modules/export_seda/class/ArchiveTransfer.php | 23 +++++++++----------
modules/export_seda/export_seda.php | 2 +-
.../ReceiveMessageExchangeController.php | 3 +--
.../SendMessageExchangeController.php | 6 ++---
sql/data_fr.sql | 10 +++++---
9 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/modules/export_seda/AdapterMaarchCourrier.php b/modules/export_seda/AdapterMaarchCourrier.php
index d299c0eee2a..6fe83593e27 100644
--- a/modules/export_seda/AdapterMaarchCourrier.php
+++ b/modules/export_seda/AdapterMaarchCourrier.php
@@ -19,17 +19,20 @@ class AdapterMaarchCourrier{
$messageObject = json_decode($message->data);
$docserver = \Docserver\models\DocserverModel::getById(['docserver_id' => $message->docserver_id]);
- $docserverType = \Docserver\models\DocserverTypeModel::getById(['docserver_type_id' => $docserver[0]['docserver_type_id']]);
+ $docserverType = \Docserver\models\DocserverTypeModel::getById(
+ ['docserver_type_id' => $docserver[0]['docserver_type_id']]
+ );
$pathDirectory = str_replace('#', DIRECTORY_SEPARATOR, $message->path);
$filePath = $docserver[0]['path_template'] . $pathDirectory . $message->filename;
- $fingerprint = \Core\Controllers\DocserverToolsController::doFingerprint([
- 'path' => $filePath,
- 'fingerprintMode' => $docserverType[0]['fingerprint_mode'],
+ $fingerprint = \SrcCore\controllers\StoreController::getFingerPrint([
+ 'filePath' => $filePath,
+ 'mode' => $docserverType[0]['fingerprint_mode'],
]);
- if($fingerprint['fingerprint'] != $message->fingerprint){
- echo _PB_WITH_FINGERPRINT_OF_DOCUMENT;exit;
+ if ($fingerprint['fingerprint'] != $message->fingerprint) {
+ echo _PB_WITH_FINGERPRINT_OF_DOCUMENT;
+ exit;
}
$pathParts = pathinfo($filePath);
diff --git a/modules/export_seda/Controllers/AdapterWS.php b/modules/export_seda/Controllers/AdapterWS.php
index 37c5686cd56..29255a6b7aa 100644
--- a/modules/export_seda/Controllers/AdapterWS.php
+++ b/modules/export_seda/Controllers/AdapterWS.php
@@ -15,7 +15,8 @@ class AdapterWS{
{
$transfer = new Transfer();
- $res = $transfer->transfer('maarchcourrier', $messageId, $type);
+ $message = $this->db->getMessageByIdentifier($messageId);
+ $res = $transfer->transfer('maarchcourrier', $message->reference, $type);
if ($res['status'] == 1) {
$this->db->updateStatusMessage($messageObject->MessageIdentifier->value, 'E');
diff --git a/modules/export_seda/Purge.php b/modules/export_seda/Purge.php
index 54a1e394b83..57fa0aeb7b2 100755
--- a/modules/export_seda/Purge.php
+++ b/modules/export_seda/Purge.php
@@ -56,7 +56,7 @@ Class Purge{
$xml = simplexml_load_file($fileName);
if (strpos($xml->ReplyCode, '000') === false) {
- $_SESSION['error'] = _ERROR_LETTER_ARCHIVED. $resId;
+ $_SESSION['error'] = _LETTER_NO_ARCHIVED. $resId;
return false;
}
diff --git a/modules/export_seda/RequestSeda.php b/modules/export_seda/RequestSeda.php
index a5bcc8e34b3..176298cd379 100644
--- a/modules/export_seda/RequestSeda.php
+++ b/modules/export_seda/RequestSeda.php
@@ -486,9 +486,9 @@ class RequestSeda
['docserver_type_id' => $docserver[0]['docserver_type_id']]
);
- $fingerprint = \Docserver\controllers\DocserverToolsController::doFingerprint([
- 'path' => $filePath,
- 'fingerprintMode' => $docserverType[0]['fingerprint_mode'],
+ $fingerprint = \SrcCore\controllers\StoreController::getFingerPrint([
+ 'filePath' => $filePath,
+ 'mode' => $docserverType[0]['fingerprint_mode'],
]);
}
diff --git a/modules/export_seda/class/ArchiveTransfer.php b/modules/export_seda/class/ArchiveTransfer.php
index 03bd949c5d5..c3db7a64372 100644
--- a/modules/export_seda/class/ArchiveTransfer.php
+++ b/modules/export_seda/class/ArchiveTransfer.php
@@ -295,22 +295,21 @@ class ArchiveTransfer
$data->messageId = $messageObject->MessageIdentifier->value;
$data->date = $messageObject->Date;
- $data->messageIdentifier = new stdClass();
- $data->messageIdentifier->value = $messageObject->MessageIdentifier->value;
+ $data->MessageIdentifier = new stdClass();
+ $data->MessageIdentifier->value = $messageObject->MessageIdentifier->value;
- $data->transferringAgency = new stdClass();
- $data->transferringAgency->identifier = new stdClass();
- $data->transferringAgency->identifier->value = $messageObject->TransferringAgency->Identifier->value;
+ $data->TransferringAgency = new stdClass();
+ $data->TransferringAgency->Identifier = new stdClass();
+ $data->TransferringAgency->Identifier->value = $messageObject->TransferringAgency->Identifier->value;
- $data->archivalAgency = new stdClass();
- $data->archivalAgency->identifier = new stdClass();
- $data->archivalAgency->identifier->value = $messageObject->ArchivalAgency->Identifier->value;
+ $data->ArchivalAgency = new stdClass();
+ $data->ArchivalAgency->Identifier = new stdClass();
+ $data->ArchivalAgency->Identifier->value = $messageObject->ArchivalAgency->Identifier->value;
- $data->archivalAgreement = new stdClass();
- $data->archivalAgreement->value = $messageObject->ArchivalAgreement->value;
+ $data->ArchivalAgreement = new stdClass();
+ $data->ArchivalAgreement->value = $messageObject->ArchivalAgreement->value;
- $data->replyCode = new stdClass();
- $data->replyCode->value = $messageObject->ReplyCode->value;
+ $data->ReplyCode = $messageObject->ReplyCode;
$aArgs = [];
$aArgs['fullMessageObject'] = $messageObject;
diff --git a/modules/export_seda/export_seda.php b/modules/export_seda/export_seda.php
index 668061a9590..56c27523f58 100644
--- a/modules/export_seda/export_seda.php
+++ b/modules/export_seda/export_seda.php
@@ -48,7 +48,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
$db = new Database();
$stmt = $db->query("select message_id from unit_identifier where res_id = ?", array($values[0]));
$unitIdentifier = $stmt->fetchObject();
- $stmt = $db->query("select data from seda where message_id = ?", array($unitIdentifier->message_id));
+ $stmt = $db->query("select data from message_exchange where message_id = ?", array($unitIdentifier->message_id));
$messageData = $stmt->fetchObject();
diff --git a/modules/sendmail/Controllers/ReceiveMessageExchangeController.php b/modules/sendmail/Controllers/ReceiveMessageExchangeController.php
index 709b20c79a9..2baddb77529 100644
--- a/modules/sendmail/Controllers/ReceiveMessageExchangeController.php
+++ b/modules/sendmail/Controllers/ReceiveMessageExchangeController.php
@@ -484,8 +484,7 @@ class ReceiveMessageExchangeController
$replyObject->MessageIdentifier = new \stdClass();
$replyObject->MessageIdentifier->value = $dataObject->MessageIdentifier->value . '_ReplySent';
- $replyObject->ReplyCode = new \stdClass();
- $replyObject->ReplyCode->value = $aArgs['replyCode'];
+ $replyObject->ReplyCode = $aArgs['replyCode'];
$replyObject->MessageRequestIdentifier = new \stdClass();
$replyObject->MessageRequestIdentifier->value = $dataObject->MessageIdentifier->value;
diff --git a/modules/sendmail/Controllers/SendMessageExchangeController.php b/modules/sendmail/Controllers/SendMessageExchangeController.php
index f67ac120757..f58d286faf5 100644
--- a/modules/sendmail/Controllers/SendMessageExchangeController.php
+++ b/modules/sendmail/Controllers/SendMessageExchangeController.php
@@ -501,12 +501,12 @@ class SendMessageExchangeController
$oData->archivalAgreement->value = ""; // TODO : ???
$replyCode = "";
- if (!empty($dataObject->ReplyCode->value)) {
- $replyCode = $dataObject->ReplyCode->value;
+ if(!empty($dataObject->ReplyCode)){
+ $replyCode = $dataObject->ReplyCode;
}
$oData->replyCode = new stdClass();
- $oData->replyCode->value = $replyCode;
+ $oData->replyCode = $replyCode;
$dataObject = self::cleanBase64Value(['dataObject' => $dataObject]);
diff --git a/sql/data_fr.sql b/sql/data_fr.sql
index 376057568a4..9021ea7fd90 100755
--- a/sql/data_fr.sql
+++ b/sql/data_fr.sql
@@ -1185,7 +1185,9 @@ INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_
INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (500, '', 'Transférer au système d''archivage', 'SEND_SEDA', 'N', 'N', 'Y', 'export_seda', 'Y', 'export_seda', 'N', NULL);
INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (501, '', 'Valider la réception du courrier par le système d''archivage', 'ACK_SEDA', 'N', 'N', 'Y', 'ack_seda', 'Y', 'apps', 'N', NULL);
INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (502, '', 'Valider l''archivage du courrier', 'REPLY_SEDA', 'N', 'N', 'Y', 'reply_seda', 'Y', 'apps', 'N', NULL);
-INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (503, '', 'Supprimer courrier', 'DEL', 'N', 'N', 'Y', 'del_seda', 'Y', 'apps', 'N', NULL);
+INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (503, '', 'Supprimer courrier', 'DEL', 'N', 'N', 'Y', 'purge_letter', 'Y', 'apps', 'N', NULL);
+INSERT INTO actions (id, keyword, label_action, id_status, is_system, is_folder_action, enabled, action_page, history, origin, create_id, category_id) VALUES (504, '', 'Remise à zero du courrier', 'END', 'N', 'N', 'Y', 'reset_letter', 'Y', 'apps', 'N', NULL);
+
Select setval('actions_id_seq', (select max(id)+1 from actions), false);
------------
--ACTIONS_GROUPBASKETS
@@ -1282,8 +1284,10 @@ INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id,
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (4, '', 'ELU', 'DdeAvisBasket', 'N', 'N', 'Y');
INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (500, '', 'ARCHIVISTE', 'ToArcBasket', 'Y', 'N', 'N');
-INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (501, '', 'ARCHIVISTE', 'SentArcBasket', 'Y', 'N', 'N');
-INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (502, '', 'ARCHIVISTE', 'AckArcBasket', 'Y', 'N', 'N');
+INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (501, '', 'ARCHIVISTE', 'ToArcBasket', 'Y', 'N', 'N');
+INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (502, '', 'ARCHIVISTE', 'SentArcBasket', 'Y', 'N', 'N');
+INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (503, '', 'ARCHIVISTE', 'AckArcBasket', 'Y', 'N', 'N');
+INSERT INTO actions_groupbaskets (id_action, where_clause, group_id, basket_id, used_in_basketlist, used_in_action_page, default_action_list) VALUES (504, '', 'ARCHIVISTE', 'AckArcBasket', 'Y', 'N', 'N');
------------
--GROUPBASKET_REDIRECT
------------
--
GitLab