chore(api): utilisation des enums

hbalty · hbalty · commit ad1b5c5b4d59 · 2025-07-08T10:31:33.000+02:00
diff --git a/_scripts/db/dumps/domifa_test.postgres.custom.gz b/_scripts/db/dumps/domifa_test.postgres.custom.gz
diff --git a/packages/backend/src/_common/mocks/POST_USER_STRUCTURE_BODY.mock.ts b/packages/backend/src/_common/mocks/POST_USER_STRUCTURE_BODY.mock.ts
@@ -2,6 +2,7 @@ import {
   UserStructureRole,
   StructureType,
   UserStructure,
+  UserFonction,
 } from "@domifa/common";
 
 export const POST_USER_STRUCTURE_BODY: Partial<UserStructure> = {
@@ -11,7 +12,7 @@ export const POST_USER_STRUCTURE_BODY: Partial<UserStructure> = {
   nom: "TEST",
   prenom: "TEST",
   role: "admin" as UserStructureRole,
-  fonction: "Président",
+  fonction: UserFonction.PRESIDENT,
   fonctionDetail: null,
   structure: {
     id: 100,
diff --git a/packages/backend/src/_common/mocks/STRUCTURE_MOCK.const.ts b/packages/backend/src/_common/mocks/STRUCTURE_MOCK.const.ts
@@ -24,7 +24,6 @@ export const STRUCTURE_MOCK: StructureCommon = {
     nom: "Jean",
     prenom: "Thomson",
     fonction: "PDG",
-    fonctionDetail: null,
   },
   structureType: "ccas",
   ville: "Asnieres-sur-seine",
diff --git a/packages/backend/src/_common/model/jwt/user-structure-jwt-payload.interface.ts b/packages/backend/src/_common/model/jwt/user-structure-jwt-payload.interface.ts
@@ -1,4 +1,4 @@
-import { UserStructureRole } from "@domifa/common";
+import { UserFonction, UserStructureRole } from "@domifa/common";
 import { UseBaseJwtPayload } from "./user-base-jwt-payload.type";
 
 export type UserStructureJwtPayload = UseBaseJwtPayload<"structure"> & {
@@ -7,7 +7,7 @@ export type UserStructureJwtPayload = UseBaseJwtPayload<"structure"> & {
   nom: string;
   prenom: string;
   role: UserStructureRole;
-  fonction: string;
+  fonction: UserFonction;
   fonctionDetail: string;
   lastLogin: Date;
   acceptTerms: Date | null;
diff --git a/packages/backend/src/_migrations/1751927912971-manual-migration.ts b/packages/backend/src/_migrations/1751927912971-manual-migration.ts
@@ -0,0 +1,113 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { domifaConfig } from "../config";
+import { matchFonctionUtilisateur } from "@domifa/common/src/structure/functions/matchFonctionUtilisateur";
+import { UserFonction } from "@domifa/common";
+
+export class ManualMigration1751927912971 implements MigrationInterface {
+  name = "ManualMigration1751927912971";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    if (
+      domifaConfig().envId === "prod" ||
+      domifaConfig().envId === "preprod" ||
+      domifaConfig().envId === "local"
+    ) {
+      console.log(
+        "Starting migration to standardize user_structure fonction values..."
+      );
+
+      // Get all user_structure records with their current fonction values
+      const users = await queryRunner.query(`
+                SELECT id, fonction 
+                FROM user_structure 
+                WHERE fonction IS NOT NULL
+            `);
+
+      console.log(
+        `Found ${users.length} user records with fonction values to process`
+      );
+
+      let updatedCount = 0;
+      let unchangedCount = 0;
+      let nullifiedCount = 0;
+
+      // Process each user record
+      for (const user of users) {
+        const currentFonction = user.fonction;
+        const matchedFonction = matchFonctionUtilisateur(currentFonction);
+
+        // Determine the new fonction value
+        let newFonction: string;
+        if (matchedFonction === null) {
+          // If no match found, set to AUTRE
+          newFonction = UserFonction.AUTRE;
+          nullifiedCount++;
+        } else {
+          newFonction = matchedFonction;
+        }
+
+        // Only update if the value has changed
+        if (newFonction !== currentFonction) {
+          await queryRunner.query(
+            `
+                        UPDATE user_structure 
+                        SET fonction = $1 
+                        WHERE id = $2
+                    `,
+            [newFonction, user.id]
+          );
+
+          console.log(
+            `Updated user ${user.id}: "${currentFonction}" -> "${newFonction}"`
+          );
+          updatedCount++;
+        } else {
+          unchangedCount++;
+        }
+      }
+
+      // Handle users with null fonction values
+      const nullFonctionUsers = await queryRunner.query(`
+                SELECT id 
+                FROM user_structure 
+                WHERE fonction IS NULL
+            `);
+
+      if (nullFonctionUsers.length > 0) {
+        await queryRunner.query(
+          `
+                    UPDATE user_structure 
+                    SET fonction = $1 
+                    WHERE fonction IS NULL
+                `,
+          [UserFonction.AUTRE]
+        );
+
+        console.log(
+          `Set ${nullFonctionUsers.length} null fonction values to AUTRE`
+        );
+        updatedCount += nullFonctionUsers.length;
+      }
+
+      console.log(`Migration completed:`);
+      console.log(`- Updated records: ${updatedCount}`);
+      console.log(`- Unchanged records: ${unchangedCount}`);
+      console.log(`- Records set to AUTRE (no match): ${nullifiedCount}`);
+    }
+  }
+
+  public async down(): Promise<void> {
+    if (
+      domifaConfig().envId === "prod" ||
+      domifaConfig().envId === "preprod" ||
+      domifaConfig().envId === "local"
+    ) {
+      console.log(
+        "WARNING: This migration cannot be fully reversed as the original non-standardized values were not preserved."
+      );
+      console.log(
+        "The down migration will not perform any changes to maintain data integrity."
+      );
+    }
+  }
+}
diff --git a/packages/backend/src/auth/guards/AppUserGuard.guard.ts b/packages/backend/src/auth/guards/AppUserGuard.guard.ts
@@ -1,4 +1,8 @@
-import { UserStructureRole, UserSupervisorRole } from "@domifa/common";
+import {
+  UserFonction,
+  UserStructureRole,
+  UserSupervisorRole,
+} from "@domifa/common";
 import { CanActivate, ExecutionContext, Injectable } from "@nestjs/common";
 import { Reflector } from "@nestjs/core";
 import { getCurrentScope } from "@sentry/node";
@@ -35,7 +39,7 @@ export class AppUserGuard implements CanActivate {
       structureId?: number | null;
       role?: UserSupervisorRole | UserStructureRole;
       email?: string | null;
-      fonction?: string | null;
+      fonction?: UserFonction | null;
       fonctionDetail?: string | null;
     } = {
       id: user._userId,
diff --git a/packages/backend/src/database/entities/user-structure/UserStructureTable.typeorm.ts b/packages/backend/src/database/entities/user-structure/UserStructureTable.typeorm.ts
@@ -12,6 +12,7 @@ import {
   UserStructureRole,
   UserStructureMails,
   UserStructure,
+  UserFonction,
 } from "@domifa/common";
 
 // https://typeorm.io/#/entities/column-types-for-postgres
@@ -25,7 +26,7 @@ export class UserStructureTable
   email: string;
 
   @Column({ type: "text", nullable: true })
-  fonction: string;
+  fonction: UserFonction;
 
   @Column({ type: "text", nullable: true })
   fonctionDetail: string;
diff --git a/packages/backend/src/database/entities/user-supervisor/UserSupervisorTable.typeorm.ts b/packages/backend/src/database/entities/user-supervisor/UserSupervisorTable.typeorm.ts
@@ -1,6 +1,10 @@
 import { Column, Entity, Generated, Index } from "typeorm";
 import { AppTypeormTable } from "../_core/AppTypeormTable.typeorm";
-import { UserSupervisor, UserSupervisorRole } from "@domifa/common";
+import {
+  UserFonction,
+  UserSupervisor,
+  UserSupervisorRole,
+} from "@domifa/common";
 
 // https://typeorm.io/#/entities/column-types-for-postgres
 @Entity({ name: "user_supervisor" })
@@ -13,7 +17,7 @@ export class UserSupervisorTable
   email: string;
 
   @Column({ type: "text", nullable: true })
-  fonction: string;
+  fonction: UserFonction;
 
   @Index()
   @Column({ type: "integer", unique: true })
diff --git a/packages/backend/src/modules/structures/controllers/structures.public.controller.ts b/packages/backend/src/modules/structures/controllers/structures.public.controller.ts
@@ -26,7 +26,6 @@ export class StructuresPublicController {
       );
       return res.status(HttpStatus.OK).json("OK");
     } catch (e) {
-      console.log(e);
       return res.status(HttpStatus.BAD_REQUEST).json("CREATE_STRUCTURE_FAIL");
     }
   }
diff --git a/packages/backend/src/modules/structures/structures.creation-full.spec.ts b/packages/backend/src/modules/structures/structures.creation-full.spec.ts
@@ -19,6 +19,7 @@ import { structureDeletorService } from "./services/structure-deletor.service";
 import { StructuresModule } from "./structure.module";
 import { PortailAdminModule } from "../portail-admin";
 import { MailsModule } from "../mails/mails.module";
+import { UserFonction } from "@domifa/common";
 const structureDto: StructureDto = {
   adresse: "1 rue de Pessac",
   adresseCourrier: {
@@ -137,7 +138,7 @@ describe("Stuctures creation full", () => {
       password: "Y67xc6D7XBibZ6r",
       prenom: "Ben",
       structure: undefined,
-      fonction: "Autre",
+      fonction: UserFonction.PRESIDENT,
       fonctionDetail: "Président",
     };
     const structureWithUser: StructureWithUserDto = {
diff --git a/packages/backend/src/modules/users/dto/user-edit.dto.ts b/packages/backend/src/modules/users/dto/user-edit.dto.ts
@@ -1,6 +1,7 @@
 import {
   USER_FONCTION_LABELS,
   USER_FONCTION_LABELS_LIST,
+  UserFonction,
 } from "@domifa/common";
 import { ApiProperty } from "@nestjs/swagger";
 import { Transform, TransformFnParams } from "class-transformer";
@@ -49,7 +50,7 @@ export class UserEditDto {
   @MaxLength(100)
   @IsIn(USER_FONCTION_LABELS_LIST)
   @IsString()
-  public readonly fonction!: string;
+  public readonly fonction!: UserFonction;
 
   @ApiProperty({
     type: String,
diff --git a/packages/backend/src/modules/users/dto/user.dto.ts b/packages/backend/src/modules/users/dto/user.dto.ts
@@ -14,6 +14,7 @@ import {
   StructureCommon,
   USER_FONCTION_LABELS,
   USER_FONCTION_LABELS_LIST,
+  UserFonction,
 } from "@domifa/common";
 
 export class UserDto {
@@ -37,7 +38,7 @@ export class UserDto {
   @MaxLength(100)
   @IsIn(USER_FONCTION_LABELS_LIST)
   @IsString()
-  public readonly fonction!: string;
+  public readonly fonction!: UserFonction;
 
   @MinLength(2)
   @MaxLength(255)
diff --git a/packages/backend/src/modules/users/services/tests/user-structure-creator.service.spec.ts b/packages/backend/src/modules/users/services/tests/user-structure-creator.service.spec.ts
@@ -1,4 +1,4 @@
-import { UserStructureRole } from "@domifa/common";
+import { UserFonction, UserStructureRole } from "@domifa/common";
 import { userStructureSecurityRepository } from "../../../../database";
 import { passwordGenerator } from "../../../../util/encoding/passwordGenerator.service";
 import { AppTestHelper } from "../../../../util/test";
@@ -25,6 +25,8 @@ describe("userStructureCreator", () => {
       prenom: "Tom",
       password,
       structureId,
+      fonction: UserFonction.PRESIDENT,
+      fonctionDetail: null,
     };
     const { user, userSecurity } =
       await userStructureCreator.createUserWithPassword(userAttributes, {
@@ -61,6 +63,8 @@ describe("userStructureCreator", () => {
       prenom: "Tom",
       role,
       structureId,
+      fonction: UserFonction.PRESIDENT,
+      fonctionDetail: null,
     };
     const { user, userSecurity } =
       await userStructureCreator.createUserWithTmpToken(userAttributes);
diff --git a/packages/common/src/structure/functions/matchFonctionUtilisateur.ts b/packages/common/src/structure/functions/matchFonctionUtilisateur.ts
@@ -1,8 +1,9 @@
 import { normalizeString } from "../../search";
+import { UserFonction } from "../../users";
 import { NORMALIZED_USER_FONCTIONS } from "../../users/user-structure/constants";
 
-export function matchFonctionUtilisateur(input: string): string | null {
-  if (!input) return "Autre";
+export function matchFonctionUtilisateur(input: string): UserFonction | null {
+  if (!input) return UserFonction.AUTRE;
 
   const normalizedInput = normalizeString(input);
 
@@ -12,10 +13,7 @@ export function matchFonctionUtilisateur(input: string): string | null {
     }
 
     for (const synonym of fonction.normalizedSynonyms) {
-      if (
-        normalizedInput.includes(synonym) ||
-        synonym.includes(normalizedInput)
-      ) {
+      if (normalizedInput.includes(synonym)) {
         return fonction.canonicalName;
       }
     }
diff --git a/packages/common/src/structure/functions/tests/matchFonctionUtilisateur.spec.ts b/packages/common/src/structure/functions/tests/matchFonctionUtilisateur.spec.ts
diff --git a/packages/common/src/users/user-structure/constants/USER_FONCTIONS.const.ts b/packages/common/src/users/user-structure/constants/USER_FONCTIONS.const.ts
diff --git a/packages/common/src/users/user-structure/constants/USER_FONCTION_LABELS.const.ts b/packages/common/src/users/user-structure/constants/USER_FONCTION_LABELS.const.ts
diff --git a/packages/common/src/users/user-structure/interfaces/UserFonctionMapping.interface.ts b/packages/common/src/users/user-structure/interfaces/UserFonctionMapping.interface.ts
diff --git a/packages/common/src/users/user-structure/types/UserFonction.enum.ts b/packages/common/src/users/user-structure/types/UserFonction.enum.ts

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ export class StructuresPublicController {`
`26`	`26`	`);`
`27`	`27`	`return res.status(HttpStatus.OK).json("OK");`
`28`	`28`	`} catch (e) {`
`29`		`- console.log(e);`
`30`	`29`	`return res.status(HttpStatus.BAD_REQUEST).json("CREATE_STRUCTURE_FAIL");`
`31`	`30`	`}`
`32`	`31`	`}`