Keep existing public status after object update

when uploading a new version or modifying metadata, let object keep existing public status in db.
bcgov · May 21, 2024 · 0221e4b · 0221e4b
1 parent 71ee983
commit 0221e4b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/app/src/controllers/object.js b/app/src/controllers/object.js
@@ -147,9 +147,6 @@ const controller = {
       const s3Response = await storageService.copyObject(data);
 
       await utils.trxWrapper(async (trx) => {
-        // set public flag to false
-        await objectService.update({ id: objId, userId: userId, path: objPath, public: false });
-
         // create or update version in DB (if a non-versioned object)
         const version = s3Response.VersionId ?
           await versionService.copy(
@@ -848,9 +845,6 @@ const controller = {
       const s3Response = await storageService.copyObject(data);
 
       await utils.trxWrapper(async (trx) => {
-        // set public flag to false
-        await objectService.update({ id: objId, userId: userId, path: objPath, public: false });
-
         // create or update version (if a non-versioned object)
         const version = s3Response.VersionId ?
           await versionService.copy(
@@ -1030,7 +1024,6 @@ const controller = {
         name: filename,
         mimeType: req.currentUpload.mimeType,
         metadata: getMetadata(req.headers),
-        public: false, // New uploads always default to private ACL status
         tags: {
           ...req.query.tagset,
           'coms-id': objId // Enforce `coms-id:<objectId>` tag

diff --git a/app/tests/unit/controllers/object.spec.js b/app/tests/unit/controllers/object.spec.js
@@ -104,8 +104,6 @@ describe('addMetadata', () => {
     });
 
     expect(trxWrapperSpy).toHaveBeenCalledTimes(1);
-    expect(updateSpy).toHaveBeenCalledTimes(1);
-    expect(updateSpy).toHaveBeenCalledWith(expect.objectContaining({ public: false }));
     expect(versionCopySpy).toHaveBeenCalledTimes(1);
     expect(metadataAssociateMetadataSpy).toHaveBeenCalledTimes(1);
     expect(tagAssociateTagsSpy).toHaveBeenCalledTimes(1);
@@ -123,7 +121,7 @@ describe('addTags', () => {
 
   it('should add the new tags', async () => {
     // response from S3
-    const getObjectTaggingResponse = { TagSet: []};
+    const getObjectTaggingResponse = { TagSet: [] };
 
     // request object
     const req = {
@@ -165,7 +163,7 @@ describe('addTags', () => {
     const req = {
       params: { objectId: 'xyz-789' },
       query: {
-        tagset: { a: '1', b: '2', c: '3', d: '4', e: '5', f: '6', g: '7', h: '8', i: '9', j: '10'}
+        tagset: { a: '1', b: '2', c: '3', d: '4', e: '5', f: '6', g: '7', h: '8', i: '9', j: '10' }
       }
     };
     getCurrentUserIdSpy.mockReturnValue('user-123');
@@ -567,8 +565,6 @@ describe('replaceMetadata', () => {
     });
 
     expect(trxWrapperSpy).toHaveBeenCalledTimes(1);
-    expect(updateSpy).toHaveBeenCalledTimes(1);
-    expect(updateSpy).toHaveBeenCalledWith(expect.objectContaining({ public: false }));
     expect(versionCopySpy).toHaveBeenCalledTimes(1);
     expect(metadataAssociateMetadataSpy).toHaveBeenCalledTimes(1);
     expect(tagAssociateTagsSpy).toHaveBeenCalledTimes(1);