Hel 537/page admin

database/dataSource.ts

@@ -45,6 +45,7 @@ import { AjoutRefDepartementRegion1694523233904 } from "./migrations/16945232339
 import { AjoutRégionDansEntitéJuridique1694616724703 } from "./migrations/1694616724703-AjoutRégionDansEntitéJuridique";
 import { AjoutRégionDansEtablissementTerritorial1694617579347 } from "./migrations/1694617579347-AjoutRégionDansEtablissementTerritorial";
 import { AjoutProfilsDansUtilisateurs1696841163367 } from "./migrations/1696841163367-AjoutProfilsDansUtilisateurs";
+import { AjouterSoftDeleteUtilisateur1701782042926 } from "./migrations/1701782042926-AjouterSoftDeleteUtilisateur";
 import { ajoutTableProfil1795731844298 } from "./migrations/1795731844278-ajoutTableProfil";
 import { updateProfileTable1796422585498 } from "./migrations/1796422585498-updateProfileTable";
 import { ActivitéMédicoSocialModel } from "./models/ActivitéMédicoSocialModel";
@@ -78,7 +79,7 @@ dotEnvConfig();
 const environmentVariables = new NodeEnvironmentVariables(logger);
 
 // eslint-disable-next-line no-console
-console.log('environmentVariables.DATABASE_URL', environmentVariables.DATABASE_URL);
+console.log("environmentVariables.DATABASE_URL", environmentVariables.DATABASE_URL);
 
 export default new DataSource({
   entities: [
@@ -154,6 +155,7 @@ export default new DataSource({
     AjoutRégionDansEtablissementTerritorial1694617579347,
     ajoutTableProfil1795731844298,
     AjoutProfilsDansUtilisateurs1696841163367,
+    AjouterSoftDeleteUtilisateur1701782042926,
     updateProfileTable1796422585498,
   ],
   type: "postgres",

database/migrations/1701782042926-AjouterSoftDeleteUtilisateur.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AjouterSoftDeleteUtilisateur1701782042926 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+        ALTER TABLE utilisateur
+        ADD ut_date_soft_delete timestamp,
+        ADD ut_date_last_connection timestamp;
+        `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+    ALTER TABLE utilisateur
+    DROP COLUMN ut_date_soft_delete;
+    DROP COLUMN ut_date_last_connection;
+    `);
+  }
+}

database/migrations/1795731844278-ajoutTableProfil.ts

@@ -1,11 +1,11 @@
-import { MigrationInterface, QueryRunner } from "typeorm"
+import { MigrationInterface, QueryRunner } from "typeorm";
 
 import { DefaultProfile } from "../../src/frontend/configuration/DefaultProfile";
 
 export class ajoutTableProfil1795731844298 implements MigrationInterface {
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`
-            CREATE TABLE profil(
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+            CREATE TABLE public.profil(
                 profil_id bigserial NOT NULL,
                 profil_code uuid NOT NULL default gen_random_uuid(),
                 profil_label character varying(255) NOT NULL,
@@ -15,17 +15,16 @@ export class ajoutTableProfil1795731844298 implements MigrationInterface {
                 PRIMARY KEY (profil_id)
             );`);
 
-        await queryRunner.query(
-            `INSERT INTO profil(profil_label, profil_value, profil_date_creation) VALUES ($1, $2, $3)`,
-            ['Utilisateur lambda', DefaultProfile, new Date()]
-        );
+    await queryRunner.query(`INSERT INTO public.profil(profil_label, profil_value, profil_date_creation) VALUES ($1, $2, $3)`, [
+      "Utilisateur lambda",
+      DefaultProfile,
+      new Date(),
+    ]);
+  }
 
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`
-            DROP TABLE profil;
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+            DROP TABLE public.profil;
         `);
-    }
-
+  }
 }

database/models/ProfilModel.ts

@@ -1,27 +1,27 @@
 import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn } from "typeorm";
 
 export type ProfileValue = Readonly<{
-    institution: { profilEJ: object, profilETSanitaire: object, profilMédicoSocial: object };
-    autreRegion: { profilEJ: object, profilETSanitaire: object, profilMédicoSocial: object };
+  institution: { profilEJ: object; profilETSanitaire: object; profilMédicoSocial: object };
+  autreRegion: { profilEJ: object; profilETSanitaire: object; profilMédicoSocial: object };
 }>;
 
 @Entity({ name: "profil" })
 export class ProfilModel {
-    @PrimaryGeneratedColumn({ name: "profil_id" })
-    public id!: number;
+  @PrimaryGeneratedColumn({ name: "profil_id" })
+  public id!: number;
 
-    @Column({ name: "profil_code" })
-    public code!: string;
+  @Column({ name: "profil_code" })
+  public code!: string;
 
-    @Column({ name: "profil_label" })
-    public label!: string;
+  @Column({ name: "profil_label" })
+  public label!: string;
 
-    @Column({ name: "profil_value", type: 'jsonb', default: {} })
-    public value!: ProfileValue;
+  @Column({ name: "profil_value", type: "jsonb", default: {} })
+  public value!: ProfileValue;
 
-    @CreateDateColumn({ name: "profil_date_creation" })
-    public dateCreation!: Date;
+  @CreateDateColumn({ name: "profil_date_creation" })
+  public dateCreation!: Date;
 
-    @UpdateDateColumn({ name: "profil_date_modification" })
-    public dateModification!: Date;
+  @UpdateDateColumn({ name: "profil_date_modification" })
+  public dateModification!: Date;
 }

database/models/UtilisateurModel.ts

@@ -1,14 +1,4 @@
-import {
-  Entity,
-  PrimaryGeneratedColumn,
-  Column,
-  CreateDateColumn,
-  UpdateDateColumn,
-  ManyToOne,
-  JoinColumn,
-  BeforeInsert,
-  BeforeUpdate,
-} from "typeorm";
+import { Entity, PrimaryGeneratedColumn, Column, CreateDateColumn, UpdateDateColumn, ManyToOne, JoinColumn, BeforeInsert, BeforeUpdate } from "typeorm";
 
 import { InstitutionModel } from "./InstitutionModel";
 import { RoleModel } from "./RoleModel";
@@ -40,6 +30,9 @@ export class UtilisateurModel {
   @JoinColumn({ name: "ut_institution", referencedColumnName: "id" })
   public institution!: InstitutionModel;
 
+  @Column({ name: "ut_institution" })
+  public institutionId!: number;
+
   @Column({ name: "ut_actif", default: false })
   public actif!: boolean;
 
@@ -62,6 +55,12 @@ export class UtilisateurModel {
   @UpdateDateColumn({ name: "ut_date_modification" })
   public dateModification!: Date;
 
+  @Column({ type: "date", name: "ut_date_soft_delete", nullable: true })
+  public deletedDate!: Date | null;
+
+  @Column({ name: "ut_date_last_connection" })
+  public lastConnectionDate!: Date;
+
   @Column({ name: "ut_cree_par", nullable: true })
   public creePar!: number;
 

package.json

@@ -84,13 +84,16 @@
     "chart.js": "^3.8.0",
     "chartjs-plugin-datalabels": "^2.0.0",
     "crypto": "^1.0.1",
+    "date-fns": "^2.30.0",
     "dompurify": "^3.0.6",
     "dotenv-defaults": "^5.0.0",
     "husky": "^7.0.4",
     "joi": "^17.9.2",
     "jsonwebtoken": "^9.0.0",
     "next": "13",
     "next-auth": "^4.22.1",
+    "next-usequerystate": "^1.12.2",
+    "node-cache": "^5.1.2",
     "node-fetch": "2.6.7",
     "pg": "^8.7.3",
     "react": "18.0.0",
@@ -150,4 +153,4 @@
     "node": "16.16"
   },
   "packageManager": "yarn@3.2.4"
-}
+}

src/backend/infrastructure/controllers/checkUserIsNotAdminAndInactifEndpoints.ts

@@ -0,0 +1,13 @@
+import { LoginUseCase } from "../../métier/use-cases/LoginUseCase";
+import { Dependencies } from "../dependencies";
+
+export async function checkUserIsNotAdminAndInactifEndpoint(dependencies: Dependencies, email: string): Promise<boolean> {
+  try {
+    const loginUseCase = new LoginUseCase(dependencies.utilisateurLoader);
+
+    return await loginUseCase.checkUserIsNotAdminAndInactif(email);
+  } catch (error) {
+    dependencies.logger.error(error);
+    throw error;
+  }
+}

src/backend/infrastructure/controllers/deleteUserEndpoint.ts

@@ -0,0 +1,12 @@
+import { UtilisateursUseCase } from "../../métier/use-cases/UtilisateursUseCase";
+import { Dependencies } from "../dependencies";
+
+export async function deleteUserEndpoint(dependencies: Dependencies, userCode: string): Promise<string | void> {
+  try {
+    const UtilisateurUseCase = new UtilisateursUseCase(dependencies.utilisateurLoader);
+    return await UtilisateurUseCase.deleteUser(userCode);
+  } catch (error) {
+    dependencies.logger.error(error);
+    throw error;
+  }
+}

src/backend/infrastructure/controllers/getAllRolesEndpoint.ts

@@ -0,0 +1,13 @@
+import { RoleModel } from "../../../../database/models/RoleModel";
+import { RolesUseCase } from "../../métier/use-cases/RolesUseCase";
+import { Dependencies } from "../dependencies";
+
+export async function getAllRolesEndpoint(dependencies: Dependencies): Promise<RoleModel[]> {
+  try {
+    const RoleUseCase = new RolesUseCase(dependencies.roleLoader);
+    return await RoleUseCase.getAllRoles();
+  } catch (error) {
+    dependencies.logger.error(error);
+    throw error;
+  }
+}

src/backend/infrastructure/controllers/getInstitutionByCodeEndpoint.ts

@@ -0,0 +1,13 @@
+import { InstitutionModel } from "../../../../database/models/InstitutionModel";
+import { InstitutionsUseCase } from "../../métier/use-cases/InstitutionsUseCase";
+import { Dependencies } from "../dependencies";
+
+export async function getInstitutionByCodeEndpoint(dependencies: Dependencies, code: string): Promise<InstitutionModel | null> {
+  try {
+    const InstitutionUseCase = new InstitutionsUseCase(dependencies.institutionLoader);
+    return await InstitutionUseCase.getInstitutionByCode(code);
+  } catch (error) {
+    dependencies.logger.error(error);
+    throw error;
+  }
+}

src/backend/infrastructure/controllers/getUserByCodeEndpoint.ts

@@ -0,0 +1,13 @@
+import { UtilisateurModel } from "../../../../database/models/UtilisateurModel";
+import { UtilisateursUseCase } from "../../métier/use-cases/UtilisateursUseCase";
+import { Dependencies } from "../dependencies";
+
+export async function getUserByCodeEndpoint(dependencies: Dependencies, code: string): Promise<UtilisateurModel | null> {
+  try {
+    const UtilisateurUseCase = new UtilisateursUseCase(dependencies.utilisateurLoader);
+    return await UtilisateurUseCase.getUserByCode(code);
+  } catch (error) {
+    dependencies.logger.error(error);
+    throw error;
+  }
+}

src/backend/infrastructure/controllers/getUsersListPaginatedEndpoint.ts

@@ -0,0 +1,23 @@
+import { UtilisateursUseCase } from "../../métier/use-cases/UtilisateursUseCase";
+import { Dependencies } from "../dependencies";
+
+export async function getUsersListPaginatedEndpoint(
+  dependencies: Dependencies,
+  key: string,
+  pdescrtion: number,
+  institutionId: number,
+  roleId: number,
+  profilId: string,
+  etatId: string,
+  itemsPerPage: number,
+  orderBy: string,
+  sortDir: string
+): Promise<any> {
+  try {
+    const UtilisateurUseCase = new UtilisateursUseCase(dependencies.utilisateurLoader);
+    return await UtilisateurUseCase.getUsersListPaginated(key, pdescrtion, institutionId, roleId, profilId, etatId, itemsPerPage, orderBy, sortDir);
+  } catch (error) {
+    dependencies.logger.error(error);
+    throw error;
+  }
+}

src/backend/infrastructure/controllers/reactivateUserEndpoint.ts

@@ -0,0 +1,12 @@
+import { UtilisateursUseCase } from "../../métier/use-cases/UtilisateursUseCase";
+import { Dependencies } from "../dependencies";
+
+export async function reactivateUserEndpoint(dependencies: Dependencies, userCode: string): Promise<string | void> {
+  try {
+    const UtilisateurUseCase = new UtilisateursUseCase(dependencies.utilisateurLoader);
+    return await UtilisateurUseCase.reactivateUser(userCode);
+  } catch (error) {
+    dependencies.logger.error(error);
+    throw error;
+  }
+}

src/backend/infrastructure/controllers/updateLastConnectionDateEndpoints.ts

@@ -0,0 +1,13 @@
+import { LoginUseCase } from "../../métier/use-cases/LoginUseCase";
+import { Dependencies } from "../dependencies";
+
+export async function updateLastConnectionDateEndpoint(dependencies: Dependencies, email: string): Promise<boolean> {
+  try {
+    const loginUseCase = new LoginUseCase(dependencies.utilisateurLoader);
+
+    return await loginUseCase.updateLastConnectionDate(email);
+  } catch (error) {
+    dependencies.logger.error(error);
+    throw error;
+  }
+}

src/backend/infrastructure/controllers/updateUserEndpoint.ts

@@ -0,0 +1,20 @@
+import { UtilisateursUseCase } from "../../métier/use-cases/UtilisateursUseCase";
+import { Dependencies } from "../dependencies";
+
+export async function updateUserEndpoint(
+  dependencies: Dependencies,
+  userCode: string,
+  roleCode: string,
+  institutionCode: string,
+  profilsCode: string[],
+  firstname: string,
+  lastname: string
+): Promise<void> {
+  try {
+    const UtilisateurUseCase = new UtilisateursUseCase(dependencies.utilisateurLoader);
+    return await UtilisateurUseCase.updateUser(userCode, roleCode, institutionCode, profilsCode, firstname, lastname);
+  } catch (error) {
+    dependencies.logger.error(error);
+    throw error;
+  }
+}

src/backend/infrastructure/dependencies.ts

@@ -17,10 +17,12 @@ import { TypeOrmEntitéJuridiqueLoader } from "./gateways/entité-juridique-load
 import { NodeEnvironmentVariables } from "./gateways/environnement-variables/NodeEnvironmentVariables";
 import { TypeOrmFavorisLoader } from "./gateways/favoris-loader/TypeOrmFavorisLoader";
 import { TypeOrmForgetPasswordLoader } from "./gateways/forget-password-loader/TypeOrmForgetPasswordLoader";
+import { TypeOrmInstitutionLoader } from "./gateways/institution-loader/TypeOrmInstitutionLoader";
 import { ConsoleLogger } from "./gateways/logger/ConsoleLogger";
 import { typeOrmOrm } from "./gateways/orm/typeOrmOrm";
 import { TypeOrmProfileLoader } from "./gateways/profile-loader/TypeOrmProfileLoader";
 import { TypeOrmRechercheLoader } from "./gateways/recherche-loader/TypeOrmRechercheLoader";
+import { TypeOrmRoleLoader } from "./gateways/role-loader/TypeOrmRoleLoader";
 import { TypeOrmSearchHistoryLoader } from "./gateways/search-history-loader/TypeOrmSearchHistoryLoader";
 import { TypeOrmUtilisateurLoader } from "./gateways/utilisateur-loader/TypeOrmUtilisateurLoader";
 import { TypeOrmÉtablissementTerritorialMédicoSocialLoader } from "./gateways/établissement-territorial-loader/TypeOrmÉtablissementTerritorialMédicoSocialLoader";
@@ -40,7 +42,9 @@ export type Dependencies = Readonly<{
   changePasswordLoader: ChangePasswordLoader;
   forgetPasswordLoader: TypeOrmForgetPasswordLoader;
   searchHistoryLoader: SearchHistoryLoader;
-  profileLoader: TypeOrmProfileLoader
+  profileLoader: TypeOrmProfileLoader;
+  roleLoader: TypeOrmRoleLoader;
+  institutionLoader: TypeOrmInstitutionLoader;
 }>;
 
 const createDependencies = (): Dependencies => {
@@ -68,7 +72,9 @@ const createDependencies = (): Dependencies => {
     changePasswordLoader: new TypeOrmChangePasswordLoader(orm),
     forgetPasswordLoader: new TypeOrmForgetPasswordLoader(orm),
     searchHistoryLoader: new TypeOrmSearchHistoryLoader(orm),
-    profileLoader: new TypeOrmProfileLoader(orm)
+    profileLoader: new TypeOrmProfileLoader(orm),
+    roleLoader: new TypeOrmRoleLoader(orm),
+    institutionLoader: new TypeOrmInstitutionLoader(orm),
   };
 };