refactor(common): merge common types & interfaces

Author: pYassine

packages/backend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@domifa/backend",
   "private": true,
-  "version": "2.140.5",
+  "version": "2.141.0",
   "description": "",
   "author": "",
   "license": "MIT",

packages/backend/src/_common/model/_core/ApiMessage.type.ts

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

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

@@ -2,12 +2,11 @@ import { Telephone } from "./../telephone/Telephone.type";
 import {
   UsagerAyantDroit,
   UsagerDecision,
-  UsagerLastInteractions,
   UsagerOptions,
   UsagerTypeDom,
 } from "..";
 import { AppEntity } from "../_core";
-import { UsagerRdv, UsagerSexe } from "@domifa/common";
+import { UsagerRdv, UsagerSexe, UsagerLastInteraction } from "@domifa/common";
 
 export type PortailUsagerPublic = AppEntity & {
   customRef: string; // valeur par défaut: 'ref'
@@ -45,7 +44,7 @@ export type PortailUsagerPublic = AppEntity & {
   historique: UsagerDecision[];
 
   // INTERACTIONS
-  lastInteraction: UsagerLastInteractions;
+  lastInteraction: UsagerLastInteraction;
 
   options: UsagerOptions;
 };

packages/backend/src/_common/model/_portail-usager/PortailUsagerPublic.type.ts

@@ -2,13 +2,17 @@ import { AppEntity } from "../_core/AppEntity.type";
 import { UsagerAyantDroit } from "./UsagerAyantDroit.type";
 import { UsagerDecision } from "./UsagerDecision.type";
 import { UsagerImport } from "./UsagerImport.type";
-import { UsagerLastInteractions } from "./UsagerLastInteractions.type";
 import { UsagerNote } from "./UsagerNote.type";
 import { UsagerOptions } from "./options/UsagerOptions.type";
 
 import { UsagerTypeDom } from "./UsagerTypeDom.type";
 import { Telephone } from "../telephone/Telephone.type";
-import { UsagerEntretien, UsagerRdv, UsagerSexe } from "@domifa/common";
+import {
+  UsagerLastInteraction,
+  UsagerEntretien,
+  UsagerRdv,
+  UsagerSexe,
+} from "@domifa/common";
 
 export type Usager = AppEntity & {
   ref: number; // unique par structure
@@ -52,7 +56,7 @@ export type Usager = AppEntity & {
   numeroDistribution: string | null;
 
   // INTERACTIONS
-  lastInteraction: UsagerLastInteractions;
+  lastInteraction: UsagerLastInteraction;
   options: UsagerOptions;
 
   migrated?: boolean;

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

@@ -1,4 +1,4 @@
-import { UserStructureResume } from "../user-structure/UserStructureResume.type";
+import { UserStructureResume } from "@domifa/common";
 
 export type UsagerNote = {
   id: number;

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

@@ -1,5 +1,4 @@
-import { UserStructureResume } from "../../user-structure/UserStructureResume.type";
-
+import { UserStructureResume } from "@domifa/common";
 export type UsagerHistoryImport = {
   createdAt: Date;
   createdBy: UserStructureResume;

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

@@ -1,4 +1,4 @@
-import { UserStructureResume } from "../../user-structure/UserStructureResume.type";
+import { UserStructureResume } from "@domifa/common";
 import { Usager } from "../Usager.type";
 import { UsagerHistoryStateCreationEvent } from "./UsagerHistoryStateCreationEvent.type";
 

packages/backend/src/_common/model/usager/history/UsagerHistoryImport.type.ts

@@ -7,7 +7,6 @@ export * from "./UsagerAyantDroit.type";
 export * from "./UsagerDecision.type";
 export * from "./UsagerDoc.type";
 export * from "./UsagerImport.type";
-export * from "./UsagerLastInteractions.type";
 export * from "./UsagerLight.type";
 export * from "./UsagerNote.type";
 export * from "./UsagerTypeDom.type";