fix(backend): fix statut when you delete an usager

Author: pYassine

packages/backend/src/_portail-admin/admin-structures/services/admin-structures.service.ts

@@ -190,7 +190,9 @@ export class AdminStructuresService {
   > {
     return usagerRepository.customCountBy({
       countBy: "structureId",
-      where: typeOrmSearch<UsagerTable>(`decision->>'statut' = 'VALIDE'`),
+      where: {
+        statut: "VALIDE",
+      },
       order: {
         count: "DESC",
         countBy: "ASC",
@@ -236,7 +238,7 @@ export class AdminStructuresService {
     }[]
   > {
     return usagerRepository.countBy({
-      countBy: `decision->>'statut'` as any,
+      countBy: "statut",
       countByAlias: "statut",
       order: { count: "DESC", countBy: "ASC" },
       escapeAttributes: false,

packages/backend/src/auth/auth.module.ts

@@ -26,7 +26,7 @@ import { StructuresAuthController } from "./structures-auth.controller";
       JwtModule.register({
         secret: domifaConfig().security.jwtSecret,
         signOptions: {
-          expiresIn: 36000,
+          expiresIn: "12h",
         },
       })
     ),

packages/backend/src/auth/guards/AppUserGuard.guard.ts

@@ -1,6 +1,6 @@
 import { CanActivate, ExecutionContext, Injectable } from "@nestjs/common";
 import { Reflector } from "@nestjs/core";
-import { addLogContext } from "../../util";
+import { addLogContext, appLogger } from "../../util";
 import { UserProfile, UserStructureAuthenticated } from "../../_common/model";
 import { authChecker } from "../services";
 import { expiredTokenRepositiory } from "../../database";
@@ -68,6 +68,12 @@ export class AppUserGuard implements CanActivate {
             token: request.headers.authorization,
           });
 
+          if (isBlacklisted) {
+            appLogger.error(`[authChecker] expired token`, {
+              context: { userProfile: user, user: user?._userId },
+            });
+          }
+
           // check structure user roles
           return (
             !isBlacklisted &&

packages/backend/src/usagers/controllers/usagers-decision.controller.ts

@@ -171,6 +171,7 @@ export class UsagersDecisionController {
         historique: usager.historique,
         etapeDemande: usager.etapeDemande,
         decision: usager.decision,
+        statut: usager.decision.statut,
       }
     );
 

packages/backend/src/usagers/controllers/usagers.controller.ts

@@ -162,15 +162,12 @@ export class UsagersController {
       .createQueryBuilder()
       .select(joinSelectFields(USAGER_LIGHT_ATTRIBUTES))
       .where(
-        `"structureId" = :structureId and statut = :statut AND nom_prenom_ref ILIKE :search`,
+        `"structureId" = :structureId and statut = 'RADIE' AND nom_prenom_ref ILIKE :search`,
         {
-          statut: "RADIE",
           structureId: user.structureId,
           search: `%${search}%`,
         }
       )
-      .limit(20)
-      .orderBy({ "decision->>'dateFin'": "DESC" })
       .getRawMany();
   }
 

packages/backend/src/usagers/services/usagers.service.ts

@@ -109,7 +109,7 @@ export class UsagersService {
       typeDom,
       motif: null,
     };
-    usager.statut = usager.decision.statut;
+    usager.statut = "INSTRUCTION";
     // Ajout du précédent état dans l'historique
     usagerVisibleHistoryManager.addDecisionToVisibleHistory({ usager });