@researchdatabox/sails-hook-redbox-storage-mongo 1.4.8 → 1.4.10

package/api/services/MongoStorageService.js

@@ -146,6 +146,7 @@ var Services;
                     _.unset(record, 'dateCreated');
                     _.unset(record, 'lastSaveDate');
                     _.unset(record, '_id');
+                    _.unset(record, 'id');
                     yield Record.updateOne({ redboxOid: oid }).set(record);
                     response.success = true;
                 }
@@ -663,9 +664,11 @@ var Services;
         updateDatastream(oid, record, newMetadata, fileRoot, fileIdsAdded) {
             return FormsService.getFormByName(record.metaMetadata.form, true)
                 .flatMap(form => {
+                form = form !== null && form !== void 0 ? form : { attachmentFields: [] };
+                const typedForm = form;
                 const reqs = [];
                 record.metaMetadata.attachmentFields = form.attachmentFields;
-                _.each(form.attachmentFields, (attField) => __awaiter(this, void 0, void 0, function* () {
+                _.each(typedForm.attachmentFields, (attField) => __awaiter(this, void 0, void 0, function* () {
                     const oldAttachments = record.metadata[attField];
                     const newAttachments = newMetadata[attField];
                     const removeIds = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@researchdatabox/sails-hook-redbox-storage-mongo",
-  "version": "1.4.8",
+  "version": "1.4.10",
   "description": "A MongoDB storage plugin for ReDBox.",
   "main": "index.js",
   "sails": {

package/typescript/api/services/MongoStorageService.ts

@@ -153,6 +153,12 @@ export module Services {
         _.unset(record, 'dateCreated');
         _.unset(record, 'lastSaveDate');
         _.unset(record, '_id');
+
+        // Records with an 'id' property fail to save with error:
+        // {"cause":{"name":"AdapterError","adapterMethodName":"update","modelIdentity":"record","raw":{"code":"E_CANNOT_INTERPRET_AS_OBJECTID"}},"isOperational":true}
+        // Fix by ensuring the 'id' property is removed.
+        _.unset(record, 'id');
+
         await Record.updateOne({ redboxOid: oid }).set(record);
         response.success = true;
       } catch (err) {
@@ -700,9 +706,13 @@ export module Services {
       // loop thru the attachment fields and determine if we need to add or remove
       return FormsService.getFormByName(record.metaMetadata.form, true)
         .flatMap(form => {
+          // For any generated, view-only forms, the form may be null, add a coalescence to avoid breaking
+          // the attachment update process.
+          form = form ?? { attachmentFields: [] };
+          const typedForm = form as { attachmentFields: string[] };
           const reqs = [];
           record.metaMetadata.attachmentFields = form.attachmentFields;
-          _.each(form.attachmentFields, async (attField) => {
+          _.each(typedForm.attachmentFields, async (attField) => {
             const oldAttachments = record.metadata[attField];
             const newAttachments = newMetadata[attField];
             const removeIds = [];