FEAT #11691 TIME 0:30 Attachments fixes

src/app/attachment/controllers/AttachmentController.php

@@ -86,12 +86,12 @@ class AttachmentController
         $attachment = AttachmentModel::getById([
             'id'        => $args['id'],
             'select'    => [
-                'res_id as "resId"', 'res_id_master', 'status', 'title', 'identifier as chrono', 'typist', 'modified_by as "modifiedBy"', 'relation', 'attachment_type as type',
+                'res_id as "resId"', 'res_id_master as "resIdMaster"', 'status', 'title', 'identifier as chrono', 'typist', 'modified_by as "modifiedBy"', 'relation', 'attachment_type as type',
                 'origin_id as "originId"', 'creation_date as "creationDate"', 'modification_date as "modificationDate"', 'validation_date as "validationDate"',
                 'fulltext_result as "fulltextResult"', 'in_signature_book as "inSignatureBook"', 'in_send_attach as "inSendAttach"'
             ]
         ]);
-        if (empty($attachment) || !in_array($attachment['status'], ['A_TRA', 'TRA', 'SIGN'])) {
+        if (empty($attachment) || in_array($attachment['status'], ['DEL', 'OBS'])) {
             return $response->withStatus(400)->withJson(['errors' => 'Attachment does not exist']);
         }
 

src/app/contentManagement/controllers/MergeController.php

@@ -94,7 +94,6 @@ class MergeController
     {
         ValidatorModel::notEmpty($args, ['userId']);
         ValidatorModel::intVal($args, ['resId', 'userId']);
-        ValidatorModel::stringType($args, ['attachmentChrono', 'attachmentTitle']);
 
         //Resource
         if (!empty($args['resId'])) {
@@ -163,7 +162,7 @@ class MergeController
         //Attachment
         $attachment = [
             'chrono'    => '[attachment.chrono]',
-            'title'     => $args['attachmentTitle'] ?? null
+            'title'     => $args['attachment_title'] ?? null
         ];
 
         //User

src/app/resource/controllers/StoreController.php

@@ -303,6 +303,7 @@ class StoreController
             'attachment_type'       => $args['type'],
             'validation_date'       => $args['validationDate'] ?? null,
             'effective_date'        => $args['effectiveDate'] ?? null,
+            'modified_by'           => $GLOBALS['id'],
             'modification_date'     => 'CURRENT_TIMESTAMP'
         ];