Prune tags and metadata during obj/version delete

bcgov · Sep 14, 2022 · ea286d1 · ea286d1
1 parent 7dc892f
commit ea286d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/src/controllers/object.js b/app/src/controllers/object.js
@@ -353,8 +353,10 @@ const controller = {
         const objectVersionId = s3Response.VersionId;
         // delete version in DB
         await versionService.delete(objId, objectVersionId);
+        // prune tags amd metadata
+        await metadataService.pruneOrphanedMetadata();
+        await tagService.pruneOrphanedTags();
         // if other versions in DB, delete object record
-        // TODO: synch with versions in S3
         const remainingVersions = await versionService.list(objId);
         if (remainingVersions.length === 0) await objectService.delete(objId);
       } else { // else deleting the object
@@ -371,6 +373,9 @@ const controller = {
         } else { // else object in bucket is not versioned
           // delete object record from DB
           await objectService.delete(objId);
+          // prune tags amd metadata
+          await metadataService.pruneOrphanedMetadata();
+          await tagService.pruneOrphanedTags();
         }
       }
 

diff --git a/app/src/services/version.js b/app/src/services/version.js
@@ -111,8 +111,6 @@ const service = {
         .returning('*')
         .throwIfNotFound();
 
-      // TODO: prune metadata and tags
-
       if (!etrx) await trx.commit();
       return Promise.resolve(response);
     } catch (err) {