fix(frontend): update unit test mocks

Author: pYassine

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 renamed to 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;
 }