fix(stats): delete deprecated functions

SocialGouv · Feb 18, 2024 · 4ed769f · 4ed769f
1 parent ec798d3
commit 4ed769f
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 368 deletions.
diff --git a/packages/backend/src/_common/model/usager/history/UsagerHistoryStates.interface.ts b/packages/backend/src/_common/model/usager/history/UsagerHistoryStates.interface.ts
@@ -6,14 +6,14 @@ import {
   UsagerRdv,
   UsagerTypeDom,
 } from "@domifa/common";
-import { UsagerHistoryImport } from "./UsagerHistoryImport.type";
+
 import { UsagerHistoryStateCreationEvent } from "./UsagerHistoryStateCreationEvent.type";
 
 export interface UsagerHistoryStates extends AppEntity {
   usagerUUID: string; // unique
   usagerRef: number; // unique par structure
   structureId: number;
-  import?: UsagerHistoryImport;
+
   migrated: boolean;
   etapeDemande: number;
   typeDom: UsagerTypeDom;

diff --git a/packages/backend/src/_migrations/1706184265892-copy-history-states-migration.ts b/packages/backend/src/_migrations/1706184265892-copy-history-states-migration.ts
@@ -35,7 +35,7 @@ export class MigrateStatsMigration1706184265892 implements MigrationInterface {
 
         for (const history of histories) {
           const historiesToPush = [];
-          let lastHistory;
+
           for (const state of history.states) {
             if (!state?.createdAt || !state?.historyBeginDate) {
               console.log({
@@ -75,20 +75,9 @@ export class MigrateStatsMigration1706184265892 implements MigrationInterface {
               historyEndDate: state.historyEndDate,
               isActive: state.isActive,
             };
-
-            if (
-              JSON.stringify(newHistory) !== JSON.stringify(lastHistory) ||
-              !lastHistory
-            ) {
-              lastHistory = newHistory;
-              newHistory.createdAt = state?.createdAt ?? state.historyBeginDate;
-              historiesToPush.push(new UsagerHistoryStatesTable(newHistory));
-            } else {
-              console.table({ newHistory, lastHistory });
-              throw new Error("");
-            }
+            newHistory.createdAt = state?.createdAt ?? state.historyBeginDate;
+            historiesToPush.push(new UsagerHistoryStatesTable(newHistory));
           }
-
           await usagerHistoryStatesRepository.save(historiesToPush);
         }
 

diff --git a/packages/backend/src/usagers/controllers/import/step3-create/usagersImportCreator.service.ts b/packages/backend/src/usagers/controllers/import/step3-create/usagersImportCreator.service.ts
@@ -1,3 +1,4 @@
+import { usagerHistoryStatesRepository } from "./../../../../database/services/usager/usagerHistoryStatesRepository.service";
 import { ImportProcessTracker } from "../ImportProcessTracker.type";
 import { UsagersImportUsager } from "../step2-validate-row";
 import { usagersImportBuilder } from "./usagersImportBuilder.service";
@@ -6,11 +7,10 @@ import {
   UsagerTable,
   usagerRepository,
   usagerEntretienRepository,
-  usagerHistoryRepository,
   UsagerEntretienTable,
 } from "../../../../database";
 import { UserStructure } from "../../../../_common/model";
-import { usagersCreator, usagerHistoryStateManager } from "../../../services";
+import { usagersCreator } from "../../../services";
 import { UsagerHistoryStateService } from "../../../services/usagerHistoryState.service";
 import { Injectable } from "@nestjs/common";
 
@@ -60,7 +60,6 @@ export class ImportCreatorService {
 
     for (let i = 0; i < usagersToPersist.length; i += 1000) {
       const nextUsagersToCreate = usagersToPersist.slice(i, i + 1000);
-
       const nextEntretienToSave = nextUsagersToCreate.map((usager) => {
         return new UsagerEntretienTable({
           ...usager.entretien,
@@ -69,34 +68,22 @@ export class ImportCreatorService {
           structureId: usager.structureId,
         });
       });
+      await usagerRepository.save(nextUsagersToCreate);
+      await usagerEntretienRepository.save(nextEntretienToSave);
 
-      for await (const usager of nextUsagersToCreate) {
-        await this.usagerHistoryStateService.buildState({
+      const historiesToSave = nextUsagersToCreate.map((usager) => {
+        return this.usagerHistoryStateService.createState({
           usager,
           createdAt: usager.decision.dateDecision,
           createdEvent: "new-decision",
           historyBeginDate: usager.decision.dateDebut,
+          isActive: usager.decision.statut === "VALIDE",
         });
-      }
-
-      // @deprecated
-      const nextUsagersHistoryToCreate = nextUsagersToCreate.map((usager) =>
-        usagerHistoryStateManager.buildInitialHistoryState({
-          isImport: true,
-          usager,
-          createdAt: usager.decision.dateDecision,
-          createdEvent: "new-decision",
-          historyBeginDate: usager.decision.dateDebut,
-        })
-      );
-
-      await usagerRepository.save(nextUsagersToCreate);
-
-      await usagerEntretienRepository.save(nextEntretienToSave);
+      });
 
-      // @deprecated
-      await usagerHistoryRepository.save(nextUsagersHistoryToCreate);
+      await usagerHistoryStatesRepository.save(historiesToSave);
     }
+
     processTracker.persist.end = new Date();
     processTracker.persist.duration =
       (processTracker.persist.end.getTime() -

diff --git a/packages/backend/src/usagers/controllers/usagers-decision.controller.ts b/packages/backend/src/usagers/controllers/usagers-decision.controller.ts
@@ -22,7 +22,7 @@ import {
   UserStructureAuthenticated,
 } from "../../_common/model";
 import { CheckDuplicateUsagerRefDto, DecisionDto } from "../dto";
-import { UsagersService, usagerHistoryStateManager } from "../services";
+import { UsagersService } from "../services";
 import {
   AllowUserStructureRoles,
   CurrentUser,
@@ -130,13 +130,6 @@ export class UsagersDecisionController {
 
     await this.usagerHistoryStateService.deleteHistoryState(usager);
 
-    // Delete last decision
-    // @deprecated
-    await usagerHistoryStateManager.removeLastDecisionFromHistory({
-      usager,
-      removedDecisionUUID: usager.decision.uuid,
-    });
-
     usager.etapeDemande =
       usager.decision.statut === "INSTRUCTION"
         ? ETAPE_ETAT_CIVIL

diff --git a/packages/backend/src/usagers/controllers/usagers.controller.ts b/packages/backend/src/usagers/controllers/usagers.controller.ts
@@ -49,11 +49,7 @@ import {
   UpdatePortailUsagerOptionsDto,
 } from "../dto";
 import { SearchUsagerDto } from "../dto/search-usager.dto";
-import {
-  deleteUsagerFolder,
-  usagerHistoryStateManager,
-  UsagersService,
-} from "../services";
+import { deleteUsagerFolder, UsagersService } from "../services";
 import { AppLogsService } from "../../modules/app-logs/app-logs.service";
 import { generateCerfaData } from "../services/cerfa";
 
@@ -201,12 +197,6 @@ export class UsagersController {
       historyBeginDate,
     });
 
-    // @deprecated
-    await usagerHistoryStateManager.updateHistoryStateWithoutDecision({
-      usager: currentUsager,
-      createdEvent: "update-usager",
-    });
-
     return currentUsager;
   }
 
@@ -262,12 +252,6 @@ export class UsagersController {
       historyBeginDate,
     });
 
-    // @deprecated
-    await usagerHistoryStateManager.updateHistoryStateWithoutDecision({
-      usager,
-      createdEvent: "update-entretien",
-    });
-
     return usager;
   }
 

diff --git a/packages/backend/src/usagers/services/index.ts b/packages/backend/src/usagers/services/index.ts
@@ -1,7 +1,6 @@
 // @index('./*service.ts', f => `export * from '${f.path}'`)
 export * from "./dataCleanerForStats.service";
 export * from "./deleteUsagerFolder.service";
-export * from "./usagerHistoryStateManager.service";
 export * from "./usagerOptionsHistory.service";
 export * from "./usagers.service";
 export * from "./usagersCreator.service";

diff --git a/packages/backend/src/usagers/services/usagerHistoryState.service.ts b/packages/backend/src/usagers/services/usagerHistoryState.service.ts
@@ -8,18 +8,21 @@ import {
   getAyantsDroitForStats,
 } from "./dataCleanerForStats.service";
 import { UsagerHistoryStatesTable } from "../../database/entities/usager/UsagerHistoryStatesTable.typeorm";
-import { getHistoryBeginDate } from ".";
+
 import { usagerHistoryStatesRepository } from "../../database";
 import { IsNull } from "typeorm";
+import { getHistoryBeginDate } from "./usagerHistoryStateManager.service";
 
 @Injectable()
 export class UsagerHistoryStateService {
-  async deleteHistoryState(usager: Pick<Usager, "uuid">): Promise<void> {
-    // Delete last entry
-    await usagerHistoryStatesRepository.delete({
-      usagerUUID: usager.uuid,
-      historyEndDate: IsNull(),
-    });
+  async deleteHistoryState(
+    usager: Pick<Usager, "uuid" | "decision">
+  ): Promise<void> {
+    await usagerHistoryStatesRepository
+      .createQueryBuilder()
+      .delete()
+      .where(`decision->>'uuid' = $1`, [usager.decision.uuid])
+      .execute();
 
     // Get last entry
     const previousState = await this.getLastHistoryState(usager);
@@ -45,9 +48,10 @@ export class UsagerHistoryStateService {
     createdEvent: UsagerHistoryStateCreationEvent;
     historyBeginDate: Date;
   }): Promise<UsagerHistoryStates> {
-    const previousState = await this.getLastHistoryState(usager);
     let isActive = usager.decision.statut === "VALIDE";
 
+    const previousState = await this.getLastHistoryState(usager);
+
     if (previousState) {
       // Update last decision
       await usagerHistoryStatesRepository.update(
@@ -67,6 +71,33 @@ export class UsagerHistoryStateService {
           isActive);
     }
 
+    const state = this.createState({
+      usager,
+      createdAt,
+      createdEvent,
+      historyBeginDate,
+      isActive,
+    });
+
+    // Update previous states
+    await usagerHistoryStatesRepository.save(state);
+
+    return state;
+  }
+
+  public createState({
+    usager,
+    createdAt,
+    createdEvent,
+    historyBeginDate,
+    isActive,
+  }: {
+    usager: Usager;
+    createdAt: Date;
+    createdEvent: UsagerHistoryStateCreationEvent;
+    historyBeginDate: Date;
+    isActive: boolean;
+  }): UsagerHistoryStates {
     const decision: Partial<UsagerDecision> = getDecisionForStats(
       usager.decision
     );
@@ -83,7 +114,7 @@ export class UsagerHistoryStateService {
       typeDom = "PREMIERE_DOM";
     }
 
-    const state: UsagerHistoryStates = new UsagerHistoryStatesTable({
+    return new UsagerHistoryStatesTable({
       usagerRef: usager.ref,
       usagerUUID: usager.uuid,
       structureId: usager.structureId,
@@ -100,11 +131,6 @@ export class UsagerHistoryStateService {
       rdv: { dateRdv: usager?.rdv?.dateRdv },
       migrated: false,
     });
-
-    // Update previous states
-    await usagerHistoryStatesRepository.save(state);
-
-    return state;
   }
 
   private async getLastHistoryState(usager: Pick<Usager, "uuid">) {