feat(stats): add 'actifs' in dashboard

packages/backend/src/_common/model/index.ts

@@ -7,7 +7,6 @@ export * from "./contact-support";
 export * from "./interaction";
 export * from "./jwt";
 export * from "./message-sms";
-export * from "./stats";
 export * from "./structure";
 export * from "./structure-doc";
 export * from "./structure-stats";

packages/backend/src/_common/model/structure-stats/index.ts

@@ -1,3 +1,4 @@
+// @index('./*', f => `export * from '${f.path}'`)
 export * from "./StructureStats.type";
 export * from "./StructureStatsFull.type";
 export * from "./StructureStatsQuestionsAtDateValidUsagers.type";

packages/backend/src/_migrations/1703676787763-fix-last-interaction-migration.ts

@@ -72,6 +72,7 @@ export class FixLastInteractionMigration1703676787763
           ) > 0
         ) {
           const log = {
+            ref: usager.ref,
             structureId: usager.structureId,
             before: usager.lastInteraction.dateInteraction,
             after: dateInteractionOut,

packages/backend/src/_portail-admin/admin-structures/controllers/admin-structures.controller.ts

@@ -35,7 +35,6 @@ import { dataCompare } from "../../../util/dataCompare.service";
 import { ExpressResponse } from "../../../util/express";
 import {
   AdminStructureListData,
-  AdminStructureStatsData,
   Structure,
   StructureAdmin,
   UserStructureAuthenticated,
@@ -47,6 +46,7 @@ import { UsersController } from "../../../users/users.controller";
 import { RegisterUserAdminDto } from "../../../users/dto";
 import { format } from "date-fns";
 import { structureCreatorService } from "../../../structures/services";
+import { AdminStructureStatsData } from "@domifa/common";
 
 @UseGuards(AuthGuard("jwt"), AppUserGuard)
 @Controller("admin/structures")

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

@@ -16,17 +16,14 @@ import { usagerDocsRepository } from "../../../database/services/usager/usagerDo
 import { StatsDeploiementExportModel } from "../../../excel/export-stats-deploiement";
 import { StatsDeploiementStructureExportModel } from "../../../excel/export-stats-deploiement/StatsDeploiementStructureExportModel.type";
 import { FranceRegion } from "../../../util/territoires";
-import {
-  AdminStructureListData,
-  AdminStructureStatsData,
-  StructureAdmin,
-} from "../../../_common/model";
+import { AdminStructureListData, StructureAdmin } from "../../../_common/model";
 import {
   StatsByLocality,
   StatsByMonth,
   StructureType,
   InteractionType,
   UsagerDecisionStatut,
+  AdminStructureStatsData,
 } from "@domifa/common";
 
 @Injectable()
@@ -55,8 +52,10 @@ export class AdminStructuresService {
 
     const structuresCountBySmsEnabled = await this.getStructuresWithSms();
     const structuresCount = await structureRepository.count();
+    const usagersActifs = await usagerRepository.countTotalActifs();
 
     const stats: AdminStructureStatsData = {
+      usagersActifs,
       structuresCount,
       usagersValidCountByStructureMap,
       usagersAyantsDroitsCountByStructureMap,
@@ -345,10 +344,12 @@ export class AdminStructuresService {
 
     const interactionsCountByStatut =
       await this.getInteractionsCountByTypeMap();
+    const usagersActifs = await usagerRepository.countTotalActifs();
 
     const stats: StatsDeploiementExportModel = {
       exportDate: new Date(),
       structures: structuresModels,
+      usagersActifs,
       usagersAllCountByStructureId: usagersAllCountByStructureMap,
       usagersValideCountByStructureId: usagersValidCountByStructureMap,
       usagersAyantsDroitsByStructureId: usagersAyantsDroitsCountByStructureMap,

packages/backend/src/database/services/usager/usagerRepository.service.ts

@@ -127,18 +127,31 @@ async function countTotalUsagers(structuresId?: number[]): Promise<number> {
   return usagers + ayantsDroits;
 }
 
-async function countTotalActifs(): Promise<number> {
-  const usagers: [{ actifs: string }] = await usagerRepository.query(`
+async function countTotalActifs(): Promise<{
+  domicilies: number;
+  ayantsDroits: number;
+  actifs: number;
+}> {
+  const usagers: {
+    domicilies: string;
+    ayantsDroits: string;
+    actifs: string;
+  }[] = await usagerRepository.query(`
     SELECT
+    COUNT(DISTINCT uh."usagerUUID") as "domicilies",
+    COALESCE(SUM(jsonb_array_length(state->'ayantsDroits')), 0) as "ayantsDroits",
     COUNT(DISTINCT uh."usagerUUID") + COALESCE(SUM(jsonb_array_length(state->'ayantsDroits')), 0) AS "actifs"
     FROM "usager_history" uh JOIN usager u ON uh."usagerUUID" = u.uuid JOIN jsonb_array_elements(uh.states) AS state ON true
     WHERE
     (state->>'isActive')::boolean
     AND (state->>'historyBeginDate')::timestamptz <  CURRENT_DATE + INTERVAL '1 day'
     AND (state->>'historyEndDate' is null OR (state->>'historyEndDate')::timestamptz >=  CURRENT_DATE + INTERVAL '1 day' )
 `);
-
-  return parseInt(usagers[0].actifs, 10);
+  return {
+    domicilies: parseInt(usagers[0].domicilies, 10),
+    ayantsDroits: parseInt(usagers[0].ayantsDroits, 10),
+    actifs: parseInt(usagers[0].actifs, 10),
+  };
 }
 
 async function countMigratedUsagers(): Promise<number> {

packages/backend/src/excel/export-stats-deploiement/StatsDeploiementExportModel.type.ts

@@ -12,6 +12,11 @@ export type StatsDeploiementExportModel = {
     region: string;
     count: number;
   }[];
+  usagersActifs: {
+    domicilies: number;
+    ayantsDroits: number;
+    actifs: number;
+  };
   usersCount: number;
   docsCount: number;
   interactionsCountByStatut: {

packages/backend/src/excel/export-stats-deploiement/worksheet-renderer/exportStatsGlobalesWorksheetRenderer.ts

@@ -35,6 +35,7 @@ function renderWorksheet({
   renderExportDate();
   renderUsagersCountByStatus();
   renderStructuresCountByRegion();
+  renderTotalActifs();
   renderStructuresCountByType();
   renderUsersDocsCount();
   renderInteractionsCountByType();
@@ -63,9 +64,21 @@ function renderWorksheet({
       value: stats.usagersCountByStatut.AYANTS_DROITS,
     });
   }
+  function renderTotalActifs() {
+    let i = 13;
+    worksheetRendered.renderCell(i++, "b", {
+      value: stats.usagersActifs.actifs,
+    });
+    worksheetRendered.renderCell(i++, "b", {
+      value: stats.usagersActifs.domicilies,
+    });
+    worksheetRendered.renderCell(i++, "b", {
+      value: stats.usagersActifs.ayantsDroits,
+    });
+  }
 
   function renderStructuresCountByType() {
-    let i = 13;
+    let i = 18;
     worksheetRendered.renderCell(i++, "b", {
       value: stats.structures.length,
     });
@@ -82,8 +95,9 @@ function renderWorksheet({
       value: stats.structuresCountByType["mairie"],
     });
   }
+
   function renderInteractionsCountByType() {
-    let i = 23;
+    let i = 28;
     worksheetRendered.renderCell(i++, "b", {
       value: stats.interactionsCountByStatut["appel" as InteractionType],
     });
@@ -127,10 +141,10 @@ function renderWorksheet({
   }
 
   function renderUsersDocsCount() {
-    worksheetRendered.renderCell(19, "b", {
+    worksheetRendered.renderCell(24, "b", {
       value: stats.usersCount,
     });
-    worksheetRendered.renderCell(20, "b", {
+    worksheetRendered.renderCell(25, "b", {
       value: stats.docsCount,
     });
   }

packages/backend/src/stats/services/publicStats.service.ts

@@ -71,7 +71,7 @@ export class PublicStatsService implements OnModuleInit {
         "courrierIn"
       ),
       usagers: await usagerRepository.countTotalUsagers(),
-      actifs: await usagerRepository.countTotalActifs(),
+      actifs: (await usagerRepository.countTotalActifs()).actifs,
     };
 
     await this.cacheManager.set("home-stats", homeStats);

packages/common/src/stats/interfaces/AdminStructureStatsData.interface.ts

@@ -0,0 +1,25 @@
+import { type InteractionType } from "../../interactions";
+
+export interface AdminStructureStatsData {
+  usersCount: number;
+  structuresCount: number;
+  usagersDocumentsCount: number;
+  usagersActifs: {
+    domicilies: number;
+    ayantsDroits: number;
+    actifs: number;
+  };
+  structuresCountByRegion: Array<{
+    region: string;
+    count: number;
+  }>;
+  structuresCountByTypeMap: Record<string, number>;
+  structuresCountBySmsEnabled: number;
+  interactionsCountByTypeMap: {
+    [statut in InteractionType]: number;
+  };
+  usagersCountByStatutMap: Record<string, number>;
+  usagersValidCountByStructureMap: Record<string, number>;
+  usagersAllCountByStructureMap: Record<string, number>;
+  usagersAyantsDroitsCountByStructureMap: Record<string, number>;
+}

packages/common/src/stats/interfaces/index.ts

@@ -1,2 +1,3 @@
 // @index('./*', f => `export * from '${f.path}'`)
+export * from "./AdminStructureStatsData.interface";
 export * from "./HomeStats.interface";

packages/frontend/src/app/modules/general/components/home/home.component.html

@@ -262,7 +262,7 @@ <h3 class="mt-3 mb-1 py-0 fw-bold text-primary">
             [options]="countOptions"
             class="display-4 fw-bold text-primary"
           ></div>
-          <div class="counter-title">domiciliés</div>
+          <div class="counter-title">dossiers enregistrés</div>
         </div>
         <div class="my-2 col-12 col-md-3">
           <div

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

@@ -88,7 +88,12 @@ export class ManageUsagersTableComponent implements OnDestroy {
   }
 
   public goToProfil(usager: UsagerFormModel): void {
-    this.router.navigate([getUrlUsagerProfil(usager)]);
+    const url =
+      this.me.role === "facteur"
+        ? `/profil/general/${usager.ref}`
+        : getUrlUsagerProfil(usager);
+
+    this.router.navigate([url]);
   }
 
   public refTrackBy(_index: number, item: UsagerFormModel) {

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

@@ -181,8 +181,7 @@
       </td>
       <td class="clickable table-name td-name">
         <a
-          [routerLink]="
-          usager.decision.statut === 'INSTRUCTION' || usager.decision.statut === 'ATTENTE_DECISION'
+          [routerLink]="(usager.decision.statut === 'INSTRUCTION' || usager.decision.statut === 'ATTENTE_DECISION') && me.role !== 'facteur'
            ? '/usager/'+usager.ref+'/edit/'+ETAPES_DEMANDE_URL[usager.etapeDemande]
            : '/profil/general/'+usager.ref"
           ariaCurrentWhenActive="page"

packages/frontend/src/app/modules/stats/components/elements/stats-charts/stats-charts.component.html

@@ -51,7 +51,7 @@
           <div class="stats-section-counter text-primary">
             {{ publicStats.usagersCount | formatBigNumber }}
           </div>
-          <div class="stats-section-label">domiciliés</div>
+          <div class="stats-section-label">dossiers enregistrés</div>
         </button>
       </div>
     </div>

packages/frontend/src/app/modules/usager-dossier/components/step-footer/step-footer.component.html

@@ -6,7 +6,7 @@ <h2 class="form-title">Commentaires privés</h2>
 </div>
 
 <app-delete-usager-menu
-  *ngIf="usager"
+  *ngIf="usager && me.role !== 'facteur'"
   class="my-4"
   [usager]="usager"
   [context]="'INSTRUCTION_FORM'"

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

@@ -1,11 +1,19 @@
 import { Component, Input } from "@angular/core";
 
 import { UsagerFormModel } from "./../../../usager-shared/interfaces/UsagerFormModel";
+import { UserStructure } from "../../../../../_common/model";
+import { AuthService } from "../../../shared/services";
 
 @Component({
   selector: "app-step-footer",
   templateUrl: "./step-footer.component.html",
 })
 export class StepFooterComponent {
   @Input() public usager!: UsagerFormModel;
+
+  public me!: UserStructure | null;
+
+  constructor(private readonly authService: AuthService) {
+    this.me = this.authService.currentUserValue;
+  }
 }

packages/frontend/src/app/modules/usager-profil/components/_historiques/profil-historique-decisions/profil-historique-decisions.component.html

@@ -55,7 +55,7 @@ <h3>Historique des décisions</h3>
         <td>{{ histo.userName }}</td>
         <td class="text-end d-print-none">
           <app-delete-usager-menu
-            *ngIf="i === 0"
+            *ngIf="i === 0 && me.role !== 'facteur'"
             [usager]="usager"
             context="HISTORY"
             [me]="me"

packages/frontend/src/app/modules/usager-profil/components/pages/profil-courriers/profil-courriers.component.html

@@ -39,7 +39,7 @@
     <app-delete-usager-menu
       [usager]="usager"
       context="PROFIL"
-      [me]="me"
+      *ngIf="me.role !== 'facteur'"
     ></app-delete-usager-menu>
   </div>
 </div>