From 3b6d420a7dec009d1415074cbc402c1f35a84684 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 10 Feb 2020 18:13:24 +0100
Subject: [PATCH] FEAT #12345 TIME 3:30 Mailing begining
---
rest/index.php | 1 +
.../controllers/AttachmentController.php | 73 ++++++++++++++++++-
.../controllers/MergeController.php | 6 +-
.../resource/controllers/StoreController.php | 7 +-
4 files changed, 81 insertions(+), 6 deletions(-)
diff --git a/rest/index.php b/rest/index.php
index 9e7848d7c2d..fd1d4ddbced 100755
--- a/rest/index.php
+++ b/rest/index.php
@@ -79,6 +79,7 @@ $app->put('/attachments/{id}/inSendAttachment', \Attachment\controllers\Attachme
$app->get('/attachments/{id}/maarchParapheurWorkflow', \ExternalSignatoryBook\controllers\MaarchParapheurController::class . ':getWorkflow');
$app->put('/attachments/{id}/inSignatureBook', \Attachment\controllers\AttachmentController::class . ':setInSignatureBook');
$app->put('/attachments/{id}/unsign', \SignatureBook\controllers\SignatureBookController::class . ':unsignAttachment');
+$app->post('/attachments/{id}/mailing', \Attachment\controllers\AttachmentController::class . ':generateMailingById');
$app->get('/attachmentsTypes', \Attachment\controllers\AttachmentController::class . ':getAttachmentsTypes');
//AutoComplete
diff --git a/src/app/attachment/controllers/AttachmentController.php b/src/app/attachment/controllers/AttachmentController.php
index 4537bacaf34..a06e3901608 100755
--- a/src/app/attachment/controllers/AttachmentController.php
+++ b/src/app/attachment/controllers/AttachmentController.php
@@ -16,6 +16,7 @@ namespace Attachment\controllers;
use Attachment\models\AttachmentModel;
use Contact\models\ContactModel;
+use ContentManagement\controllers\MergeController;
use Convert\controllers\ConvertPdfController;
use Convert\controllers\ConvertThumbnailController;
use Convert\models\AdrModel;
@@ -27,6 +28,7 @@ use Resource\controllers\ResController;
use Resource\controllers\StoreController;
use Resource\controllers\WatermarkController;
use Resource\models\ResModel;
+use Resource\models\ResourceContactModel;
use Respect\Validation\Validator;
use Slim\Http\Request;
use Slim\Http\Response;
@@ -707,6 +709,75 @@ class AttachmentController
return $return;
}
+ public static function generateMailingById(Request $request, Response $response, array $args)
+ {
+ if (!Validator::intVal()->validate($args['id'])) {
+ return $response->withStatus(400)->withJson(['errors' => 'Route id is not an integer']);
+ }
+
+ $attachment = AttachmentModel::getById([
+ 'select' => ['status', 'res_id_master', 'title', 'identifier', 'docserver_id', 'path', 'filename', 'format', 'attachment_type'],
+ 'id' => $args['id']
+ ]);
+ if (empty($attachment)) {
+ return $response->withStatus(403)->withJson(['errors' => 'Attachment does not exist']);
+ } elseif (!ResController::hasRightByResId(['resId' => [$attachment['res_id_master']], 'userId' => $GLOBALS['id']])) {
+ return $response->withStatus(403)->withJson(['errors' => 'Document out of perimeter']);
+ } elseif ($attachment['status'] != 'SEND_MASS') {
+ return $response->withStatus(403)->withJson(['errors' => 'Attachment is not candidate to mailing']);
+ }
+
+ $recipients = ResourceContactModel::get([
+ 'select' => ['item_id'],
+ 'where' => ['res_id = ?', 'type = ?', 'mode = ?'],
+ 'data' => [$attachment['res_id_master'], 'contact', 'sender']
+ ]);
+ if (empty($recipients)) {
+ return $response->withStatus(400)->withJson(['errors' => 'No contacts available']);
+ }
+
+ $docserver = DocserverModel::getByDocserverId(['docserverId' => $attachment['docserver_id'], 'select' => ['path_template']]);
+ if (empty($docserver['path_template']) || !is_dir($docserver['path_template'])) {
+ return $response->withStatus(400)->withJson(['errors' => 'Docserver does not exist']);
+ }
+ $pathToAttachment = $docserver['path_template'] . str_replace('#', DIRECTORY_SEPARATOR, $attachment['path']) . $attachment['filename'];
+ if (!is_file($pathToAttachment)) {
+ return $response->withStatus(400)->withJson(['errors' => 'Attachment not found on docserver']);
+ }
+
+ foreach ($recipients as $key => $recipient) {
+ $chrono = $attachment['identifier'] . '-' . ($key+1);
+
+ $mergedDocument = MergeController::mergeDocument([
+ 'path' => $pathToAttachment,
+ 'data' => ['userId' => $GLOBALS['id'], 'recipientId' => $recipient['item_id'], 'recipientType' => 'contact']
+ ]);
+
+ $data = [
+ 'title' => $attachment['title'],
+ 'encodedFile' => $mergedDocument['encodedDocument'],
+ 'format' => $attachment['format'],
+ 'resIdMaster' => $attachment['res_id_master'],
+ 'chrono' => $chrono,
+ 'type' => $attachment['attachment_type'],
+ 'recipientId' => $recipient['item_id'],
+ 'recipientType' => 'contact'
+ ];
+
+ StoreController::storeAttachment($data);
+ }
+
+ AttachmentModel::update([
+ 'set' => [
+ 'status' => 'DEL',
+ ],
+ 'where' => ['res_id = ?'],
+ 'data' => [$args['id']]
+ ]);
+
+ return $response->withStatus(204);
+ }
+
private static function controlAttachment(array $args)
{
$body = $args['body'];
@@ -721,7 +792,7 @@ class AttachmentController
return ['errors' => 'Body resIdMaster is empty or not an integer'];
} elseif (!Validator::stringType()->notEmpty()->validate($body['type'])) {
return ['errors' => 'Body type is empty or not a string'];
- } elseif (isset($body['status']) && !in_array($body['status'], ['A_TRA', 'TRA'])) {
+ } elseif (isset($body['status']) && !in_array($body['status'], ['A_TRA', 'TRA', 'SEND_MASS'])) {
return ['errors' => 'Body type is empty or not a string'];
}
diff --git a/src/app/contentManagement/controllers/MergeController.php b/src/app/contentManagement/controllers/MergeController.php
index 5b6e9b47dc9..751e106501e 100644
--- a/src/app/contentManagement/controllers/MergeController.php
+++ b/src/app/contentManagement/controllers/MergeController.php
@@ -318,8 +318,6 @@ class MergeController
$dataToBeMerge['destination'] = empty($destination) ? [] : $destination;
$dataToBeMerge['parentDestination'] = empty($parentDestination) ? [] : $parentDestination;
$dataToBeMerge['attachment'] = $attachment;
- $dataToBeMerge['attachmentRecipient'] = $attachmentRecipient;
- $dataToBeMerge['sender'] = $sender;
$dataToBeMerge['recipient'] = $recipient;
$dataToBeMerge['user'] = $currentUser;
$dataToBeMerge['userPrimaryEntity'] = $currentUserPrimaryEntity;
@@ -329,6 +327,10 @@ class MergeController
$dataToBeMerge['contact'] = [];
$dataToBeMerge['notes'] = $mergedNote;
$dataToBeMerge['datetime'] = $datetime;
+ if (!empty($args['inMailing'])) {
+ $dataToBeMerge['attachmentRecipient'] = $attachmentRecipient;
+ $dataToBeMerge['sender'] = $sender;
+ }
return $dataToBeMerge;
}
diff --git a/src/app/resource/controllers/StoreController.php b/src/app/resource/controllers/StoreController.php
index 7b03c0a3b60..d8aa8e6c04f 100755
--- a/src/app/resource/controllers/StoreController.php
+++ b/src/app/resource/controllers/StoreController.php
@@ -46,7 +46,7 @@ class StoreController
if (!empty($args['encodedFile'])) {
$fileContent = base64_decode(str_replace(['-', '_'], ['+', '/'], $args['encodedFile']));
- if (empty($args['resId']) && in_array($args['format'], MergeController::OFFICE_EXTENSIONS)) {
+ if (empty($args['resId']) && in_array($args['format'], MergeController::OFFICE_EXTENSIONS) && empty($args['integrations']['inMailing'])) {
$tmpPath = CoreConfigModel::getTmpPath();
$uniqueId = CoreConfigModel::uniqueId();
$tmpFilename = "storeTmp_{$GLOBALS['id']}_{$uniqueId}.{$args['format']}";
@@ -98,7 +98,7 @@ class StoreController
if (!empty($args['encodedFile'])) {
$fileContent = base64_decode(str_replace(['-', '_'], ['+', '/'], $args['encodedFile']));
- if (empty($args['id']) && in_array($args['format'], MergeController::OFFICE_EXTENSIONS)) {
+ if (empty($args['id']) && in_array($args['format'], MergeController::OFFICE_EXTENSIONS) && $data['status'] != 'SEND_MASS') {
$tmpPath = CoreConfigModel::getTmpPath();
$uniqueId = CoreConfigModel::uniqueId();
$tmpFilename = "storeTmp_{$GLOBALS['id']}_{$uniqueId}.{$args['format']}";
@@ -172,10 +172,11 @@ class StoreController
$externalId = json_encode($args['externalId']);
}
- $integrations = ['inSignatureBook' => false, 'inShipping' => false];
+ $integrations = ['inSignatureBook' => false, 'inShipping' => false, 'inMailing' => false];
if (!empty($args['integrations'])) {
$integrations['inSignatureBook'] = !empty($args['integrations']['inSignatureBook']);
$integrations['inShipping'] = !empty($args['integrations']['inShipping']);
+ $integrations['inMailing'] = !empty($args['integrations']['inMailing']);
}
if (!empty($args['customFields'])) {
--
GitLab