fix(frontend): update unit test mocks

packages/common/src/index.ts

@@ -3,7 +3,6 @@ export * from "./_core";
 export * from "./import";
 export * from "./interactions";
 export * from "./message-sms";
-export * from "./mocks";
 export * from "./pagination";
 export * from "./stats";
 export * from "./structure";

packages/common/src/mocks/USAGER_ACTIF.mock.ts

@@ -1,6 +1,6 @@
 import { ETAPE_DOSSIER_COMPLET } from "../usager";
 
-export const USAGER_ACTIF_MOCK = {
+export const USAGER_VALIDE_MOCK = {
   numeroDistribution: null,
   decision: {
     statut: "VALIDE",

packages/common/src/usager/functions/getRdvInfos.service.spec.ts

@@ -1,4 +1,4 @@
-import { USAGER_ACTIF_MOCK } from "../../mocks";
+import { USAGER_VALIDE_MOCK } from "../../mocks";
 import {
   ETAPE_RENDEZ_VOUS,
   ETAPE_DOSSIER_COMPLET,
@@ -68,7 +68,7 @@ describe("Création des rendez-vous", () => {
   });
 
   it("Rendez-vous de base", () => {
-    const usager = USAGER_ACTIF_MOCK;
+    const usager = USAGER_VALIDE_MOCK;
     usager.rdv = { dateRdv: null, userId: 0, userName: "" };
     expect(getRdvInfos(usager)).toEqual({
       class: "",

packages/frontend/src/_common/mocks/USAGER_ACTIF.mock.ts → packages/frontend/src/_common/mocks/USAGER_VALIDE.mock.ts

@@ -2,7 +2,7 @@ import { CountryISO } from "@khazii/ngx-intl-tel-input";
 import { UsagerLight } from "../model";
 import { ETAPE_DOSSIER_COMPLET } from "@domifa/common";
 
-export const USAGER_ACTIF_MOCK: UsagerLight = {
+export const USAGER_VALIDE_MOCK: UsagerLight = {
   numeroDistribution: null,
   statut: "VALIDE",
   decision: {
@@ -20,7 +20,7 @@ export const USAGER_ACTIF_MOCK: UsagerLight = {
     userName: "Testeur Robin",
   },
   lastInteraction: {
-    colisIn: 0,
+    colisIn: 10,
     courrierIn: 0,
     enAttente: false,
     recommandeIn: 0,

packages/frontend/src/_common/mocks/index.ts

@@ -1,7 +1,7 @@
 // @index('./*', f => `export * from '${f.path}'`)
 export * from "./AuthServiceMock";
 export * from "./STRUCTURE_MOCK.const";
-export * from "./USAGER_ACTIF.mock";
+export * from "./USAGER_VALIDE.mock";
 export * from "./USAGER_NOTE.mock";
 export * from "./USAGER_REFUS.mock";
 export * from "./USER_STRUCTURE.mock";

packages/frontend/src/app/modules/manage-usagers/components/column-informations/column-informations.component.spec.ts

@@ -2,7 +2,7 @@ import { UsagerFormModel } from "./../../../usager-shared/interfaces/UsagerFormM
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { ColumnInformationsComponent } from "./column-informations.component";
-import { USAGER_ACTIF_MOCK } from "../../../../../_common/mocks";
+import { USAGER_VALIDE_MOCK } from "../../../../../_common/mocks";
 import { APP_BASE_HREF } from "@angular/common";
 import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
@@ -22,7 +22,7 @@ describe("ColumnInformationsComponent", () => {
 
     fixture = TestBed.createComponent(ColumnInformationsComponent);
     component = fixture.componentInstance;
-    component.usager = new UsagerFormModel(USAGER_ACTIF_MOCK);
+    component.usager = new UsagerFormModel(USAGER_VALIDE_MOCK);
     fixture.detectChanges();
   });
 

packages/frontend/src/app/modules/manage-usagers/components/manage-download-docs/manage-download-docs.component.spec.ts

@@ -1,7 +1,7 @@
 import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 import {
-  USAGER_ACTIF_MOCK,
+  USAGER_VALIDE_MOCK,
   USER_STRUCTURE_MOCK,
 } from "../../../../../_common/mocks";
 import { UsagerFormModel } from "../../../usager-shared/interfaces";
@@ -29,7 +29,7 @@ describe("ManageDownloadDocsComponent", () => {
     component = fixture.componentInstance;
     component.me = USER_STRUCTURE_MOCK;
     component.me.structure = USER_STRUCTURE_MOCK.structure;
-    component.usager = new UsagerFormModel(USAGER_ACTIF_MOCK);
+    component.usager = new UsagerFormModel(USAGER_VALIDE_MOCK);
     fixture.detectChanges();
   });
 

packages/frontend/src/app/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.ts

@@ -259,9 +259,11 @@ export class ManageUsagersPageComponent implements OnInit, OnDestroy {
     usagers: UsagerLight[],
     usagersRadiesTotalCount: number
   ) {
-    this.usagersCountByStatus = calculateUsagersCountByStatus(usagers);
-    this.usagersCountByStatus.RADIE = usagersRadiesTotalCount;
-    this.usagersCountByStatus.TOUS = usagers.length;
+    this.usagersCountByStatus = calculateUsagersCountByStatus(
+      usagers,
+      usagersRadiesTotalCount
+    );
+
     this.usagersRadiesLoadedCount = usagers.filter(
       (usager) => usager.statut === "RADIE"
     ).length;

packages/frontend/src/app/modules/manage-usagers/components/manage-usagers-table/manage-usagers-table.html

@@ -157,8 +157,8 @@
         </label>
       </td>
       <td *ngIf="filters.statut === 'TOUS'" class="clickable text-start">
-        <span [class]="'label-info ' + usager?.statusInfos?.color">
-          {{ usager?.statusInfos?.text }}</span
+        <span [class]="'label-info ' + usager?.statusInfo?.color">
+          {{ usager?.statusInfo?.text }}</span
         >
       </td>
       <td

packages/frontend/src/app/modules/manage-usagers/components/usager-filter/services/calculateUsagersCountByStatus.service.ts

@@ -2,13 +2,15 @@ import { UsagersCountByStatus } from "..";
 import { UsagerLight } from "../../../../../../_common/model";
 
 export function calculateUsagersCountByStatus(
-  usagers: UsagerLight[]
+  usagers: UsagerLight[],
+  usagersRadiesTotalCount: number
 ): UsagersCountByStatus {
-  return usagers.reduce(
+  const counters = usagers.reduce(
     (count, usager) => {
       // We skip "RADIE" already count by backend
       if (usager.statut !== "RADIE") {
         count[usager.statut]++;
+        count.TOUS++;
       }
       return count;
     },
@@ -21,4 +23,7 @@ export function calculateUsagersCountByStatus(
       TOUS: 0,
     }
   );
+  counters.TOUS = counters.TOUS + usagersRadiesTotalCount;
+  counters.RADIE = usagersRadiesTotalCount;
+  return counters;
 }

packages/frontend/src/app/modules/manage-usagers/services/manage-usagers.service.ts

@@ -7,7 +7,11 @@ import { environment } from "src/environments/environment";
 import { UsagerLight } from "../../../../_common/model/usager/UsagerLight.type";
 
 import { Store } from "@ngrx/store";
-import { setUsagerInformation, usagerActions } from "../../../shared";
+import {
+  setUsagerInformation,
+  usagerActions,
+  UsagerState,
+} from "../../../shared";
 
 @Injectable({
   providedIn: "root",
@@ -17,7 +21,7 @@ export class ManageUsagersService {
 
   constructor(
     private readonly http: HttpClient,
-    private readonly store: Store
+    private readonly store: Store<UsagerState>
   ) {}
 
   public fetchSearchPageUsagerData({
@@ -82,11 +86,13 @@ export class ManageUsagersService {
     return this.http
       .get<UsagerLight[]>(`${environment.apiUrl}usagers/update-manage`)
       .pipe(
-        tap((usagers: UsagerLight[]) =>
-          this.store.dispatch(
-            usagerActions.updateManyUsagersForManage({ usagers })
-          )
-        )
+        tap((usagers: UsagerLight[]) => {
+          if (usagers?.length) {
+            this.store.dispatch(
+              usagerActions.updateManyUsagersForManage({ usagers })
+            );
+          }
+        })
       );
   }
 }

packages/frontend/src/app/modules/structures/components/structures-edit/structures-edit.component.ts

@@ -16,7 +16,7 @@ import { AuthService } from "../../../shared/services/auth.service";
 import { StructureService } from "../../services/structure.service";
 import { UserStructure, StructureCommon } from "@domifa/common";
 import { Store } from "@ngrx/store";
-import { usagerActions } from "../../../../shared";
+import { usagerActions, UsagerState } from "../../../../shared";
 
 @Component({
   selector: "app-structures-edit",
@@ -41,7 +41,7 @@ export class StructuresEditComponent implements OnInit, OnDestroy {
     private readonly authService: AuthService,
     private readonly modalService: NgbModal,
     private readonly titleService: Title,
-    private readonly store: Store
+    private readonly store: Store<UsagerState>
   ) {
     this.showHardReset = false;
     this.exportLoading = false;

packages/frontend/src/app/modules/usager-dossier/components/base-usager-dossier-page/base-usager-dossier-page.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { Title } from "@angular/platform-browser";
 import { ActivatedRoute, Router } from "@angular/router";
-import { filter, Observable, Subscription } from "rxjs";
+import { Observable, Subscription } from "rxjs";
 
 import { Store } from "@ngrx/store";
 import { UsagerLight } from "../../../../../_common/model";
@@ -45,17 +45,14 @@ export class BaseUsagerDossierPageComponent implements OnInit, OnDestroy {
   public ngOnInit(): void {
     const id = this.route.snapshot.params.id;
     this.subscription.add(
-      this.store
-        .select(selectUsagerById(id))
-        .pipe(filter((usager): usager is UsagerLight => !!usager))
-        .subscribe({
-          next: (usager: UsagerLight) => {
-            this.usager = new UsagerFormModel(usager);
-          },
-          error: (error) => {
-            console.error("Erreur lors de la récupération du dossier:", error);
-          },
-        })
+      this.store.select(selectUsagerById(id)).subscribe({
+        next: (usager: UsagerLight) => {
+          this.usager = new UsagerFormModel(usager);
+        },
+        error: (error) => {
+          console.error("Erreur lors de la récupération du dossier:", error);
+        },
+      })
     );
 
     this.subscription.add(

packages/frontend/src/app/modules/usager-dossier/components/decision-refus-form/decision-refus-form.component.spec.ts

@@ -7,7 +7,7 @@ import { FormsModule, ReactiveFormsModule } from "@angular/forms";
 import { RouterTestingModule } from "@angular/router/testing";
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
 
-import { USAGER_ACTIF_MOCK } from "../../../../../_common/mocks/USAGER_ACTIF.mock";
+import { USAGER_VALIDE_MOCK } from "../../../../../_common/mocks/USAGER_VALIDE.mock";
 import { SharedModule } from "../../../shared/shared.module";
 import { UsagerFormModel } from "../../../usager-shared/interfaces";
 
@@ -41,7 +41,7 @@ describe("DecisionRefusFormComponent", () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(DecisionRefusFormComponent);
     component = fixture.componentInstance;
-    component.usager = new UsagerFormModel(USAGER_ACTIF_MOCK);
+    component.usager = new UsagerFormModel(USAGER_VALIDE_MOCK);
     fixture.detectChanges();
   });
 

packages/frontend/src/app/modules/usager-dossier/components/decision-standby-form/decision-standby-form.component.spec.ts

@@ -5,7 +5,7 @@ import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { UsagerFormModel } from "../../../usager-shared/interfaces";
 import {
   USER_STRUCTURE_MOCK,
-  USAGER_ACTIF_MOCK,
+  USAGER_VALIDE_MOCK,
 } from "../../../../../_common/mocks";
 import { APP_BASE_HREF } from "@angular/common";
 import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
@@ -33,7 +33,7 @@ describe("DecisionStandbyFormComponent", () => {
     fixture = TestBed.createComponent(DecisionStandbyFormComponent);
     component = fixture.componentInstance;
     component.me = USER_STRUCTURE_MOCK;
-    component.usager = new UsagerFormModel(USAGER_ACTIF_MOCK);
+    component.usager = new UsagerFormModel(USAGER_VALIDE_MOCK);
     fixture.detectChanges();
   });
 

packages/frontend/src/app/modules/usager-dossier/components/decision-valide-form/decision-valide-form.component.spec.ts

@@ -11,7 +11,7 @@ import {
   NgbModule,
 } from "@ng-bootstrap/ng-bootstrap";
 
-import { USAGER_ACTIF_MOCK } from "../../../../../_common/mocks/USAGER_ACTIF.mock";
+import { USAGER_VALIDE_MOCK } from "../../../../../_common/mocks/USAGER_VALIDE.mock";
 import { NgbDateCustomParserFormatter } from "../../../shared/services/date-formatter.service";
 import { CustomDatepickerI18n } from "../../../shared/services/date-french.service";
 import { SharedModule } from "../../../shared/shared.module";
@@ -54,7 +54,7 @@ describe("DecisionValideFormComponent", () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(DecisionValideFormComponent);
     component = fixture.componentInstance;
-    component.usager = new UsagerFormModel(USAGER_ACTIF_MOCK);
+    component.usager = new UsagerFormModel(USAGER_VALIDE_MOCK);
     fixture.detectChanges();
   });
 

packages/frontend/src/app/modules/usager-dossier/components/display-contact-details-decision/display-contact-details-decision.component.spec.ts

@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
 
 import { DisplayContactDetailsDecisionComponent } from "./display-contact-details-decision.component";
-import { USAGER_ACTIF_MOCK } from "../../../../../_common/mocks";
+import { USAGER_VALIDE_MOCK } from "../../../../../_common/mocks";
 import { UsagerFormModel } from "../../../usager-shared/interfaces";
 import { FormatInternationalPhoneNumberPipe } from "../../../usager-shared/formatInternationalPhoneNumber.pipe";
 
@@ -17,7 +17,7 @@ describe("DisplayContactDetailsDecisionComponent", () => {
 
     fixture = TestBed.createComponent(DisplayContactDetailsDecisionComponent);
     component = fixture.componentInstance;
-    component.usager = new UsagerFormModel(USAGER_ACTIF_MOCK);
+    component.usager = new UsagerFormModel(USAGER_VALIDE_MOCK);
     fixture.detectChanges();
   });
 

packages/frontend/src/app/modules/usager-dossier/components/display-etat-civil-decision/display-etat-civil-decision.component.spec.ts

@@ -3,7 +3,7 @@ import { NO_ERRORS_SCHEMA } from "@angular/core";
 
 import { DisplayEtatCivilDecisionComponent } from "./display-etat-civil-decision.component";
 import { FormatInternationalPhoneNumberPipe } from "../../../usager-shared/formatInternationalPhoneNumber.pipe";
-import { USAGER_ACTIF_MOCK } from "../../../../../_common/mocks";
+import { USAGER_VALIDE_MOCK } from "../../../../../_common/mocks";
 import { UsagerFormModel } from "../../../usager-shared/interfaces";
 
 describe("DisplayEtatCivilDecisionComponent", () => {
@@ -18,7 +18,7 @@ describe("DisplayEtatCivilDecisionComponent", () => {
     });
     fixture = TestBed.createComponent(DisplayEtatCivilDecisionComponent);
     component = fixture.componentInstance;
-    component.usager = new UsagerFormModel(USAGER_ACTIF_MOCK);
+    component.usager = new UsagerFormModel(USAGER_VALIDE_MOCK);
   });
 
   it("can load instance", () => {

packages/frontend/src/app/modules/usager-dossier/components/step-rdv/step-rdv.component.spec.ts

@@ -7,7 +7,7 @@ import { ReactiveFormsModule, FormsModule } from "@angular/forms";
 
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
 
-import { USAGER_ACTIF_MOCK } from "../../../../../_common/mocks/USAGER_ACTIF.mock";
+import { USAGER_VALIDE_MOCK } from "../../../../../_common/mocks/USAGER_VALIDE.mock";
 import { SharedModule } from "../../../shared/shared.module";
 import { UsagerFormModel } from "../../../usager-shared/interfaces";
 import { StepRdvComponent } from "./step-rdv.component";
@@ -40,7 +40,7 @@ describe("StepRdvComponent", () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(StepRdvComponent);
     component = fixture.debugElement.componentInstance;
-    component.usager = new UsagerFormModel(USAGER_ACTIF_MOCK);
+    component.usager = new UsagerFormModel(USAGER_VALIDE_MOCK);
   });
 
   it("should create", () => {

packages/frontend/src/app/modules/usager-dossier/services/usager-dossier.service.ts

@@ -12,15 +12,18 @@ import {
 import { userStructureBuilder } from "../../users/services";
 import { Store } from "@ngrx/store";
 import { UserStructure, Usager } from "@domifa/common";
-import { usagerActions } from "../../../shared";
+import { usagerActions, UsagerState } from "../../../shared";
 
 @Injectable({
   providedIn: "root",
 })
 export class UsagerDossierService {
   public endPointUsagers = environment.apiUrl + "usagers";
 
-  constructor(private readonly http: HttpClient, private store: Store) {}
+  constructor(
+    private readonly http: HttpClient,
+    private store: Store<UsagerState>
+  ) {}
 
   public editStepEtatCivil(
     usager: UsagerEtatCivilFormData,

packages/frontend/src/app/modules/usager-notes/components/base-usager-notes/base-usager-notes.component.spec.ts

@@ -5,7 +5,7 @@ import { HttpClientTestingModule } from "@angular/common/http/testing";
 import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core";
 import { NgbModule } from "@ng-bootstrap/ng-bootstrap";
 import {
-  USAGER_ACTIF_MOCK,
+  USAGER_VALIDE_MOCK,
   USER_STRUCTURE_MOCK,
 } from "../../../../../_common/mocks";
 import { UsagerFormModel } from "../../../usager-shared/interfaces";
@@ -29,7 +29,7 @@ describe("BaseUsagerNotesComponent", () => {
 
     fixture = TestBed.createComponent(BaseUsagerNotesComponent);
     component = fixture.componentInstance;
-    component.usager = new UsagerFormModel(USAGER_ACTIF_MOCK);
+    component.usager = new UsagerFormModel(USAGER_VALIDE_MOCK);
     component.me = USER_STRUCTURE_MOCK;
 
     fixture.detectChanges();