fix: transfert expiration #1501

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

@@ -1,21 +1,10 @@
 import { UsagerOptionsHistorique } from "./UsagerOptionsHistorique.type";
+import { UsagerOptionsProcuration } from "./UsagerOptionsProcuration.type";
+import { UsagerOptionsTransfert } from "./UsagerOptionsTransfert.type";
 
 export type UsagerOptions = {
-  transfert: {
-    actif: boolean;
-    nom?: string;
-    adresse?: string;
-    dateDebut?: Date | null;
-    dateFin?: Date | null;
-  };
-  procuration: {
-    actif: boolean;
-    nom?: string;
-    prenom?: string;
-    dateFin?: Date | null;
-    dateDebut?: Date | null;
-    dateNaissance?: string | null;
-  };
+  transfert: UsagerOptionsTransfert;
+  procuration: UsagerOptionsProcuration;
   npai: {
     actif: boolean;
     dateDebut?: Date | null;

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

@@ -0,0 +1,8 @@
+export type UsagerOptionsProcuration = {
+  actif: boolean;
+  nom?: string;
+  prenom?: string;
+  dateFin?: Date | null;
+  dateDebut?: Date | null;
+  dateNaissance?: Date | string | null;
+};

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

@@ -0,0 +1,7 @@
+export type UsagerOptionsTransfert = {
+  actif: boolean;
+  nom?: string;
+  adresse?: string;
+  dateDebut?: Date | null;
+  dateFin?: Date | null;
+};

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

@@ -8,13 +8,15 @@ export * from "./UsagerDecisionOrientation.type";
 export * from "./UsagerDecisionStatut.type";
 export * from "./UsagerDoc.type";
 export * from "./UsagerEntretien.type";
+export * from "./UsagerImport.type";
 export * from "./UsagerLastInteractions.type";
 export * from "./UsagerLight.type";
 export * from "./UsagerOptions.type";
 export * from "./UsagerOptionsHistorique.type";
+export * from "./UsagerOptionsProcuration.type";
+export * from "./UsagerOptionsTransfert.type";
 export * from "./UsagerPreferenceContact.type";
 export * from "./UsagerRaisonDemande.type";
 export * from "./UsagerRdv.type";
 export * from "./UsagerSexe.type";
-export * from "./UsagerImport.type";
 export * from "./UsagerTypeDom.type";

packages/backend/src/interactions/interactions.service.ts

@@ -7,6 +7,7 @@ import {
 } from "../database";
 import { AppAuthUser, AppUser, Usager, UsagerLight } from "../_common/model";
 import { Interactions, InteractionType } from "../_common/model/interaction";
+import { UsagerOptionsTransfert } from "../_common/model/usager";
 import { InteractionDto } from "./interactions.dto";
 
 @Injectable()
@@ -162,7 +163,7 @@ function buildNewInteraction({
     }
 
     // Transfert actif: on le précise dans le contenu
-    if (usager.options.transfert.actif) {
+    if (isTransfertActifMaintenant(usager.options.transfert)) {
       newInteraction.content =
         "Courrier transféré à : " +
         usager.options.transfert.nom +
@@ -197,3 +198,15 @@ function buildNewInteraction({
 
   return { usager, newInteraction };
 }
+
+export function isTransfertActifMaintenant(
+  transfert: UsagerOptionsTransfert
+): boolean {
+  if (transfert.actif) {
+    const debut = new Date(transfert.dateDebut).getTime();
+    const fin = new Date(transfert.dateFin).getTime();
+    const now = new Date().getTime();
+    return debut < now && fin > now;
+  }
+  return false;
+}

packages/frontend/src/_common/model/usager/UsagerOptions.type.ts

@@ -1,21 +1,10 @@
 import { UsagerOptionsHistorique } from "./UsagerOptionsHistorique.type";
+import { UsagerOptionsProcuration } from "./UsagerOptionsProcuration.type";
+import { UsagerOptionsTransfert } from "./UsagerOptionsTransfert.type";
 
 export type UsagerOptions = {
-  transfert: {
-    actif: boolean;
-    nom: string;
-    adresse: string;
-    dateDebut?: Date;
-    dateFin?: Date;
-  };
-  procuration: {
-    actif: boolean;
-    nom?: string;
-    prenom?: string;
-    dateFin?: Date;
-    dateDebut?: Date;
-    dateNaissance?: Date;
-  };
+  transfert: UsagerOptionsTransfert;
+  procuration: UsagerOptionsProcuration;
   npai: {
     actif: boolean;
     dateDebut?: Date;

packages/frontend/src/_common/model/usager/UsagerOptionsProcuration.type.ts

@@ -0,0 +1,8 @@
+export type UsagerOptionsProcuration = {
+  actif: boolean;
+  nom?: string;
+  prenom?: string;
+  dateFin?: Date | null;
+  dateDebut?: Date | null;
+  dateNaissance?: Date | string | null;
+};

packages/frontend/src/_common/model/usager/UsagerOptionsTransfert.type.ts

@@ -0,0 +1,7 @@
+export type UsagerOptionsTransfert = {
+  actif: boolean;
+  nom?: string;
+  adresse?: string;
+  dateDebut?: Date | null;
+  dateFin?: Date | null;
+};

packages/frontend/src/_common/model/usager/index.ts

@@ -1,17 +1,19 @@
 export * from "./Usager.type";
+export * from "./UsagerAyantDroit.type";
 export * from "./UsagerDecision.type";
+export * from "./UsagerDecisionMotif.type";
 export * from "./UsagerDecisionStatut.type";
 export * from "./UsagerDoc.type";
 export * from "./UsagerEntretien.type";
+export * from "./UsagerImport.type";
 export * from "./UsagerLastInteractions.type";
 export * from "./UsagerLight.type";
 export * from "./UsagerOptions.type";
 export * from "./UsagerOptionsHistorique.type";
+export * from "./UsagerOptionsProcuration.type";
+export * from "./UsagerOptionsTransfert.type";
 export * from "./UsagerPreferenceContact.type";
 export * from "./UsagerRaisonDemande.type";
 export * from "./UsagerRdv.type";
 export * from "./UsagerSexe.type";
-export * from "./UsagerAyantDroit.type";
 export * from "./UsagerTypeDom.type";
-export * from "./UsagerDecisionMotif.type";
-export * from "./UsagerImport.type";

packages/frontend/src/app/modules/usagers/components/interactions/set-interaction-out-form/set-interaction-out-form.component.ts

@@ -43,7 +43,7 @@ export class SetInteractionOutFormComponent implements OnInit, OnDestroy {
   public procuration: boolean; // Mandataire = true / domicilié = false
 
   public displayProcuration() {
-    return isProcurationActifMaintenant(this.usager);
+    return isProcurationActifMaintenant(this.usager.options.procuration);
   }
 
   private subscription = new Subscription();

packages/frontend/src/app/modules/usagers/components/manage/manage-usagers-table/manage-usagers-table.component.ts

@@ -7,24 +7,29 @@ import {
   TemplateRef,
   ViewChild,
 } from "@angular/core";
-
 import { NgbModal, NgbModalOptions } from "@ng-bootstrap/ng-bootstrap";
 import { MatomoTracker } from "ngx-matomo";
 import { ToastrService } from "ngx-toastr";
 import { fadeInOut, fadeInOutSlow } from "src/app/shared/animations";
-import { AppUser, UsagerLight } from "../../../../../../_common/model";
+import {
+  AppUser,
+  UsagerLight,
+  UsagerOptionsProcuration,
+  UsagerOptionsTransfert,
+} from "../../../../../../_common/model";
 import {
   InteractionForApi,
   InteractionType,
 } from "../../../../../../_common/model/interaction";
 import { interactionsLabels } from "../../../interactions.labels";
+import { isProcurationActifMaintenant } from "../../../services";
 import { InteractionService } from "../../../services/interaction.service";
+import { isTransfertActifMaintenant } from "../../../services/transfert.service";
 import { UsagerFormModel } from "../../form/UsagerFormModel";
 import {
   UsagersFilterCriteria,
   UsagersFilterCriteriaDernierPassage,
   UsagersFilterCriteriaSortValues,
-  UsagersFilterCriteriaStatut,
 } from "../usager-filter";
 
 @Component({
@@ -87,6 +92,13 @@ export class ManageUsagersTableComponent implements OnInit {
     this.today = new Date();
   }
 
+  public isProcurationActifMaintenant(procuration: UsagerOptionsProcuration) {
+    return isProcurationActifMaintenant(procuration);
+  }
+  public isTransfertActifMaintenant(transfert: UsagerOptionsTransfert) {
+    return isTransfertActifMaintenant(transfert);
+  }
+
   public setSingleInteraction(
     usager: UsagerFormModel,
     type: InteractionType

packages/frontend/src/app/modules/usagers/components/manage/manage-usagers-table/manage-usagers-table.html

@@ -111,7 +111,7 @@
 
           <div
             class="label-info label-yellow"
-            *ngIf="usager.options.transfert.actif"
+            *ngIf="isTransfertActifMaintenant(usager.options.transfert)"
             [ngbTooltip]="transfertActif"
           >
             <ng-template #transfertActif>
@@ -135,7 +135,7 @@
 
           <div
             class="label-info label-yellow"
-            *ngIf="usager.options.procuration.actif"
+            *ngIf="isProcurationActifMaintenant(usager.options.procuration)"
             [ngbTooltip]="procurationActif"
           >
             <ng-template #procurationActif>

packages/frontend/src/app/modules/usagers/components/profil/profil-component.ts

@@ -19,7 +19,12 @@ import {
   minDateNaissance,
 } from "src/app/shared/bootstrap-util";
 import { regexp } from "src/app/shared/validators";
-import { AppUser, UsagerLight, UserRole } from "../../../../../_common/model";
+import {
+  AppUser,
+  UsagerLight,
+  UsagerOptionsProcuration,
+  UserRole,
+} from "../../../../../_common/model";
 import { InteractionType } from "../../../../../_common/model/interaction";
 import { StructureDocTypesAvailable } from "../../../../../_common/model/structure-doc";
 import { ETAPES_DEMANDE_URL } from "../../../../../_common/model/usager/constants";
@@ -395,6 +400,10 @@ export class UsagersProfilComponent implements OnInit {
     }
   }
 
+  public isProcurationActifMaintenant(procuration: UsagerOptionsProcuration) {
+    return isProcurationActifMaintenant(procuration);
+  }
+
   public setInteraction(type: InteractionType, procuration?: boolean) {
     const interaction: {
       content?: string;
@@ -411,7 +420,7 @@ export class UsagersProfilComponent implements OnInit {
     this.matomo.trackEvent("test-nouveau-profil", "gros-icones", type, 1);
 
     if (type.substring(type.length - 3) === "Out") {
-      if (isProcurationActifMaintenant(this.usager)) {
+      if (isProcurationActifMaintenant(this.usager.options.procuration)) {
         if (typeof procuration === "undefined") {
           this.typeInteraction = type;
           this.modalService.open(this.distributionConfirm);

packages/frontend/src/app/modules/usagers/interfaces/options.ts

@@ -1,23 +1,13 @@
+import {
+  UsagerOptionsProcuration,
+  UsagerOptionsTransfert,
+} from "../../../../_common/model";
 import { UsagerOptions } from "./../../../../_common/model/usager/UsagerOptions.type";
 import { HistoriqueOptions } from "./historique-options";
 
 export class Options implements UsagerOptions {
-  public transfert: {
-    actif: boolean;
-    adresse: string | null;
-    dateDebut: Date | null;
-    dateFin: Date | null;
-    nom: string | null;
-  };
-
-  public procuration: {
-    actif: boolean;
-    dateDebut: Date | null;
-    dateFin: Date | null;
-    dateNaissance: Date | null;
-    nom: string;
-    prenom: string;
-  };
+  public transfert: UsagerOptionsTransfert;
+  public procuration: UsagerOptionsProcuration;
 
   public npai: {
     actif: boolean;

packages/frontend/src/app/modules/usagers/services/procuration.service.ts

@@ -1,11 +1,11 @@
-import { UsagerLight } from "../../../../_common/model";
+import { UsagerOptionsProcuration } from "../../../../_common/model";
 
 export function isProcurationActifMaintenant(
-  usager: Pick<UsagerLight, "options">
+  procuration: UsagerOptionsProcuration
 ): boolean {
-  if (usager.options.procuration.actif) {
-    const debut = new Date(usager.options.procuration.dateDebut).getTime();
-    const fin = new Date(usager.options.procuration.dateFin).getTime();
+  if (procuration.actif) {
+    const debut = new Date(procuration.dateDebut).getTime();
+    const fin = new Date(procuration.dateFin).getTime();
     const now = new Date().getTime();
     return debut < now && fin > now;
   }

packages/frontend/src/app/modules/usagers/services/transfert.service.ts

@@ -0,0 +1,13 @@
+import { UsagerOptionsTransfert } from "../../../../_common/model/usager";
+
+export function isTransfertActifMaintenant(
+  transfert: UsagerOptionsTransfert
+): boolean {
+  if (transfert.actif) {
+    const debut = new Date(transfert.dateDebut).getTime();
+    const fin = new Date(transfert.dateFin).getTime();
+    const now = new Date().getTime();
+    return debut < now && fin > now;
+  }
+  return false;
+}