@solidstarters/solid-core 1.2.33 → 1.2.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.33",
+  "version": "1.2.34",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/services/crud-helper.service.ts

@@ -173,7 +173,7 @@ export class CrudHelperService {
         if (normalizedFields && normalizedFields.length) {
             qb.select(normalizedFields.map(field => {
                 // If the field contains a (, do not prefix the entity alias
-                return this.isAggregateField(field) ? field : `${entityAlias}.${field}`;
+                return this.wrapFieldWithAlias(field, entityAlias);
             }));
         }
 
@@ -220,6 +220,15 @@ export class CrudHelperService {
         return qb;
     }
 
+    private wrapFieldWithAlias(field: string, entityAlias: string): string {
+        if (!this.isAggregateField(field)) return `${entityAlias}.${field}`;
+        // For aggregate fields, extract the field name from the aggregate function & wrap it with the entity alias, if it is not already wrapped
+        const fieldParts = field.split('(');
+        const aggregateFunction = fieldParts[0];
+        const fieldName = fieldParts[1].replace(')', '');
+        return `${aggregateFunction}(${entityAlias}.${fieldName})`;
+    }
+
     isAggregateField(field: string): boolean {
         return field.includes('(');
     }