From 763ace76675a5730329a0d0122404903362772ae Mon Sep 17 00:00:00 2001
From: Noah Lancien <noah.lancien@ldc.fr>
Date: Tue, 28 Oct 2025 09:49:12 +0100
Subject: [PATCH 1/6] feat: order by alphabetical ASC the user list in delete
 page

---
 app/Http/Controllers/UserController.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index ff8f5dd..5fab7b2 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -190,10 +190,14 @@ class UserController extends Controller
         $marques     = Marque::orderBy('libMarq', 'asc')->get();
         $userSujets  = $user->sujets;
         $sujets      = Sujet::where('sujet_dam', true)->orderBy('libelle', 'asc')->get();
-        $users       = User::select(['id', 'email'])->whereIn('role', [
-            config('roles.const.ADMIN'), config('roles.const.CONTRIBUTEUR'),
-            config('roles.const.REDACTEUR')
-        ])->where('id', '!=', $user->id)->get();
+        $users       = User::select(['id', 'email'])
+            ->whereIn('role', [
+                config('roles.const.ADMIN'), config('roles.const.CONTRIBUTEUR'),
+                config('roles.const.REDACTEUR')
+            ])
+            ->where('id', '!=', $user->id)
+            ->orderBy('email')
+            ->get();
         return view('users.edit')->with([
             'user' => $user, 'roles' => $roles, 'users' => $users,
             'userMarques' => $userMarques, 'marques' => $marques,

From dbb92dd6ed3c53bd9f2f73843f26a655439214ee Mon Sep 17 00:00:00 2001
From: Vincent BRIDIER <vincent.bridier@ldc.fr>
Date: Mon, 17 Nov 2025 16:00:34 +0100
Subject: [PATCH 2/6] fix: Fix variante field - Close #27

---
 .../media-editor/tabs/MeEditComponent.vue        | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue b/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue
index 87edd59..9994615 100644
--- a/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue
+++ b/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue
@@ -73,7 +73,7 @@
               required
               v-model="oMedia.type_vue_id"
               :disabled="oMedia.isLocked || oMedia.arcadia_id !== null"
-              @change="updateVariantes"
+              @change="oMedia.variante_id = null"
             >
               <option :value="null" selected disabled>Sélectionnez un type de vue</option>
               <option v-for="item in storeTypesvue" :value="item.codeTypevue">
@@ -394,11 +394,9 @@ export default {
     storeRole() {
       return this.$store.state.role;
     },
-  },
-  mounted() {
-    this.$nextTick(() => {
-        this.availableVariantes = this.storeTypesvariante;
-    })
+    availableVariantes() {
+        return this.storeTypesvariante.filter(e => e.typevue_id === this.oMedia.type_vue_id);
+    }
   },
   watch: {
     marques() {
@@ -428,7 +426,6 @@ export default {
       }
     },
     searchMarques() {
-      console.log("search");
       this.refreshMarques();
     },
     searchSocietes() {
@@ -444,14 +441,9 @@ export default {
       selectedSocietes: [],
       searchMarques: "",
       searchSocietes: "",
-      availableVariantes: [],
     };
   },
   methods: {
-    updateVariantes(evt) {
-        this.oMedia.variante_id = null;
-        this.availableVariantes = this.storeTypesvariante.filter(e => e.typevue_id === this.oMedia.type_vue_id);
-    },
     ArcadiaLink() {
       if (this.oMedia.isDefault) {
         $.fancyMessage({

From 7a9c8f4da31b1206b939bc66b9e0da72d0a09d8b Mon Sep 17 00:00:00 2001
From: Vincent BRIDIER <vincent.bridier@ldc.fr>
Date: Mon, 17 Nov 2025 17:06:38 +0100
Subject: [PATCH 3/6] fix: Fix xml generation on ArcadiaLink

---
 app/Lib/ArcadiaLinkUtilities.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Lib/ArcadiaLinkUtilities.php b/app/Lib/ArcadiaLinkUtilities.php
index efcb775..9816da1 100644
--- a/app/Lib/ArcadiaLinkUtilities.php
+++ b/app/Lib/ArcadiaLinkUtilities.php
@@ -132,7 +132,7 @@ class ArcadiaLinkUtilities
             $storage->path($filename),
             \ZipArchive::CREATE | \ZipArchive::OVERWRITE
         );
-        $success  = $zip->addFromString($xml, 'media.xml') && $success;
+        $success  = $zip->addFromString('media.xml', $xml) && $success;
         $success  = $zip->addFile($media->full_path, $media->basename) && $success;
         $success  = $zip->close() && $success;
         unset($zip);

From 840c3ea47564c7b07e6dc9252780293c9a55b81b Mon Sep 17 00:00:00 2001
From: Vincent BRIDIER <vincent.bridier@ldc.fr>
Date: Mon, 17 Nov 2025 17:31:56 +0100
Subject: [PATCH 4/6] fix: Fix media link on ArcadiaLink

---
 app/Lib/ArcadiaLinkUtilities.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Lib/ArcadiaLinkUtilities.php b/app/Lib/ArcadiaLinkUtilities.php
index 9816da1..9a96b80 100644
--- a/app/Lib/ArcadiaLinkUtilities.php
+++ b/app/Lib/ArcadiaLinkUtilities.php
@@ -245,7 +245,7 @@ class ArcadiaLinkUtilities
                     ->appendChild($dom->createCDATASection($formatModel['hauteur']));
                 $format->appendChild($dom->createElement('lien'))
                     ->appendChild($dom->createCDATASection(\sprintf(
-                        "%s/{$media->folder}{$media->uid}_%s.{$media->extension->value}",
+                        "%s/{$media->folder}/{$media->uid}_%s.{$media->extension->value}",
                         config('app.url'),
                         $formatModel['libelle']
                     )));

From 116f465849a77ffd467054a5ce61c777f4b5d66f Mon Sep 17 00:00:00 2001
From: Noah Lancien <noah.lancien@ldc.fr>
Date: Wed, 19 Nov 2025 11:20:01 +0100
Subject: [PATCH 5/6] feat: block arcadia link request when the media is in
 draft status

---
 app/Http/Controllers/MediaController.php                    | 6 ++++++
 .../media-manager/media-editor/tabs/MeEditComponent.vue     | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php
index e03487b..ca89f21 100644
--- a/app/Http/Controllers/MediaController.php
+++ b/app/Http/Controllers/MediaController.php
@@ -659,6 +659,12 @@ class MediaController extends Controller
             ]);
         }
 
+        if ($media->statut === MediaStatut::brouillon) {
+            throw ValidationException::withMessages([
+                'media' => trans('Ce média n\'est pas publié. Veuillez sauvegarder pour enregistrer le statut.')
+            ]);
+        }
+
         MediaLinkWithArcadia::dispatch($user, $media);
 
         return response()->json(true);
diff --git a/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue b/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue
index 9994615..5dfac03 100644
--- a/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue
+++ b/resources/js/components/media-manager/media-editor/tabs/MeEditComponent.vue
@@ -547,9 +547,10 @@ export default {
             __DAM.methods.sessionTimedOut();
             return;
           }
+          const errorMessage = error.response.data.message ?? "Erreur lors de l'opération, merci d'actualiser la page.";
           $.fancyMessage({
             title: "Lier un média à Arcadia",
-            message: "Erreur lors de l'opération, merci d'actualiser la page.",
+            message: errorMessage,
             type: "error",
           });
           console.error(error);

From 6c90845c4c5b42f9e11a4ae48a8510eebb0534c8 Mon Sep 17 00:00:00 2001
From: Vincent BRIDIER <vincent.bridier@ldc.fr>
Date: Wed, 19 Nov 2025 14:27:59 +0100
Subject: [PATCH 6/6] fix: some fixes

---
 .../Commands/ResendArcadiaLinkMedias.php      | 54 +++++++++++++++++++
 app/Http/Controllers/UploadController.php     |  2 +-
 app/Models/Media.php                          |  2 -
 app/Providers/AppServiceProvider.php          |  2 +-
 .../documents/arcadia/incoming_medias.xsd     | 11 ++--
 .../arcadia/incoming_medias.xsd.ok_keep       | 20 +++++++
 6 files changed, 82 insertions(+), 9 deletions(-)
 create mode 100644 app/Console/Commands/ResendArcadiaLinkMedias.php
 create mode 100644 resources/documents/arcadia/incoming_medias.xsd.ok_keep

diff --git a/app/Console/Commands/ResendArcadiaLinkMedias.php b/app/Console/Commands/ResendArcadiaLinkMedias.php
new file mode 100644
index 0000000..56c5d00
--- /dev/null
+++ b/app/Console/Commands/ResendArcadiaLinkMedias.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Lib\ArcadiaLinkUtilities;
+use App\Models\ArcadiaLink;
+use App\Models\Media;
+use Illuminate\Console\Command;
+
+class ResendArcadiaLinkMedias extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'medias:resend-aracadia-links';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Resend files to Arcadia after Arcadia Link fix';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        // FIXME : Variabiliser la date
+        //$al = ArcadiaLink::where('created_at', '>=', '2025-10-23')->get();
+
+        foreach ($al as $error)
+        {
+            $media = Media::withTrashed()->find($error->media_id);
+
+            if ($error->arcadia_id === 0) {
+                
+                ArcadiaLinkUtilities::create($media);
+            } else {
+                if (is_null($media->deleted_at)) {
+                    ArcadiaLinkUtilities::update($media);
+                } else {
+                    ArcadiaLinkUtilities::delete($media);
+                }
+            }
+        }
+
+        return Command::SUCCESS;
+    }
+}
diff --git a/app/Http/Controllers/UploadController.php b/app/Http/Controllers/UploadController.php
index 3067029..5be1dc2 100644
--- a/app/Http/Controllers/UploadController.php
+++ b/app/Http/Controllers/UploadController.php
@@ -214,7 +214,7 @@ class UploadController extends Controller
                         'File guessed extensions :guessedExts does not match file name extension :extension',
                         [
                             'guessedExt' => $guessedExts,
-                            'extension' => $mediaExtension,
+                            'extension' => $mediaExtension->value,
                         ]
                     )
                 ]);
diff --git a/app/Models/Media.php b/app/Models/Media.php
index 39a9770..b65a88c 100644
--- a/app/Models/Media.php
+++ b/app/Models/Media.php
@@ -267,8 +267,6 @@ class Media extends Model
 
             /** @throws \RuntimeException */
             $model->removeFromElasticSearch();
-
-            $model->deleteFilesOnAllPath();
         });
     }
 
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index cfd18e6..1ecd319 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -20,7 +20,7 @@ class AppServiceProvider extends ServiceProvider
         if (
             in_array(config('app.env'), ['local', 'testing']) && config('app.bypassldap') && !app()->runningInConsole()
         ) {
-            Auth::loginUsingId(1);
+            Auth::loginUsingId(24);
         }
 
         // !!! Fuc**** Lab LDC exception OMG !!!
diff --git a/resources/documents/arcadia/incoming_medias.xsd b/resources/documents/arcadia/incoming_medias.xsd
index 64a8652..90ca2d0 100644
--- a/resources/documents/arcadia/incoming_medias.xsd
+++ b/resources/documents/arcadia/incoming_medias.xsd
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- < XSD deviné, basé sur la BDD et cette seule affirmation "les 3 champs sont obligatoires"  @author Jérémy Munsch jeremy.munsch@ldc.fr > -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
     <xs:element name="MEDIA_VISUEL">
         <xs:complexType>
             <xs:sequence>
                 <xs:element name="codeArcadia" type="_positive_unsigned_integer_without_leading_zeros" />
                 <xs:element name="code_DAM" type="_positive_unsigned_integer_without_leading_zeros"/>
-                <xs:element name="version" type="_positive_unsigned_integer_without_leading_zeros"/>
+                <xs:element name="version" minOccurs="1" nillable="true" >
+                    <xs:simpleType>
+                        <xs:union memberTypes="_positive_unsigned_integer_without_leading_zeros xs:string"/>
+                    </xs:simpleType>
+                </xs:element>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -16,5 +18,4 @@
             <xs:pattern value="[123456789]\d*"/>
         </xs:restriction>
     </xs:simpleType>
-
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/resources/documents/arcadia/incoming_medias.xsd.ok_keep b/resources/documents/arcadia/incoming_medias.xsd.ok_keep
new file mode 100644
index 0000000..64a8652
--- /dev/null
+++ b/resources/documents/arcadia/incoming_medias.xsd.ok_keep
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- < XSD deviné, basé sur la BDD et cette seule affirmation "les 3 champs sont obligatoires"  @author Jérémy Munsch jeremy.munsch@ldc.fr > -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+    <xs:element name="MEDIA_VISUEL">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="codeArcadia" type="_positive_unsigned_integer_without_leading_zeros" />
+                <xs:element name="code_DAM" type="_positive_unsigned_integer_without_leading_zeros"/>
+                <xs:element name="version" type="_positive_unsigned_integer_without_leading_zeros"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:simpleType name="_positive_unsigned_integer_without_leading_zeros">
+        <xs:restriction base="xs:positiveInteger">
+            <xs:pattern value="[123456789]\d*"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+</xs:schema>