Tests fonctionels de bout en bout

betagouv · Jan 10, 2025 · 40e3b46 · 40e3b46
1 parent df93642
commit 40e3b46
Show file tree

Hide file tree

Showing 19 changed files with 427 additions and 205 deletions.
diff --git a/.github/workflows/deploy-develop.yml b/.github/workflows/deploy-develop.yml
@@ -27,6 +27,5 @@ jobs:
           CLEVER_SECRET: ${{ secrets.CLEVER_SECRET }}
           CLEVER_TOKEN: ${{ secrets.CLEVER_TOKEN }}
         run: |
-          git rev-parse HEAD
           clever link $CC_APP_ID
           clever deploy --alias precontentieux-dev --force
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -27,6 +27,5 @@ jobs:
           CLEVER_SECRET: ${{ secrets.CLEVER_SECRET }}
           CLEVER_TOKEN: ${{ secrets.CLEVER_TOKEN }}
         run: |
-          echo $CC_APP_ID
           clever link $CC_APP_ID
           clever deploy --alias precontentieux-prod --force
diff --git a/assets/apps/bris_porte/deposer_mon_dossier.tsx b/assets/apps/bris_porte/deposer_mon_dossier.tsx
@@ -28,8 +28,16 @@ const root = ReactDOM.createRoot(document.getElementById('react-app'));
 let queuedChanges = {};
 
 
+// Déclaration d'une variable globale indiquant si des opérations sont en attentes
+declare global {
+    interface Window { appPendingChanges: boolean; }
+}
+
+window.appPendingChanges = window.appPendingChanges || false;
+
 const apiPatch = () => {
     if (Object.keys(queuedChanges).length > 0) {
+        window.appPendingChanges = true;
         // Run a PATCH call and store the result as state
         fetch(`/api/requerant/dossier/${dossier.id}`, {
             method: 'PATCH',
@@ -39,6 +47,7 @@ const apiPatch = () => {
         }).then(
             (response) => {
                 queuedChanges = {};
+                window.appPendingChanges = false;
             }
         )//.catch((e) => alert(e))
     }

diff --git a/assets/react/components/PieceJointe/PieceJointe.jsx b/assets/react/components/PieceJointe/PieceJointe.jsx
@@ -12,43 +12,38 @@ export const Document = ({documents, libelle, lectureSeule, liasseDocumentaire,
 
     return (
         <>
-            <div className="fr-col-12 fr-m-3w">
-                {lectureSeule ?
-                    <h6>{libelle}</h6> :
-                    <h4>{libelle}</h4>
+            <div className="fr-col-12 fr-my-1w">
+                {lectureSeule &&
+                    <h6>{libelle}</h6>
                 }
                 <div className="fr-pl-3w">
+                {!lectureSeule &&
+                    <Uploader
+                        libelle={libelle}
+                        type={type}
+                        liasseDocumentaire={liasseDocumentaire}
+                        onUploaded={onUploaded}
+                    />
+                }
                 {documents.map((document) =>
-                    <div key={document.id} className="fr-grid-row">
-                        <div className="fr-col-lg-10 fr-col-12 fr-my-1w">
-                            <a
-                                className="fr-link"
-                                target="_blank"
-                                href={`/document/${document.id}/${document.filename}`}
-                            >
-                                {document.originalFilename}
-                            </a>
-                        </div>
+                    <div key={document.id} className="fr-grid-row fr-col-6">
                         {!lectureSeule &&
-                            <div className="fr-col-lg-2 fr-col-12 fr-btns-group fr-btns-group--sm fr-btns-group--right">
-                                <button className="fr-btn fr-icon-delete-line fr-btn--tertiary-no-outline" onClick={() => handleRemove(document)}>
-                                    Retirer
-                                </button>
-                            </div>
+                            <button className="fr-btn fr-btn--sm fr-icon-delete-line fr-btn--tertiary-no-outline fr-mx-1w" onClick={() => handleRemove(document)}>
+                                Retirer
+                            </button>
                         }
+                        <a
+                            className="fr-link"
+                            target="_blank"
+                            href={`/document/${document.id}/${document.filename}`}
+                        >
+                            {document.originalFilename}
+                        </a>
                     </div>
                 )}
                 {documents.length === 0 &&
                     <i>Aucun document</i>
                 }
-                {!lectureSeule &&
-                    <Uploader
-                        label={libelle}
-                        type={type}
-                        liasseDocumentaire={liasseDocumentaire}
-                        onUploaded={onUploaded}
-                    />
-                }
                 </div>
             </div>
         </>

diff --git a/assets/react/components/Uploader.jsx b/assets/react/components/Uploader.jsx
@@ -1,10 +1,13 @@
-import React, {useState} from 'react';
+import React, {useRef, useState} from 'react';
+import { randomId } from "@/react/services/Random.ts";
 
-export const Uploader = ({liasseDocumentaire, onUploaded, type }) => {
+export const Uploader = ({liasseDocumentaire, libelle, onUploaded, type }) => {
 
   const MAX_SIZE=2048*1000*8;
   const [erreur,setErreur]=useState("");
 
+  const id = useRef(randomId());
+
   const handleFileInput = (ev) => {
     setErreur("");
     const file = ev.target.files[0];
@@ -24,11 +27,11 @@ export const Uploader = ({liasseDocumentaire, onUploaded, type }) => {
 
   return (
       <div className={`fr-my-2w fr-upload-group ${erreur ? 'fr-input-group--error' : ''}`}>
-        <label className="fr-label" htmlFor="file-upload">
-          <span className="fr-icon-upload-2-line fr-mr-1w" aria-hidden="true"></span>
-          Ajouter un document
+        <label className="fr-label" htmlFor={id}>
+            {/*<span className="fr-icon-upload-2-line fr-mr-1w" aria-hidden="true"></span>*/}
+            {libelle}
         </label>
-        <input className="fr-upload" type="file" onChange={handleFileInput}/>
+        <input id={id} className="fr-upload" type="file" onChange={handleFileInput}/>
         <span className="fr-hint-text">
             Taille maximale : 2 Mo. Formats supportés : jpg, png, pdf.
           </span>

diff --git a/config/bundles.php b/config/bundles.php
@@ -16,7 +16,7 @@
     Knp\Bundle\SnappyBundle\KnpSnappyBundle::class => ['all' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
     Sentry\SentryBundle\SentryBundle::class => ['all' => true],
-    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true],
+    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
     DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true],
     Pentatrion\ViteBundle\PentatrionViteBundle::class => ['all' => true],
     Acsiomatic\DeviceDetectorBundle\AcsiomaticDeviceDetectorBundle::class => ['all' => true],

diff --git a/migrations/.gitignore b/migrations/.gitignore
diff --git a/migrations/Version20250107142052.php b/migrations/Version20250107142052.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20250107142052 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Amélioration de la suppression en cascade';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE bris_porte DROP CONSTRAINT FK_BC580EED9450CE1E');
+        $this->addSql('ALTER TABLE bris_porte ADD CONSTRAINT FK_BC580EED9450CE1E FOREIGN KEY (test_eligibilite_id) REFERENCES eligibilite_tests (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE eligibilite_tests DROP CONSTRAINT FK_881877C14A93DAA5');
+        $this->addSql('ALTER TABLE eligibilite_tests ADD CONSTRAINT FK_881877C14A93DAA5 FOREIGN KEY (requerant_id) REFERENCES requerants (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE document DROP CONSTRAINT FK_D8698A76BCC8DD14');
+        $this->addSql('ALTER TABLE document ADD CONSTRAINT FK_D8698A76BCC8DD14 FOREIGN KEY (liasse_documentaire_id) REFERENCES liasse_documentaire (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE document DROP CONSTRAINT fk_d8698a76bcc8dd14');
+        $this->addSql('ALTER TABLE document ADD CONSTRAINT fk_d8698a76bcc8dd14 FOREIGN KEY (liasse_documentaire_id) REFERENCES liasse_documentaire (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE eligibilite_tests DROP CONSTRAINT fk_881877c14a93daa5');
+        $this->addSql('ALTER TABLE eligibilite_tests ADD CONSTRAINT fk_881877c14a93daa5 FOREIGN KEY (requerant_id) REFERENCES requerants (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE bris_porte DROP CONSTRAINT fk_bc580eed9450ce1e');
+        $this->addSql('ALTER TABLE bris_porte ADD CONSTRAINT fk_bc580eed9450ce1e FOREIGN KEY (test_eligibilite_id) REFERENCES eligibilite_tests (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+}
diff --git a/src/Entity/BrisPorte.php b/src/Entity/BrisPorte.php
@@ -95,8 +95,8 @@ class BrisPorte
     #[ORM\Column(options: ['default' => false])]
     private bool $isPorteBlindee = false;
 
-    #[ORM\OneToOne(targetEntity: TestEligibilite::class, cascade: ['persist'])]
-    #[ORM\JoinColumn(nullable: true)]
+    #[ORM\OneToOne(targetEntity: TestEligibilite::class, cascade: ['persist', 'remove'])]
+    #[ORM\JoinColumn(nullable: true, onDelete: 'CASCADE')]
     protected ?TestEligibilite $testEligibilite = null;
 
     #[Groups(['dossier:lecture', 'dossier:patch'])]

diff --git a/src/Entity/Document.php b/src/Entity/Document.php
@@ -49,8 +49,8 @@ class Document
     protected ?string $mime = null;
 
 
-    #[ORM\ManyToOne(inversedBy: 'documents')]
-    #[ORM\JoinColumn(nullable: false)]
+    #[ORM\ManyToOne(inversedBy: 'documents', cascade: ['persist', 'remove'])]
+    #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
     private ?LiasseDocumentaire $liasseDocumentaire = null;
 
     #[Groups(['dossier:lecture'])]

diff --git a/src/Entity/PersonnePhysique.php b/src/Entity/PersonnePhysique.php
@@ -196,7 +196,7 @@ public function getCommuneNaissance(): ?string
         return $this->communeNaissance;
     }
 
-    public function setCommuneNaissance(?GeoPays $communeNaissance = null): static
+    public function setCommuneNaissance(?string $communeNaissance = null): static
     {
         $this->communeNaissance = $communeNaissance;
 

diff --git a/src/Entity/Requerant.php b/src/Entity/Requerant.php
@@ -5,6 +5,7 @@
 use App\Repository\RequerantRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\Selectable;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
@@ -65,7 +66,7 @@ class Requerant implements UserInterface, PasswordAuthenticatedUserInterface
     #[ORM\OneToOne(inversedBy: 'compte', cascade: ['persist', 'remove'])]
     private ?PersonneMorale $personneMorale;
 
-    #[ORM\OneToMany(targetEntity: BrisPorte::class, mappedBy: 'requerant', cascade: ['remove'], )]
+    #[ORM\OneToMany(targetEntity: BrisPorte::class, mappedBy: 'requerant', cascade: ['remove'])]
     #[ORM\OrderBy(['dateCreation' => 'ASC'])]
     /** @type Collection<BrisPorte> $brisPorte */
     protected Collection $dossiers;
@@ -293,7 +294,10 @@ public function getDernierDossier(): ?BrisPorte
         return $this->dossiers->isEmpty() ? null : $this->dossiers->last();
     }
 
-    public function getDossiers(): Collection
+    /**
+     * @return Collection|BrisPorte[]
+     */
+    public function getDossiers(): Collection|array
     {
         return $this->dossiers;
     }

diff --git a/src/Entity/TestEligibilite.php b/src/Entity/TestEligibilite.php
@@ -37,8 +37,8 @@ class TestEligibilite
     #[ORM\Column(nullable: true)]
     public ?bool $aContacteBailleur = null;
 
-    #[ORM\OneToOne(targetEntity: Requerant::class)]
-    #[ORM\JoinColumn]
+    #[ORM\OneToOne(targetEntity: Requerant::class, cascade: ['persist', 'remove'])]
+    #[ORM\JoinColumn(onDelete: 'CASCADE')]
     public ?Requerant $requerant = null;
 
     #[ORM\Column]

diff --git a/templates/bris_porte/tester_mon_eligibilite.html.twig b/templates/bris_porte/tester_mon_eligibilite.html.twig
@@ -126,12 +126,12 @@
                     >
                         <fieldset
                             class="fr-fieldset"
-                            aria-labelledby="checkboxes-inline-legend"
+                            aria-labelledby="eligibilite-test-form-question-estVise"
                         >
-                            <legend class="fr-fieldset__legend--regular fr-fieldset__legend" id="checkboxes-inline-legend">
+                            <legend class="fr-fieldset__legend--regular fr-fieldset__legend" id="eligibilite-test-form-question-estVise">
                                 Êtes-vous la personne visée par l'intervention des forces de l'ordre ?
                             </legend>
-                            <div class="fr-fieldset__element fr-fieldset__element--inline" id="eligibilite-test-form-question-estVise">
+                            <div class="fr-fieldset__element fr-fieldset__element--inline">
                                 <div class="fr-radio-group">
                                     <input
                                         id="eligibilite-test-form-est-vise-oui"
@@ -170,9 +170,9 @@
                     >
                         <fieldset
                             class="fr-fieldset"
-                            aria-labelledby="checkboxes-inline-legend"
+                            aria-labelledby="eligibilite-test-form-question-estHebergeant"
                         >
-                            <legend class="fr-fieldset__legend--regular fr-fieldset__legend" id="checkboxes-inline-legend">
+                            <legend class="fr-fieldset__legend--regular fr-fieldset__legend" id="eligibilite-test-form-question-estHebergeant">
                                 Est-ce que la personne recherchée réside ou est hébergée à votre adresse ?
                             </legend>
                             <div class="fr-fieldset__element fr-fieldset__element--inline">
@@ -220,9 +220,9 @@
                     >
                         <fieldset
                             class="fr-fieldset"
-                            aria-labelledby="checkboxes-inline-legend"
+                            aria-labelledby="eligibilite-test-form-question-estProprietaire"
                         >
-                            <legend class="fr-fieldset__legend--regular fr-fieldset__legend" id="checkboxes-inline-legend">
+                            <legend class="fr-fieldset__legend--regular fr-fieldset__legend" id="eligibilite-test-form-question-estProprietaire">
                                 Quel est votre statut par rapport au logement ?
                             </legend>
                             <div class="fr-fieldset__element fr-fieldset__element--inline">
@@ -263,9 +263,9 @@
                     >
                         <fieldset
                             class="fr-fieldset"
-                            aria-labelledby="checkboxes-inline-legend"
+                            aria-labelledby="eligibilite-test-form-question-aContacteAssurance"
                         >
-                            <legend class="fr-fieldset__legend--regular fr-fieldset__legend" id="checkboxes-inline-legend">
+                            <legend class="fr-fieldset__legend--regular fr-fieldset__legend" id="eligibilite-test-form-question-aContacteAssurance">
                                 Avez-vous pris contact avec votre assurance habitation et obtenu une attestation de non prise en charge du sinistre ?
                             </legend>
                             <div class="fr-fieldset__element fr-fieldset__element--inline">
@@ -306,9 +306,9 @@
                     >
                         <fieldset
                             class="fr-fieldset"
-                            aria-labelledby="checkboxes-inline-legend"
+                            aria-labelledby="eligibilite-test-form-question-aContacteBailleur"
                         >
-                            <legend class="fr-fieldset__legend--regular fr-fieldset__legend" id="checkboxes-inline-legend">
+                            <legend class="fr-fieldset__legend--regular fr-fieldset__legend" id="eligibilite-test-form-question-aContacteBailleur">
                                 Avez-vous pris contact avec votre bailleur et obtenu une attestation de non prise en charge des réparations ?
                             </legend>
                             <div class="fr-fieldset__element fr-fieldset__element--inline">
@@ -356,7 +356,9 @@
                 <div class="fr-alert fr-alert--warning fr-my-3w eligibilite-test-form-decision" v-cloak v-if="estDecide('warning_contact_assurance') || estDecide('warning_contact_bailleur')">
 
                     <h3 class="fr-alert__title" v-if="estDecide('warning_contact_assurance') && estDecide('warning_contact_bailleur')">Nous ne serons pas en mesure de traiter votre demande d’indemnisation car ces attestations sont des documents essentiels pour s’assurer du respect du principe de la réparation intégrale sans perte ni profit</h3>
-                    <h3 class="fr-alert__title" v-else="">Nous ne serons pas en mesure de traiter votre demande d’indemnisation, car cette attestation est un document essentiel pour s’assurer du respect du principe de la réparation intégrale sans perte ni profit</h3>
+                    <h3 class="fr-alert__title" v-else="">
+                        Nous serons en mesure de traiter votre demande d’indemnisation <u>uniquement si votre dossier est complet</u>. Cependant, vous pouvez créer votre compte et commencer à constituer votre dossier en ligne.
+                    </h3>
 
                     <p v-if="estDecide('warning_contact_assurance')">
                         Nous vous recommandons de prendre contact avec votre assurance habitation dès que possible. En

diff --git a/templates/index.html.twig b/templates/index.html.twig
@@ -341,7 +341,7 @@
                 <p>
                     {% block appelAAction %}
                     <a class="fr-btn fr-p-3v" href="{{ url('bris_porte_tester_eligibilite') }}">
-                        <span class="text-center full-width">Déposer votre demande d’indemnisation</span>
+                        Déposer votre demande d’indemnisation
                     </a>
                     {% endblock appelAAction %}
                 </p>