fix: #43, not deleting old files

Author: jmikrut

dev/package.json

@@ -21,7 +21,7 @@
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
     "image-size": "^1.0.2",
-    "payload": "^1.6.6",
+    "payload": "^1.7.2",
     "probe-image-size": "^7.2.3"
   },
   "devDependencies": {

package.json

@@ -17,7 +17,7 @@
     "@aws-sdk/lib-storage": "^3.267.0",
     "@azure/storage-blob": "^12.11.0",
     "@google-cloud/storage": "^6.4.1",
-    "payload": "^1.0.27"
+    "payload": "^1.7.2"
   },
   "peerDependenciesMeta": {
     "@aws-sdk/client-s3": {
@@ -55,7 +55,7 @@
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-prettier": "^4.0.0",
     "nodemon": "^2.0.6",
-    "payload": "^1.6.6",
+    "payload": "^1.7.2",
     "prettier": "^2.7.1",
     "rimraf": "^4.1.2",
     "ts-node": "^9.1.1",
@@ -64,4 +64,4 @@
   "dependencies": {
     "range-parser": "^1.2.1"
   }
-}
+}

src/hooks/beforeChange.ts

@@ -11,15 +11,44 @@ interface Args {
 
 export const getBeforeChangeHook =
   ({ collection, adapter }: Args): CollectionBeforeChangeHook<FileData & TypeWithID> =>
-  async ({ req, data }) => {
+  async ({ req, data, originalDoc }) => {
     try {
       const files = getIncomingFiles({ req, data })
 
-      const promises = files.map(async file => {
-        await adapter.handleUpload({ collection, data, req, file })
-      })
+      if (files.length > 0) {
+        // If there is an original doc,
+        // And we have new files,
+        // We need to delete the old files before uploading new
+        if (originalDoc) {
+          let filesToDelete: string[] = []
 
-      await Promise.all(promises)
+          if (typeof originalDoc?.filename === 'string') {
+            filesToDelete.push(originalDoc.filename)
+          }
+
+          if (typeof originalDoc.sizes === 'object') {
+            filesToDelete = filesToDelete.concat(
+              Object.values(originalDoc?.sizes || []).map(
+                resizedFileData => resizedFileData?.filename,
+              ),
+            )
+          }
+
+          const deletionPromises = filesToDelete.map(async filename => {
+            if (filename) {
+              await adapter.handleDelete({ collection, doc: originalDoc, req, filename })
+            }
+          })
+
+          await Promise.all(deletionPromises)
+        }
+
+        const promises = files.map(async file => {
+          await adapter.handleUpload({ collection, data, req, file })
+        })
+
+        await Promise.all(promises)
+      }
     } catch (err: unknown) {
       req.payload.logger.error(
         `There was an error while uploading files corresponding to the collection ${collection.slug} with filename ${data.filename}:`,