fix: data post-processing; feat: controlsData meta accepted (#17)

* fix: export settings pre-saved in file metadata
* feat: controlsData in metadata
* fixes starting export from upload
* adds ability to supply controlsData meta
* chore: update deps

Author: AVVS

package.json

@@ -30,11 +30,11 @@
     "lodash": "^4.13.1",
     "md5": "^2.1.0",
     "ms-amqp-transport": "^3.0.0",
-    "ms-conf": "^2.0.0",
+    "ms-conf": "^2.1.0",
     "ms-files-gce": "^1.0.1",
     "ms-files-providers": "^1.0.2",
     "ms-validation": "^2.0.0",
-    "mservice": "^2.4.0",
+    "mservice": "^2.5.1",
     "redis-filtered-sort": "^1.2.0"
   },
   "optionalDependencies": {
@@ -51,7 +51,7 @@
     "cz-conventional-changelog": "^1.1.6",
     "eslint": "^2.13.1",
     "eslint-config-airbnb-base": "^3.0.1",
-    "eslint-plugin-import": "^1.9.2",
+    "eslint-plugin-import": "^1.10.0",
     "eslint-plugin-mocha": "^3.0.0",
     "faker": "^3.1.0",
     "isparta": "^4.0.0",

schemas/common.json

@@ -14,6 +14,14 @@
       "type": "string",
       "pattern": "^[0-9A-Fa-f]{32}\/[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}\/[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-4[0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}"
     },
+    "controlsData": {
+      "type": "array",
+      "minItems": 29,
+      "maxItems": 29,
+      "items": {
+        "type": "number"
+      }
+    },
     "export": {
       "type": "object",
       "required": ["format", "compression"],
@@ -141,6 +149,9 @@
         },
         "export": {
           "$ref": "common#/definitions/export"
+        },
+        "controlsData": {
+          "$ref": "common#/definitions/controlsData"
         }
       }
     },

schemas/update.json

@@ -10,7 +10,14 @@
       "$ref": "common#/definitions/owner"
     },
     "meta": {
-      "$ref": "common#/definitions/meta"
+      "allOf": [
+        {
+          "not": { "required": ["export"] }
+        },
+        {
+          "$ref": "common#/definitions/meta"
+        }
+      ]
     }
   }
 }

src/actions/download.js

@@ -57,6 +57,8 @@ module.exports = function getDownloadURL(opts) {
         urls = Promise.map(files, file => provider.createSignedURL({ ...settings, resource: file.filename }));
       }
 
-      return Promise.props({ uploadId, name, files, urls, username: alias });
+      return Promise
+        .props({ uploadId, name, files, urls, username: alias })
+        .tap(output => this.hook.call(this, 'files:download:post', data, output));
     });
 };

src/actions/process.js

@@ -12,7 +12,7 @@ const hasAccess = require('../utils/hasAccess.js');
  * @return {Promise}
  */
 module.exports = function postProcessFile(opts) {
-  const { uploadId, username, export: exportSettings } = opts;
+  const { uploadId, username } = opts;
   const key = `${FILES_DATA}:${uploadId}`;
 
   return Promise
@@ -21,6 +21,7 @@ module.exports = function postProcessFile(opts) {
     .then(hasAccess(username))
     .then(data => {
       const status = data.status;
+      const exportSettings = opts.export || data.export;
 
       if (exportSettings) {
         if (data[exportSettings.format]) {

src/custom/cappasity-download-post.js

@@ -0,0 +1,16 @@
+const findIndex = require('lodash/findIndex');
+const PROPS_TO_ADD = ['model', 'obj', 'wrl', 'stl'];
+
+/**
+ * Decorates output with extra data to ease fetching of links
+ */
+module.exports = function decorateOutput(originalData, output) {
+  const files = originalData.files;
+  PROPS_TO_ADD.forEach(prop => {
+    const nonResolvedLink = originalData[prop];
+    if (nonResolvedLink) {
+      const idx = findIndex(files, { filename: nonResolvedLink });
+      output[prop] = output.urls[idx];
+    }
+  });
+};

test/docker-compose.yml

@@ -61,6 +61,7 @@ services:
     working_dir: /src
     volumes:
       - ${PWD}:/src
+      - /etc/localtime:/etc/localtime:ro
     container_name: tester
     environment:
       NODE_ENV: "test"