fix: cappasity - allow to upload files of types other than cappasity … (#41)

* fix: cappasity - allow to upload files of types other than cappasity models

* add separate typemap for cappasity

Author: jenyapoyarkov

src/constant.js

@@ -57,3 +57,10 @@ exports.FIELDS_TO_STRINGIFY = [
   exports.FILES_CONTROLS_FIELD,
   exports.FILES_BACKGROUND_IMAGE_FIELD,
 ];
+
+exports.CAPPASITY_TYPE_MAP = {
+  'c-preview': 'preview',
+  'c-bin': 'model',
+  'c-texture': 'texture',
+  'c-archive': 'archive',
+};

src/custom/cappasity-process-pre.js

@@ -1,21 +1,14 @@
 const Promise = require('bluebird');
-const { FILES_OWNER_FIELD } = require('../constant.js');
+const { FILES_OWNER_FIELD, CAPPASITY_TYPE_MAP } = require('../constant.js');
 const { HttpStatusError } = require('common-errors');
 
-const TYPE_MAP = {
-  'c-preview': 'preview',
-  'c-bin': 'model',
-  'c-texture': 'texture',
-  'c-archive': 'archive',
-};
-
 function parseMeta(data) {
   const parsedFiles = typeof data.files === 'string' ? JSON.parse(data.files) : data.files;
   const output = {};
 
   let textures = 0;
   parsedFiles.forEach(({ type, filename }) => {
-    const responsibility = TYPE_MAP[type];
+    const responsibility = CAPPASITY_TYPE_MAP[type];
     if (responsibility === 'texture') {
       output[`texture_${textures}`] = filename;
       textures += 1;

src/custom/cappasity-upload-pre.js

@@ -1,6 +1,7 @@
 const Errors = require('common-errors');
 const Promise = require('bluebird');
 const assert = require('assert');
+const isCappasityUpload = require('../utils/isCappasityUpload');
 
 module.exports = function extractMetadata({ files, meta, temp }) {
   let sourceSHA;
@@ -26,13 +27,15 @@ module.exports = function extractMetadata({ files, meta, temp }) {
         }
       });
 
-      // assert constraints
-      if (differentFileTypes === 1) {
-        assert.equal(fileTypes['c-preview'], 1, 'must contain exactly one preview');
-      } else {
-        // must always be true if it's not a simple preview upload
-        assert.equal(fileTypes['c-bin'], 1, 'must contain exactly one binary upload');
-        meta.sourceSHA = sourceSHA;
+      if (isCappasityUpload(Object.keys(fileTypes))) {
+        // assert constraints
+        if (differentFileTypes === 1) {
+          assert.equal(fileTypes['c-preview'], 1, 'must contain exactly one preview');
+        } else {
+          // must always be true if it's not a simple preview upload
+          assert.equal(fileTypes['c-bin'], 1, 'must contain exactly one binary upload');
+          meta.sourceSHA = sourceSHA;
+        }
       }
 
       if (meta.export && !temp) {

src/utils/isCappasityUpload.js

@@ -0,0 +1,11 @@
+const intersectionBy = require('lodash/intersectionBy');
+const lowerCase = require('lodash/lowerCase');
+const { CAPPASITY_TYPE_MAP } = require('../constant');
+
+const CAPPASITY_FILES = Object.keys(CAPPASITY_TYPE_MAP);
+
+module.exports = function isCappasityUpload(types) {
+  const cappasityFiles = intersectionBy(types, CAPPASITY_FILES, lowerCase);
+
+  return cappasityFiles.length > 0;
+};