fix(backend): fix statut in import

SocialGouv · Jul 24, 2024 · aa5a80e · aa5a80e
1 parent f070d49
commit aa5a80e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 11 deletions.
diff --git a/packages/backend/src/usagers/controllers/import/step3-create/usagersImportBuilder.service.ts b/packages/backend/src/usagers/controllers/import/step3-create/usagersImportBuilder.service.ts
@@ -127,6 +127,7 @@ function buildUsager({
       userId: user.id,
       userName: agent,
     },
+    statut: decision.statut,
     decision,
     lastInteraction: {
       dateInteraction: dernierPassage,

diff --git a/packages/backend/src/usagers/controllers/usagers.controller.ts b/packages/backend/src/usagers/controllers/usagers.controller.ts
@@ -54,7 +54,12 @@ import pdftk = require("node-pdftk");
 import { join, resolve } from "path";
 import { readFile } from "fs-extra";
 import { ExpressResponse } from "../../util/express";
-import { Usager, ETAPE_DOCUMENTS, CerfaDocType } from "@domifa/common";
+import {
+  Usager,
+  ETAPE_DOCUMENTS,
+  CerfaDocType,
+  UsagerDecision,
+} from "@domifa/common";
 import { UsagerHistoryStateService } from "../services/usagerHistoryState.service";
 import { domifaConfig } from "../../config";
 import { FileManagerService } from "../../util/file-manager/file-manager.service";
@@ -105,9 +110,26 @@ export class UsagersController {
           },
         });
 
+    const filterHistorique = (usager: Usager) => {
+      if (usager.historique && Array.isArray(usager.historique)) {
+        usager.historique = usager.historique.map((item: UsagerDecision) => ({
+          statut: item.statut,
+          dateDecision: item.dateDecision,
+          dateDebut: item.dateDebut,
+          dateFin: item.dateFin,
+        })) as UsagerDecision[];
+      }
+      return usager;
+    };
+
+    // Appliquer le filtre sur les deux ensembles d'usagers
+    const filteredUsagersNonRadies = usagersNonRadies.map(filterHistorique);
+    const filteredUsagersRadiesFirsts =
+      usagersRadiesFirsts.map(filterHistorique);
+
     return {
-      usagersNonRadies,
-      usagersRadiesFirsts,
+      usagersNonRadies: filteredUsagersNonRadies,
+      usagersRadiesFirsts: filteredUsagersRadiesFirsts,
       usagersRadiesTotalCount,
     };
   }

diff --git a/packages/frontend/src/app/app.component.ts b/packages/frontend/src/app/app.component.ts
@@ -115,11 +115,7 @@ export class AppComponent implements OnInit, OnDestroy {
 
     this.currentUrl = this.router.url;
 
-    this.authService.isAuth().subscribe({
-      next: () => {
-        console.log("");
-      },
-    });
+    this.authService.isAuth().subscribe();
 
     this.authService.currentUserSubject.subscribe({
       next: (user: UserStructure | null) => {

diff --git a/.../modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.html b/.../modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.html
@@ -201,7 +201,7 @@ <h1 class="col-md-2 col-12 title text-start order-1 order-md-1">
         class="col-md-2 col-6"
         [ngClass]="{ 'selected-section': filters.statut === 'REFUS' }"
         [attr.aria-label]="
-          'Afficher les ' + allUsagersByStatus.REFUS.length + ' dossiers '
+          'Afficher les ' + allUsagersByStatus?.REFUS?.length + ' dossiers '
         "
         [attr.aria-selected]="filters.statut === 'REFUS'"
         (click)="updateFilters({ element: 'statut', value: 'REFUS' })"
@@ -216,7 +216,7 @@ <h1 class="col-md-2 col-12 title text-start order-1 order-md-1">
         class="col-md-2 col-6"
         [ngClass]="{ 'selected-section': filters.statut === 'RADIE' }"
         [attr.aria-label]="
-          'Afficher les ' + allUsagersByStatus.RADIE.length + ' dossiers '
+          'Afficher les ' + allUsagersByStatus?.RADIE?.length + ' dossiers '
         "
         [attr.aria-selected]="filters.statut === 'RADIE'"
         (click)="updateFilters({ element: 'statut', value: 'RADIE' })"

diff --git a/...pp/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.ts b/...pp/modules/manage-usagers/components/manage-usagers-page/manage-usagers-page.component.ts
@@ -129,7 +129,7 @@ export class ManageUsagersPageComponent implements OnInit, OnDestroy {
     this.usagers = [];
     this.filters = new UsagersFilterCriteria(this.getFilters());
 
-    this.pageSize = 200;
+    this.pageSize = 50;
     this.filters.page = 0;
     this.titleService.setTitle("Gestion des domiciliés - DomiFa");
   }
@@ -226,6 +226,7 @@ export class ManageUsagersPageComponent implements OnInit, OnDestroy {
   private updateComponentState(
     searchPageLoadedUsagersData: SearchPageLoadedUsagersData
   ) {
+    console.log(searchPageLoadedUsagersData.usagersRadiesTotalCount);
     this.usagersRadiesTotalCount =
       searchPageLoadedUsagersData.usagersRadiesTotalCount;
     this.usagersTotalCount =