@drax/crud-back 2.6.0 → 2.9.0

package/dist/repository/AbstractMongoRepository.js

@@ -153,6 +153,7 @@ class AbstractMongoRepository {
             }
         }
         MongooseQueryFilter.applyFilters(query, filters);
+        // console.log("Paginate Query", query)
         const sort = MongooseSort.applySort(orderBy, order);
         const populate = this._populateFields;
         const lean = this._lean;
@@ -218,6 +219,7 @@ class AbstractMongoRepository {
     async groupBy({ fields = [], filters = [], dateFormat = 'day' }) {
         const query = {};
         MongooseQueryFilter.applyFilters(query, filters);
+        //  console.log("groupBy Query", query)
         // Obtener el schema para identificar campos de referencia y fechas
         const schema = this._model.schema;
         // Construir el objeto de agrupación dinámicamente
@@ -226,6 +228,13 @@ class AbstractMongoRepository {
         const finalProjectFields = { count: 1, _id: 0 };
         const refFields = new Set();
         const dateFields = new Set();
+        const numericFields = new Set();
+        const groupFields = [];
+        const numericInstances = new Set(['Number', 'Decimal128', 'Double', 'Int32', 'Long', 'BigInt']);
+        const totalGroupFields = fields.filter(field => {
+            const schemaPath = schema.path(field);
+            return !(schemaPath && numericInstances.has(schemaPath.instance));
+        }).length;
         // Función para obtener el formato de fecha según el nivel de granularidad
         const getDateFormat = (field, format) => {
             const formats = {
@@ -282,6 +291,13 @@ class AbstractMongoRepository {
         };
         fields.forEach(field => {
             const schemaPath = schema.path(field);
+            // Verificar si el campo es numérico: se agregará con $sum y no formará parte de la clave de agrupación
+            if (schemaPath && numericInstances.has(schemaPath.instance)) {
+                numericFields.add(field);
+                finalProjectFields[field] = 1;
+                return;
+            }
+            groupFields.push(field);
             // Verificar si el campo es de tipo Date
             if (schemaPath && schemaPath.instance === 'Date') {
                 dateFields.add(field);
@@ -296,7 +312,7 @@ class AbstractMongoRepository {
                 const refModelInstance = mongoose.model(refModel);
                 const collectionName = refModelInstance.collection.name;
                 // Determinar el campo local correcto según si es un solo campo o múltiples
-                const localField = fields.length === 1 ? '_id' : `_id.${fieldName}`;
+                const localField = totalGroupFields === 1 ? '_id' : `_id.${fieldName}`;
                 lookupStages.push({
                     $lookup: {
                         from: collectionName,
@@ -322,9 +338,9 @@ class AbstractMongoRepository {
             }
         });
         // Construir la proyección final para campos de fecha
-        fields.forEach(field => {
+        groupFields.forEach(field => {
             if (dateFields.has(field)) {
-                if (fields.length === 1) {
+                if (groupFields.length === 1) {
                     finalProjectFields[field] = `$_id`;
                 }
                 else {
@@ -332,7 +348,7 @@ class AbstractMongoRepository {
                 }
             }
             else if (!refFields.has(field)) {
-                if (fields.length === 1) {
+                if (groupFields.length === 1) {
                     finalProjectFields[field] = `$_id`;
                 }
                 else {
@@ -340,13 +356,24 @@ class AbstractMongoRepository {
                 }
             }
         });
+        const groupStage = {
+            _id: null,
+            count: { $sum: 1 }
+        };
+        numericFields.forEach(field => {
+            groupStage[field] = { $sum: { $ifNull: [`$${field}`, 0] } };
+        });
+        if (groupFields.length === 1) {
+            const field = groupFields[0];
+            groupStage._id = dateFields.has(field) ? getDateFormat(field, dateFormat) : groupId[field];
+        }
+        else if (groupFields.length > 1) {
+            groupStage._id = groupId;
+        }
         const pipeline = [
             { $match: query },
             {
-                $group: {
-                    _id: fields.length === 1 ? (dateFields.has(fields[0]) ? getDateFormat(fields[0], dateFormat) : `$${fields[0]}`) : groupId,
-                    count: { $sum: 1 }
-                }
+                $group: groupStage
             }
         ];
         // Solo agregar lookups si hay campos de referencia

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.6.0",
+  "version": "2.9.0",
   "description": "Crud utils across modules",
   "main": "dist/index.js",
   "types": "types/index.d.ts",
@@ -22,10 +22,10 @@
   "author": "Cristian Incarnato & Drax Team",
   "license": "ISC",
   "dependencies": {
-    "@drax/common-back": "^2.6.0",
+    "@drax/common-back": "^2.8.0",
     "@drax/common-share": "^2.0.0",
     "@drax/identity-share": "^2.0.0",
-    "@drax/media-back": "^2.6.0",
+    "@drax/media-back": "^2.9.0",
     "@graphql-tools/load-files": "^7.0.0",
     "@graphql-tools/merge": "^9.0.4",
     "mongoose": "^8.23.0",
@@ -46,5 +46,5 @@
     "tsc-alias": "^1.8.10",
     "typescript": "^5.9.3"
   },
-  "gitHead": "57830b50c2c9081b9d7e236d441ed9b2a3aca0ba"
+  "gitHead": "2bc9b59a45c762bd32403dce14db2693be34dcc7"
 }

package/src/repository/AbstractMongoRepository.ts

@@ -219,6 +219,8 @@ class AbstractMongoRepository<T, C, U> implements IDraxCrud<T, C, U> {
 
         MongooseQueryFilter.applyFilters(query, filters)
 
+       // console.log("Paginate Query", query)
+
         const sort = MongooseSort.applySort(orderBy, order)
         const populate = this._populateFields
         const lean = this._lean
@@ -319,6 +321,7 @@ class AbstractMongoRepository<T, C, U> implements IDraxCrud<T, C, U> {
         const query = {}
 
         MongooseQueryFilter.applyFilters(query, filters)
+        //  console.log("groupBy Query", query)
 
         // Obtener el schema para identificar campos de referencia y fechas
         const schema = this._model.schema
@@ -329,6 +332,13 @@ class AbstractMongoRepository<T, C, U> implements IDraxCrud<T, C, U> {
         const finalProjectFields: any = {count: 1, _id: 0}
         const refFields = new Set<string>()
         const dateFields = new Set<string>()
+        const numericFields = new Set<string>()
+        const groupFields: string[] = []
+        const numericInstances = new Set(['Number', 'Decimal128', 'Double', 'Int32', 'Long', 'BigInt'])
+        const totalGroupFields = fields.filter(field => {
+            const schemaPath = schema.path(field)
+            return !(schemaPath && numericInstances.has(schemaPath.instance))
+        }).length
 
         // Función para obtener el formato de fecha según el nivel de granularidad
         const getDateFormat = (field: string, format: string) => {
@@ -388,6 +398,15 @@ class AbstractMongoRepository<T, C, U> implements IDraxCrud<T, C, U> {
         fields.forEach(field => {
             const schemaPath = schema.path(field)
 
+            // Verificar si el campo es numérico: se agregará con $sum y no formará parte de la clave de agrupación
+            if (schemaPath && numericInstances.has(schemaPath.instance)) {
+                numericFields.add(field)
+                finalProjectFields[field] = 1
+                return
+            }
+
+            groupFields.push(field)
+
             // Verificar si el campo es de tipo Date
             if (schemaPath && schemaPath.instance === 'Date') {
                 dateFields.add(field)
@@ -405,7 +424,7 @@ class AbstractMongoRepository<T, C, U> implements IDraxCrud<T, C, U> {
                 const collectionName = refModelInstance.collection.name
 
                 // Determinar el campo local correcto según si es un solo campo o múltiples
-                const localField = fields.length === 1 ? '_id' : `_id.${fieldName}`
+                const localField = totalGroupFields === 1 ? '_id' : `_id.${fieldName}`
 
                 lookupStages.push({
                     $lookup: {
@@ -434,15 +453,15 @@ class AbstractMongoRepository<T, C, U> implements IDraxCrud<T, C, U> {
         })
 
         // Construir la proyección final para campos de fecha
-        fields.forEach(field => {
+        groupFields.forEach(field => {
             if (dateFields.has(field)) {
-                if (fields.length === 1) {
+                if (groupFields.length === 1) {
                     finalProjectFields[field] = `$_id`
                 } else {
                     finalProjectFields[field] = `$_id.${field}`
                 }
             } else if (!refFields.has(field)) {
-                if (fields.length === 1) {
+                if (groupFields.length === 1) {
                     finalProjectFields[field] = `$_id`
                 } else {
                     finalProjectFields[field] = `$_id.${field}`
@@ -450,13 +469,26 @@ class AbstractMongoRepository<T, C, U> implements IDraxCrud<T, C, U> {
             }
         })
 
+        const groupStage: any = {
+            _id: null,
+            count: {$sum: 1}
+        }
+
+        numericFields.forEach(field => {
+            groupStage[field] = {$sum: {$ifNull: [`$${field}`, 0]}}
+        })
+
+        if (groupFields.length === 1) {
+            const field = groupFields[0]
+            groupStage._id = dateFields.has(field) ? getDateFormat(field, dateFormat) : groupId[field]
+        } else if (groupFields.length > 1) {
+            groupStage._id = groupId
+        }
+
         const pipeline: any[] = [
             {$match: query},
             {
-                $group: {
-                    _id: fields.length === 1 ? (dateFields.has(fields[0]) ? getDateFormat(fields[0], dateFormat) : `$${fields[0]}`) : groupId,
-                    count: {$sum: 1}
-                }
+                $group: groupStage
             }
         ]