fix: structure zip (#341)

SocialGouv · Jun 20, 2022 · 6d8e4aa · 6d8e4aa
1 parent 12c33ea
commit 6d8e4aa
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/src/components/Commission.tsx b/src/components/Commission.tsx
@@ -62,7 +62,7 @@ const Commission: React.FC<Props> = ({ commission }) => {
   const docName = `commission_${frenchDepartementName(
     commission.departement
   )}_${frenchDateText(commission.date)}`;
-  const urlDoc = `/api/docs?zipname=${docName}`;
+  const urlDoc = `/api/docs?zipname=${docName.replace(/[\W]+/g, "_")}`;
   return (
     <div className="card">
       <div className={styles.commissionHeader}>

diff --git a/src/lib/generateZip.ts b/src/lib/generateZip.ts
@@ -19,10 +19,20 @@ import type { CommissionData, DossierData } from "./types";
 export default (commission: CommissionData) => {
   const zip = new JSZip();
 
+  const fileName = `commission_${frenchDepartementName(
+    commission.departement
+  )}_${new Date(commission.date).toLocaleDateString("fr-FR", {
+    day: "numeric",
+    month: "long",
+    year: "numeric",
+  })}`.replace(/[\W]+/g, "_");
+
+  const zipFolder = zip.folder(fileName);
+
   _.forEach(
     commission.dossiers,
     (dossier: DossierData & { files: unknown[] }) => {
-      const dossierFolder = zip.folder(
+      const dossierFolder = zipFolder?.folder(
         dossier.nom
           .slice(0, 75)
           .normalize("NFD")
@@ -174,21 +184,11 @@ Rémunération totale: ${enfant.remunerationTotale}
 
   zip
     .generateNodeStream({ streamFiles: true, type: "nodebuffer" })
-    .pipe(
-      fs.createWriteStream(
-        `/mnt/docs/commission_${frenchDepartementName(
-          commission.departement
-        )}_${new Date(commission.date).toLocaleDateString("fr-FR", {
-          day: "numeric",
-          month: "long",
-          year: "numeric",
-        })}.zip`
-      )
-    )
+    .pipe(fs.createWriteStream(`/mnt/docs/${fileName}.zip`))
     .on("finish", function () {
       // JSZip generates a readable stream with a "end" event,
       // but is piped here in a writable stream which emits a "finish" event.
-      console.log("commission.zip written.");
+      console.log(fileName, " written.");
     });
 
   /*const zipAsBase64 = await zip.generateAsync({ type: "base64" });*/

diff --git a/src/pages/api/docs/index.ts b/src/pages/api/docs/index.ts
@@ -60,6 +60,7 @@ const handler: NextApiHandler = async (req, res) => {
 
 const downloadZip: NextApiHandler = async (req, res) => {
   const zipname = req.query.zipname;
+  console.log("zipname : ", zipname);
 
   const filePath = `/mnt/docs/${zipname}.zip`;
   const stat = fs.statSync(filePath);

diff --git a/src/pages/download.tsx b/src/pages/download.tsx
@@ -41,7 +41,7 @@ const Download: React.FC = () => {
               day: "numeric",
               month: "long",
               year: "numeric",
-            })}`
+            })}`.replace(/[\W]+/g, "_")
           );
           setUrlDoc(
             `/api/docs?zipname=${`commission_${frenchDepartementName(
@@ -50,7 +50,7 @@ const Download: React.FC = () => {
               day: "numeric",
               month: "long",
               year: "numeric",
-            })}`}`
+            })}`.replace(/[\W]+/g, "_")}`
           );
         })
         .catch((e) => {