Skip to content
Snippets Groups Projects
Verified Commit 63f9876a authored by Florian Azizian's avatar Florian Azizian
Browse files

FEAT #8391 improve return error send to maarchParapheur

parent b308c199
No related branches found
No related tags found
No related merge requests found
......@@ -392,12 +392,12 @@ class PreProcessActionController
}
$adrMainInfo = ConvertPdfController::getConvertedPdfById(['resId' => $resId, 'collId' => 'letterbox_coll']);
if (empty($adrMainInfo)) {
if (empty($adrMainInfo['docserver_id'])) {
$additionalsInfos['noMail'][] = ['alt_identifier' => $noAttachmentsResource['alt_identifier'], 'res_id' => $resId, 'reason' => 'noMailConversion'];
continue;
}
$docserverMainInfo = DocserverModel::getByDocserverId(['docserverId' => $adrMainInfo['docserver_id']]);
if (empty($docserverMainInfo)) {
if (empty($docserverMainInfo['path_template'])) {
$additionalsInfos['noMail'][] = ['alt_identifier' => $noAttachmentsResource['alt_identifier'], 'res_id' => $resId, 'reason' => 'docserverDoesNotExists'];
continue;
}
......@@ -434,12 +434,12 @@ class PreProcessActionController
}
$adrInfo = ConvertPdfController::getConvertedPdfById(['resId' => $resIdAttachment, 'collId' => $collId, 'isVersion' => $is_version]);
if (empty($adrInfo)) {
if (empty($adrInfo['docserver_id'])) {
$additionalsInfos['noAttachment'][] = ['alt_identifier' => $noAttachmentsResource['alt_identifier'], 'res_id' => $resIdAttachment, 'reason' => 'noAttachmentConversion'];
break;
}
$docserverInfo = DocserverModel::getByDocserverId(['docserverId' => $adrInfo['docserver_id']]);
if (empty($docserverInfo)) {
if (empty($docserverInfo['path_template'])) {
$additionalsInfos['noAttachment'][] = ['alt_identifier' => $noAttachmentsResource['alt_identifier'], 'res_id' => $resIdAttachment, 'reason' => 'docserverDoesNotExists'];
break;
}
......
......@@ -55,11 +55,11 @@ class MaarchParapheurController
$attachmentToFreeze = [];
$adrMainInfo = ConvertPdfController::getConvertedPdfById(['resId' => $aArgs['resIdMaster'], 'collId' => 'letterbox_coll']);
if (empty($adrMainInfo)) {
if (empty($adrMainInfo['docserver_id'])) {
return ['error' => 'Document ' . $resId . ' is not converted in pdf'];
}
$docserverMainInfo = DocserverModel::getByDocserverId(['docserverId' => $adrMainInfo['docserver_id']]);
if (empty($docserverMainInfo)) {
if (empty($docserverMainInfo['path_template'])) {
return ['error' => 'Docserver does not exist ' . $adrMainInfo['docserver_id']];
}
$arrivedMailMainfilePath = $docserverMainInfo['path_template'] . str_replace('#', '/', $adrMainInfo['path']) . $adrMainInfo['filename'];
......@@ -111,12 +111,12 @@ class MaarchParapheurController
$is_version = true;
}
$adrInfo = ConvertPdfController::getConvertedPdfById(['resId' => $resId, 'collId' => $collId, 'isVersion' => $is_version]);
if (empty($adrInfo)) {
$adrInfo = ConvertPdfController::getConvertedPdfById(['resId' => $resId, 'collId' => $collId, 'isVersion' => $is_version]);
if (empty($adrInfo['docserver_id'])) {
return ['error' => 'Attachment ' . $resId . ' is not converted in pdf'];
}
$docserverInfo = DocserverModel::getByDocserverId(['docserverId' => $adrInfo['docserver_id']]);
if (empty($docserverInfo)) {
if (empty($docserverInfo['path_template'])) {
return ['error' => 'Docserver does not exist ' . $adrInfo['docserver_id']];
}
$filePath = $docserverInfo['path_template'] . str_replace('#', '/', $adrInfo['path']) . $adrInfo['filename'];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment