FEAT #15049 TIME 0:30 fix purge + send action + notification migration

bin/exportSeda/purge.php

@@ -188,8 +188,10 @@ if (!empty($resIdMaster)) {
             $resIdToPurge[] = $resource['res_id'];
         }
     }
-    $tmpWhere[] = 'res_id in (?)';
-    $tmpData[]  = $resIdToPurge;
+    if (!empty($resIdToPurge)) {
+        $tmpWhere[] = 'res_id in (?)';
+        $tmpData[]  = $resIdToPurge;
+    }
 }
 
 $wherePurge[] = '((' . implode(") or (", $tmpWhere) . '))';

migration/20.10/migrateNotificationsConfig.php

@@ -31,6 +31,13 @@ foreach ($customs as $custom) {
         } elseif (is_readable("custom/{$custom}/modules/notifications/batch/config/config_{$custom}.xml") && is_writable("custom/{$custom}/modules/notifications/batch/config/config_{$custom}.xml")) {
             $notificationFilePath = "custom/{$custom}/modules/notifications/batch/config/config_{$custom}.xml";
         } else {
+            $file = file_get_contents($configPath);
+            $file = json_decode($file, true);
+            $file['config']['maarchDirectory'] = realpath('.') . '/';
+            $file['config']['customID'] = $custom;
+            $fp = fopen($configPath, 'w+');
+            fwrite($fp, json_encode($file, JSON_PRETTY_PRINT));
+            fclose($fp);
             printf("Aucun fichier de configuration de notification trouvé pour le custom {$custom}\n");
             continue;
         }
@@ -46,7 +53,7 @@ foreach ($customs as $custom) {
                 $file['config']['maarchUrl'] = (string)$loadedNotificationXml->CONFIG->applicationUrl;
             }
 
-            $fp = fopen("apps/maarch_entreprise/xml/config.json", 'a+');
+            $fp = fopen($configPath, 'w+');
             fwrite($fp, json_encode($file, JSON_PRETTY_PRINT));
             fclose($fp);
 

src/app/external/exportSeda/controllers/DOMTemplateProcessorController.php

@@ -96,7 +96,7 @@ class DOMTemplateProcessorController extends \DOMXPath
         if ($pis = $this->query("descendant-or-self::processing-instruction('xinclude')", $node)) {
             foreach ($pis as $pi) {
                 $includeFragment = $this->document->createDocumentFragment();
-                $source = file_get_contents('modules/export_seda' . trim($pi->data));
+                $source = file_get_contents('src/app/external/exportSeda' . trim($pi->data));
                 if (!$source) {
                     throw new \Exception("Error including Xml fragment: fragment '$pi->data' could not be parsed");
                 }

src/app/external/exportSeda/controllers/ExportSEDATrait.php

@@ -14,6 +14,7 @@ namespace ExportSeda\controllers;
 
 use Attachment\models\AttachmentModel;
 use Contact\controllers\ContactController;
+use Convert\controllers\ConvertPdfController;
 use Docserver\models\DocserverModel;
 use Docserver\models\DocserverTypeModel;
 use Doctype\models\DoctypeModel;
@@ -250,6 +251,10 @@ trait ExportSEDATrait
             'format'        => 'xml',
             'status'        => 'TRA'
         ]);
+        ConvertPdfController::convert([
+            'resId'  => $id,
+            'collId' => 'attachments_coll'
+        ]);
         if (empty($id) || !empty($id['errors'])) {
             return ['errors' => ['[storeAttachment] ' . $id['errors']]];
         }