spice-js 2.5.30 → 2.5.32

package/build/models/SpiceModel.js

@@ -92,12 +92,6 @@ class SpiceModel {
         }
       };
       this.deleted = false;
-      /*
-      if (args.args) {
-        delete args.args["ctx"];
-      }
-      */
-
       this[_database] = new Database(args.connection || "default", {
         collection: args.collection,
         scope: args.scope
@@ -802,11 +796,21 @@ class SpiceModel {
         data = Array.of(data);
       }
 
+      function log() {
+        if (source_property === "entity") {
+          for (var _len = arguments.length, message = new Array(_len), _key = 0; _key < _len; _key++) {
+            message[_key] = arguments[_key];
+          }
+
+          console.log(message);
+        }
+      }
+
       var classes = _.isArray(Class) ? Class : [Class];
       var ids = [];
 
       _.each(data, result => {
-        if (_.isString(result[source_property])) {
+        if (_.isString(result[source_property]) && result[source_property] != "") {
           ids = _.union(ids, [result[source_property]]);
         }
       });
@@ -822,7 +826,11 @@ class SpiceModel {
       })));
 
       data = _.map(data, result => {
-        result[store_property] = _.find(ug, g => g.id === result[source_property]) || {};
+        var result_found = _.find(ug, g => {
+          return g.id == result[source_property];
+        }) || {};
+        log(result[source_property], result_found.id);
+        result[store_property] = result_found;
         return result;
       });
       return original_is_array ? data : data[0];
@@ -852,7 +860,7 @@ class SpiceModel {
           value = [result[source_property]];
         }
 
-        var items = _.filter(value, obj => _.isString(obj));
+        var items = _.filter(value, obj => _.isString(obj) && obj != "");
 
         ids = _.union(ids, items);
       });

package/build/storage/Storage.js

@@ -52,6 +52,28 @@ class Storage {
     })();
   }
 
+  download(_ref2) {
+    var _this2 = this;
+
+    return _asyncToGenerator(function* () {
+      var {
+        file,
+        bucket,
+        options
+      } = _ref2;
+
+      if (options) {
+        _this2.driver_options = _lodash.default.merge(_this2.driver_options, options);
+      }
+
+      var driver = new _this2.Driver(_this2.driver_options);
+      return yield driver.download({
+        file,
+        bucket
+      });
+    })();
+  }
+
 }
 
 exports.default = Storage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-js",
-  "version": "2.5.30",
+  "version": "2.5.32",
   "description": "spice",
   "main": "build/index.js",
   "repository": {

package/src/models/SpiceModel.js

@@ -77,12 +77,6 @@ export default class SpiceModel {
       };
 
       this.deleted = false;
-
-      /*
-      if (args.args) {
-        delete args.args["ctx"];
-      }
-    */
       this[_database] = new Database(args.connection || "default", {
         collection: args.collection,
         scope: args.scope,
@@ -123,8 +117,8 @@ export default class SpiceModel {
                 this[i] = _.isBoolean(args.args[i])
                   ? args.args[i]
                   : args.args[i] == "true" ||
-                  args.args[i] == 1 ||
-                  args.args[i] == "True";
+                    args.args[i] == 1 ||
+                    args.args[i] == "True";
                 break;
               }
               case Date:
@@ -181,17 +175,19 @@ export default class SpiceModel {
   }
 
   async propsToBeRemoved(data) {
-
     if (!_.isArray(data)) {
-      data = Array.of(data)
+      data = Array.of(data);
     }
 
     if (this[_ctx]) {
-      let returned = await new this[_ctx].state.process_fields().process(this[_ctx], data, this.type);
+      let returned = await new this[_ctx].state.process_fields().process(
+        this[_ctx],
+        data,
+        this.type
+      );
       return returned;
-
     }
-    return []
+    return [];
   }
 
   createValidationString({ property_name, props, operation, complete }) {
@@ -711,11 +707,20 @@ export default class SpiceModel {
       data = Array.of(data);
     }
 
+    function log(...message) {
+      if (source_property === "entity") {
+        console.log(message);
+      }
+    }
+
     let classes = _.isArray(Class) ? Class : [Class];
 
     let ids = [];
     _.each(data, (result) => {
-      if (_.isString(result[source_property])) {
+      if (
+        _.isString(result[source_property]) &&
+        result[source_property] != ""
+      ) {
         ids = _.union(ids, [result[source_property]]);
       }
     });
@@ -736,8 +741,12 @@ export default class SpiceModel {
     );
 
     data = _.map(data, (result) => {
-      result[store_property] =
-        _.find(ug, (g) => g.id === result[source_property]) || {};
+      let result_found =
+        _.find(ug, (g) => {
+          return g.id == result[source_property];
+        }) || {};
+      log(result[source_property], result_found.id);
+      result[store_property] = result_found;
       return result;
     });
     return original_is_array ? data : data[0];
@@ -766,7 +775,7 @@ export default class SpiceModel {
         value = [result[source_property]];
       }
 
-      let items = _.filter(value, (obj) => _.isString(obj));
+      let items = _.filter(value, (obj) => _.isString(obj) && obj != "");
       ids = _.union(ids, items);
     });
 
@@ -877,11 +886,11 @@ export default class SpiceModel {
   async do_serialize(data, type, old_data, args, path_to_be_removed) {
     try {
       // run serializers
-      
-      if(!path_to_be_removed){
-         path_to_be_removed =[]
+
+      if (!path_to_be_removed) {
+        path_to_be_removed = [];
       }
-     
+
       if (this.shouldSerializerRun(args, type)) {
         for (let i of this[_serializers][type]["modifiers"]) {
           try {
@@ -908,9 +917,9 @@ export default class SpiceModel {
           ) {
             defaults[i] = _.isFunction(this.props[i].defaults[type])
               ? this.props[i].defaults[type]({
-                old_data: data,
-                new_data: old_data,
-              })
+                  old_data: data,
+                  new_data: old_data,
+                })
               : this.props[i].defaults[type];
           }
         }
@@ -921,7 +930,6 @@ export default class SpiceModel {
 
         // apply cleaners
         if (type == "read") {
-   
           let props_to_clean = ["deleted", "type", ...path_to_be_removed];
           for (let i in this.props) {
             if (this.props[i].hide) {

package/src/storage/Storage.js

@@ -27,4 +27,15 @@ export default class Storage {
         : path,
     });
   }
+
+  async download({ file, bucket, options }) {
+    if (options) {
+      this.driver_options = _.merge(this.driver_options, options);
+    }
+    let driver = new this.Driver(this.driver_options);
+    return await driver.download({
+      file,
+      bucket,
+    });
+  }
 }