FEAT #16956 TIME 2:10 Add all proof in zip file

src/app/history/controllers/HistoryController.php

@@ -444,17 +444,44 @@ class HistoryController
             $documentPathToZip[] = ['path' => $historyXmlPath, 'filename' => 'maarchProof.xml'];
         }
 
-        if ($queryParams['onlyProof']) {
-            if (!empty($proofDocument)) {
-                $content  = $proofDocument;
-                $format   = 'pdf';
-                $mimeType = 'application/pdf';
-            } else {
-                $content  = $historyXml;
-                $format   = 'xml';
-                $mimeType = 'application/xml';
+        $notesWorkflow = [];
+        foreach ($workflow as $step) {
+            $workflowExternalInformations = WorkflowExternalInformationModel::getByWorkflowId(['select' => ['informations', 'firstname', 'lastname'], 'workflowId' => $step['id']]);
+            if (!empty($step['note'])) {
+                if (empty($step['user_id'])) {
+                    if (!empty($workflowExternalInformations)) {
+                        $userDisplay = "{$workflowExternalInformations['firstname']} {$workflowExternalInformations['lastname']}";
+                    }
+                } else {
+                    $userDisplay = UserModel::getLabelledUserById(['id' => $step['user_id']]);
+                }
+                $notesWorkflow[] = [
+                    'creator'      => $userDisplay,
+                    'creationDate' => $step['process_date'],
+                    'value'        => $step['note']
+                ];
             }
-        } else {
+
+            if (!empty($workflowExternalInformations)) {
+                $informations = json_decode($workflowExternalInformations['informations'], true);
+                if ($informations['type'] == 'yousign' && !empty($informations['yousignProcedureId'])) {
+                    $yousignProof = YousignController::getProofByWorkflowId(['workflowId' => $step['id']]);
+                    $archivePath = $tmpPath . 'yousignProof' . $GLOBALS['id'] . "_" . rand() . '.zip';
+                    file_put_contents($archivePath, base64_decode($yousignProof));
+                    $zipArchive = new \ZipArchive();
+                    $zipArchive->open($archivePath);
+                    $nameInArchive = $zipArchive->getNameIndex(0);
+                    $yousignPdfProof = $zipArchive->getFromIndex(0);
+                    $yousignPath = $tmpPath . 'yousignProof' . $GLOBALS['id'] . "_" . rand() . '.pdf';
+                    file_put_contents($yousignPath, $yousignPdfProof);
+                    unlink($archivePath);
+
+                    $documentPathToZip[] = ['path' => $yousignPath, 'filename' => $nameInArchive];
+                }
+            }
+        }
+
+        if (!$queryParams['onlyProof']) {
             if ($workflowCompleted && ($queryParams['eSignDocument'] ?? $hasCertificate)) {
                 $contentType = 'ESIGN';
             }
@@ -508,56 +535,20 @@ class HistoryController
             if (!empty($documentNotes)) {
                 $notes[] = $documentNotes;
             }
-
-            foreach ($workflow as $step) {
-                if (!empty($step['note'])) {
-                    if (empty($step['user_id'])) {
-                        $workflowExternalInformations = WorkflowExternalInformationModel::getByWorkflowId(['select' => ['firstname', 'lastname'], 'workflowId' => $step['id']]);
-                        if (!empty($workflowExternalInformations)) {
-                            $userDisplay = "{$workflowExternalInformations['firstname']} {$workflowExternalInformations['lastname']}";
-                        }
-                    } else {
-                        $userDisplay = UserModel::getLabelledUserById(['id' => $step['user_id']]);
-                    }
-                    $notes[] = [
-                        'creator'      => $userDisplay,
-                        'creationDate' => $step['process_date'],
-                        'value'        => $step['note']
-                    ];
-                }
-
-                $workflowExternalInformations = WorkflowExternalInformationModel::getByWorkflowId(['select' => ['informations'], 'workflowId' => $step['id']]);
-                if (!empty($workflowExternalInformations)) {
-                    $informations = json_decode($workflowExternalInformations['informations'], true);
-                    if ($informations['type'] == 'yousign' && !empty($informations['yousignProcedureId'])) {
-                        $yousignProof = YousignController::getProofByWorkflowId(['workflowId' => $step['id']]);
-                        $archivePath = $tmpPath . 'yousignProof' . $GLOBALS['id'] . "_" . rand() . '.zip';
-                        file_put_contents($archivePath, base64_decode($yousignProof));
-                        $zipArchive = new \ZipArchive();
-                        $zipArchive->open($archivePath);
-                        $nameInArchive = $zipArchive->getNameIndex(0);
-                        $yousignPdfProof = $zipArchive->getFromIndex(0);
-                        $yousignPath = $tmpPath . 'yousignProof' . $GLOBALS['id'] . "_" . rand() . '.pdf';
-                        file_put_contents($yousignPath, $yousignPdfProof);
-                        unlink($archivePath);
-
-                        $documentPathToZip[] = ['path' => $yousignPath, 'filename' => $nameInArchive];
-                    }
-                }
-            }
+            $notes = array_merge($notes, $notesWorkflow);
 
             if (!empty($notes)) {
                 $documentPathToZip[] = HistoryController::createNotesFile(['notes' => $notes]);
             }
+        }
 
-            $content = HistoryController::createZip(['documents' => $documentPathToZip]);
-            if (!empty($content['errors'])) {
-                return $response->withStatus(400)->withJson(['errors' => $content['errors']]);
-            }
-            $content  = $content['fileContent'];
-            $format   = 'zip';
-            $mimeType = 'application/zip';
+        $content = HistoryController::createZip(['documents' => $documentPathToZip]);
+        if (!empty($content['errors'])) {
+            return $response->withStatus(400)->withJson(['errors' => $content['errors']]);
         }
+        $content  = $content['fileContent'];
+        $format   = 'zip';
+        $mimeType = 'application/zip';
 
         HistoryController::add([
             'code'          => 'OK',