controle file type and fix validation message error #3622

MTES-MCT · hmeneuvrier · Feb 21, 2025 · Feb 7, 2025 · Feb 12, 2025 · Feb 21, 2025
commit c2ba0fabdaaa54a2044cbff694aaf31d047d24ea
diff --git a/src/Controller/Api/SignalementFileUpdateController.php b/src/Controller/Api/SignalementFileUpdateController.php
@@ -95,9 +95,14 @@ public function __invoke(
         }
         $this->denyAccessUnlessGranted('FILE_EDIT', $file);
 
-        $file->setDocumentType(DocumentType::tryFrom($fileRequest->documentType));
+        $documentType = DocumentType::tryFrom($fileRequest->documentType);
         if (File::FILE_TYPE_PHOTO === $file->getFileType()) {
+            if (isset(DocumentType::getOrderedPhotosList()[$documentType->name])) {
+                $file->setDocumentType($documentType);
+            }
             $file->setDescription($fileRequest->description);
+        } else {
+            $file->setDocumentType($documentType);
         }
         $this->entityManager->flush();
 

diff --git a/src/Dto/Api/Request/FilesUploadRequest.php b/src/Dto/Api/Request/FilesUploadRequest.php
@@ -19,7 +19,7 @@ class FilesUploadRequest implements RequestInterface
             maxSize: '10M',
             mimeTypes: File::DOCUMENT_MIME_TYPES,
             maxSizeMessage: 'Le fichier ne doit pas dépasser 10 Mo.',
-            mimeTypesMessage: 'Seuls les fichiers {{mimeTypes}} sont autorisés.'
+            mimeTypesMessage: 'Seuls les fichiers {{ types }} sont autorisés.'
         ),
     ])]
     #[Assert\Count(

diff --git a/src/Entity/File.php b/src/Entity/File.php
@@ -161,7 +161,8 @@ public function isPartnerFile(): ?bool
         && ($this->uploadedBy->isSuperAdmin()
         || $this->uploadedBy->isTerritoryAdmin()
         || $this->uploadedBy->isPartnerAdmin()
-        || $this->uploadedBy->isUserPartner());
+        || $this->uploadedBy->isUserPartner()
+        || $this->uploadedBy->isApiUser());
     }
 
     public function getSignalement(): ?Signalement

diff --git a/src/Entity/User.php b/src/Entity/User.php
@@ -618,6 +618,11 @@ public function isUserPartner(): bool
         return \in_array(self::ROLE_USER_PARTNER, $this->getRoles());
     }
 
+    public function isApiUser(): bool
+    {
+        return \in_array(self::ROLE_API_USER, $this->getRoles());
+    }
+
     public function isUsager(): bool
     {
         return \in_array(self::ROLE_USAGER, $this->getRoles());

diff --git a/tests/Functional/Controller/Api/SignalementFileUpdateControllerTest.php b/tests/Functional/Controller/Api/SignalementFileUpdateControllerTest.php
@@ -33,7 +33,7 @@ public function testUpdateSignalementFile(): void
         })->current();
 
         $payload = [
-            'documentType' => 'PROCEDURE_ARRETE_PREFECTORAL',
+            'documentType' => 'PHOTO_SITUATION',
             'description' => 'lorem ipsum dolor sit amet',
         ];
         $this->client->request(
@@ -48,6 +48,29 @@ public function testUpdateSignalementFile(): void
         $this->assertEquals($payload['documentType'], $response['documentType']);
     }
 
+    public function testUpdateSignalementFileWithIncorrectType(): void
+    {
+        $signalement = self::getContainer()->get(SignalementRepository::class)->find(1);
+        $file = $signalement->getFiles()->filter(function (File $file) {
+            return 'photo' === $file->getFileType();
+        })->current();
+
+        $payload = [
+            'documentType' => 'PROCEDURE_ARRETE_PREFECTORAL',
+            'description' => 'lorem ipsum dolor sit amet',
+        ];
+        $this->client->request(
+            method: 'PATCH',
+            uri: $this->router->generate('api_signalements_files_patch', ['uuid' => $file->getUuid()]),
+            server: ['CONTENT_TYPE' => 'application/json'],
+            content: json_encode($payload)
+        );
+
+        $response = json_decode($this->client->getResponse()->getContent(), true);
+        $this->assertResponseIsSuccessful();
+        $this->assertEquals('AUTRE', $response['documentType']);
+    }
+
     public function testUpdateSignalementFileWithFileNotFound(): void
     {
         $payload = [