@drax/crud-back 3.17.2 → 3.18.0

package/dist/repository/AbstractMongoRepository.js

@@ -9,6 +9,9 @@ class AbstractMongoRepository {
         this._populateFields = [];
         this._lean = true;
     }
+    getNestedValue(source, path) {
+        return path.split('.').reduce((value, key) => value == null ? undefined : value[key], source);
+    }
     assertId(id) {
         if (!mongoose.Types.ObjectId.isValid(id)) {
             console.log(`Invalid ID: ${id} is not a valid ObjectId.`);
@@ -415,7 +418,8 @@ class AbstractMongoRepository {
         });
         if (groupFields.length === 1) {
             const field = groupFields[0];
-            groupStage._id = dateFields.has(field) ? getDateFormat(field, dateFormat) : groupId[field];
+            const fieldAlias = groupFieldAliases.get(field);
+            groupStage._id = dateFields.has(field) ? getDateFormat(field, dateFormat) : groupId[fieldAlias];
         }
         else if (groupFields.length > 1) {
             groupStage._id = groupId;
@@ -436,7 +440,19 @@ class AbstractMongoRepository {
         }, { $sort: { count: -1 } });
         // console.log("pipeline", JSON.stringify(pipeline, null, 2))
         const result = await this._model.aggregate(pipeline).exec();
-        return result;
+        return result.map((item) => {
+            const normalizedItem = { ...item };
+            groupFields.forEach(field => {
+                if (!field.includes('.') || normalizedItem[field] !== undefined) {
+                    return;
+                }
+                const nestedValue = this.getNestedValue(normalizedItem, field);
+                if (nestedValue !== undefined) {
+                    normalizedItem[field] = nestedValue;
+                }
+            });
+            return normalizedItem;
+        });
     }
 }
 export default AbstractMongoRepository;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.17.2",
+  "version": "3.18.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": "^3.14.0",
+    "@drax/common-back": "^3.18.0",
     "@drax/common-share": "^3.0.0",
     "@drax/identity-share": "^3.15.0",
-    "@drax/media-back": "^3.17.2",
+    "@drax/media-back": "^3.18.0",
     "@graphql-tools/load-files": "^7.0.0",
     "@graphql-tools/merge": "^9.0.4",
     "mongoose": "^8.23.0",
@@ -47,5 +47,5 @@
     "typescript": "^5.9.3",
     "vitest": "^3.2.4"
   },
-  "gitHead": "832f9362009d55b03e0a51c3f558c439f158d9e6"
+  "gitHead": "c7709f3912ba1f8ae6a7e78376e17d50b32cfa7d"
 }

package/src/repository/AbstractMongoRepository.ts

@@ -30,6 +30,10 @@ class AbstractMongoRepository<T, C, U> implements IDraxCrud<T, C, U> {
     protected _populateFields: string[] | PopulateOptions[] = []
     protected _lean: boolean = true
 
+    private getNestedValue(source: any, path: string): any {
+        return path.split('.').reduce((value, key) => value == null ? undefined : value[key], source)
+    }
+
     assertId(id: string): void {
         if (!mongoose.Types.ObjectId.isValid(id)) {
             console.log(`Invalid ID: ${id} is not a valid ObjectId.`)
@@ -541,7 +545,8 @@ class AbstractMongoRepository<T, C, U> implements IDraxCrud<T, C, U> {
 
         if (groupFields.length === 1) {
             const field = groupFields[0]
-            groupStage._id = dateFields.has(field) ? getDateFormat(field, dateFormat) : groupId[field]
+            const fieldAlias = groupFieldAliases.get(field) as string
+            groupStage._id = dateFields.has(field) ? getDateFormat(field, dateFormat) : groupId[fieldAlias]
         } else if (groupFields.length > 1) {
             groupStage._id = groupId
         }
@@ -567,7 +572,23 @@ class AbstractMongoRepository<T, C, U> implements IDraxCrud<T, C, U> {
         )
         // console.log("pipeline", JSON.stringify(pipeline, null, 2))
         const result = await this._model.aggregate(pipeline).exec()
-        return result
+
+        return result.map((item: any) => {
+            const normalizedItem = {...item}
+
+            groupFields.forEach(field => {
+                if (!field.includes('.') || normalizedItem[field] !== undefined) {
+                    return
+                }
+
+                const nestedValue = this.getNestedValue(normalizedItem, field)
+                if (nestedValue !== undefined) {
+                    normalizedItem[field] = nestedValue
+                }
+            })
+
+            return normalizedItem
+        })
     }
 }
 

package/test/controllers/PersonController.test.ts

@@ -627,6 +627,56 @@ describe("Person Controller Test", function () {
         ]))
     })
 
+    it("should groupBy a single embedded nested field", async () => {
+        const { accessToken } = await testSetup.rootUserLogin()
+        await testSetup.dropCollection('Person')
+
+        const entityData: IPersonBase[] = [
+            {
+                fullname: "Argentina One",
+                address: { street: "Main St", country: "Argentina", city: "Buenos Aires" }
+            },
+            {
+                fullname: "Argentina Two",
+                address: { street: "Second St", country: "Argentina", city: "Cordoba" }
+            },
+            {
+                fullname: "Chile One",
+                address: { street: "Third St", country: "Chile", city: "Santiago" }
+            }
+        ]
+
+        for (const data of entityData) {
+            const createResp = await testSetup.fastifyInstance.inject({
+                method: 'POST',
+                url: '/api/person',
+                payload: data,
+                headers: { Authorization: `Bearer ${accessToken}` }
+            })
+
+            expect(createResp.statusCode).toBe(200)
+        }
+
+        const groupResp = await testSetup.fastifyInstance.inject({
+            method: 'GET',
+            url: '/api/person/group-by?fields=address.country',
+            headers: { Authorization: `Bearer ${accessToken}` }
+        })
+
+        const groupResult = await groupResp.json()
+        expect(groupResp.statusCode).toBe(200)
+        expect(groupResult).toEqual(expect.arrayContaining([
+            expect.objectContaining({
+                'address.country': 'Argentina',
+                count: 2
+            }),
+            expect.objectContaining({
+                'address.country': 'Chile',
+                count: 1
+            })
+        ]))
+    })
+
     // 9. Error Handling - Not Found
     it("should handle error responses correctly when person is not found", async () => {
         const { accessToken } = await testSetup.rootUserLogin()