From 6e683e3eeb5e14955ae2ac442b8067d8b41e838a Mon Sep 17 00:00:00 2001
From: "Yassine R." <riffi.yassine@gmail.com>
Date: Tue, 28 Jan 2025 02:02:57 +0100
Subject: [PATCH] fix(backend): fix search for birth date & phone

---
 .../delete-structure/test.ref.html            |  2 +-
 .../new-structure/test.ref.html               |  2 +-
 ...ersImportValidator.service.invalid.test.ts |  2 +-
 .../controllers/search-usagers.controller.ts  | 10 ---
 .../src/usagers/dto/search-usager.dto.ts      | 10 ++-
 .../services/cerfa/tests/CERFA_MOCKS.mock.ts  |  6 +-
 .../CUSTOM_DOC_ATTESTATION_POSTALE.const.ts   |  2 +-
 .../tests/CUSTOM_DOC_COURRIER_REFUS.ts        |  2 +-
 .../tests/FIRST_SHEET_USAGERS.mock.ts         |  4 +-
 .../utils/validate-search-field.decorator.ts  |  1 -
 .../src/util/phone/phoneUtils.service.spec.ts |  2 +-
 .../src/util/test/AppTestHelper.service.ts    |  5 ++
 packages/common/src/search/functions/index.ts |  1 +
 .../src/search/functions/parseBirthDate.ts    | 15 ++++
 .../functions/tests/parseBirthDate.spec.ts    | 71 +++++++++++++++++++
 .../manage-filters.component.html             | 38 +++++++---
 .../manage-filters.component.ts               | 15 ++--
 .../manage-usagers-page.component.html        |  1 +
 .../manage-usagers-page.component.ts          | 23 +++---
 .../usager-filter/UsagersFilterCriteria.ts    |  5 +-
 .../usagersSearchStringFilter.service.ts      |  4 +-
 .../usager-filter/usagersFilter.service.ts    |  1 +
 .../user-profil/user-profil.component.ts      | 23 ++----
 .../services/manage-users.service.ts          | 45 ++++++++----
 ...display-etat-civil-decision.component.html |  2 +-
 .../components/step-rdv/step-rdv.component.ts |  7 +-
 .../display-etat-civil.component.html         |  2 +-
 .../profil-general-section.component.html     |  2 +-
 .../etat-civil-parent-form.component.ts       |  8 ++-
 .../usager-shared/pipes/referrer-name.pipe.ts | 16 +++--
 30 files changed, 223 insertions(+), 104 deletions(-)
 create mode 100644 packages/common/src/search/functions/parseBirthDate.ts
 create mode 100644 packages/common/src/search/functions/tests/parseBirthDate.spec.ts

diff --git a/packages/backend/src/_static/email-templates/delete-structure/test.ref.html b/packages/backend/src/_static/email-templates/delete-structure/test.ref.html
index 3ed65c5f3c..cbd4d9f311 100644
--- a/packages/backend/src/_static/email-templates/delete-structure/test.ref.html
+++ b/packages/backend/src/_static/email-templates/delete-structure/test.ref.html
@@ -443,7 +443,7 @@
                               margin-left: 5px;
                             "
                           >
-                            +33 1 02 03 04 05
+                            01 02 03 04 05
                           </li>
                         </ul>
                         <p
diff --git a/packages/backend/src/_static/email-templates/new-structure/test.ref.html b/packages/backend/src/_static/email-templates/new-structure/test.ref.html
index 09d6292b3d..d559cfd06e 100644
--- a/packages/backend/src/_static/email-templates/new-structure/test.ref.html
+++ b/packages/backend/src/_static/email-templates/new-structure/test.ref.html
@@ -443,7 +443,7 @@
                               margin-left: 5px;
                             "
                           >
-                            +33 1 02 03 04 05
+                            01 02 03 04 05
                           </li>
                         </ul>
                         <p
diff --git a/packages/backend/src/usagers/controllers/import/step2-validate-row/usagersImportValidator.service.invalid.test.ts b/packages/backend/src/usagers/controllers/import/step2-validate-row/usagersImportValidator.service.invalid.test.ts
index 5a2d734d89..8b72f5f969 100644
--- a/packages/backend/src/usagers/controllers/import/step2-validate-row/usagersImportValidator.service.invalid.test.ts
+++ b/packages/backend/src/usagers/controllers/import/step2-validate-row/usagersImportValidator.service.invalid.test.ts
@@ -93,7 +93,7 @@ describe("usagersImportValidator parse invalid data", () => {
         rowNumber: 10,
         value: {
           countryCode: "fr",
-          numero: "0102030405 et des lettres",
+          numero: "0102030405",
         },
       },
 
diff --git a/packages/backend/src/usagers/controllers/search-usagers.controller.ts b/packages/backend/src/usagers/controllers/search-usagers.controller.ts
index ac64a37cdb..9d4d950c03 100644
--- a/packages/backend/src/usagers/controllers/search-usagers.controller.ts
+++ b/packages/backend/src/usagers/controllers/search-usagers.controller.ts
@@ -120,7 +120,6 @@ export class SearchUsagersController {
         structureId: user.structureId,
       });
 
-    console.log(search);
     if (search.searchString?.length > 0) {
       if (search.searchStringField === CriteriaSearchField.DEFAULT) {
         query.andWhere("nom_prenom_surnom_ref ILIKE :str", {
@@ -137,7 +136,6 @@ export class SearchUsagersController {
       } else if (
         search.searchStringField === CriteriaSearchField.PHONE_NUMBER
       ) {
-        console.log(search.searchString);
         query.andWhere(`telephone->>'numero' ILIKE :phone`, {
           phone: `%${search.searchString}%`,
         });
@@ -199,14 +197,6 @@ export class SearchUsagersController {
       }
     }
 
-    console.log({
-      searchString: !search.searchString,
-      echeance: !search?.echeance,
-      entretien: !search?.entretien,
-      referrerId: typeof search?.referrerId === "undefined",
-      lastInteractionDate: !search?.lastInteractionDate,
-    });
-
     if (
       !search.searchString &&
       !search?.echeance &&
diff --git a/packages/backend/src/usagers/dto/search-usager.dto.ts b/packages/backend/src/usagers/dto/search-usager.dto.ts
index b0612832d0..c9924280cb 100644
--- a/packages/backend/src/usagers/dto/search-usager.dto.ts
+++ b/packages/backend/src/usagers/dto/search-usager.dto.ts
@@ -3,6 +3,7 @@ import { IsIn, IsNumber, IsOptional, ValidateIf } from "class-validator";
 import {
   CriteriaSearchField,
   normalizeString,
+  parseBirthDate,
   UsagersFilterCriteriaDernierPassage,
   UsagersFilterCriteriaEcheance,
   UsagersFilterCriteriaEntretien,
@@ -20,13 +21,10 @@ export class SearchUsagerDto {
       return null;
     }
 
-    if (
-      [
-        CriteriaSearchField.PHONE_NUMBER,
-        CriteriaSearchField.BIRTH_DATE,
-      ].includes(obj.searchStringField)
-    ) {
+    if (CriteriaSearchField.PHONE_NUMBER === obj.searchStringField) {
       return value.replace(/\D/g, "");
+    } else if (CriteriaSearchField.BIRTH_DATE === obj.searchStringField) {
+      return parseBirthDate(value);
     }
 
     return normalizeString(value).trim();
diff --git a/packages/backend/src/usagers/services/cerfa/tests/CERFA_MOCKS.mock.ts b/packages/backend/src/usagers/services/cerfa/tests/CERFA_MOCKS.mock.ts
index 7d72585b22..41744623dd 100644
--- a/packages/backend/src/usagers/services/cerfa/tests/CERFA_MOCKS.mock.ts
+++ b/packages/backend/src/usagers/services/cerfa/tests/CERFA_MOCKS.mock.ts
@@ -59,8 +59,8 @@ export const CERFA_MOCK_USAGER_ACTIF: UsagerCerfaFields = {
   signature1A: "ASNIERES-SUR-SEINE",
   signature1B: "ASNIERES-SUR-SEINE",
   signature2: "ASNIERES-SUR-SEINE",
-  telephone: "+33 6 06 06 06 06",
-  telephoneOrga: "+33 6 02 03 04 05",
+  telephone: "06 06 06 06 06",
+  telephoneOrga: "06 02 03 04 05",
   typeDemande: "2",
 };
 
@@ -124,6 +124,6 @@ export const CERFA_MOCK_USAGER_REFUS: UsagerCerfaFields = {
   signature1B: "ASNIERES-SUR-SEINE",
   signature2: "ASNIERES-SUR-SEINE",
   telephone: "",
-  telephoneOrga: "+33 6 02 03 04 05",
+  telephoneOrga: "06 02 03 04 05",
   typeDemande: "1",
 };
diff --git a/packages/backend/src/usagers/services/custom-docs/tests/CUSTOM_DOC_ATTESTATION_POSTALE.const.ts b/packages/backend/src/usagers/services/custom-docs/tests/CUSTOM_DOC_ATTESTATION_POSTALE.const.ts
index 1ee33960a3..aba31222ee 100644
--- a/packages/backend/src/usagers/services/custom-docs/tests/CUSTOM_DOC_ATTESTATION_POSTALE.const.ts
+++ b/packages/backend/src/usagers/services/custom-docs/tests/CUSTOM_DOC_ATTESTATION_POSTALE.const.ts
@@ -27,7 +27,7 @@ export const CUSTOM_DOC_ATTESTATION_POSTALE: StructureCustomDocTags = {
   USAGER_SURNOM: "TEST",
   USAGER_DATE_NAISSANCE: "02/11/1988",
   USAGER_LIEU_NAISSANCE: "Paris",
-  USAGER_PHONE: "+33 6 06 06 06 06",
+  USAGER_PHONE: "06 06 06 06 06",
   USAGER_EMAIL: "fake-mail@yopmail.com",
   USAGER_NUMERO_DISTRIBUTION_SPECIALE: "",
   STATUT_DOM: "Actif",
diff --git a/packages/backend/src/usagers/services/custom-docs/tests/CUSTOM_DOC_COURRIER_REFUS.ts b/packages/backend/src/usagers/services/custom-docs/tests/CUSTOM_DOC_COURRIER_REFUS.ts
index 75eba7b418..c6d9acbfb6 100644
--- a/packages/backend/src/usagers/services/custom-docs/tests/CUSTOM_DOC_COURRIER_REFUS.ts
+++ b/packages/backend/src/usagers/services/custom-docs/tests/CUSTOM_DOC_COURRIER_REFUS.ts
@@ -28,7 +28,7 @@ export const CUSTOM_DOC_COURRIER_REFUS: StructureCustomDocTags = {
   USAGER_SURNOM: "",
   USAGER_DATE_NAISSANCE: "07/08/1998",
   USAGER_LIEU_NAISSANCE: "Bouaké, Côte d'Ivoire",
-  USAGER_PHONE: "+33 6 06 06 06 06",
+  USAGER_PHONE: "06 06 06 06 06",
   USAGER_EMAIL: "domicilie2@yopmail.com",
   AYANTS_DROITS_LISTE: "Karamoko Mauricette né(e) le 20/12/1978",
   STATUT_DOM: "Refusé",
diff --git a/packages/backend/src/usagers/services/xlsx-structure-usagers-renderer/tests/FIRST_SHEET_USAGERS.mock.ts b/packages/backend/src/usagers/services/xlsx-structure-usagers-renderer/tests/FIRST_SHEET_USAGERS.mock.ts
index 09341a0d27..c9574a9b8b 100644
--- a/packages/backend/src/usagers/services/xlsx-structure-usagers-renderer/tests/FIRST_SHEET_USAGERS.mock.ts
+++ b/packages/backend/src/usagers/services/xlsx-structure-usagers-renderer/tests/FIRST_SHEET_USAGERS.mock.ts
@@ -21,7 +21,7 @@ export const FIRST_SHEET_USAGERS = [
     USAGER_NATIONALITE: "",
     USAGER_NOM: "NOUVEAU",
     USAGER_NUMERO_DISTRIBUTION_SPECIALE: "",
-    USAGER_PHONE: "+33 6 06 06 06 06",
+    USAGER_PHONE: "06 06 06 06 06",
     USAGER_PRENOM: "DOSSIER",
     USAGER_CUSTOM_REF: "6",
     USAGER_SURNOM: "TEST",
@@ -62,7 +62,7 @@ export const FIRST_SHEET_USAGERS = [
     USAGER_NATIONALITE: "",
     USAGER_NOM: "Martine",
     USAGER_NUMERO_DISTRIBUTION_SPECIALE: "",
-    USAGER_PHONE: "+33 6 06 06 06 06",
+    USAGER_PHONE: "06 06 06 06 06",
     USAGER_PRENOM: "Sembat",
     USAGER_CUSTOM_REF: "5",
     USAGER_SURNOM: "",
diff --git a/packages/backend/src/usagers/utils/validate-search-field.decorator.ts b/packages/backend/src/usagers/utils/validate-search-field.decorator.ts
index 5c64b30074..42809a8a77 100644
--- a/packages/backend/src/usagers/utils/validate-search-field.decorator.ts
+++ b/packages/backend/src/usagers/utils/validate-search-field.decorator.ts
@@ -14,7 +14,6 @@ export function ValidateSearchField(validationOptions?: ValidationOptions) {
       options: validationOptions,
       validator: {
         validate(value: string, args: ValidationArguments) {
-          console.log({ value });
           const searchStringField = args.object["searchStringField"];
           if (!searchStringField) {
             return false;
diff --git a/packages/backend/src/util/phone/phoneUtils.service.spec.ts b/packages/backend/src/util/phone/phoneUtils.service.spec.ts
index 82ca7be54f..9809c464cb 100644
--- a/packages/backend/src/util/phone/phoneUtils.service.spec.ts
+++ b/packages/backend/src/util/phone/phoneUtils.service.spec.ts
@@ -15,7 +15,7 @@ describe("Telephone utils", () => {
 
   it("getPhoneString shoud return string with countryCode and numero", () => {
     expect(getPhoneString({ countryCode: "fr", numero: "0622062206" })).toEqual(
-      "0622062206"
+      "06 22 06 22 06"
     );
   });
 });
diff --git a/packages/backend/src/util/test/AppTestHelper.service.ts b/packages/backend/src/util/test/AppTestHelper.service.ts
index 6e6e3c78cd..7fff666d66 100644
--- a/packages/backend/src/util/test/AppTestHelper.service.ts
+++ b/packages/backend/src/util/test/AppTestHelper.service.ts
@@ -94,6 +94,11 @@ async function bootstrapTestApp(
     context.app.useGlobalPipes(
       new ValidationPipe({
         whitelist: true,
+        stopAtFirstError: true,
+        transform: true,
+        transformOptions: {
+          enableImplicitConversion: false,
+        },
       })
     );
     await context.app.init();
diff --git a/packages/common/src/search/functions/index.ts b/packages/common/src/search/functions/index.ts
index 0b4f872473..a705d68131 100644
--- a/packages/common/src/search/functions/index.ts
+++ b/packages/common/src/search/functions/index.ts
@@ -1,3 +1,4 @@
 //@index('./*.ts', f => `export * from '${f.path}'`)
 export * from "./getUsagerDeadlines";
 export * from "./normalize-string";
+export * from "./parseBirthDate";
diff --git a/packages/common/src/search/functions/parseBirthDate.ts b/packages/common/src/search/functions/parseBirthDate.ts
new file mode 100644
index 0000000000..9cfb194046
--- /dev/null
+++ b/packages/common/src/search/functions/parseBirthDate.ts
@@ -0,0 +1,15 @@
+import { format, isValid, parse } from "date-fns";
+
+export const parseBirthDate = (text: string): string | null => {
+  const parsedDate = parse(text.trim(), "dd/MM/yyyy", new Date());
+  if (!isValid(parsedDate)) {
+    return null;
+  }
+  const minDate = new Date(1900, 0, 1);
+  const today = new Date();
+
+  if (parsedDate < minDate || parsedDate > today) {
+    return null;
+  }
+  return format(parsedDate, "ddMMyyyy");
+};
diff --git a/packages/common/src/search/functions/tests/parseBirthDate.spec.ts b/packages/common/src/search/functions/tests/parseBirthDate.spec.ts
new file mode 100644
index 0000000000..13cbfdb054
--- /dev/null
+++ b/packages/common/src/search/functions/tests/parseBirthDate.spec.ts
@@ -0,0 +1,71 @@
+import { parseBirthDate } from "../parseBirthDate";
+
+describe("parseBirthDate", () => {
+  describe("Valid Date Formats", () => {
+    it("should parse a valid date", () => {
+      const result = parseBirthDate("15/08/1990");
+      expect(result).toBe("15081990");
+    });
+
+    it("should handle initial zeros", () => {
+      const result = parseBirthDate("01/02/2000");
+      expect(result).toBe("01022000");
+    });
+  });
+
+  describe("Date Range Validation: 1900 < date > now", () => {
+    it("should return null for a date before 1900", () => {
+      const result = parseBirthDate("01/01/1899");
+      expect(result).toBeNull();
+    });
+
+    it("should return null for a future date", () => {
+      const result = parseBirthDate("01/01/2045");
+      expect(result).toBeNull();
+    });
+  });
+
+  describe("Invalid Date Formats", () => {
+    it("should return null for incorrect date format", () => {
+      const result = parseBirthDate("2023-01-15");
+      expect(result).toBeNull();
+    });
+
+    it("should return null for a non-existent date", () => {
+      const result = parseBirthDate("31/02/2000");
+      expect(result).toBeNull();
+    });
+
+    it("should return null for a non-numeric string", () => {
+      const result = parseBirthDate("abc/def/ghij");
+      expect(result).toBeNull();
+    });
+  });
+
+  // Spaces handling tests
+  describe("Spaces Handling", () => {
+    it("should remove spaces before and after the date", () => {
+      const result = parseBirthDate("  15/08/1990  ");
+      expect(result).toBe("15081990");
+    });
+  });
+
+  // Boundary cases tests
+  describe("Boundary Cases", () => {
+    it("should accept the minimum allowed date", () => {
+      const result = parseBirthDate("01/01/1900");
+      expect(result).toBe("01011900");
+    });
+
+    it("should accept the maximum allowed date (today)", () => {
+      const today = new Date();
+      const formattedToday = `${today.getDate().toString().padStart(2, "0")}/${(
+        today.getMonth() + 1
+      )
+        .toString()
+        .padStart(2, "0")}/${today.getFullYear()}`;
+      const result = parseBirthDate(formattedToday);
+      expect(result).not.toBeNull();
+    });
+  });
+});
diff --git a/packages/frontend/src/app/modules/manage-usagers/components/manage-filters/manage-filters.component.html b/packages/frontend/src/app/modules/manage-usagers/components/manage-filters/manage-filters.component.html
index a89f6d22dd..06f67f1d11 100644
--- a/packages/frontend/src/app/modules/manage-usagers/components/manage-filters/manage-filters.component.html
+++ b/packages/frontend/src/app/modules/manage-usagers/components/manage-filters/manage-filters.component.html
@@ -29,6 +29,7 @@
           class="d-md-inline-block d-block me-2 text-md-start text-center my-1"
         >
           <button
+            [disabled]="searching"
             *ngIf="filters.lastInteractionDate"
             type="button"
             aria-label="Réinitialiser le filtre date de dernier passage"
@@ -56,7 +57,7 @@
             #dropdownDernierPassage="ngbDropdown"
             class="d-inline-block my-1"
           >
-            <button type="button" ngbDropdownToggle>
+            <button type="button" [disabled]="searching" ngbDropdownToggle>
               <span>Dernier passage</span>
             </button>
             <div
@@ -65,6 +66,7 @@
               class="dropdown-menu"
             >
               <button
+                [disabled]="searching"
                 *ngFor="let p of labelsDernierPassage | keyvalue"
                 type="button"
                 (click)="
@@ -91,6 +93,7 @@
           <button
             type="button"
             *ngIf="filters.echeance"
+            [disabled]="searching"
             class="btn btn-outline-primary"
             (click)="updateFilters.emit({ element: 'echeance', value: null })"
           >
@@ -110,7 +113,7 @@
             class="d-inline-block my-1"
             #dropdownEcheance="ngbDropdown"
           >
-            <button type="button" ngbDropdownToggle>
+            <button type="button" [disabled]="searching" ngbDropdownToggle>
               <span>Échéance de domiciliation</span>
             </button>
 
@@ -192,6 +195,7 @@
           class="d-md-inline-block d-block me-2 text-md-start text-center my-1"
         >
           <button
+            [disabled]="searching"
             type="button"
             aria-label="Réinitialiser le filtre courrier à récupérer"
             class="btn btn-outline-primary"
@@ -245,6 +249,7 @@
           class="d-md-inline-block d-block me-2 text-md-start text-center my-1"
         >
           <button
+            [disabled]="searching"
             type="button"
             *ngIf="filters.entretien"
             aria-label="Réinitialiser le filtre entretien"
@@ -267,13 +272,16 @@
             class="d-inline-block my-1"
             #dropDownEntretien="ngbDropdown"
           >
-            <button type="button" ngbDropdownToggle>Entretien</button>
+            <button type="button" [disabled]="searching" ngbDropdownToggle>
+              Entretien
+            </button>
             <div
               ngbDropdownMenu
               aria-labelledby="dropDownEntretien"
               class="dropdown-menu"
             >
               <button
+                [disabled]="searching"
                 type="button"
                 (click)="
                   updateFilters.emit({
@@ -287,6 +295,7 @@
               </button>
 
               <button
+                [disabled]="searching"
                 type="button"
                 (click)="
                   updateFilters.emit({
@@ -305,8 +314,9 @@
           class="d-md-inline-block d-block me-2 text-md-start text-center my-1"
         >
           <button
+            [disabled]="searching"
             type="button"
-            *ngIf="filters.referrerId !== undefined"
+            *ngIf="filters?.referrerId !== undefined"
             aria-label="Réinitialiser le filtre référents"
             class="btn btn-outline-primary"
             (click)="
@@ -316,7 +326,7 @@
             {{
               filters.referrerId === null
                 ? "Aucun référent"
-                : (filters.referrerId | referrerName)
+                : (filters.referrerId | referrerName | async)
             }}
             <fa-icon
               aria-hidden="true"
@@ -329,11 +339,12 @@
             ngbDropdown
             id="dropDownUsers"
             placement="bottom"
-            *ngIf="filters.referrerId === undefined"
+            *ngIf="filters?.referrerId === undefined"
             class="d-inline-block my-1"
             #dropDownUsers="ngbDropdown"
           >
             <button
+              [disabled]="searching"
               type="button"
               ngbDropdownToggle
               aria-label="Filtrer par référent"
@@ -347,6 +358,7 @@
             >
               <button
                 type="button"
+                [disabled]="searching"
                 ngbDropdownItem
                 aria-label="Filtrer les dossiers sans référent"
                 (click)="
@@ -359,23 +371,24 @@
                 Aucun référent
               </button>
               <button
-                *ngFor="let user of users"
+                [disabled]="searching"
+                *ngFor="let referrer of referrers"
                 type="button"
                 ngbDropdownItem
                 [attr.aria-label]="
                   'Filtrer les dossiers suivis par ' +
-                  user.prenom +
+                  referrer.prenom +
                   ' ' +
-                  user.nom
+                  referrer.nom
                 "
                 (click)="
                   updateFilters.emit({
                     element: 'referrerId',
-                    value: user.id
+                    value: referrer.id
                   })
                 "
               >
-                {{ user.nom | uppercase }} {{ user.prenom }}
+                {{ referrer.nom | uppercase }} {{ referrer.prenom }}
               </button>
             </div>
           </div>
@@ -389,6 +402,7 @@
           #dropdownSort="ngbDropdown"
         >
           <button
+            [disabled]="searching"
             type="button"
             class="mx-auto ms-md-auto me-md-0"
             id="dropdownSortButton"
@@ -422,6 +436,7 @@
             <ng-container *ngFor="let option of sortMenuItems">
               <button
                 type="button"
+                [disabled]="searching"
                 (click)="
                   updateFilters.emit({
                     element: 'sortKey',
@@ -444,6 +459,7 @@
               </button>
 
               <button
+                [disabled]="searching"
                 type="button"
                 (click)="
                   updateFilters.emit({
diff --git a/packages/frontend/src/app/modules/manage-usagers/components/manage-filters/manage-filters.component.ts b/packages/frontend/src/app/modules/manage-usagers/components/manage-filters/manage-filters.component.ts
index 4a7e533e6c..7429681cb6 100644
--- a/packages/frontend/src/app/modules/manage-usagers/components/manage-filters/manage-filters.component.ts
+++ b/packages/frontend/src/app/modules/manage-usagers/components/manage-filters/manage-filters.component.ts
@@ -27,10 +27,11 @@ import { Subscription } from "rxjs";
   styleUrls: ["../manage-usagers-page/manage-usagers-page.component.scss"],
 })
 export class ManageFiltersComponent implements OnInit, OnChanges {
-  @Input() public filters: UsagersFilterCriteria;
-  @Input() public usagersRadiesLoadedCount: number;
-  @Input() public usagersRadiesTotalCount: number;
-  @Input() public nbResults: number;
+  @Input({ required: true }) public filters: UsagersFilterCriteria;
+  @Input({ required: true }) public usagersRadiesLoadedCount: number;
+  @Input({ required: true }) public usagersRadiesTotalCount: number;
+  @Input({ required: true }) public searching: boolean;
+  @Input({ required: true }) public nbResults: number;
 
   @Output() public readonly updateFilters = new EventEmitter();
 
@@ -70,14 +71,16 @@ export class ManageFiltersComponent implements OnInit, OnChanges {
     label: string;
   }> = [];
 
-  public users: UserStructureProfile[] = [];
+  public referrers: UserStructureProfile[] = [];
   public subscription: Subscription = new Subscription();
 
   constructor(private readonly manageUsersService: ManageUsersService) {}
 
   ngOnInit(): void {
     this.sortMenuItems = this.getSortKeys();
-    this.users = this.manageUsersService.referrers;
+    this.manageUsersService.referrers$.subscribe((referrers) => {
+      this.referrers = referrers;
+    });
   }
 
   ngOnChanges() {
diff --git a/packages/frontend/src/app/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.html b/packages/frontend/src/app/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.html
index ab9371f5b9..761c34c72b 100644
--- a/packages/frontend/src/app/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.html
+++ b/packages/frontend/src/app/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.html
@@ -308,6 +308,7 @@ <h1 class="col-md-2 col-6 title text-start order-1 order-md-1">
   [filters]="filters"
   (updateFilters)="updateFilters($event)"
   [nbResults]="nbResults"
+  [searching]="searching"
   [usagersRadiesLoadedCount]="usagersRadiesLoadedCount"
   [usagersRadiesTotalCount]="usagersCountByStatus.RADIE"
 ></app-manage-filters>
diff --git a/packages/frontend/src/app/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.ts b/packages/frontend/src/app/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.ts
index 699c8d6482..6f59264aae 100644
--- a/packages/frontend/src/app/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.ts
+++ b/packages/frontend/src/app/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.ts
@@ -49,6 +49,7 @@ import { Store } from "@ngrx/store";
 import { ManageUsagersService } from "../../services/manage-usagers.service";
 import {
   CriteriaSearchField,
+  parseBirthDate,
   SortValues,
   UsagersFilterCriteriaStatut,
   UserStructure,
@@ -60,7 +61,6 @@ import {
   calculateUsagersCountByStatus,
   usagersSorter,
 } from "../usager-filter/services";
-import { isValid, parse } from "date-fns";
 
 const FIVE_MINUTES = 5 * 60 * 1000;
 const STORAGE_KEY = "SEARCH";
@@ -153,6 +153,8 @@ export class ManageUsagersPageComponent
   }
 
   ngAfterViewInit() {
+    this.setupIntersectionObserver();
+
     if (this.sentinel) {
       this.observer.observe(this.sentinel.nativeElement);
     }
@@ -162,7 +164,6 @@ export class ManageUsagersPageComponent
     if (!this.me?.acceptTerms) {
       return;
     }
-    this.setupIntersectionObserver();
 
     this.searchInput.nativeElement.value = this.filters.searchString;
 
@@ -351,11 +352,14 @@ export class ManageUsagersPageComponent
       (this.filters.statut === UsagersFilterCriteriaStatut.TOUS ||
         this.filters.statut === UsagersFilterCriteriaStatut.RADIE)
     ) {
-      if (
-        this.filters.searchStringField === "BIRTH_DATE" &&
-        !this.validateDateSearchInput(filters?.searchString)
-      ) {
-        return of(filters.searchString);
+      const formattedDate = parseBirthDate(filters?.searchString);
+
+      if (this.filters.searchStringField === CriteriaSearchField.BIRTH_DATE) {
+        if (!formattedDate) {
+          return of(filters.searchString);
+        } else {
+          filters.searchString = formattedDate;
+        }
       }
 
       return this.usagerService
@@ -385,11 +389,6 @@ export class ManageUsagersPageComponent
     this.chargerTousRadies$.next(true);
   }
 
-  private validateDateSearchInput(text: string): Date | null {
-    const parsedDate = parse(text.trim(), "dd/MM/yyyy", new Date());
-    return isValid(parsedDate) ? parsedDate : null;
-  }
-
   private scrollTop(): void {
     window.scroll({
       behavior: "smooth",
diff --git a/packages/frontend/src/app/modules/manage-usagers/components/usager-filter/UsagersFilterCriteria.ts b/packages/frontend/src/app/modules/manage-usagers/components/usager-filter/UsagersFilterCriteria.ts
index e68dec84b7..3d06b59358 100644
--- a/packages/frontend/src/app/modules/manage-usagers/components/usager-filter/UsagersFilterCriteria.ts
+++ b/packages/frontend/src/app/modules/manage-usagers/components/usager-filter/UsagersFilterCriteria.ts
@@ -41,6 +41,9 @@ export class UsagersFilterCriteria extends Search {
     this.page = search?.page || 1;
     this.sortKey = search?.sortKey || "NOM";
     this.sortValue = search?.sortValue || "asc";
-    this.referrerId = search?.referrerId || undefined;
+    this.referrerId =
+      search?.referrerId || search?.referrerId === null
+        ? search?.referrerId
+        : undefined;
   }
 }
diff --git a/packages/frontend/src/app/modules/manage-usagers/components/usager-filter/services/usagersSearchStringFilter.service.ts b/packages/frontend/src/app/modules/manage-usagers/components/usager-filter/services/usagersSearchStringFilter.service.ts
index f541506fb8..5a0c3de5e9 100644
--- a/packages/frontend/src/app/modules/manage-usagers/components/usager-filter/services/usagersSearchStringFilter.service.ts
+++ b/packages/frontend/src/app/modules/manage-usagers/components/usager-filter/services/usagersSearchStringFilter.service.ts
@@ -22,9 +22,7 @@ export const getAttributes = (
     return usager?.phoneNumber
       ? [usager.phoneNumber.replace(/[^0-9+]/g, "")]
       : [];
-  }
-
-  if (searchStringField === CriteriaSearchField.BIRTH_DATE) {
+  } else if (searchStringField === CriteriaSearchField.BIRTH_DATE) {
     const attributes: string[] = [];
 
     if (usager.dateNaissance) {
diff --git a/packages/frontend/src/app/modules/manage-usagers/components/usager-filter/usagersFilter.service.ts b/packages/frontend/src/app/modules/manage-usagers/components/usager-filter/usagersFilter.service.ts
index 2ba66a24f4..a353e39073 100644
--- a/packages/frontend/src/app/modules/manage-usagers/components/usager-filter/usagersFilter.service.ts
+++ b/packages/frontend/src/app/modules/manage-usagers/components/usager-filter/usagersFilter.service.ts
@@ -51,6 +51,7 @@ function filterByCriteria(
         "dd/MM/yyyy",
         new Date()
       );
+
       if (isValid(parsedDate)) {
         words.push(criteria.searchString);
       }
diff --git a/packages/frontend/src/app/modules/manage-users/components/user-profil/user-profil.component.ts b/packages/frontend/src/app/modules/manage-users/components/user-profil/user-profil.component.ts
index a78ae8fc50..854e527376 100644
--- a/packages/frontend/src/app/modules/manage-users/components/user-profil/user-profil.component.ts
+++ b/packages/frontend/src/app/modules/manage-users/components/user-profil/user-profil.component.ts
@@ -8,7 +8,6 @@ import { CustomToastService } from "src/app/modules/shared/services/custom-toast
 import { DEFAULT_MODAL_OPTIONS } from "../../../../../_common/model";
 import { AuthService } from "../../../shared/services/auth.service";
 
-import { differenceInCalendarDays } from "date-fns";
 import {
   UserStructureProfile,
   SortValues,
@@ -58,6 +57,11 @@ export class UserProfilComponent implements OnInit, OnDestroy {
 
     this.me = this.authService.currentUserValue;
     this.getUsers();
+
+    this.userService.users$.subscribe((users) => {
+      this.loading = false;
+      this.users = users;
+    });
   }
 
   public updateRole(uuid: string, role: UserStructureRole): void {
@@ -112,22 +116,7 @@ export class UserProfilComponent implements OnInit, OnDestroy {
   }
 
   public getUsers(): void {
-    this.subscription.add(
-      this.userService.getUsers().subscribe((users: UserStructureProfile[]) => {
-        this.users = users.map((user: UserStructureProfile) => {
-          const verified = user.lastLogin
-            ? differenceInCalendarDays(new Date(), new Date(user.lastLogin)) <
-              60
-            : false;
-          return {
-            ...user,
-            lastLogin: user.lastLogin ? new Date(user.lastLogin) : null,
-            verified,
-          };
-        });
-        this.loading = false;
-      })
-    );
+    this.userService.loadUsers();
   }
 
   public userIdTrackBy(_index: number, user: UserStructureProfile) {
diff --git a/packages/frontend/src/app/modules/manage-users/services/manage-users.service.ts b/packages/frontend/src/app/modules/manage-users/services/manage-users.service.ts
index 4d170b80df..bec24afeaa 100644
--- a/packages/frontend/src/app/modules/manage-users/services/manage-users.service.ts
+++ b/packages/frontend/src/app/modules/manage-users/services/manage-users.service.ts
@@ -13,6 +13,7 @@ import {
 } from "../../../../_common/model";
 import { environment } from "../../../../environments/environment";
 import { userStructureBuilder } from "../../users/services";
+import { differenceInCalendarDays } from "date-fns";
 
 @Injectable({
   providedIn: "root",
@@ -21,22 +22,40 @@ export class ManageUsersService {
   private endPoint = environment.apiUrl + "users";
   private usersSubject = new BehaviorSubject<UserStructureProfile[]>([]);
 
-  readonly users$ = this.usersSubject.asObservable();
-  readonly referrersMap: { [key: number]: string } = {};
+  // Observables dérivés
+  readonly users$ = this.usersSubject.pipe(
+    map((users) =>
+      users.map((user) => ({
+        ...user,
+        lastLogin: user.lastLogin ? new Date(user.lastLogin) : null,
+        verified: user.lastLogin
+          ? differenceInCalendarDays(new Date(), new Date(user.lastLogin)) < 60
+          : false,
+      }))
+    )
+  );
 
-  public users: UserStructureProfile[] = [];
-  public referrers: UserStructureProfile[] = [];
+  readonly referrers$ = this.users$.pipe(
+    map((users) => users.filter((user) => user.role !== "facteur"))
+  );
+
+  readonly referrersMap$ = this.referrers$.pipe(
+    map((referrers) => {
+      const map: { [key: number]: string } = {};
+      referrers.forEach((user) => {
+        map[user.id] = `${user.nom} ${user.prenom}`;
+      });
+      return map;
+    })
+  );
 
   constructor(private readonly http: HttpClient) {
+    this.loadUsers();
+  }
+
+  public loadUsers(): void {
     this.http.get<UserStructureProfile[]>(this.endPoint).subscribe((users) => {
       this.usersSubject.next(users);
-      this.users = users;
-      users.forEach((user) => {
-        if (user.role !== "facteur") {
-          this.referrers.push(user);
-          this.referrersMap[user.id] = `${user.nom} ${user.prenom}`;
-        }
-      });
     });
   }
 
@@ -48,10 +67,6 @@ export class ManageUsersService {
     );
   }
 
-  public getUsers(): Observable<UserStructureProfile[]> {
-    return this.http.get<UserStructureProfile[]>(`${this.endPoint}`);
-  }
-
   public updateRole(
     uuid: string,
     role: UserStructureRole
diff --git a/packages/frontend/src/app/modules/usager-dossier/components/display-etat-civil-decision/display-etat-civil-decision.component.html b/packages/frontend/src/app/modules/usager-dossier/components/display-etat-civil-decision/display-etat-civil-decision.component.html
index 9eeb73634c..2a6569455e 100644
--- a/packages/frontend/src/app/modules/usager-dossier/components/display-etat-civil-decision/display-etat-civil-decision.component.html
+++ b/packages/frontend/src/app/modules/usager-dossier/components/display-etat-civil-decision/display-etat-civil-decision.component.html
@@ -33,7 +33,7 @@
 
   <p class="my-2">
     <span class="valeur"> Référent: </span>
-    <span> {{ usager.referrerId | referrerName }}</span>
+    <span> {{ usager.referrerId | referrerName | async }}</span>
   </p>
 </ng-container>
 
diff --git a/packages/frontend/src/app/modules/usager-dossier/components/step-rdv/step-rdv.component.ts b/packages/frontend/src/app/modules/usager-dossier/components/step-rdv/step-rdv.component.ts
index 207bb6e0f1..9673cb4642 100644
--- a/packages/frontend/src/app/modules/usager-dossier/components/step-rdv/step-rdv.component.ts
+++ b/packages/frontend/src/app/modules/usager-dossier/components/step-rdv/step-rdv.component.ts
@@ -108,6 +108,12 @@ export class StepRdvComponent
         })
     );
 
+    this.subscription.add(
+      this.manageUsersService.referrers$.subscribe((referrers) => {
+        this.users = referrers;
+      })
+    );
+
     this.subscription.add(
       this.usagerDossierService.findOne(id).subscribe({
         next: (usager: Usager) => {
@@ -175,7 +181,6 @@ export class StepRdvComponent
     this.rdvForm.controls.userId.setValue(userIdRdv, {
       onlySelf: true,
     });
-    this.users = this.manageUsersService.referrers;
   }
 
   public setValueRdv(value: boolean): void {
diff --git a/packages/frontend/src/app/modules/usager-profil/components/_general-section/display-etat-civil/display-etat-civil.component.html b/packages/frontend/src/app/modules/usager-profil/components/_general-section/display-etat-civil/display-etat-civil.component.html
index 48ecf0b5bf..9e2fe8b3dc 100644
--- a/packages/frontend/src/app/modules/usager-profil/components/_general-section/display-etat-civil/display-etat-civil.component.html
+++ b/packages/frontend/src/app/modules/usager-profil/components/_general-section/display-etat-civil/display-etat-civil.component.html
@@ -53,7 +53,7 @@
   <p class="col-md-4 reponses">
     <span class="question">Référent.e au sein de la structure</span>
     <span class="valeur">
-      {{ usager.referrerId | referrerName }}
+      {{ usager.referrerId | referrerName | async }}
     </span>
   </p>
 </div>
diff --git a/packages/frontend/src/app/modules/usager-profil/components/pages/profil-general-section/profil-general-section.component.html b/packages/frontend/src/app/modules/usager-profil/components/pages/profil-general-section/profil-general-section.component.html
index 509eeac605..c18eeddb96 100644
--- a/packages/frontend/src/app/modules/usager-profil/components/pages/profil-general-section/profil-general-section.component.html
+++ b/packages/frontend/src/app/modules/usager-profil/components/pages/profil-general-section/profil-general-section.component.html
@@ -315,7 +315,7 @@ <h2>Dossier</h2>
               <span class="label">Référent au sein de la structure</span>
             </div>
             <div class="col-6 my-1">
-              {{ usager.referrerId | referrerName }}
+              {{ usager.referrerId | referrerName | async }}
             </div>
             <div class="col-12 mt-4">
               <a
diff --git a/packages/frontend/src/app/modules/usager-shared/components/etat-civil-parent-form/etat-civil-parent-form.component.ts b/packages/frontend/src/app/modules/usager-shared/components/etat-civil-parent-form/etat-civil-parent-form.component.ts
index 48f85877dd..88cb6e0274 100644
--- a/packages/frontend/src/app/modules/usager-shared/components/etat-civil-parent-form/etat-civil-parent-form.component.ts
+++ b/packages/frontend/src/app/modules/usager-shared/components/etat-civil-parent-form/etat-civil-parent-form.component.ts
@@ -129,7 +129,13 @@ export class EtatCivilParentFormComponent implements OnDestroy {
     this.minDateToday = minDateToday;
     this.minDateNaissance = minDateNaissance;
     this.maxDateNaissance = formatDateToNgb(new Date());
-    this.users = this.manageUsersService.referrers;
+
+    this.subscription.add(
+      this.manageUsersService.referrers$.subscribe((referrers) => {
+        this.users = referrers;
+      })
+    );
+
     this.currentUserSubject$ = this.authService.currentUserSubject;
   }
 
diff --git a/packages/frontend/src/app/modules/usager-shared/pipes/referrer-name.pipe.ts b/packages/frontend/src/app/modules/usager-shared/pipes/referrer-name.pipe.ts
index a4c5733342..a5b2867951 100644
--- a/packages/frontend/src/app/modules/usager-shared/pipes/referrer-name.pipe.ts
+++ b/packages/frontend/src/app/modules/usager-shared/pipes/referrer-name.pipe.ts
@@ -1,16 +1,20 @@
 import { Pipe, PipeTransform } from "@angular/core";
 import { ManageUsersService } from "../../manage-users/services/manage-users.service";
-
+import { map, Observable } from "rxjs";
 @Pipe({
   name: "referrerName",
 })
 export class ReferrerNamePipe implements PipeTransform {
   constructor(private manageUsersService: ManageUsersService) {}
 
-  transform(referrerId: number | null): string {
-    if (!referrerId) {
-      return "Aucun référent";
-    }
-    return this.manageUsersService.referrersMap[referrerId] || "Aucun référent";
+  transform(referrerId: number | null): Observable<string> {
+    return this.manageUsersService.referrersMap$.pipe(
+      map((referrersMap) => {
+        if (!referrerId) {
+          return "Aucun référent";
+        }
+        return referrersMap[referrerId] || "Aucun référent";
+      })
+    );
   }
 }