pangea-server 1.0.59 → 1.0.61

package/dist/database/db.class.js

@@ -16,7 +16,7 @@ class Db {
         const { scopes, attributes, order, paranoid = true } = options;
         const scopedModel = scopes?.length ? model.scope(...scopes) : model;
         const baseOptions = {
-            attributes: getFinalAttributes(attributes),
+            attributes: getFinalAttributes(model, attributes),
             paranoid,
             subQuery: false,
             transaction: this.__tx,
@@ -81,9 +81,12 @@ class Db {
             };
         }
         return {
-            attributes: getFinalAttributes(attributes),
+            attributes: getFinalAttributes(model, attributes),
             ...getInclude(model, { attributes, where: { ...where, ...searchWhere } }),
             ...(group && { group: group.map(pangea_helpers_1.camelToSnake) }),
+            ...(group && {
+                group: group.map((field) => (field.includes('.') ? field : `${model.name}.${(0, pangea_helpers_1.camelToSnake)(field)}`)),
+            }),
             order: getFinalOrder(order),
             paranoid,
             subQuery: false,
@@ -183,14 +186,17 @@ class Db {
 }
 exports.Db = Db;
 // internal functions
-function getFinalAttributes(attributes) {
+function getFinalAttributes(model, attributes) {
     if (!attributes)
         return;
     return Object.entries(attributes).map(([alias, column]) => {
-        if (typeof column === 'string')
-            return [(0, sequelize_1.col)((0, pangea_helpers_1.camelToSnake)(column)), alias];
-        const [op, field] = column;
-        return [(0, sequelize_1.fn)(op, (0, sequelize_1.col)((0, pangea_helpers_1.camelToSnake)(field))), alias];
+        if (typeof column === 'string') {
+            const field = column.includes('.') ? column : `${model.name}.${(0, pangea_helpers_1.camelToSnake)(column)}`;
+            return [(0, sequelize_1.col)(field), alias];
+        }
+        const [op, fieldName] = column;
+        const field = fieldName.includes('.') ? fieldName : `${model.name}.${(0, pangea_helpers_1.camelToSnake)(fieldName)}`;
+        return [(0, sequelize_1.fn)(op, (0, sequelize_1.col)(field)), alias];
     });
 }
 function convertWhereKeys(obj) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "1.0.59",
+  "version": "1.0.61",
   "files": [
     "dist"
   ],