feat(frontend): add referrer

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

@@ -1,13 +1,5 @@
 //@index('./*.ts', f => `export * from '${f.path}'`)
 export * from "./IsValidPasswordDecorator";
 export * from "./IsValidPhoneDecorator";
-export * from "./LowerCaseDecorator";
-export * from "./parse-hard-reset-token.pipe";
-export * from "./parse-token.pipe";
-export * from "./ParseRegion.pipe";
-export * from "./ParseString.pipe";
-export * from "./PhoneTransformDecorator";
-export * from "./StripTagsDecorator";
-export * from "./TrimDecorator";
-export * from "./TrimOrNullDecorator";
-export * from "./UpperCaseDecorator";
+export * from "./transformers";
+export * from "./parse-pipes";

packages/backend/src/_common/decorators/parse-pipes/index.ts

@@ -0,0 +1,5 @@
+//@index('./*.ts', f => `export * from '${f.path}'`)
+export * from "./parse-hard-reset-token.pipe";
+export * from "./parse-token.pipe";
+export * from "./ParseRegion.pipe";
+export * from "./ParseString.pipe";

packages/backend/src/_common/decorators/tests/parse-hard-reset-token-pipe.spec.ts

@@ -1,5 +1,5 @@
 import { BadRequestException } from "@nestjs/common";
-import { ParseHardResetTokenPipe } from "../parse-hard-reset-token.pipe";
+import { ParseHardResetTokenPipe } from "../parse-pipes/parse-hard-reset-token.pipe";
 
 describe("ParseHardResetTokenPipe", () => {
   let pipe: ParseHardResetTokenPipe;

packages/backend/src/_common/decorators/tests/parse-token-pipe.spec.ts

@@ -1,6 +1,6 @@
 import { BadRequestException } from "@nestjs/common";
 import { tokenGenerator } from "../../../util";
-import { ParseTokenPipe } from "../parse-token.pipe";
+import { ParseTokenPipe } from "../parse-pipes/parse-token.pipe";
 
 describe("ParseTokenPipe", () => {
   let pipe: ParseTokenPipe;

packages/backend/src/_common/decorators/transformers/index.ts

@@ -0,0 +1,7 @@
+//@index('./*.ts', f => `export * from '${f.path}'`)
+export * from "./LowerCaseDecorator";
+export * from "./PhoneTransformDecorator";
+export * from "./StripTagsDecorator";
+export * from "./TrimDecorator";
+export * from "./TrimOrNullDecorator";
+export * from "./UpperCaseDecorator";

packages/backend/src/_common/mocks/VERIFIED_USERS_STRUCTURE.const.ts

@@ -0,0 +1,22 @@
+import { UserStructureProfile } from "@domifa/common";
+
+export const VERIFIED_USERS_STRUCTURE: Pick<
+  UserStructureProfile,
+  "id" | "nom" | "prenom"
+>[] = [
+  {
+    id: 1,
+    nom: "Martin",
+    prenom: "Sophie",
+  },
+  {
+    id: 2,
+    nom: "Dubois",
+    prenom: "Pierre",
+  },
+  {
+    id: 3,
+    nom: "Laurent",
+    prenom: "Marie",
+  },
+];

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

@@ -1,4 +1,5 @@
 // @index('./*', f => `export * from '${f.path}'`)
+export * from "./POST_USER_STRUCTURE_BODY.mock";
 export * from "./STRUCTURE_MOCK.const";
 export * from "./usagers";
-export * from "./POST_USER_STRUCTURE_BODY.mock";
+export * from "./VERIFIED_USERS_STRUCTURE.const";

packages/backend/src/_common/mocks/usagers/POST_USAGER.mock.ts

@@ -28,6 +28,7 @@ export const POST_USAGER: {
     surnom: "Surnom ",
     villeNaissance: "Monaco",
     nationalite: null,
+    referrerId: null,
   },
   response: {
     nationalite: null,

packages/backend/src/_common/model/structure-doc/constants/CUSTOM_DOCS_LABELS.const.ts

@@ -40,6 +40,7 @@ export const CUSTOM_DOCS_LABELS: {
   USAGER_NATIONALITE: "Nationalité",
   USAGER_DATE_NAISSANCE: "Date naissance",
   USAGER_LIEU_NAISSANCE: "Lieu naissance",
+  REFERENT: "Référent.e dans la structure",
   AYANTS_DROITS_NOMBRE: "Nombre d'ayants-droit",
   AYANTS_DROITS_LISTE:
     "La liste des ayants droits avec nom prénom et date de naissance",

packages/backend/src/_common/model/structure-doc/types/StructureCustomDocKeys.type.ts

@@ -39,6 +39,7 @@ export type StructureCustomDocKeys =
   | "USAGER_NUMERO_DISTRIBUTION_SPECIALE"
   | "AYANTS_DROITS_LISTE"
   | "AYANTS_DROITS_NOMBRE"
+  | "REFERENT"
   // DECISION
   | "STATUT_DOM"
   | "TYPE_DOM"

packages/backend/src/_common/model/usager/UsagerLight.type.ts

@@ -26,6 +26,7 @@ export type UsagerLight = AppEntity &
     | "options"
     | "historique"
     | "ayantsDroits"
+    | "referrerId"
     | "villeNaissance"
     | "telephone"
     | "import"

packages/backend/src/_common/model/user-structure/UserStructurePublic.type.ts

@@ -1,4 +1,4 @@
-import { UserStructure } from "./UserStructure.type";
+import { UserStructure } from "@domifa/common";
 
 // UserStructure: attributs publics (retournés au frontend via UserStructureAuthenticated)
 export type UserStructurePublic = Pick<

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

@@ -1,8 +1,6 @@
 // @index('./*', f => `export * from '${f.path}'`)
 export * from "./_constants";
-export * from "./UserStructure.type";
 export * from "./UserStructureAuthenticated.type";
-export * from "./UserStructureProfile.type";
 export * from "./UserStructurePublic.type";
 export * from "./UserStructureSecurity.type";
 export * from "./UserStructureSecurityEvent.type";

packages/backend/src/_migrations/1736291936636-auto-migration.ts

@@ -0,0 +1,20 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { domifaConfig } from "../config";
+
+export class AutoMigration1736291936636 implements MigrationInterface {
+  name = "AutoMigration1736291936636";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    if (
+      domifaConfig().envId === "prod" ||
+      domifaConfig().envId === "preprod" ||
+      domifaConfig().envId === "local"
+    ) {
+      await queryRunner.query(`ALTER TABLE "usager" ADD "referrerId" integer`);
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE "usager" DROP COLUMN "referrerId"`);
+  }
+}

packages/backend/src/_migrations/_init-db/1603812391580-pr-env-create-database.ts

@@ -430,6 +430,7 @@ async function createTables(queryRunner: QueryRunner) {
       "numeroDistribution" text NULL,
       "pinnedNote" jsonb NULL,
       nationalite text NULL,
+      "referrerId" int4 NULL,
       statut text DEFAULT 'INSTRUCTION'::text NOT NULL,
       nom_prenom_surnom_ref varchar NOT NULL,
       CONSTRAINT "PK_1bb36e24229bec446a281573612" PRIMARY KEY (uuid),

packages/backend/src/app.bootstrap.ts

@@ -74,6 +74,10 @@ export async function bootstrapApplication(): Promise<{
         stopAtFirstError: true,
         enableDebugMessages: true,
         disableErrorMessages: domifaConfig().envId !== "local",
+        transform: true,
+        transformOptions: {
+          enableImplicitConversion: false,
+        },
       })
     );
 

packages/backend/src/auth/services/auth-checker.service.ts

@@ -1,11 +1,7 @@
 import { appLogger } from "../../util";
-import {
-  UserAuthenticated,
-  UserProfile,
-  UserStructure,
-} from "../../_common/model";
+import { UserAuthenticated, UserProfile } from "../../_common/model";
 import { DOMIFA_ADMIN_STRUCTURE_ID } from "./DOMIFA_ADMIN_STRUCTURE_ID.const";
-import { UserStructureRole } from "@domifa/common";
+import { UserStructure, UserStructureRole } from "@domifa/common";
 
 export const authChecker = {
   checkRole,

packages/backend/src/auth/services/structures-auth.service.ts

@@ -5,13 +5,12 @@ import { domifaConfig } from "../../config";
 import { userStructureRepository, structureRepository } from "../../database";
 import {
   CURRENT_JWT_PAYLOAD_VERSION,
-  UserStructure,
   UserStructureAuthenticated,
   UserStructureJwtPayload,
   UserStructurePublic,
 } from "../../_common/model";
 import { isDomifaAdmin } from "./auth-checker.service";
-import { StructureCommon } from "@domifa/common";
+import { UserStructure, StructureCommon } from "@domifa/common";
 
 export const APP_USER_PUBLIC_ATTRIBUTES: (keyof UserStructurePublic)[] = [
   "uuid",

packages/backend/src/database/entities/usager/UsagerTable.typeorm.ts

@@ -123,6 +123,9 @@ export class UsagerTable
   @Column({ type: "integer", default: 0 })
   public etapeDemande!: number;
 
+  @Column({ type: "integer", default: null, nullable: true })
+  public referrerId!: number;
+
   @Column({ type: "jsonb", nullable: true })
   public rdv!: UsagerRdv | null;
 

packages/backend/src/database/services/app-log/user-structure-security/userStructureSecurityPasswordChecker.service.ts

@@ -1,6 +1,6 @@
+import { UserStructure } from "@domifa/common";
+import { passwordGenerator } from "../../../../util";
 import { userStructureRepository } from "../../user-structure";
-import { passwordGenerator } from "../../../../util/encoding/passwordGenerator.service";
-import { UserStructure } from "../../../../_common/model";
 import { userStructureSecurityEventHistoryManager } from "./userStructureSecurityEventHistoryManager.service";
 import { userStructureSecurityRepository } from "./userStructureSecurityRepository.service";
 

packages/backend/src/database/services/app-log/user-structure-security/userStructureSecurityResetPasswordInitiator.service.ts

@@ -3,14 +3,14 @@ import { addDays } from "date-fns";
 import { domifaConfig } from "../../../../config";
 import { tokenGenerator } from "../../../../util";
 import {
-  UserStructureProfile,
   UserStructureSecurity,
   UserStructureTokens,
   UserStructureTokenType,
 } from "../../../../_common/model";
 import { userStructureRepository } from "../../user-structure";
 import { userStructureSecurityEventHistoryManager } from "./userStructureSecurityEventHistoryManager.service";
 import { userStructureSecurityRepository } from "./userStructureSecurityRepository.service";
+import { UserStructureProfile } from "@domifa/common";
 
 export const userStructureSecurityResetPasswordInitiator = {
   buildResetPasswordLink,

packages/backend/src/database/services/app-log/user-structure-security/userStructureSecurityResetPasswordUpdater.service.ts

@@ -1,11 +1,9 @@
 import { passwordGenerator } from "../../../../util/encoding/passwordGenerator.service";
-import {
-  UserStructureProfile,
-  UserStructureSecurity,
-} from "../../../../_common/model";
+import { UserStructureSecurity } from "../../../../_common/model";
 import { userStructureRepository } from "../../user-structure/userStructureRepository.service";
 import { userStructureSecurityEventHistoryManager } from "./userStructureSecurityEventHistoryManager.service";
 import { userStructureSecurityRepository } from "./userStructureSecurityRepository.service";
+import { UserStructureProfile } from "@domifa/common";
 
 export const userStructureSecurityResetPasswordUpdater = {
   checkResetPasswordToken,

packages/backend/src/database/services/usager/constants/USAGER_LIGHT_ATTRIBUTES.const.ts

@@ -23,6 +23,7 @@ export const USAGER_LIGHT_ATTRIBUTES: (keyof Usager)[] = [
   "lastInteraction",
   "options",
   "historique",
+  "referrerId",
   "ayantsDroits",
   //"villeNaissance",
   "telephone",

packages/backend/src/database/services/user-structure/userStructureRepository.service.ts

@@ -1,8 +1,11 @@
 import { In } from "typeorm";
-import { UserStructureProfile } from "../../../_common/model";
 import { UserStructureTable } from "../../entities";
 import { myDataSource } from "../_postgres";
-import { UserStructureRole, UserStructure } from "@domifa/common";
+import {
+  UserStructureRole,
+  UserStructure,
+  UserStructureProfile,
+} from "@domifa/common";
 
 export type AppUserForAdminEmail = Pick<
   UserStructure,
@@ -12,6 +15,29 @@ export type AppUserForAdminEmail = Pick<
 export const userStructureRepository = myDataSource
   .getRepository(UserStructureTable)
   .extend({
+    getVerifiedUsersByStructureId(
+      structureId: number
+    ): Promise<UserStructureProfile[]> {
+      return userStructureRepository.find({
+        where: {
+          structureId,
+        },
+        select: {
+          uuid: true,
+          id: true,
+          role: true,
+          nom: true,
+          prenom: true,
+          email: true,
+          createdAt: true,
+          lastLogin: true,
+          verified: true,
+        },
+        order: {
+          nom: "ASC",
+        },
+      });
+    },
     findVerifiedStructureUsersByRoles({
       structureId,
       roles,

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

@@ -23,10 +23,7 @@ import {
   usagerRepository,
 } from "../../database";
 import { ExpressResponse } from "../../util/express";
-import {
-  UserStructureAuthenticated,
-  UserStructureProfile,
-} from "../../_common/model";
+import { UserStructureAuthenticated } from "../../_common/model";
 import { RdvDto } from "../dto/decision-form/rdv.dto";
 import { UsagersService } from "../services/usagers.service";
 import { getUsagerNomComplet, Usager } from "@domifa/common";
@@ -39,18 +36,6 @@ import { usagerAppointmentCreatedEmailSender } from "../../modules/mails/service
 export class AgendaController {
   constructor(private readonly usagersService: UsagersService) {}
 
-  @Get("users")
-  @ApiOperation({ summary: "Liste des utilisateurs pour l'agenda" })
-  @AllowUserStructureRoles("simple", "responsable", "admin")
-  public getAllUsersForAgenda(
-    @CurrentUser() currentUser: UserStructureAuthenticated
-  ): Promise<UserStructureProfile[]> {
-    return userStructureRepository.findVerifiedStructureUsersByRoles({
-      structureId: currentUser.structureId,
-      roles: ["admin", "simple", "responsable"],
-    });
-  }
-
   @Get("")
   @ApiOperation({ summary: "Liste des rendez-vous à venir" })
   @AllowUserStructureRoles("simple", "responsable", "admin")

packages/backend/src/usagers/controllers/export-structure-usagers.controller.ts

@@ -28,6 +28,7 @@ import { AppLogsService } from "../../modules/app-logs/app-logs.service";
 import { domifaConfig } from "../../config";
 
 import { UsagersFilterCriteriaStatut } from "@domifa/common";
+import { userStructureRepository } from "../../database";
 
 let lastCpuUsage = process.cpuUsage();
 let lastTime = Date.now();
@@ -91,6 +92,9 @@ export class ExportStructureUsagersController {
 
       const workbook = XLSX.utils.book_new();
 
+      const users = await userStructureRepository.getVerifiedUsersByStructureId(
+        user.structureId
+      );
       const { firstSheetHeaders, secondSheetHeaders } =
         renderStructureUsagersHeaders(user.structure);
 
@@ -128,7 +132,7 @@ export class ExportStructureUsagersController {
         logProcessState(`Processing chunk (${currentRowUsagers}/${count})`);
 
         const { firstSheetUsagers, secondSheetEntretiens } =
-          renderStructureUsagersRows(chunk, user.structure);
+          renderStructureUsagersRows(chunk, user.structure, users);
 
         // Application du format des dates
         applyDateFormat(firstSheetUsagers, [