spice-js 2.6.36 → 2.6.38

package/build/models/SpiceModel.js

@@ -9,6 +9,8 @@ var _ResourceLifecycleTriggered = _interopRequireDefault(require("../events/even
 
 var _Security = require("../utility/Security");
 
+var _fix = require("../utility/fix");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -883,7 +885,7 @@ class SpiceModel {
 
     return _asyncToGenerator(function* () {
       try {
-        var _args4, _args5, _args6, _args7;
+        var _args4, _args5, _args6;
 
         if (!args) {
           args = {};
@@ -1014,18 +1016,18 @@ class SpiceModel {
 
           _.each(nestings, nesting => {
             if (nesting.type == _2.DataType.ARRAY || nesting.type == Array || nesting.type == "array") {
-              joinSection += "NEST `" + nesting.reference + "` AS `" + nesting.alias + "` ON KEYS `" + that.type + "`.`" + nesting.alias + "` ";
+              joinSection += "NEST `" + (0, _fix.fixCollection)(nesting.reference) + "` AS `" + nesting.alias + "` ON KEYS `" + that.type + "`.`" + nesting.alias + "` ";
             } else {
-              joinSection += "LEFT JOIN `" + nesting.reference + "` AS `" + nesting.alias + "` ON KEYS `" + that.type + "`.`" + nesting.alias + "` ";
+              joinSection += "LEFT JOIN `" + (0, _fix.fixCollection)(nesting.reference) + "` AS `" + nesting.alias + "` ON KEYS `" + that.type + "`.`" + nesting.alias + "` ";
             }
           });
 
           return joinSection;
         }
 
-        var _join = createJoinSection(mappedNestings);
+        var _join = createJoinSection(mappedNestings); //console.log("Props", that.type, nestings, _join, args?.query);
+
 
-        console.log("Props", that.type, nestings, _join, (_args7 = args) == null ? void 0 : _args7.query);
         args._join = _join;
 
         if (args.is_full_text && args.is_full_text === "true" || args.is_custom_query && args.is_custom_query === "true") {

package/build/utility/fix.js

@@ -0,0 +1,33 @@
+"use strict";
+
+exports.__esModule = true;
+exports.fixCollection = fixCollection;
+exports.unFixCollection = unFixCollection;
+
+function fixCollection(collection) {
+  if (collection === void 0) {
+    collection = "";
+  }
+
+  collection = collection.toLowerCase();
+
+  if (collection == "usergroup") {
+    return "user_group";
+  }
+
+  return collection;
+}
+
+function unFixCollection(collection) {
+  if (collection === void 0) {
+    collection = "";
+  }
+
+  collection = collection.toLowerCase();
+
+  if (collection == "user_group") {
+    return "usergroup";
+  }
+
+  return collection;
+}

package/package.json

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

package/src/models/SpiceModel.js

@@ -5,6 +5,7 @@ let co = require("co");
 var regeneratorRuntime = require("regenerator-runtime");
 import ResourceLifecycleTriggered from "../events/events/ResourceLifecycleTriggered";
 import { hasSQLInjection } from "../utility/Security";
+import { fixCollection } from "../utility/fix";
 
 var SDate = require("sonover-date"),
   UUID = require("uuid"),
@@ -917,15 +918,15 @@ export default class SpiceModel {
             nesting.type == Array ||
             nesting.type == "array"
           ) {
-            joinSection += `NEST \`${nesting.reference}\` AS \`${nesting.alias}\` ON KEYS \`${that.type}\`.\`${nesting.alias}\` `;
+            joinSection += `LEFT NEST \`${fixCollection(nesting.reference)}\` AS \`${nesting.alias}\` ON KEYS \`${that.type}\`.\`${nesting.alias}\` `;
           } else {
-            joinSection += `LEFT JOIN \`${nesting.reference}\` AS \`${nesting.alias}\` ON KEYS \`${that.type}\`.\`${nesting.alias}\` `;
+            joinSection += `LEFT JOIN \`${fixCollection(nesting.reference)}\` AS \`${nesting.alias}\` ON KEYS \`${that.type}\`.\`${nesting.alias}\` `;
           }
         });
         return joinSection;
       }
       let _join = createJoinSection(mappedNestings);
-      console.log("Props", that.type, nestings, _join, args?.query);
+      //console.log("Props", that.type, nestings, _join, args?.query);
 
       args._join = _join;
 

package/src/utility/fix.js

@@ -0,0 +1,15 @@
+export function fixCollection(collection = "") {
+  collection = collection.toLowerCase();
+  if (collection == "usergroup") {
+    return "user_group";
+  }
+  return collection;
+}
+
+export function unFixCollection(collection = "") {
+  collection = collection.toLowerCase();
+  if (collection == "user_group") {
+    return "usergroup";
+  }
+  return collection;
+}