From a5fd7c719f92ef4b24c6ba7cbc45d1ac67a8f9ba Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 19 Jan 2021 16:29:28 +0100
Subject: [PATCH] FEAT #10240 TIME 0:35 Mailing unique id
---
src/app/document/controllers/DocumentController.php | 3 ++-
src/app/document/models/DocumentModel.php | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/app/document/controllers/DocumentController.php b/src/app/document/controllers/DocumentController.php
index f6bf435108..447c08ff16 100755
--- a/src/app/document/controllers/DocumentController.php
+++ b/src/app/document/controllers/DocumentController.php
@@ -435,7 +435,8 @@ class DocumentController
'link_id' => (string)$body['linkId'] ?? null,
'metadata' => empty($body['metadata']) ? '{}' : json_encode($body['metadata']),
'status' => 'CREATED',
- 'typist' => $GLOBALS['id']
+ 'typist' => $GLOBALS['id'],
+ 'mailing_id' => (string)$body['mailingId'] ?? null
]);
AdrModel::createDocumentAdr([
diff --git a/src/app/document/models/DocumentModel.php b/src/app/document/models/DocumentModel.php
index 79451e45da..47a4050c66 100755
--- a/src/app/document/models/DocumentModel.php
+++ b/src/app/document/models/DocumentModel.php
@@ -60,7 +60,7 @@ class DocumentModel
public static function create(array $args)
{
ValidatorModel::notEmpty($args, ['title', 'sender', 'metadata']);
- ValidatorModel::stringType($args, ['title', 'reference', 'description', 'sender', 'deadline', 'notes', 'link_id', 'metadata']);
+ ValidatorModel::stringType($args, ['title', 'reference', 'description', 'sender', 'deadline', 'notes', 'link_id', 'metadata', 'mailing_id']);
$nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'main_documents_id_seq']);
@@ -75,7 +75,8 @@ class DocumentModel
'deadline' => $args['deadline'],
'notes' => $args['notes'],
'link_id' => $args['link_id'],
- 'metadata' => $args['metadata']
+ 'metadata' => $args['metadata'],
+ 'mailing_id' => $args['mailing_id']
]
]);
--
GitLab