Skip to content
Snippets Groups Projects
Commit 4425562e authored by Florian Azizian's avatar Florian Azizian
Browse files

FEAT #14043 TIME 0:10 process workflow until signatory user when sending... 

FEAT #14043 TIME 0:10 process workflow until signatory user when sending document to Iparapheur/FastParapheur
parent f120318c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/app/external/externalSignatoryBook/controllers/FastParapheurController.php
+ 28
− 27
View file @ 4425562e
......@@ -79,7 +79,7 @@ class FastParapheurController
$aArgs['idsToRetrieve'][$version][$resId]['status'] = 'validated';
$aArgs['idsToRetrieve'][$version][$resId]['format'] = 'pdf';
$aArgs['idsToRetrieve'][$version][$resId]['encodedFile'] = $response['b64FileContent'];
FastParapheurController::processVisaWorkflow(['res_id_master' => $value['res_id_master'], 'res_id' => $value['res_id']]);
FastParapheurController::processVisaWorkflow(['res_id_master' => $value['res_id_master'], 'res_id' => $value['res_id'], 'processSignatory' => true]);
break;
} elseif ($state == $aArgs['config']['data']['refusedState']) {
$res = DatabaseModel::select([
......@@ -108,7 +108,7 @@ class FastParapheurController
$resIdMaster = $aArgs['res_id_master'] ?? $aArgs['res_id'];
$attachments = AttachmentModel::get(['select' => ['count(1)'], 'where' => ['res_id_master = ?', 'status = ?'], 'data' => [$resIdMaster, 'FRZ']]);
if (count($attachments) < 2) {
if ((count($attachments) < 2 && $aArgs['processSignatory']) || !$aArgs['processSignatory']) {
$visaWorkflow = ListInstanceModel::get([
'select' => ['listinstance_id', 'requested_signature'],
'where' => ['res_id = ?', 'difflist_type = ?', 'process_date IS NULL'],
......@@ -118,12 +118,14 @@ class FastParapheurController
if (!empty($visaWorkflow)) {
foreach ($visaWorkflow as $listInstance) {
ListInstanceModel::update(['set' => ['process_date' => 'CURRENT_TIMESTAMP'], 'where' => ['listinstance_id = ?'], 'data' => [$listInstance['listinstance_id']]]);
// Stop to the first signatory user
if ($listInstance['requested_signature']) {
ListInstanceModel::update(['set' => ['signatory' => 'true'], 'where' => ['listinstance_id = ?'], 'data' => [$listInstance['listinstance_id']]]);
// Stop to the first signatory user
if ($aArgs['processSignatory']) {
ListInstanceModel::update(['set' => ['signatory' => 'true', 'process_date' => 'CURRENT_TIMESTAMP'], 'where' => ['listinstance_id = ?'], 'data' => [$listInstance['listinstance_id']]]);
}
break;
}
ListInstanceModel::update(['set' => ['process_date' => 'CURRENT_TIMESTAMP'], 'where' => ['listinstance_id = ?'], 'data' => [$listInstance['listinstance_id']]]);
}
}
}
......@@ -180,7 +182,7 @@ class FastParapheurController
$resId = $attachment['res_id'];
$collId = 'attachments_coll';
$curlReturn = FastParapheurController::uploadFile([
$response = FastParapheurController::uploadFile([
'resId' => $resId,
'collId' => $collId,
'resIdMaster' => $aArgs['resIdMaster'],
......@@ -191,16 +193,10 @@ class FastParapheurController
'config' => $aArgs['config']
]);
if ($curlReturn['infos']['http_code'] == 404) {
return ['error' => 'Erreur 404 : ' . $curlReturn['raw']];
} elseif (!empty($curlReturn['error'])) {
return ['error' => $curlReturn['error']];
} elseif (!empty($curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body->Fault[0])) {
$error = (string)$curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body->Fault[0]->children()->faultstring . PHP_EOL;
return ['error' => $error];
if (!empty($response['error'])) {
return $response;
} else {
$documentId = $curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body->children('http://sei.ws.fast.cdc.com/')->uploadResponse->children();
$attachmentToFreeze[$collId][$resId] = (string) $documentId;
$attachmentToFreeze[$collId][$resId] = $response['success'];
}
}
......@@ -213,7 +209,7 @@ class FastParapheurController
$collId = 'letterbox_coll';
unset($annexes['letterbox']);
$curlReturn = FastParapheurController::uploadFile([
$response = FastParapheurController::uploadFile([
'resId' => $resId,
'collId' => $collId,
'resIdMaster' => $aArgs['resIdMaster'],
......@@ -223,17 +219,11 @@ class FastParapheurController
'subscriberId' => $subscriberId,
'config' => $aArgs['config']
]);
if ($curlReturn['infos']['http_code'] == 404) {
return ['error' => 'Erreur 404 : ' . $curlReturn['raw']];
} elseif (!empty($curlReturn['error'])) {
return ['error' => $curlReturn['error']];
} elseif (!empty($curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body->Fault[0])) {
$error = (string)$curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body->Fault[0]->children()->faultstring . PHP_EOL;
return ['error' => $error];
if (!empty($response['error'])) {
return $response;
} else {
$documentId = $curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body->children('http://sei.ws.fast.cdc.com/')->uploadResponse->children();
$attachmentToFreeze[$collId][$resId] = (string) $documentId;
$attachmentToFreeze[$collId][$resId] = $response['success'];
}
}
}
......@@ -307,7 +297,18 @@ class FastParapheurController
]
]);
return $curlReturn;
if ($curlReturn['infos']['http_code'] == 404) {
return ['error' => 'Erreur 404 : ' . $curlReturn['raw']];
} elseif (!empty($curlReturn['error'])) {
return ['error' => $curlReturn['error']];
} elseif (!empty($curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body->Fault[0])) {
$error = (string)$curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body->Fault[0]->children()->faultstring . PHP_EOL;
return ['error' => $error];
}
IParapheurController::processVisaWorkflow(['res_id_master' => $aArgs['resIdMaster'], 'processSignatory' => false]);
$documentId = $curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body->children('http://sei.ws.fast.cdc.com/')->uploadResponse->children();
return ['success' => (string)$documentId];
}
public static function download($aArgs)
......
src/app/external/externalSignatoryBook/controllers/IParapheurController.php
+ 24
− 22
View file @ 4425562e
......@@ -129,7 +129,7 @@ class IParapheurController
$collId = 'attachments_coll';
$dossierId = $resId . '_' . rand(0001, 9999);
$curlReturn = IParapheurController::uploadFile([
$response = IParapheurController::uploadFile([
'resId' => $resId,
'collId' => $collId,
'resIdMaster' => $aArgs['resIdMaster'],
......@@ -139,13 +139,8 @@ class IParapheurController
'dossierId' => $dossierId
]);
if (!empty($curlReturn['error'])) {
return ['error' => $curlReturn['error']];
}
$response = $curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body->children('http://www.adullact.org/spring-ws/iparapheur/1.0')->CreerDossierResponse[0];
if ($response->MessageRetour->codeRetour == $aArgs['config']['data']['errorCode'] || $curlReturn['infos']['http_code'] >= 500) {
return ['error' => '[' . $response->MessageRetour->severite . ']' . $response->MessageRetour->message];
if (!empty($response['error'])) {
return $response;
} else {
$attachmentToFreeze[$collId][$resId] = $dossierId;
}
......@@ -161,7 +156,7 @@ class IParapheurController
$dossierId = $resId . '_' . rand(0001, 9999);
unset($annexes['letterbox']);
$curlReturn = IParapheurController::uploadFile([
$response = IParapheurController::uploadFile([
'resId' => $resId,
'collId' => $collId,
'resIdMaster' => $aArgs['resIdMaster'],
......@@ -171,13 +166,8 @@ class IParapheurController
'dossierId' => $dossierId
]);
if (!empty($curlReturn['error'])) {
return ['error' => $curlReturn['error']];
}
$response = $curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body->children('http://www.adullact.org/spring-ws/iparapheur/1.0')->CreerDossierResponse[0];
if ($response->MessageRetour->codeRetour == $aArgs['config']['data']['errorCode'] || $curlReturn['infos']['http_code'] >= 500) {
return ['error' => '[' . $response->MessageRetour->severite . ']' . $response->MessageRetour->message];
if (!empty($response['error'])) {
return $response;
} else {
$attachmentToFreeze[$collId][$resId] = $dossierId;
}
......@@ -256,7 +246,17 @@ class IParapheurController
$curlReturn = IParapheurController::returnCurl($xmlPostString, $aArgs['config']);
return $curlReturn;
if (!empty($curlReturn['error'])) {
return ['error' => $curlReturn['error']];
}
$response = $curlReturn['response']->children('http://schemas.xmlsoap.org/soap/envelope/')->Body->children('http://www.adullact.org/spring-ws/iparapheur/1.0')->CreerDossierResponse[0];
if ($response->MessageRetour->codeRetour == $aArgs['config']['data']['errorCode'] || $curlReturn['infos']['http_code'] >= 500) {
return ['error' => '[' . $response->MessageRetour->severite . ']' . $response->MessageRetour->message];
}
IParapheurController::processVisaWorkflow(['res_id_master' => $aArgs['resIdMaster'], 'processSignatory' => false]);
return ['success' => $dossierId];
}
public static function download($aArgs)
......@@ -334,7 +334,7 @@ class IParapheurController
$aArgs['idsToRetrieve'][$version][$resId]['encodedFile'] = $response['b64FileContent'];
$aArgs['idsToRetrieve'][$version][$resId]['noteContent'] = $noteContent;
if ($status == $aArgs['config']['data']['signState']) {
IParapheurController::processVisaWorkflow(['res_id_master' => $value['res_id_master'], 'res_id' => $value['res_id']]);
IParapheurController::processVisaWorkflow(['res_id_master' => $value['res_id_master'], 'res_id' => $value['res_id'], 'processSignatory' => true]);
break;
}
} elseif ($status == $aArgs['config']['data']['refusedVisa'] || $status == $aArgs['config']['data']['refusedSign']) {
......@@ -360,7 +360,7 @@ class IParapheurController
$resIdMaster = $aArgs['res_id_master'] ?? $aArgs['res_id'];
$attachments = AttachmentModel::get(['select' => ['count(1)'], 'where' => ['res_id_master = ?', 'status = ?'], 'data' => [$resIdMaster, 'FRZ']]);
if (count($attachments) < 2) {
if ((count($attachments) < 2 && $aArgs['processSignatory']) || !$aArgs['processSignatory']) {
$visaWorkflow = ListInstanceModel::get([
'select' => ['listinstance_id', 'requested_signature'],
'where' => ['res_id = ?', 'difflist_type = ?', 'process_date IS NULL'],
......@@ -370,12 +370,14 @@ class IParapheurController
if (!empty($visaWorkflow)) {
foreach ($visaWorkflow as $listInstance) {
ListInstanceModel::update(['set' => ['process_date' => 'CURRENT_TIMESTAMP'], 'where' => ['listinstance_id = ?'], 'data' => [$listInstance['listinstance_id']]]);
// Stop to the first signatory user
if ($listInstance['requested_signature']) {
ListInstanceModel::update(['set' => ['signatory' => 'true'], 'where' => ['listinstance_id = ?'], 'data' => [$listInstance['listinstance_id']]]);
// Stop to the first signatory user
if ($aArgs['processSignatory']) {
ListInstanceModel::update(['set' => ['signatory' => 'true', 'process_date' => 'CURRENT_TIMESTAMP'], 'where' => ['listinstance_id = ?'], 'data' => [$listInstance['listinstance_id']]]);
}
break;
}
ListInstanceModel::update(['set' => ['process_date' => 'CURRENT_TIMESTAMP'], 'where' => ['listinstance_id = ?'], 'data' => [$listInstance['listinstance_id']]]);
}
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment