@researchdatabox/sails-hook-redbox-storage-mongo 1.4.9 → 1.5.1

package/.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "master"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "master"

package/api/services/MongoStorageService.js

@@ -12,8 +12,9 @@ var __await = (this && this.__await) || function (v) { return this instanceof __
 var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
     if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
     var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
+    return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+    function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+    function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
     function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
     function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
     function fulfill(value) { resume("next", value); }
@@ -22,9 +23,9 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Services = void 0;
-const Rx_1 = require("rxjs/Rx");
+const rxjs_1 = require("rxjs");
 const uuid_1 = require("uuid");
-const moment = require("moment");
+const luxon_1 = require("luxon");
 const mongodb = require("mongodb");
 const util = require("util");
 const stream = require("stream");
@@ -151,8 +152,14 @@ var Services;
                     response.success = true;
                 }
                 catch (err) {
-                    sails.log.error(`${this.logHeader} Failed to save update to MongoDB:`);
-                    sails.log.error(JSON.stringify(err));
+                    sails.log.error(`${this.logHeader} Failed to save update to MongoDB: ${JSON.stringify({
+                        error: err,
+                        response: response,
+                        brand: brand,
+                        oid: oid,
+                        record: record,
+                        user: user,
+                    })}`);
                     response.success = false;
                     response.message = err;
                 }
@@ -199,28 +206,24 @@ var Services;
         provideUserAccessAndRemovePendingAccess(oid, userid, pendingValue) {
             const batchFn = () => __awaiter(this, void 0, void 0, function* () {
                 const metadata = yield this.getMeta(oid);
-                var pendingEditArray = metadata['authorization']['editPending'];
-                var editArray = metadata['authorization']['edit'];
-                for (var i = 0; i < pendingEditArray.length; i++) {
-                    if (pendingEditArray[i] == pendingValue) {
-                        pendingEditArray = pendingEditArray.filter(e => e !== pendingValue);
-                        editArray = editArray.filter(e => e !== userid);
-                        editArray.push(userid);
-                    }
-                }
-                metadata['authorization']['editPending'] = pendingEditArray;
-                metadata['authorization']['edit'] = editArray;
-                var pendingViewArray = metadata['authorization']['viewPending'];
-                var viewArray = metadata['authorization']['view'];
-                for (var i = 0; i < pendingViewArray.length; i++) {
-                    if (pendingViewArray[i] == pendingValue) {
-                        pendingViewArray = pendingViewArray.filter(e => e !== pendingValue);
-                        viewArray = viewArray.filter(e => e !== userid);
-                        viewArray.push(userid);
-                    }
-                }
-                metadata['authorization']['viewPending'] = pendingViewArray;
-                metadata['authorization']['view'] = viewArray;
+                const pendingEditArray = _.get(metadata, 'authorization.editPending', []);
+                const editArray = _.get(metadata, 'authorization.edit', []);
+                const pendingEditArrayFiltered = pendingEditArray.filter(value => value !== pendingValue);
+                const pendingEditFound = pendingEditArray.length > pendingEditArrayFiltered.length;
+                if (pendingEditFound && !editArray.includes(userid)) {
+                    editArray.push(userid);
+                }
+                _.set(metadata, 'authorization.editPending', pendingEditArrayFiltered);
+                _.set(metadata, 'authorization.edit', editArray);
+                const pendingViewArray = _.get(metadata, 'authorization.viewPending', []);
+                const viewArray = _.get(metadata, 'authorization.view', []);
+                const pendingViewArrayFiltered = pendingViewArray.filter(value => value !== pendingValue);
+                const pendingViewFound = pendingViewArray.length > pendingViewArrayFiltered.length;
+                if (pendingViewFound && !viewArray.includes(userid)) {
+                    viewArray.push(userid);
+                }
+                _.set(metadata, 'authorization.viewPending', pendingViewArrayFiltered);
+                _.set(metadata, 'authorization.view', viewArray);
                 try {
                     yield this.updateMeta(null, oid, metadata);
                 }
@@ -231,8 +234,8 @@ var Services;
             });
             batchFn();
         }
-        getRelatedRecords(oid, brand, recordTypeName = null, mappingContext = null) {
-            return __awaiter(this, void 0, void 0, function* () {
+        getRelatedRecords(oid_1, brand_1) {
+            return __awaiter(this, arguments, void 0, function* (oid, brand, recordTypeName = null, mappingContext = null) {
                 let record = yield this.getMeta(oid);
                 if (_.isEmpty(recordTypeName)) {
                     recordTypeName = record['metaMetadata']['type'];
@@ -284,8 +287,8 @@ var Services;
                 return mappingContext;
             });
         }
-        delete(oid, permanentlyDelete = false) {
-            return __awaiter(this, void 0, void 0, function* () {
+        delete(oid_1) {
+            return __awaiter(this, arguments, void 0, function* (oid, permanentlyDelete = false) {
                 const response = new redbox_core_types_1.StorageServiceResponse();
                 try {
                     if (permanentlyDelete) {
@@ -333,7 +336,7 @@ var Services;
                     const logName = _.get(options, 'logName', null);
                     if (logName) {
                         let log = _.get(record, logName, null);
-                        const entry = { date: moment().format('YYYY-MM-DDTHH:mm:ss') };
+                        const entry = { date: luxon_1.DateTime.now().toFormat("yyyy-LL-dd'T'HH:mm:ss") };
                         if (log) {
                             log.push(entry);
                         }
@@ -367,8 +370,8 @@ var Services;
                 return record;
             });
         }
-        getDeletedRecords(workflowState, recordType = undefined, start, rows = 10, username, roles, brand, editAccessOnly = undefined, packageType = undefined, sort = undefined, filterFields = undefined, filterString = undefined, filterMode = 'regex') {
-            return __awaiter(this, void 0, void 0, function* () {
+        getDeletedRecords(workflowState_1) {
+            return __awaiter(this, arguments, void 0, function* (workflowState, recordType = undefined, start, rows = 10, username, roles, brand, editAccessOnly = undefined, packageType = undefined, sort = undefined, filterFields = undefined, filterString = undefined, filterMode = 'regex') {
                 let query = {
                     "deletedRecordMetadata.metaMetadata.brandId": brand.id
                 };
@@ -446,8 +449,8 @@ var Services;
                 return response;
             });
         }
-        getRecords(workflowState, recordType = undefined, start, rows = 10, username, roles, brand, editAccessOnly = undefined, packageType = undefined, sort = undefined, filterFields = undefined, filterString = undefined, filterMode = undefined, secondarySort = undefined) {
-            return __awaiter(this, void 0, void 0, function* () {
+        getRecords(workflowState_1) {
+            return __awaiter(this, arguments, void 0, function* (workflowState, recordType = undefined, start, rows = 10, username, roles, brand, editAccessOnly = undefined, packageType = undefined, sort = undefined, filterFields = undefined, filterString = undefined, filterMode = undefined, secondarySort = undefined) {
                 if (_.isUndefined(filterMode) || _.isNull(filterMode) || _.isEmpty(filterMode)) {
                     filterMode = 'regex';
                 }
@@ -563,8 +566,8 @@ var Services;
                 return { items: yield this.deletedRecordCol.find(query, options).toArray(), totalItems: yield this.deletedRecordCol.count(query) };
             });
         }
-        fetchAllRecords(query, options, stringifyJSON = false) {
-            return __asyncGenerator(this, arguments, function* fetchAllRecords_1() {
+        fetchAllRecords(query_1, options_1) {
+            return __asyncGenerator(this, arguments, function* fetchAllRecords_1(query, options, stringifyJSON = false) {
                 let skip = 0;
                 let limit = options.limit;
                 options.skip = skip;
@@ -689,9 +692,9 @@ var Services;
                     reqs.push(this.addAndRemoveDatastreams(oid, fileIdsAdded, removeIds));
                 }));
                 if (_.isEmpty(reqs)) {
-                    reqs.push(Rx_1.Observable.of({ "request": "dummy" }));
+                    reqs.push((0, rxjs_1.of)({ "request": "dummy" }));
                 }
-                return Rx_1.Observable.of(reqs);
+                return (0, rxjs_1.of)(reqs);
             });
         }
         removeDatastream(oid, datastream) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@researchdatabox/sails-hook-redbox-storage-mongo",
-  "version": "1.4.9",
+  "version": "1.5.1",
   "description": "A MongoDB storage plugin for ReDBox.",
   "main": "index.js",
   "sails": {
@@ -11,9 +11,16 @@
     "url": "https://github.com/redbox-mint/sails-hook-redbox-storage-mongo.git"
   },
   "scripts": {
-    "test": "NODE_ENV=test; mocha",
-    "installHook": "docker run -v $(pwd):/opt/sailshook qcifengineering/redbox-portal /bin/bash -c 'cd /opt/redbox-portal;yarn add  \"file:/opt/sailshook\"'; docker commit $(docker ps -lq) redboxportalwithhook",
-    "runDev": "docker-compose -f support/development/docker-compose.yml up"
+    "compile": "./node_modules/typescript/bin/tsc -p tsconfig.json",
+    "dev:run": "docker compose -f ./support/docker-compose.yml -f ./support/docker-compose.dev.yml up --menu=false --remove-orphans --abort-on-container-exit --exit-code-from rbportal",
+    "predev:run": "npm install --ignore-scripts && npm run compile",
+    "dev:clean": "docker compose -f ./support/docker-compose.yml -f ./support/docker-compose.dev.yml down",
+    "dev:logs": "docker compose -f ./support/docker-compose.yml -f ./support/docker-compose.dev.yml logs",
+    "dev:removedata": "docker compose -f ./support/docker-compose.yml -f ./support/docker-compose.dev.yml down -v",
+    "test": "docker compose -f ./support/docker-compose.yml -f ./support/docker-compose.mocha.yml up --menu=false --abort-on-container-exit --exit-code-from rbportal",
+    "pretest": "npm install --ignore-scripts && npm run compile",
+    "posttest": "npm run test:clean",
+    "test:clean": "docker compose -f ./support/docker-compose.yml -f ./support/docker-compose.mocha.yml down -v"
   },
   "keywords": [
     "sails",
@@ -26,27 +33,31 @@
   "author": "QCIF Engineering dev@redboxresearchdata.com.au",
   "license": "GPL-3.0",
   "devDependencies": {
-    "@researchdatabox/redbox-core-types": "^1.4.3",
-    "@types/chai": "^4.2.12",
-    "@types/lodash": "^4.14.159",
-    "@types/mocha": "^8.0.3",
-    "chai": "^4.2.0",
+    "@researchdatabox/redbox-core-types": "^1.5.0",
+    "@types/chai": "5.2.2",
+    "@types/lodash": "4.17.17",
+    "@types/mocha": "10.0.10",
+    "@types/node": "20.17.51",
+    "chai": "5.2.0",
     "fs": "0.0.1-security",
-    "mocha": "^8.1.1",
-    "moment": "^2.29.1",
-    "mongodb": "^6.2.0",
-    "rxjs": "^6.6.2",
-    "rxjs-compat": "^6.6.7",
-    "sails": "^1.2.5",
-    "stream": "0.0.2",
-    "typescript": "^5.2.2",
-    "util": "^0.12.4"
+    "luxon": "^3.7.1",
+    "mocha": "11.5.0",
+    "mocha-junit-reporter": "2.2.1",
+    "mongodb": "6.16.0",
+    "sails": "1.5.14",
+    "stream": "0.0.3",
+    "typescript": "5.5.4",
+    "util": "0.12.5"
   },
   "dependencies": {
     "json2csv": "^5.0.3",
     "lodash": "^4.17.21",
     "uuid": "8.3.0"
   },
+  "peerDependencies": {
+    "luxon": ">=3.0.0",
+    "rxjs": ">=7.0.0"
+  },
   "publishConfig": {
     "access": "public"
   }

package/test/unit/.mocharc.js

@@ -0,0 +1,21 @@
+"use strict";
+
+module.exports = {
+    require: "chai",
+    recursive: true,
+    slow: 2000,
+    timeout: "20s",
+    ui: "bdd",
+    global: ["sails", "moment", "_", "expect"],
+};
+
+if (process.env.CI === "true") {
+    console.log("Mocha running in CI.");
+    // (For CI) Run mocha and write results to a junit format file:
+    module.exports["reporter"] = "mocha-junit-reporter";
+    module.exports["reporter-option"] = "mochaFile=/opt/redbox-portal/node_modules/@researchdatabox/sails-hook-redbox-storage-mongo/support/junit/unit-mocha.xml";
+} else {
+    console.log("Mocha running in local dev.");
+    // (For development) Run mocha and show the results on stdout:
+    module.exports["reporter"] = "spec";
+}

package/test/unit/bootstrap.js

@@ -0,0 +1,63 @@
+var sails = require("sails");
+var _ = require("lodash");
+
+global.moment = require("moment");
+global.sails = sails;
+global._ = _;
+
+/* global before, after */
+
+before(function (done) {
+    import("chai").then((chai) => {
+        global.chai = chai;
+        global.should = chai.should();
+        global.expect = chai.expect;
+
+        // Set the timeout so that Sails has enough time to lift.
+        this.timeout(60000);
+        sails.lift({
+            log: {
+                level: "verbose",
+            },
+            hooks: {
+                grunt: false,
+            },
+            models: {
+                datastore: "mongodb",
+                migrate: "drop",
+            },
+            datastores: {
+                mongodb: {
+                    adapter: require('sails-mongo'),
+                    url: "mongodb://mongodb:27017/redbox-portal"
+                },
+                redboxStorage: {
+                    adapter: require('sails-mongo'),
+                    url: 'mongodb://mongodb:27017/redbox-storage'
+                }
+            },
+            security: {
+                csrf: false,
+            },
+            auth: {
+                default: {
+                    local: {
+                        default: {
+                            token: "auth-default-local-default-token",
+                        },
+                    },
+                },
+            },
+        }, function (err, server) {
+            if (err) return done(err);
+            done(err, sails);
+        });
+    });
+});
+
+after(function (done) {
+    // here you can clear fixtures, etc.
+    if (sails && _.isFunction(sails.lower)) {
+        sails.lower(done);
+    }
+});

package/test/unit/db/storage.test.js

@@ -0,0 +1,121 @@
+const service = require("../../../api/services/MongoStorageService");
+
+
+/* global describe, it, expect */
+
+async function sleep(ms = 300) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+describe("Records", function () {
+    [
+        {
+            // missing 'editPending' does not cause error
+            args: {
+                record: {
+                    metadata: {},
+                    "authorization": {
+                        "viewRoles": ["Admin", "Librarians"],
+                        "editRoles": ["Admin", "Librarians"],
+                        "view": ["example-2@redboxresearchdata.com.au"],
+                        "edit": [],
+                        "viewPending": ["example-1@redboxresearchdata.com.au"]
+                    }
+                }
+            },
+            expected: {
+                record: {
+                    "authorization": {
+                        "viewRoles": ["Admin", "Librarians"],
+                        "editRoles": ["Admin", "Librarians"],
+                        "view": ["example-2@redboxresearchdata.com.au", "example-1@redboxresearchdata.com.au"],
+                        "edit": [],
+                        "viewPending": [],
+                        "editPending": [],
+                    }
+                }
+            },
+        },
+        {
+            // duplicate entries in pending array are transformed to in one entry in real access array
+            args: {
+                record: {
+                    metadata: {},
+                    "authorization": {
+                        "viewRoles": ["Admin", "Librarians"],
+                        "editRoles": ["Admin", "Librarians"],
+                        "view": ["example-2@redboxresearchdata.com.au"],
+                        "edit": [],
+                        "viewPending": [],
+                        "editPending": ["example-1@redboxresearchdata.com.au", "example-1@redboxresearchdata.com.au"],
+                    }
+                }
+            },
+            expected: {
+                record: {
+                    "authorization": {
+                        "viewRoles": ["Admin", "Librarians"],
+                        "editRoles": ["Admin", "Librarians"],
+                        "view": ["example-2@redboxresearchdata.com.au"],
+                        "edit": ["example-1@redboxresearchdata.com.au"],
+                        "viewPending": [],
+                        "editPending": [],
+                    }
+                }
+            },
+        },
+        {
+            // same entry in real access array and pending is removed from pending array
+            args: {
+                record: {
+                    metadata: {},
+                    "authorization": {
+                        "viewRoles": ["Admin", "Librarians"],
+                        "editRoles": ["Admin", "Librarians"],
+                        "view": ["example-2@redboxresearchdata.com.au"],
+                        "edit": ["example-1@redboxresearchdata.com.au"],
+                        "viewPending": [],
+                        "editPending": ["example-1@redboxresearchdata.com.au"],
+                    }
+                }
+            },
+            expected: {
+                record: {
+                    "authorization": {
+                        "viewRoles": ["Admin", "Librarians"],
+                        "editRoles": ["Admin", "Librarians"],
+                        "view": ["example-2@redboxresearchdata.com.au"],
+                        "edit": ["example-1@redboxresearchdata.com.au"],
+                        "viewPending": [],
+                        "editPending": [],
+                    }
+                }
+            },
+        }
+    ].forEach(({args, expected}) => {
+        it(`should provideUserAccessAndRemovePendingAccess as expected '${JSON.stringify(args)}' = ${JSON.stringify(expected)}`, async function () {
+
+            const brand = 'testing-brand';
+            const record = args.record;
+            const recordType = "rdmp";
+
+            const response = await service.create(brand, record, recordType);
+
+            expect(response.oid).to.have.lengthOf(32);
+
+            const oid = response.oid;
+            const userid = "example-1@redboxresearchdata.com.au";
+            const pendingValue = "example-1@redboxresearchdata.com.au";
+
+            service.provideUserAccessAndRemovePendingAccess(oid, userid, pendingValue);
+            // TODO: provideUserAccessAndRemovePendingAccess is a sync method, but it calls async methods.
+            //      So, wait for a bit for the method to complete.
+            //      This means that any errors may not be raised, as they occur in an untracked async function.
+            await sleep(5000);
+
+            const result = await service.getMeta(oid);
+
+            expect(result.authorization).to.eql(expected.record.authorization);
+        });
+    });
+});

package/transformer/ExportJSONTransformer.js

@@ -1,12 +1,12 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 const { Transform } = require('stream');
-const moment = require("moment");
+const luxon_1 = require("luxon");
 class ExportJSONTransformer extends Transform {
     constructor(recordtype, modifiedBefore, modifiedAfter) {
         super();
         this.first = true;
-        this.push(`{ "recordType": "${recordtype}",\n "dateGenerated": "${moment().toISOString()}",\n`);
+        this.push(`{ "recordType": "${recordtype}",\n "dateGenerated": "${luxon_1.DateTime.now().toISO()}",\n`);
         if (!_.isEmpty(modifiedBefore) || !_.isEmpty(modifiedAfter)) {
             this.push(`"dateModifiedRange": ${this.getDateModifiedRangeObject(modifiedBefore, modifiedAfter)},\n`);
         }

package/typescript/api/services/MongoStorageService.ts

@@ -1,10 +1,8 @@
-import {
-  Observable
-} from 'rxjs/Rx';
+import { Observable, of } from 'rxjs';
 
 import { Sails, Model } from "sails";
 import { v1 as uuidv1 } from 'uuid';
-import moment = require('moment');
+import { DateTime } from 'luxon';
 
 import mongodb = require('mongodb');
 import util = require('util');
@@ -162,8 +160,14 @@ export module Services {
         await Record.updateOne({ redboxOid: oid }).set(record);
         response.success = true;
       } catch (err) {
-        sails.log.error(`${this.logHeader} Failed to save update to MongoDB:`);
-        sails.log.error(JSON.stringify(err));
+        sails.log.error(`${this.logHeader} Failed to save update to MongoDB: ${JSON.stringify({
+          error: err,
+          response: response,
+          brand: brand,
+          oid: oid,
+          record: record,
+          user: user,
+        })}`);
         response.success = false;
         response.message = err;
       }
@@ -208,33 +212,55 @@ export module Services {
       return response;
     }
 
+    /**
+     * If pendingValue is in editPending or viewPending, remove all instances from the pending arrays and
+     * put the userid in the matching access / non-pending array, then save the changes to the storage.
+     *
+     * Implementation Note: This is a sync method, but it calls async methods.
+     * This means that the storage will not be updated when this method returns, but at some point later.
+     *
+     * @param oid The record identifier.
+     * @param userid The value to put in the matching access / non-pending arrays.
+     * @param pendingValue The value to find in the pending arrays.
+     */
     public provideUserAccessAndRemovePendingAccess(oid, userid, pendingValue): void {
       const batchFn = async () => {
         const metadata = await this.getMeta(oid);
-        // remove pending edit access and add real edit access with userid
-        var pendingEditArray = metadata['authorization']['editPending'];
-        var editArray = metadata['authorization']['edit'];
-        for (var i = 0; i < pendingEditArray.length; i++) {
-          if (pendingEditArray[i] == pendingValue) {
-            pendingEditArray = pendingEditArray.filter(e => e !== pendingValue);
-            editArray = editArray.filter(e => e !== userid);
-            editArray.push(userid);
-          }
+
+        // Update edit authorization - remove pending edit access and add real edit access with userid
+        const pendingEditArray: string[] = _.get(metadata, 'authorization.editPending', []);
+        const editArray: string[] = _.get(metadata, 'authorization.edit', []);
+
+        // remove all items matching pendingValue from the pendingEditArray
+        const pendingEditArrayFiltered = pendingEditArray.filter(value => value !== pendingValue);
+        const pendingEditFound = pendingEditArray.length > pendingEditArrayFiltered.length;
+
+        // add the item to the editArray if it existed in the pendingEditArray, and it is not in the editArray
+        if (pendingEditFound && !editArray.includes(userid)) {
+          editArray.push(userid);
         }
-        metadata['authorization']['editPending'] = pendingEditArray;
-        metadata['authorization']['edit'] = editArray;
-
-        var pendingViewArray = metadata['authorization']['viewPending'];
-        var viewArray = metadata['authorization']['view'];
-        for (var i = 0; i < pendingViewArray.length; i++) {
-          if (pendingViewArray[i] == pendingValue) {
-            pendingViewArray = pendingViewArray.filter(e => e !== pendingValue);
-            viewArray = viewArray.filter(e => e !== userid);
-            viewArray.push(userid);
-          }
+
+        // update the metadata with the modified arrays
+        _.set(metadata, 'authorization.editPending', pendingEditArrayFiltered);
+        _.set(metadata, 'authorization.edit', editArray);
+
+        // Update view authorization - remove pending view access and add real view access with userid
+        const pendingViewArray: string[] = _.get(metadata, 'authorization.viewPending', []);
+        const viewArray: string[] = _.get(metadata, 'authorization.view', []);
+
+        // remove all items matching pendingValue from the pendingViewArray
+        const pendingViewArrayFiltered = pendingViewArray.filter(value => value !== pendingValue);
+        const pendingViewFound = pendingViewArray.length > pendingViewArrayFiltered.length;
+
+        // add the item to the viewArray if it existed in the pendingViewArray, and it is not in the viewArray
+        if (pendingViewFound && !viewArray.includes(userid)) {
+          viewArray.push(userid);
         }
-        metadata['authorization']['viewPending'] = pendingViewArray;
-        metadata['authorization']['view'] = viewArray;
+
+        // update the metadata with the modified arrays
+        _.set(metadata, 'authorization.viewPending', pendingViewArrayFiltered);
+        _.set(metadata, 'authorization.view', viewArray);
+
         try {
           await this.updateMeta(null, oid, metadata);
         } catch (err) {
@@ -242,6 +268,8 @@ export module Services {
           sails.log.error(JSON.stringify(err));
         }
       };
+
+      // TODO: Fix this so that the method only returns after the storage is updated.
       batchFn();
     }
 
@@ -345,7 +373,8 @@ export module Services {
         const logName = _.get(options, 'logName', null);
         if (logName) {
           let log = _.get(record, logName, null);
-          const entry = { date: moment().format('YYYY-MM-DDTHH:mm:ss') };
+          // Use Luxon for ISO-like local timestamp without timezone offset
+          const entry = { date: DateTime.now().toFormat("yyyy-LL-dd'T'HH:mm:ss") };
           if (log) {
             log.push(entry);
           } else {
@@ -733,9 +762,9 @@ export module Services {
             reqs.push(this.addAndRemoveDatastreams(oid, fileIdsAdded, removeIds));
           });
           if (_.isEmpty(reqs)) {
-            reqs.push(Observable.of({ "request": "dummy" }));
+            reqs.push(of({ "request": "dummy" }));
           }
-          return Observable.of(reqs);
+          return of(reqs);
         });
     }
 

package/typescript/transformer/ExportJSONTransformer.ts

@@ -1,16 +1,16 @@
 'use strict';
 
-const {
-    Transform
-} = require('stream');
-import moment = require('moment');
+const { Transform } = require('stream');
+import { DateTime } from 'luxon';
+declare var require: any;
+declare var module: any;
 declare let sails, _;
 
 class ExportJSONTransformer extends Transform {
     first:boolean = true;
     constructor(recordtype:string, modifiedBefore:string, modifiedAfter:string) {
         super();
-        this.push(`{ "recordType": "${recordtype}",\n "dateGenerated": "${moment().toISOString()}",\n`)
+    this.push(`{ "recordType": "${recordtype}",\n "dateGenerated": "${DateTime.now().toISO()}",\n`)
         if(!_.isEmpty(modifiedBefore) || !_.isEmpty(modifiedAfter)) {
             this.push(`"dateModifiedRange": ${this.getDateModifiedRangeObject(modifiedBefore, modifiedAfter)},\n`);
         }

package/test/bootstrap.js

@@ -1,65 +0,0 @@
-var Sails = require('sails').Sails;
-
- describe('Bootstrap tests ::', function() {
-     // Var to hold a running sails app instance
-     var _sails;
-     var appPath = '/opt/redbox-portal'
-
-     // Before running any tests, attempt to lift Sails
-     before(function (done) {
-
-         // Hook will timeout in 10 seconds
-         this.timeout(11000);
-
-         // Attempt to lift sails
-         Sails().lift({
-           appPath: appPath,
-           models: {
-            migrate: 'drop'
-           },
-           datastores: {
-             mongodb: {
-               adapter: require(appPath+'/node_modules/sails-mongo'),
-               url: "mongodb://mongodb:27017/redbox-portal"
-             },
-             redboxStorage: {
-              adapter: require(appPath+'/node_modules/sails-mongo'),
-              url: 'mongodb://mongodb:27017/redbox-storage'
-            }
-           },
-           globals: {
-             sails: true,
-             _: require('lodash'),
-             async: require('async'),
-             models: true,
-             services: true
-           },
-           hooks: {
-             // Skip grunt (unless your hook uses it)
-             "grunt": false
-           },
-           log: {level: "verbose"}
-         },function (err, __sails) {
-           if (err) return done(err);
-           _sails = __sails;
-           return done();
-         });
-     });
-
-     // After tests are complete, lower Sails
-     after(function (done) {
-
-         // Lower Sails (if it successfully lifted)
-         if (_sails) {
-             return _sails.lower(done);
-         }
-         // Otherwise just return
-         return done();
-     });
-
-     // Test that Sails can lift with the hook in place
-     it ('sails does not crash', function() {
-         return true;
-     });
-
- });