Feat: Move sent items into sent folder to prevent resend

Author: Gum-Joe

email/libmailmerge/src/previews/sidecarData.ts

@@ -180,14 +180,17 @@ export async function writeSidecarFile(
  */
 export async function* loadSidecars(
     previewsRoot: string,
-): AsyncIterableIterator<SidecarData & { $originalfilename: string }> {
+): AsyncIterableIterator<SidecarData & { $originalFilepath: string }> {
     logger.info(`Loading sidecar metadata from ${previewsRoot}`);
     const files = await fs.readdir(previewsRoot);
     const metadataFiles = files.filter((file) => file.endsWith(METADATA_FILE_SUFFIX));
 
     for (const metadataFile of metadataFiles) {
         logger.debug(`Loading metadata from ${metadataFile}`);
         const metadata = await fs.readFile(join(previewsRoot, metadataFile), "utf-8");
-        yield { ...(JSON.parse(metadata) as SidecarData), $originalfilename: metadataFile };
+        yield {
+            ...(JSON.parse(metadata) as SidecarData),
+            $originalFilepath: join(previewsRoot, metadataFile),
+        };
     }
 }

email/mailmerge-cli/src/common/rerender.ts

@@ -46,14 +46,16 @@ export async function rerenderPreviews(directory: string) {
             renderedPreviews.map(async (preview, idx) => {
                 const file = files[idx];
                 logger.debug(`Writing rerendered preview ${file.filename}...`);
-                await stopIfCriticalFsError(fs.writeFile(join(directory, file.filename), preview.content));
+                await stopIfCriticalFsError(
+                    fs.writeFile(join(directory, file.filename), preview.content),
+                );
                 logger.debug("Overwriting sidecar metadata with new metadata...");
                 sidecar.files[idx].engineData = { ...preview, content: undefined };
             }),
         );
 
-        logger.info(`Updating sidecar metadata for ${name} at ${sidecar.$originalfilename}...`);
-        await writeSidecarFile(directory, sidecar.$originalfilename, sidecar);
+        logger.info(`Updating sidecar metadata for ${name} at ${sidecar.$originalFilepath}...`);
+        await writeSidecarFile(directory, sidecar.$originalFilepath, sidecar);
 
         logger.info(`Finished rerendering ${name}`);
     }

email/mailmerge-cli/src/common/send.ts

@@ -10,10 +10,17 @@ import { createLogger } from "@docsoc/util";
 import chalk from "chalk";
 // Load dotenv
 import "dotenv/config";
+import { promises as fs } from "fs";
+import { mkdirp } from "mkdirp";
+import { basename, join } from "path";
 import readlineSync from "readline-sync";
 
 const logger = createLogger("docsoc");
 
+const move = (file: string, directory: string) => {
+    return fs.rename(file, join(directory, basename(file)));
+};
+
 export async function sendEmails(directory: string) {
     logger.info(`Sending previews at ${directory}...`);
 
@@ -26,6 +33,8 @@ export async function sendEmails(directory: string) {
         subject: string;
         html: string;
         attachments: string[];
+        /** These files will be moved to the sent folder on the file system so they are not resent (include sidecar data) */
+        filesToMove: string[];
     }[] = [];
     for await (const sidecar of sidecars) {
         const { name, engine: engineName, engineOptions, files } = sidecar;
@@ -52,6 +61,9 @@ export async function sendEmails(directory: string) {
             subject: sidecar.email.subject,
             html,
             attachments: sidecar.attachments,
+            filesToMove: files
+                .map((file) => join(directory, file.filename))
+                .concat([sidecar.$originalFilepath]),
         });
     }
 
@@ -88,7 +100,9 @@ If you are happy to proceed, please type "Yes, send emails" below.`),
     const mailer = getDefaultMailer();
     const total = pendingEmails.length;
     let sent = 0;
-    for (const { to, subject, html, attachments } of pendingEmails) {
+    const sentDir = join(directory, "sent");
+    await mkdirp(sentDir);
+    for (const { to, subject, html, attachments, filesToMove } of pendingEmails) {
         logger.info(`(${++sent} / ${total}) Sending email to ${to} with subject ${subject}...`);
         await defaultMailer(
             [to],
@@ -99,5 +113,13 @@ If you are happy to proceed, please type "Yes, send emails" below.`),
                 path: file,
             })),
         );
+
+        // Then move
+        await Promise.all(
+            filesToMove.map(async (file) => {
+                await move(file, sentDir);
+                logger.info(`Moved ${file} to ${sentDir}`);
+            }),
+        );
     }
 }

email/workspace/output/previews/identical.teal.starfish/[email protected] renamed to email/workspace/output/previews/identical.teal.starfish/sent/[email protected]

@@ -42,9 +42,10 @@
     ],
     "dependencies": {
         "axios": "^1.6.0",
+        "mkdirp": "^3.0.1",
         "tslib": "^2.3.0"
     },
     "nx": {
         "includedScripts": []
     }
-}
+}