constraint on erp #790

MTES-MCT · Sep 27, 2024 · d1e4d48 · d1e4d48
1 parent ccf7785
commit d1e4d48
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 80 deletions.
diff --git a/src/Controller/Front/SignalementErpController.php b/src/Controller/Front/SignalementErpController.php
@@ -6,6 +6,7 @@
 use App\Form\SignalementErpType;
 use App\Manager\SignalementManager;
 use App\Service\Mailer\MailerProvider;
+use App\Service\Signalement\GeolocateService;
 use App\Service\Upload\UploadHandlerService;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
@@ -40,16 +41,16 @@ public function save(
         SignalementManager $signalementManager,
         UploadHandlerService $uploadHandlerService,
         MailerProvider $mailerProvider,
+        GeolocateService $geolocateService,
     ): Response {
         $signalement = new Signalement();
         $form = $this->createForm(SignalementErpType::class, $signalement);
         $form->handleRequest($request);
 
-        if ($form->isValid()
-            && $this->isCsrfTokenValid('save_signalement_erp', $request->request->get('_csrf_token'))
-        ) {
+        if ($form->isValid()) {
             $files = $uploadHandlerService->handleUploadFilesRequest($request->files->get('file-upload'));
             $signalement->setPhotos($files);
+            $geolocateService->geolocate($signalement);
             $signalementManager->save($signalement);
             $mailerProvider->sendSignalementValidationWithConseilsEviterPunaises($signalement);
 

diff --git a/src/Entity/Signalement.php b/src/Entity/Signalement.php
@@ -37,14 +37,14 @@ class Signalement
     #[Assert\Length(max: 255)]
     #[Assert\NotBlank(
         message: 'Veuillez renseigner une adresse.',
-        groups: ['front_add_signalement_logement']
+        groups: ['front_add_signalement_logement', 'front_add_signalement_erp']
     )]
     private ?string $adresse = null;
 
     #[ORM\Column(length: 10)]
     #[Assert\NotBlank(
         message: 'Veuillez renseigner le code postal.',
-        groups: ['front_add_signalement_logement']
+        groups: ['front_add_signalement_logement', 'front_add_signalement_transport', 'front_add_signalement_erp']
     )]
     #[Assert\Regex(
         pattern: '/^[0-9]{5}$/',
@@ -56,7 +56,7 @@ class Signalement
     #[Assert\Length(max: 255)]
     #[Assert\NotBlank(
         message: 'Veuillez renseigner la ville.',
-        groups: ['front_add_signalement_logement', 'front_add_signalement_transport']
+        groups: ['front_add_signalement_logement', 'front_add_signalement_transport', 'front_add_signalement_erp']
     )]
     private ?string $ville = null;
 
@@ -211,6 +211,7 @@ class Signalement
 
     #[ORM\Column(length: 100, nullable: true)]
     #[Assert\Length(max: 100)]
+    #[Assert\NotBlank(message: 'Veuillez renseigner le nom de l\'établissement.', groups: ['front_add_signalement_erp'])]
     private ?string $nomProprietaire = null;
 
     #[ORM\Column(nullable: true)]
@@ -248,16 +249,17 @@ class Signalement
     private SignalementType $type;
 
     #[ORM\Column(nullable: true)]
-    #[Assert\NotBlank(message: 'Veuillez renseigner la date.', groups: ['front_add_signalement_transport'])]
+    #[Assert\NotBlank(message: 'Veuillez renseigner la date.', groups: ['front_add_signalement_transport', 'front_add_signalement_erp'])]
     #[Assert\LessThan(
         value: new \DateTime(),
         message: 'La date renseignée n\'est pas encore passée, veuillez renseigner une nouvelle date.',
-        groups: ['front_add_signalement_transport']
+        groups: ['front_add_signalement_transport', 'front_add_signalement_erp']
     )]
     private ?\DateTimeImmutable $punaisesViewedAt = null;
 
     #[ORM\Column(type: 'string', enumType: PlaceType::class, nullable: true)]
     #[Assert\NotBlank(message: 'Veuillez renseigner le type de transport', groups: ['front_add_signalement_transport'])]
+    #[Assert\NotBlank(message: 'Veuillez selectionner le type d\'établissement', groups: ['front_add_signalement_erp'])]
     private ?PlaceType $placeType = null;
 
     #[ORM\Column(length: 50, nullable: true)]
@@ -266,26 +268,28 @@ class Signalement
 
     #[ORM\Column(nullable: true)]
     #[Assert\NotNull(message: 'Veuillez indiquer si vous avez prévenu la compagnie de transport.', groups: ['front_add_signalement_transport'])]
+    #[Assert\NotNull(message: 'Veuillez indiquer si vous avez prévenu l\'établissement.', groups: ['front_add_signalement_erp'])]
     private ?bool $isPlaceAvertie = null;
 
     #[ORM\Column(type: 'text', nullable: true)]
-    #[Assert\Length(min: 10, max: 500, minMessage: 'Merci de proposer une description (minimum 10 caractères).')]
+    #[Assert\Length(max: 500)]
+    #[Assert\Length(min: 10, minMessage: 'Merci de proposer une description (minimum 10 caractères).', groups: ['front_add_signalement_transport', 'front_add_signalement_erp'])]
     private ?string $autresInformations;
 
     #[ORM\Column(length: 50, nullable: true)]
     #[Assert\Length(max: 50)]
-    #[Assert\NotBlank(message: 'Veuillez renseigner votre nom.', groups: ['front_add_signalement_transport'])]
+    #[Assert\NotBlank(message: 'Veuillez renseigner votre nom.', groups: ['front_add_signalement_transport', 'front_add_signalement_erp'])]
     private ?string $nomDeclarant = null;
 
     #[ORM\Column(length: 50, nullable: true)]
     #[Assert\Length(max: 50)]
-    #[Assert\NotBlank(message: 'Veuillez renseigner votre prénom.', groups: ['front_add_signalement_transport'])]
+    #[Assert\NotBlank(message: 'Veuillez renseigner votre prénom.', groups: ['front_add_signalement_transport', 'front_add_signalement_erp'])]
     private ?string $prenomDeclarant = null;
 
     #[ORM\Column(length: 100, nullable: true)]
     #[Assert\Length(max: 100)]
     #[Email(mode : Email::VALIDATION_MODE_STRICT, message: 'Veuillez renseigner un email valide.', )]
-    #[Assert\NotBlank(message: 'Veuillez renseigner votre e-mail.', groups: ['front_add_signalement_transport'])]
+    #[Assert\NotBlank(message: 'Veuillez renseigner votre e-mail.', groups: ['front_add_signalement_transport', 'front_add_signalement_erp'])]
     private ?string $emailDeclarant = null;
 
     public function __construct()

diff --git a/src/Form/SignalementErpType.php b/src/Form/SignalementErpType.php
@@ -11,7 +11,6 @@
 use App\Service\Signalement\SignalementDateTimeProcessing;
 use App\Service\Signalement\ZipCodeProvider;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
@@ -25,7 +24,6 @@
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints as Assert;
-use Symfony\Component\Validator\Constraints\Email;
 
 class SignalementErpType extends AbstractType
 {
@@ -54,13 +52,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 'label' => 'Date',
                 'required' => true,
                 'invalid_message' => 'La date que vous avez saisie a un format de date incorrect.',
-                'constraints' => [
-                    new Assert\NotBlank(message: 'Veuillez renseigner la date.'),
-                    new Assert\LessThan(
-                        value: new \DateTime(),
-                        message: 'La date renseignée n\'est pas encore passée, veuillez renseigner une nouvelle date.'
-                    ),
-                ],
             ])
             ->add('punaisesViewedTimeAt', TimeType::class, [
                 'widget' => 'single_text',
@@ -90,9 +81,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 ],
                 'label' => 'Nom de l\'établissement',
                 'required' => true,
-                'constraints' => [
-                    new Assert\NotBlank(message: 'Veuillez renseigner le nom de l\'établissement.'),
-                ],
             ])
             ->add('adresse', TextType::class, [
                 'attr' => [
@@ -109,9 +97,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'class' => 'fr-hint-text',
                 ],
                 'required' => true,
-                'constraints' => [
-                    new Assert\NotBlank(message: 'Veuillez renseigner l\'adresse.'),
-                ],
             ])
             ->add('codePostal', TextType::class, [
                 'attr' => [
@@ -126,10 +111,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 ],
                 'label' => 'Code postal',
                 'required' => true,
-                'constraints' => [
-                    new Assert\NotBlank(message: 'Veuillez renseigner le code postal.'),
-                    new Assert\Regex('/[0-9]{5}/', 'Veuillez utiliser un code postal valide'),
-                ],
             ])
             ->add('ville', TextType::class, [
                 'attr' => [
@@ -142,9 +123,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 ],
                 'label' => 'Ville',
                 'required' => true,
-                'constraints' => [
-                    new Assert\NotBlank(message: 'Veuillez renseigner la ville.'),
-                ],
             ])
             ->add('codeInsee', HiddenType::class, [
                 'attr' => [
@@ -157,6 +135,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'class' => 'fr-hidden',
                 ],
                 'required' => false,
+                'mapped' => false,
             ])
             ->add('placeType', EnumType::class, [
                 'class' => PlaceType::class,
@@ -173,9 +152,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 ],
                 'label' => 'Type d\'établissement',
                 'required' => true,
-                'constraints' => [
-                    new Assert\NotBlank(message: 'Veuillez selectionner le type d\'établissement.'),
-                ],
             ])
             ->add('isPlaceAvertie', ChoiceType::class, [
                 'choice_attr' => [
@@ -211,9 +187,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                     'class' => 'fr-hint-text',
                 ],
                 'required' => false,
-                'constraints' => [
-                    new Assert\Length(min: 10, minMessage: 'Merci de proposer une description (minimum 10 caractères).'),
-                ],
             ])
             ->add('nomDeclarant', TextType::class, [
                 'attr' => [
@@ -225,10 +198,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 ],
                 'label' => 'Nom',
                 'required' => true,
-                'constraints' => [
-                    new Assert\NotBlank(message: 'Veuillez renseigner votre nom.'),
-                    new Assert\Length(max: 100),
-                ],
             ])
             ->add('prenomDeclarant', TextType::class, [
                 'attr' => [
@@ -240,10 +209,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 ],
                 'label' => 'Prénom',
                 'required' => true,
-                'constraints' => [
-                    new Assert\NotBlank(message: 'Veuillez renseigner votre prénom.'),
-                    new Assert\Length(max: 100),
-                ],
             ])
             ->add('emailDeclarant', EmailType::class, [
                 'attr' => [
@@ -254,36 +219,8 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 ],
                 'label' => 'Adresse email',
                 'required' => true,
-                'constraints' => [
-                    new Assert\NotBlank(message: 'Veuillez renseigner votre email.'),
-                    new Email(
-                        mode: Email::VALIDATION_MODE_STRICT,
-                        message: 'Veuillez renseigner un email valide.'
-                    ),
-                ],
             ]);
 
-        $builder->get('geoloc')->addModelTransformer(new CallbackTransformer(
-            function ($tagsAsArray) {
-                // transform the array to a string
-                if (!empty($tagsAsArray)) {
-                    return $tagsAsArray[0].'|'.$tagsAsArray[1];
-                }
-
-                return '';
-            },
-            function ($tagsAsString) {
-                // transform the string back to an array
-                if (!empty($tagsAsString)) {
-                    $coord = explode('|', $tagsAsString);
-
-                    return ['lat' => $coord[0], 'lng' => $coord[1]];
-                }
-
-                return [];
-            }
-        ));
-
         $builder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) {
             $form = $event->getForm();
             /** @var Signalement $signalement */
@@ -309,7 +246,7 @@ public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => Signalement::class,
-            'csrf_protection' => false, // generated manually
+            'validation_groups' => ['Default', 'front_add_signalement_erp'],
         ]);
     }
 

diff --git a/src/Service/Signalement/GeolocateService.php b/src/Service/Signalement/GeolocateService.php
@@ -19,7 +19,7 @@ public function __construct(
 
     public function geolocate(Signalement $signalement): int
     {
-        if (SignalementType::TYPE_LOGEMENT === $signalement->getType()) {
+        if (SignalementType::TYPE_TRANSPORT !== $signalement->getType()) {
             $response = $this->geolocateAddress($signalement);
         } else {
             $response = $this->geolocateMunicipality($signalement);

diff --git a/templates/front_signalement_erp/index.html.twig b/templates/front_signalement_erp/index.html.twig
@@ -137,7 +137,7 @@
                 <div class="fr-form-group fr-mt-3v">
                     {{ forms.input(form.emailDeclarant, 'Veuillez renseigner votre adresse e-mail.') }}
                 </div>
-                <input type="hidden" name="_csrf_token" value="{{ csrf_token('save_signalement_erp') }}">
+                {{ form_widget(form._token) }}
                 <div class="fr-input-group fr-mt-3v">
                     <button type="submit" class="fr-btn btn-next fr-btn--icon-left fr-icon-check-line">
                         Signaler mon problème

diff --git a/tests/Functional/Controller/Front/SignalementErpControllerTest.php b/tests/Functional/Controller/Front/SignalementErpControllerTest.php
@@ -70,7 +70,7 @@ public function testPostInvalidFormErp(): void
                 'error' => [
                     'signalement_front[nomDeclarant]' => 'Veuillez renseigner votre nom.',
                     'signalement_front[prenomDeclarant]' => 'Veuillez renseigner votre prénom.',
-                    'signalement_front[emailDeclarant]' => 'Veuillez renseigner votre email.',
+                    'signalement_front[emailDeclarant]' => 'Veuillez renseigner votre e-mail.',
                 ],
             ],
             json_decode($client->getResponse()->getContent(), true));