feat(portail-usager): testing edge cases where server data is different

Author: hbalty

packages/common/src/structure-information/classes/StructureInformation.class.ts

@@ -0,0 +1,44 @@
+import { StructureInformation } from "./../interfaces/StructureInformation.interface";
+import { createDate } from "../../_core";
+import { UserStructureResume } from "../../users";
+import { isWithinInterval } from "date-fns";
+
+export class StructureInformationMessage implements StructureInformation {
+  public title: string;
+  public description: string;
+  public startDate: Date;
+  public endDate: Date | null;
+  public type: "closing" | "opening-hours" | "general" | "other";
+  public createdBy: UserStructureResume;
+  public structureId: number;
+  public isTemporary: boolean;
+  public isExpired: boolean;
+  public uuid?: string | undefined;
+  public createdAt?: Date;
+  public updatedAt?: Date;
+  public version?: number;
+  constructor(options: StructureInformation) {
+    this.title = options.title;
+    this.description = options.description;
+    this.startDate = options.startDate;
+    this.endDate = options.endDate;
+    this.type = options.type;
+    this.createdAt = createDate(options.createdAt) ?? undefined;
+    this.updatedAt = createDate(options.updatedAt) ?? undefined;
+    this.createdBy = options.createdBy;
+    this.structureId = options.structureId;
+    this.isTemporary = options.isTemporary;
+    this.isExpired = this.isMessageExpired();
+    this.uuid = options.uuid;
+    this.version = options.version;
+  }
+
+  public isMessageExpired(): boolean {
+    if (!this.endDate || !this.startDate || !this.isTemporary) return false;
+    const today = new Date();
+    return !isWithinInterval(today, {
+      start: new Date(this.startDate),
+      end: new Date(this.endDate),
+    });
+  }
+}

packages/common/src/structure-information/classes/index.ts

@@ -0,0 +1 @@
+export * from "./StructureInformation.class";

packages/common/src/structure-information/index.ts

@@ -2,3 +2,4 @@
 export * from "./constants";
 export * from "./interfaces";
 export * from "./types";
+export * from "./classes";

packages/portail-usagers/src/_tests/mocks/STRUCTURE_INFORMATION.mock.ts

@@ -44,3 +44,25 @@ export const unMessageFutur: StructureInformation = {
     days: 4,
   }),
 };
+
+export const unMessageFuturAvecIsoDate = {
+  ...unMessageCourant,
+  title: "Un message futur",
+  startDate: add(new Date(), {
+    days: 2,
+  }).toISOString(),
+  endDate: add(new Date(), {
+    days: 4,
+  }).toISOString(),
+};
+
+export const unMessageAvecIsoDate = {
+  ...unMessageCourant,
+  title: "Un message courant avec text date",
+  startDate: sub(new Date(), {
+    days: 4,
+  }).toISOString(),
+  endDate: add(new Date(), {
+    days: 1,
+  }).toISOString(),
+};

packages/portail-usagers/src/app/modules/usager-account/components/home-usager/home-usager.component.spec.ts

@@ -13,8 +13,10 @@ import { StructureInformationService } from "../../services/structure-informatio
 import { BehaviorSubject, of } from "rxjs";
 import { PortailUsagerProfile, StructureInformation } from "@domifa/common";
 import {
+  unMessageAvecIsoDate,
   unMessageCourant,
   unMessageFutur,
+  unMessageFuturAvecIsoDate,
   unMessagePasse,
 } from "../../../../../_tests/mocks/STRUCTURE_INFORMATION.mock";
 import { unProfilUsager } from "../../../../../_tests/mocks/PORTAIL_USAGER_PROFILE.mock";
@@ -26,6 +28,8 @@ describe("HomeUsagerComponent", () => {
     unMessageCourant,
     unMessagePasse,
     unMessageFutur,
+    unMessageAvecIsoDate as unknown as StructureInformation, // un message avec date string
+    unMessageFuturAvecIsoDate as unknown as StructureInformation,
   ];
   const structureInformationService = {
     getAllStructureInformation: jest.fn(() => of(messagesStructures)),
@@ -69,9 +73,12 @@ describe("HomeUsagerComponent", () => {
 
   it("Filter out obsolete messages", fakeAsync(() => {
     tick();
-    expect(component.structureInformation.length).toEqual(1);
+    expect(component.structureInformation.length).toEqual(2);
     expect(component.structureInformation[0].title).toEqual(
       "Un message courant"
     );
+    expect(component.structureInformation[1].title).toEqual(
+      "Un message courant avec text date"
+    );
   }));
 });

packages/portail-usagers/src/app/modules/usager-account/components/home-usager/home-usager.component.ts

@@ -1,10 +1,13 @@
 import { Component, OnInit } from "@angular/core";
 import { Title } from "@angular/platform-browser";
-import { PortailUsagerProfile, StructureInformation } from "@domifa/common";
+import {
+  PortailUsagerProfile,
+  StructureInformation,
+  StructureInformationMessage,
+} from "@domifa/common";
 import { UsagerAuthService } from "../../../usager-auth/services/usager-auth.service";
 import { Router } from "@angular/router";
 import { Subscription } from "rxjs";
-import { isWithinInterval } from "date-fns";
 import { StructureInformationService } from "../../services/structure-information.service";
 
 @Component({
@@ -49,20 +52,12 @@ export class HomeUsagerComponent implements OnInit {
     this.subscription.add(
       this.structureInformationService.getAllStructureInformation().subscribe({
         next: (structureInformation: StructureInformation[]) => {
-          const today = new Date();
-          this.structureInformation = structureInformation.filter((info) => {
-            if (!info.isTemporary) {
-              return true;
-            }
-
-            if (info.endDate && info.startDate) {
-              return isWithinInterval(today, {
-                start: new Date(info.startDate),
-                end: new Date(info.endDate),
-              });
-            }
-            return false;
-          });
+          this.structureInformation = structureInformation
+            .map(
+              (_structureInfo) =>
+                new StructureInformationMessage(_structureInfo)
+            )
+            .filter((info) => !info.isExpired);
         },
       })
     );