Merge branch 'tra-14824' into tra-15092

back/src/registryDelegation/resolvers/mutations/__tests__/createRegistryDelegation.integration.ts

@@ -251,6 +251,80 @@ describe("mutation createRegistryDelegation", () => {
  });
  });
 
+ it("testing email content - no end date", async () => {
+ // Given
+ const delegate = await companyFactory({ givenName: "Some given name" });
+ const { user: delegatorAdmin, company: delegator } =
+ await userWithCompanyFactory();
+
+ // Email
+ jest.mock("../../../../mailer/mailing");
+ (sendMail as jest.Mock).mockImplementation(() => Promise.resolve());
+
+ // When
+ const { errors, delegation } = await createDelegation(delegatorAdmin, {
+ delegateOrgId: delegate.orgId,
+ delegatorOrgId: delegator.orgId
+ });
+
+ // Then
+ expect(errors).toBeUndefined();
+ expect(sendMail as jest.Mock).toHaveBeenCalledTimes(1);
+ expect(delegation).not.toBeUndefined();
+
+ if (!delegation) return;
+
+ const formattedStartDate = toddMMYYYY(delegation.startDate).replace(
+ /\//g,
+ "/"
+ );
+ expect(sendMail as jest.Mock).toHaveBeenCalledWith(
+ expect.objectContaining({
+ body: expect.stringContaining(`effective à partir du ${formattedStartDate}
+ <span>pour une durée illimitée.</span>`),
+ subject: `Émission d'une demande de délégation de l'établissement ${delegator.name} (${delegator.siret})`
+ })
+ );
+ });
+
+ it("testing email content - with end date", async () => {
+ // Given
+ const delegate = await companyFactory({ givenName: "Some given name" });
+ const { user: delegatorAdmin, company: delegator } =
+ await userWithCompanyFactory();
+ const endDate = new Date("2050-10-10");
+
+ // Email
+ jest.mock("../../../../mailer/mailing");
+ (sendMail as jest.Mock).mockImplementation(() => Promise.resolve());
+
+ // When
+ const { errors, delegation } = await createDelegation(delegatorAdmin, {
+ delegateOrgId: delegate.orgId,
+ delegatorOrgId: delegator.orgId,
+ endDate: endDate.toISOString() as any
+ });
+
+ // Then
+ expect(errors).toBeUndefined();
+ expect(sendMail as jest.Mock).toHaveBeenCalledTimes(1);
+
+ if (!delegation) return;
+
+ const formattedStartDate = toddMMYYYY(delegation.startDate).replace(
+ /\//g,
+ "&#x2F;"
+ );
+ const formattedEndDate = toddMMYYYY(endDate).replace(/\//g, "&#x2F;");
+ expect(sendMail as jest.Mock).toHaveBeenCalledWith(
+ expect.objectContaining({
+ body: expect.stringContaining(`effective à partir du ${formattedStartDate}
+ <span>et jusqu'au ${formattedEndDate}.</span>`),
+ subject: `Émission d'une demande de délégation de l'établissement ${delegator.name} (${delegator.siret})`
+ })
+ );
+ });
+
  describe("authentication & roles", () => {
  it("user must be authenticated", async () => {
  // Given

back/src/registryDelegation/resolvers/mutations/utils/createRegistryDelegation.utils.ts

@@ -92,6 +92,7 @@ export const sendRegistryDelegationCreationEmail = async (
  const payload = renderMail(registryDelegationCreation, {
  variables: {
  startDate: toddMMYYYY(delegation.startDate),
+ endDate: delegation.endDate ? toddMMYYYY(delegation.endDate) : undefined,
  delegator,
  delegate
  },

back/src/registryDelegation/resolvers/subResolvers/status.ts

@@ -1,26 +1,14 @@
 import {
  RegistryDelegation,
- RegistryDelegationResolvers,
- RegistryDelegationStatus
+ RegistryDelegationResolvers
 } from "../../../generated/graphql/types";
+import { getDelegationStatus } from "../utils";
 
 /**
  * For frontend's convenience, we compute the status here
  */
-const getStatus = (delegation: RegistryDelegation) => {
- const NOW = new Date();
-
- const { isRevoked, startDate, endDate } = delegation;
-
- if (isRevoked) return "CLOSED" as RegistryDelegationStatus;
-
- if (startDate > NOW) return "INCOMING" as RegistryDelegationStatus;
-
- if (startDate <= NOW && (!endDate || endDate > NOW))
- return "ONGOING" as RegistryDelegationStatus;
-
- return "CLOSED" as RegistryDelegationStatus;
-};
+const getStatus = (delegation: RegistryDelegation) =>
+ getDelegationStatus(delegation);
 
 export const statusResolver: RegistryDelegationResolvers["status"] =
  delegation => getStatus(delegation);

back/src/registryDelegation/resolvers/utils.ts

@@ -2,6 +2,10 @@ import { prisma } from "@td/prisma";
 import { UserInputError } from "../../common/errors";
 import { getRegistryDelegationRepository } from "../repository";
 import { Company, Prisma } from "@prisma/client";
+import {
+ RegistryDelegation,
+ RegistryDelegationStatus
+} from "../../generated/graphql/types";
 
 export const findDelegateAndDelegatorOrThrow = async (
  delegateOrgId: string,
@@ -74,3 +78,18 @@ export const findDelegateOrDelegatorOrThrow = async (
 
  return { delegator, delegate };
 };
+
+export const getDelegationStatus = (delegation: RegistryDelegation) => {
+ const NOW = new Date();
+
+ const { isRevoked, startDate, endDate } = delegation;
+
+ if (isRevoked) return "CLOSED" as RegistryDelegationStatus;
+
+ if (startDate > NOW) return "INCOMING" as RegistryDelegationStatus;
+
+ if (startDate <= NOW && (!endDate || endDate > NOW))
+ return "ONGOING" as RegistryDelegationStatus;
+
+ return "CLOSED" as RegistryDelegationStatus;
+};

libs/back/mail/src/templates/index.ts

@@ -254,6 +254,7 @@ export const registryDelegationCreation: MailTemplate<{
  startDate: string;
  delegator: Company;
  delegate: Company;
+ endDate?: string;
 }> = {
  subject: ({ delegator }) =>
  `Émission d'une demande de délégation de l'établissement ${delegator.name} (${delegator.siret})`,

libs/back/mail/src/templates/mustache/registry-delegation-creation.html

@@ -1,8 +1,12 @@
 <p>
  La plateforme Trackdéchets vous informe qu'une délégation a été accordée par
  l'établissement {{delegator.name}} ({{delegator.siret}}) à l'établissement
- {{delegate.name}} ({{delegate.siret}}), effective à partir du {{startDate}}.
- Cette délégation permet à l'établissement {{delegate.name}}
+ {{delegate.name}} ({{delegate.siret}}), effective à partir du {{startDate}}
+ {{#endDate}}
+ <span>et jusqu'au {{endDate}}.</span>
+ {{/endDate}} {{^endDate}}
+ <span>pour une durée illimitée.</span>
+ {{/endDate}} Cette délégation permet à l'établissement {{delegate.name}}
  ({{delegate.siret}}) de déclarer des registres de déchets règlementaires au
  nom de l'établissement {{delegator.name}} ({{delegator.siret}}).
 </p>