fix(backend): 📅 fix update date of procurations (#3887)

Author: pYassine

.talismanrc

@@ -26,6 +26,6 @@ fileignoreconfig:
 - filename: packages/portail-admins/src/app/modules/admin-structures/utils/structure-filter-criteria.ts
   checksum: c54f1bf45a44280960869561243668e7a92713fb5265f008a95fc3fe66014bf1
 - filename: yarn.lock
-  checksum: 391cb6ca45460de1264a5bb0717dbb870be35f011ae28d00b7bde2fe46ff2842
+  checksum: 075be99c7d081e6dc58ad5b0a0382963b392355221e5f8cf7f18bdcab8dae794
 threshold: medium
 version: "1.0"

packages/backend/package.json

@@ -101,7 +101,6 @@
     "sanitize-html": "^2.17.0",
     "sharp": "^0.34.0",
     "slug": "^9.1.0",
-    "sort-object": "^3.0.3",
     "source-map-support": "^0.5.21",
     "striptags": "^3.2.0",
     "swagger-ui-express": "^5.0.1",
@@ -129,7 +128,6 @@
     "@types/nodemailer": "^6.4.17",
     "@types/nunjucks": "^3.2.6",
     "@types/passport-jwt": "^3.0.13",
-    "@types/pdfkit": "^0.13.9",
     "@types/pino": "^7.0.5",
     "@types/pizzip": "^3.0.5",
     "@types/sanitize-html": "^2.16.0",

packages/backend/src/usagers/controllers/usager-options.controller.ts

@@ -33,7 +33,6 @@ import { UsagerOptionsHistoryService } from "../services";
 import { ExpressResponse } from "../../util/express";
 import { isEqual } from "lodash";
 
-import * as sortObj from "sort-object";
 import { usagerRepository } from "../../database";
 import {
   Usager,
@@ -121,7 +120,7 @@ export class UsagerOptionsController {
       );
     }
 
-    if (!isEqual(sortObj(usager.options.transfert), sortObj(transfertDto))) {
+    if (!isEqual(usager.options.transfert, transfertDto)) {
       await this.usagerOptionsHistoryService.createOptionHistory(
         usager,
         user,
@@ -177,12 +176,7 @@ export class UsagerOptionsController {
             usager.options.procurations[i].dateFin
           );
 
-          if (
-            isEqual(
-              sortObj(usager.options.procurations[i]),
-              sortObj(procurationsDto[i])
-            )
-          ) {
+          if (isEqual(usager.options.procurations[i], procurationsDto[i])) {
             needCreateHistory = false;
           }
         } else {

packages/common/src/usager-options/classes/MailDelegate.class.ts

@@ -1,5 +1,6 @@
 import { createDate } from "../../_core";
 import { IMailDelegate } from "../interfaces";
+import { endOfDay, isBefore } from "date-fns";
 
 export class MailDelegate implements IMailDelegate {
   public nom: string;
@@ -11,6 +12,11 @@ export class MailDelegate implements IMailDelegate {
     this.nom = options?.nom || "";
     this.dateDebut = createDate(options?.dateDebut);
     this.dateFin = createDate(options?.dateFin);
-    this.isExpired = this.dateFin ? new Date() > this.dateFin : false;
+
+    if (!this?.dateFin) {
+      this.isExpired = false;
+    } else {
+      this.isExpired = isBefore(this.dateFin, endOfDay(new Date()));
+    }
   }
 }

packages/frontend/src/app/modules/admin-portail-usagers/components/manage-structure-information-form/manage-structure-information-form.component.ts

@@ -244,7 +244,7 @@ export class ManageStructureInformationFormComponent
     );
   }
 
-  private endDateAfterBeginDateValidator = (
+  private readonly endDateAfterBeginDateValidator = (
     controls: AbstractControl
   ): ValidationErrors | null => {
     const beginDateControl: AbstractControl | null = controls.get("startDate");

packages/frontend/src/app/modules/usager-dossier/components/decision-refus-form/decision-refus-form.component.ts

@@ -21,14 +21,12 @@ import {
 import {
   formatDateToNgb,
   minDateToday,
+  parseDateFromNgb,
 } from "../../../../shared/bootstrap-util";
 import { UsagerDecisionService } from "../../../usager-shared/services/usager-decision.service";
 import { Subscription } from "rxjs";
 import { NoWhiteSpaceValidator } from "../../../../shared";
-import {
-  NgbDateCustomParserFormatter,
-  CustomToastService,
-} from "../../../shared/services";
+import { CustomToastService } from "../../../shared/services";
 import { UsagerFormModel } from "../../../usager-shared/interfaces";
 import { MOTIFS_REFUS_LABELS } from "@domifa/common";
 
@@ -56,7 +54,6 @@ export class DecisionRefusFormComponent implements OnInit, OnDestroy {
     private readonly formBuilder: UntypedFormBuilder,
     private readonly usagerDecisionService: UsagerDecisionService,
     private readonly router: Router,
-    private readonly nbgDate: NgbDateCustomParserFormatter,
     private readonly toastService: CustomToastService
   ) {
     this.loading = false;
@@ -108,9 +105,7 @@ export class DecisionRefusFormComponent implements OnInit, OnDestroy {
 
     const formDatas: UsagerDecisionRefusForm = {
       ...this.refusForm.value,
-      dateFin: new Date(
-        this.nbgDate.formatEn(this.refusForm.controls.dateFin.value)
-      ),
+      dateFin: parseDateFromNgb(this.refusForm.controls.dateFin.value),
     };
 
     this.setDecision(formDatas);

packages/frontend/src/app/modules/usager-dossier/components/decision-valide-form/decision-valide-form.component.ts

@@ -20,7 +20,7 @@ import {
   UsagerLight,
   UsagerDecisionValideForm,
 } from "../../../../../_common/model";
-import { formatDateToNgb } from "../../../../shared";
+import { formatDateToNgb, parseDateFromNgb } from "../../../../shared";
 import { Decision, UsagerFormModel } from "../../../usager-shared/interfaces";
 import { UsagerDecisionService } from "../../../usager-shared/services/usager-decision.service";
 import {
@@ -130,17 +130,14 @@ export class DecisionValideFormComponent implements OnInit, OnDestroy {
 
     this.subscription.add(
       this.valideForm.get("dateFin")?.valueChanges.subscribe((value) => {
-        const dateDebut = new Date(
-          this.nbgDate.formatEn(this.valideForm.get("dateDebut")?.value)
+        const dateDebut = parseDateFromNgb(
+          this.valideForm.get("dateDebut")?.value
         );
 
         if (
           value !== null &&
           this.nbgDate.isValid(value) &&
-          isBefore(
-            new Date(this.nbgDate.formatEn(value)),
-            subDays(addYears(dateDebut, 1), 1)
-          )
+          isBefore(parseDateFromNgb(value), subDays(addYears(dateDebut, 1), 1))
         ) {
           this.showDurationWarning = true;
         } else {

packages/frontend/src/app/modules/usager-profil/components/_courriers/profil-procuration-courrier/profil-procuration-courrier-component.ts

@@ -25,8 +25,6 @@ import {
 } from "@ng-bootstrap/ng-bootstrap";
 import { MatomoTracker } from "ngx-matomo-client";
 import { Subscription } from "rxjs";
-import { CustomToastService } from "src/app/modules/shared/services/custom-toast.service";
-import { NgbDateCustomParserFormatter } from "src/app/modules/shared/services/date-formatter.service";
 import { DEFAULT_MODAL_OPTIONS } from "../../../../../../_common/model";
 import {
   endDateAfterBeginDateValidator,
@@ -36,12 +34,14 @@ import {
   minDateToday,
   minDateNaissance,
   formatDateToNgb,
+  parseDateFromNgb,
 } from "../../../../../shared/bootstrap-util";
 
 import { UsagerFormModel } from "../../../../usager-shared/interfaces";
 
 import { UsagerOptionsService } from "../../../services/usager-options.service";
 import { UserStructure, UsagerOptionsProcuration } from "@domifa/common";
+import { CustomToastService } from "../../../../shared/services";
 
 @Component({
   selector: "app-profil-procuration-courrier",
@@ -75,7 +75,6 @@ export class UsagersProfilProcurationCourrierComponent
 
   constructor(
     private readonly formBuilder: UntypedFormBuilder,
-    private readonly nbgDate: NgbDateCustomParserFormatter,
     private readonly toastService: CustomToastService,
     private readonly usagerOptionsService: UsagerOptionsService,
     private readonly matomo: MatomoTracker,
@@ -188,9 +187,9 @@ export class UsagersProfilProcurationCourrierComponent
         return {
           nom: procuration.nom,
           prenom: procuration.prenom,
-          dateFin: this.nbgDate.formatEn(procuration.dateFin),
-          dateDebut: this.nbgDate.formatEn(procuration.dateDebut),
-          dateNaissance: this.nbgDate.formatEn(procuration.dateNaissance),
+          dateFin: parseDateFromNgb(procuration.dateFin),
+          dateDebut: parseDateFromNgb(procuration.dateDebut),
+          dateNaissance: parseDateFromNgb(procuration.dateNaissance),
         };
       }
     );

packages/frontend/src/app/modules/usager-profil/components/_courriers/profil-transfert-courrier/profil-transfert-courrier-component.ts

@@ -20,11 +20,9 @@ import {
   endDateAfterBeginDateValidator,
   formatDateToNgb,
   NoWhiteSpaceValidator,
+  parseDateFromNgb,
 } from "../../../../../shared";
-import {
-  NgbDateCustomParserFormatter,
-  CustomToastService,
-} from "../../../../shared/services";
+import { CustomToastService } from "../../../../shared/services";
 import { UsagerFormModel } from "../../../../usager-shared/interfaces";
 import { UsagerOptionsService } from "../../../services/usager-options.service";
 import { UserStructure } from "@domifa/common";
@@ -53,7 +51,6 @@ export class UsagersProfilTransfertCourrierComponent implements OnDestroy {
 
   constructor(
     private readonly formBuilder: UntypedFormBuilder,
-    private readonly nbgDate: NgbDateCustomParserFormatter,
     private readonly toastService: CustomToastService,
     private readonly usagerOptionsService: UsagerOptionsService,
     private readonly modalService: NgbModal,
@@ -136,12 +133,8 @@ export class UsagersProfilTransfertCourrierComponent implements OnDestroy {
     const formValue = {
       actif: true,
       ...this.transfertForm.value,
-      dateFin: new Date(
-        this.nbgDate.formatEn(this.transfertForm.controls.dateFin.value)
-      ),
-      dateDebut: new Date(
-        this.nbgDate.formatEn(this.transfertForm.controls.dateDebut.value)
-      ),
+      dateFin: parseDateFromNgb(this.transfertForm.controls.dateFin.value),
+      dateDebut: parseDateFromNgb(this.transfertForm.controls.dateDebut.value),
     };
 
     this.loading = true;