fix(send-mail): add send mail route to ui

dataesr · Sep 30, 2024 · abc94ae · abc94ae
1 parent 94b3fd7
commit abc94ae
Show file tree

Hide file tree

Showing 13 changed files with 208 additions and 153 deletions.
diff --git a/client/src/api/send-mail/index.tsx b/client/src/api/send-mail/index.tsx
@@ -9,10 +9,10 @@ import {
   Col,
 } from "@dataesr/dsfr-plus";
 import { EmailSenderProps } from "../../types";
-import { postHeaders } from "../../config/api";
 import { toast } from "react-toastify";
 import ProfileModal from "../../components/profil-modal";
 import EmailForm from "../../components/mail-form";
+import { getCollectionNameFromUrl } from "../utils/collectionName";
 
 function EmailSender({ contribution, refetch }: EmailSenderProps) {
   const [, setEmailSent] = useState(false);
@@ -24,18 +24,9 @@ function EmailSender({ contribution, refetch }: EmailSenderProps) {
   );
 
   const isDevelopment = import.meta.env.VITE_HEADER_TAG === "Development";
-  let basePath = "contacts";
-  if (window.location.pathname.includes("contributionpage")) {
-    basePath = "contribute";
-  } else if (window.location.pathname.includes("apioperations")) {
-    basePath = "production";
-  }
-  const brevoUrl = isDevelopment
-    ? "http://localhost:3000/api/"
-    : "https://ticket-office.staging.dataesr.ovh/";
-  const scanRUrl = isDevelopment
-    ? `http://localhost:3000/api${basePath}/${contribution?.id}`
-    : `https://ticket-office.staging.dataesr.ovh/api/${basePath}/${contribution?.id}`;
+  const apiBaseUrl = isDevelopment
+    ? "http://localhost:3000/api/send-email"
+    : "https://ticket-office.staging.dataesr.ovh/api/send-email";
 
   useEffect(() => {
     const profileFromLocalStorage = localStorage.getItem("selectedProfile");
@@ -56,59 +47,31 @@ function EmailSender({ contribution, refetch }: EmailSenderProps) {
 
     const formattedResponse = userResponse.replace(/\n/g, "<br/>");
 
-    const dataForBrevo = {
-      sender: {
-        email: "scanr@recherche.gouv.fr",
-        name: `${selectedProfile} de l'équipe scanR`,
-      },
-      to: [
-        {
-          email: `${contribution.email}`,
-          name: `${contribution.name}`,
-        },
-      ],
-      replyTo: {
-        email: "scanr@recherche.gouv.fr",
-        name: "L'équipe scanR",
-      },
+    const currentUrl = window.location.href;
+    const collectionName = getCollectionNameFromUrl(currentUrl);
+
+    const emailPayload = {
+      contributionId: contribution.id,
+      collectionName: collectionName,
+      to: contribution.email,
+      name: contribution.name,
       subject: `Réponse à votre contribution, référence ${contribution.id}`,
-      templateId: 262,
-      params: {
-        date: new Date().toLocaleDateString(),
-        userResponse: formattedResponse,
-        message: contribution.message,
-        selectedProfile: selectedProfile,
-      },
+      userResponse: formattedResponse,
+      selectedProfile,
+      message: contribution.message,
     };
 
     try {
-      const responseBrevo = await fetch(brevoUrl, {
+      const response = await fetch(apiBaseUrl, {
         method: "POST",
         headers: {
-          "api-key": import.meta.env.VITE_BREVO_API_AUTHORIZATION,
           "Content-Type": "application/json",
         },
-        body: JSON.stringify(dataForBrevo),
-      });
-
-      if (!responseBrevo.ok) {
-        throw new Error(`HTTP error! status: ${responseBrevo.status}`);
-      }
-
-      const dataForScanR = {
-        mailSent: userResponse,
-        mailSentDate: new Date(),
-        responseFrom: selectedProfile,
-      };
-
-      const responseScanR = await fetch(scanRUrl, {
-        method: "PATCH",
-        headers: postHeaders,
-        body: JSON.stringify(dataForScanR),
+        body: JSON.stringify(emailPayload),
       });
 
-      if (!responseScanR.ok) {
-        throw new Error(`HTTP error! status: ${responseScanR.status}`);
+      if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`);
       }
 
       setEmailSent(true);

diff --git a/client/src/api/utils/collectionName.tsx b/client/src/api/utils/collectionName.tsx
@@ -0,0 +1,29 @@
+const collectionMapping = [
+  {
+    regex: /contact/i,
+    collectionName: "contacts",
+  },
+  {
+    regex: /contribution/i,
+    collectionName: "contribute",
+  },
+  {
+    regex: /apioperations/i,
+    collectionName: "contribute_productions",
+  },
+  {
+    regex: /removeuser/i,
+    collectionName: "remove-user",
+  },
+  {
+    regex: /namechange/i,
+    collectionName: "update-user-data",
+  },
+];
+
+export const getCollectionNameFromUrl = (url: string) => {
+  const mapping = collectionMapping.find(({ regex }) => regex.test(url));
+  return mapping ? mapping.collectionName : null;
+};
+
+export default collectionMapping;
diff --git a/client/src/components/contact/contributor-summary.tsx b/client/src/components/contact/contributor-summary.tsx
@@ -26,9 +26,9 @@ const ContributorSummary: React.FC<ContributorSummaryProps> = ({
 
   return (
     <SideMenu title="Contributeurs" sticky fullHeight>
-      {contributions.map((contribution) => (
+      {contributions.map((contribution, index) => (
         <SideMenuItem
-          key={contribution.id}
+          key={`${contribution.id}-${index}`}
           className="contribution-message"
           title={
             <>
@@ -56,9 +56,9 @@ const ContributorSummary: React.FC<ContributorSummaryProps> = ({
                   {contribution?.tags?.length > 0 &&
                     contribution.tags
                       .filter((tag) => tag !== "")
-                      .map((tag) => (
+                      .map((tag, key) => (
                         <Badge
-                          key={tag}
+                          key={key}
                           size="sm"
                           color="green-menthe"
                           className="fr-mr-1w fr-mb-1w"

diff --git a/client/src/components/last-mail/lasts-mails-sent.tsx b/client/src/components/last-mail/lasts-mails-sent.tsx
@@ -96,7 +96,9 @@ const LatestMails: React.FC<LatestMailsProps> = ({ data }) => {
             }}
           >
             <Text size="xs">
-              <strong>{mail.threads?.[0]?.team?.join(", ") || "Équipe"}</strong>{" "}
+              <strong>
+                {mail.threads?.[0].responses?.[0]?.team?.join(", ") || "Équipe"}
+              </strong>{" "}
               le{" "}
               <i>
                 {new Date(

diff --git a/client/src/components/mail-form/index.tsx b/client/src/components/mail-form/index.tsx
@@ -1,5 +1,4 @@
 import { Button, Col, Row, TextArea, ButtonGroup } from "@dataesr/dsfr-plus";
-import React from "react";
 
 function EmailForm({
   userResponse,

diff --git a/client/src/types/index.ts b/client/src/types/index.ts
@@ -15,6 +15,7 @@ export interface Contribution {
   fonction?: string;
   modified_at?: string;
   threads?: Thread[];
+  fromApplication: string;
 }
 export interface ContributorSummaryProps {
   contributions: Contribution[];
@@ -144,6 +145,7 @@ export type Contribute_Production = {
   status: string;
   productions: any[];
   threads?: Thread[];
+  fromApplication: string;
 };
 
 export type EditModalProps = {
@@ -197,6 +199,7 @@ interface MailData {
   threads: Array<{
     team: string[];
     responses: Array<{
+      team: any;
       responseMessage: string;
       timestamp: string;
     }>;

diff --git a/server/index.ts b/server/index.ts
@@ -8,8 +8,8 @@ import contributionObjectRoutes from "./routes/contributionObjectRoutes";
 import productionsRoutes from "./routes/productions";
 import removeUserRoutes from "./routes/remove-user";
 import updateUserDataRoutes from "./routes/update-user-data";
-// import replyRoutes from "./routes/reply/replyRoutes";
 import contactsRoutes from "./routes/contacts";
+import sendMail from "./routes/reply/replyRoutes";
 // import connectToImapServer from "./routes/receive-email";
 
 dotenv.config();
@@ -37,6 +37,7 @@ app
           { name: "Contacts", description: "Gestion des contacts" },
           { name: "Contributions", description: "Gestion des contributions" },
           { name: "Productions", description: "Gestion des productions" },
+          { name: "Envoi de mails", description: "Gestion de emails" },
           {
             name: "Supressions de profil",
             description: "Gestion des demandes supression de profil",
@@ -59,7 +60,7 @@ app
     app.use(productionsRoutes);
     app.use(removeUserRoutes);
     app.use(updateUserDataRoutes);
-    // app.use(replyRoutes);
+    app.use(sendMail);
     return app;
   })
   .use(

diff --git a/server/routes/contacts/post/index.ts b/server/routes/contacts/post/index.ts
@@ -34,11 +34,12 @@ postContactsRoutes.post(
       }),
       {}
     );
-
+    const _id = new ObjectId();
     const newContribution = {
       ...body,
+      _id,
       extra: extraLowercase,
-      id: new ObjectId().toHexString(),
+      id: _id.toHexString(),
       created_at: new Date(),
       status: "new",
     };

diff --git a/server/routes/contributionObjectRoutes/post/index.ts b/server/routes/contributionObjectRoutes/post/index.ts
@@ -28,10 +28,12 @@ postContributionObjectRoutes.post(
       {}
     );
 
+    const _id = new ObjectId();
     const newContribution = {
       ...body,
+      _id,
       extra: extraLowercase,
-      id: new ObjectId().toHexString(),
+      id: _id.toHexString(),
       created_at: new Date(),
       status: "new",
     };

diff --git a/server/routes/productions/post/index.ts b/server/routes/productions/post/index.ts
@@ -20,12 +20,14 @@ postProductionRoutes.post(
       {}
     );
 
+    const _id = new ObjectId();
     const newContribution = {
       ...body,
-      id: new ObjectId().toHexString(),
+      _id,
+      extra: extraLowercase,
+      id: _id.toHexString(),
       created_at: new Date(),
       status: "new",
-      extra: extraLowercase,
     };
 
     const result = await db

diff --git a/server/routes/remove-user/post/index.ts b/server/routes/remove-user/post/index.ts
@@ -20,12 +20,14 @@ postRemoveUserRoutes.post(
       {}
     );
 
+    const _id = new ObjectId();
     const newContribution = {
       ...body,
-      id: new ObjectId().toHexString(),
+      _id,
+      extra: extraLowercase,
+      id: _id.toHexString(),
       created_at: new Date(),
       status: "new",
-      extra: extraLowercase,
     };
 
     const result = await db