@drax/crud-back 3.6.0 → 3.10.0

package/dist/controllers/AbstractFastifyController.js

@@ -42,9 +42,9 @@ class AbstractFastifyController extends CommonController {
             const filterArray = stringFilters.split("|");
             const filters = [];
             filterArray.forEach((filter) => {
-                const [field, operator, value] = filter.split(";");
+                const [field, operator, value, orGroup] = filter.split(";");
                 if (field && operator && (operator === 'empty' || (value !== undefined && value !== ''))) {
-                    filters.push({ field, operator, value });
+                    filters.push({ field, operator, value, orGroup: orGroup || undefined });
                 }
             });
             return filters;
@@ -260,6 +260,10 @@ class AbstractFastifyController extends CommonController {
     async postUpdatePartial(request, item) {
         return item;
     }
+    //Sobrescribir este metodo para manipular filtros en operaciones de lectura
+    async preRead(request, filters) {
+        return filters;
+    }
     //Sobrescribir este metodo para manipular items a devolver en operaciones de lectura
     async postRead(request, item) {
         return item;
@@ -414,8 +418,9 @@ class AbstractFastifyController extends CommonController {
             const orderBy = request.query.orderBy;
             const order = request.query.order;
             const search = (_a = request.query).search ?? (_a.search = undefined);
-            const filters = this.parseFilters(request.query.filters);
+            let filters = this.parseFilters(request.query.filters);
             this.applyUserAndTenantFilters(filters, request.rbac);
+            filters = await this.preRead(request, filters);
             let items = await this.service.find({ search, filters, order, orderBy, limit });
             items = await this.postReadItems(request, items);
             return items;
@@ -429,7 +434,8 @@ class AbstractFastifyController extends CommonController {
         try {
             request.rbac.assertPermission(this.permission.View);
             const search = (_a = request.query).search ?? (_a.search = undefined);
-            const filters = this.parseFilters(request.query.filters);
+            let filters = this.parseFilters(request.query.filters);
+            filters = await this.preRead(request, filters);
             this.applyUserAndTenantFilters(filters, request.rbac);
             let item = await this.service.findOne({ search, filters });
             item = await this.postReadItem(request, item);
@@ -451,6 +457,7 @@ class AbstractFastifyController extends CommonController {
             const value = request.params.value;
             let filters = [];
             this.applyUserAndTenantFilters(filters, request.rbac);
+            filters = await this.preRead(request, filters);
             let items = await this.service.findBy(field, value, limit, filters);
             items = await this.postReadItems(request, items);
             return items;
@@ -470,6 +477,7 @@ class AbstractFastifyController extends CommonController {
             const value = request.params.value;
             let filters = [];
             this.applyUserAndTenantFilters(filters, request.rbac);
+            filters = await this.preRead(request, filters);
             let item = await this.service.findOneBy(field, value, filters);
             item = await this.postReadItem(request, item);
             return item;
@@ -482,9 +490,10 @@ class AbstractFastifyController extends CommonController {
         try {
             request.rbac.assertPermission(this.permission.View);
             const search = request.query.search;
-            const filters = [];
+            let filters = [];
             const limit = this.defaultLimit;
             this.applyUserAndTenantFilters(filters, request.rbac);
+            filters = await this.preRead(request, filters);
             let items = await this.service.search(search, limit, filters);
             items = await this.postReadItems(request, items);
             return items;
@@ -504,8 +513,9 @@ class AbstractFastifyController extends CommonController {
             const orderBy = request.query.orderBy;
             const order = request.query.order;
             const search = request.query.search;
-            const filters = this.parseFilters(request.query.filters);
+            let filters = this.parseFilters(request.query.filters);
             this.applyUserAndTenantFilters(filters, request.rbac);
+            filters = await this.preRead(request, filters);
             let paginateResult = await this.service.paginate({ page, limit, orderBy, order, search, filters });
             paginateResult = await this.postReadPaginate(request, paginateResult);
             return paginateResult;
@@ -526,8 +536,9 @@ class AbstractFastifyController extends CommonController {
             const orderBy = request.query.orderBy;
             const order = request.query.order;
             const search = request.query.search;
-            const filters = this.parseFilters(request.query.filters);
+            let filters = this.parseFilters(request.query.filters);
             this.applyUserAndTenantFilters(filters, request.rbac);
+            filters = await this.preRead(request, filters);
             const year = (new Date().getFullYear()).toString();
             const month = (new Date().getMonth() + 1).toString().padStart(2, '0');
             const exportPath = 'exports';
@@ -568,8 +579,9 @@ class AbstractFastifyController extends CommonController {
             if (fields.length === 0) {
                 throw new BadRequestError('At least one field is required for grouping');
             }
-            const filters = this.parseFilters(request.query.filters);
+            let filters = this.parseFilters(request.query.filters);
             this.applyUserAndTenantFilters(filters, request.rbac);
+            filters = await this.preRead(request, filters);
             const result = await this.service.groupBy({ fields, filters, dateFormat });
             return result;
         }

package/dist/regexs/QueryFilterRegex.js

@@ -1,3 +1,3 @@
-const QueryFilterRegex = /^(?:[a-zA-Z0-9_.\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte|empty);[a-zA-Z0-9_.\-:\., áéíóúÁÉÍÓÚ]*)(?:\|[a-zA-Z0-9_.\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte|empty);[a-zA-Z0-9_.\-:\., áéíóúÁÉÍÓÚ]*)*$/;
+const QueryFilterRegex = /^(?:[a-zA-Z0-9_.\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte|empty);[a-zA-Z0-9_.\-:\., áéíóúÁÉÍÓÚ]*(?:;[a-zA-Z0-9_.\-]+)?)(?:\|[a-zA-Z0-9_.\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte|empty);[a-zA-Z0-9_.\-:\., áéíóúÁÉÍÓÚ]*(?:;[a-zA-Z0-9_.\-]+)?)*$/;
 export default QueryFilterRegex;
 export { QueryFilterRegex };

package/dist/schemas/FindSchema.js

@@ -4,6 +4,6 @@ const FindQuerySchema = z.object({
     orderBy: z.string().optional(),
     order: z.enum(["asc", "desc"]).optional(),
     search: z.string().optional(),
-    filters: z.string().regex(QueryFilterRegex).optional().describe("Format: field;operator;value|field;operator;value|..."),
+    filters: z.string().regex(QueryFilterRegex).optional().describe("Format: field;operator;value[;orGroup]|field;operator;value[;orGroup]|..."),
 });
 export { FindQuerySchema };

package/dist/schemas/GroupBySchema.js

@@ -2,6 +2,6 @@ import z from "zod";
 import QueryFilterRegex from "../regexs/QueryFilterRegex.js";
 const GroupByQuerySchema = z.object({
     fields: z.array(z.string()).min(1).max(10),
-    filters: z.string().regex(QueryFilterRegex).optional().describe("Format: field;operator;value|field;operator;value|..."),
+    filters: z.string().regex(QueryFilterRegex).optional().describe("Format: field;operator;value[;orGroup]|field;operator;value[;orGroup]|..."),
 });
 export { GroupByQuerySchema };

package/dist/schemas/PaginateSchema.js

@@ -6,7 +6,7 @@ const PaginateQuerySchema = z.object({
     orderBy: z.string().optional(),
     order: z.enum(["asc", "desc"]).optional(),
     search: z.string().optional(),
-    filters: z.string().regex(QueryFilterRegex).optional().describe("Format: field;operator;value|field;operator;value|..."),
+    filters: z.string().regex(QueryFilterRegex).optional().describe("Format: field;operator;value[;orGroup]|field;operator;value[;orGroup]|..."),
 });
 const PaginateBodyResponseSchema = z.object({
     page: z.number(),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.6.0",
+  "version": "3.10.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.0.0",
+    "@drax/common-back": "^3.10.0",
     "@drax/common-share": "^3.0.0",
     "@drax/identity-share": "^3.0.0",
-    "@drax/media-back": "^3.6.0",
+    "@drax/media-back": "^3.10.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": "217fe65bcb4b69b0cf8cca51d72b60644e14cb2f"
+  "gitHead": "063b6aba11e891c5374c2d3de6546a3ff120b4c9"
 }

package/src/controllers/AbstractFastifyController.ts

@@ -112,10 +112,10 @@ class AbstractFastifyController<T, C, U> extends CommonController {
             const filterArray = stringFilters.split("|")
             const filters: IDraxFieldFilter[] = []
             filterArray.forEach((filter) => {
-                const [field, operator, value] = filter.split(";")
+                const [field, operator, value, orGroup] = filter.split(";")
 
                 if (field && operator && (operator === 'empty' || (value !== undefined && value !== ''))) {
-                    filters.push({field, operator, value})
+                    filters.push({field, operator, value, orGroup: orGroup || undefined})
                 }
 
             })
@@ -367,6 +367,11 @@ class AbstractFastifyController<T, C, U> extends CommonController {
         return item
     }
 
+    //Sobrescribir este metodo para manipular filtros en operaciones de lectura
+    async preRead(request: CustomRequest, filters: IDraxFieldFilter[]):Promise<IDraxFieldFilter[]> {
+        return filters
+    }
+
     //Sobrescribir este metodo para manipular items a devolver en operaciones de lectura
     async postRead(request: CustomRequest, item: T) {
         return item
@@ -562,11 +567,11 @@ class AbstractFastifyController<T, C, U> extends CommonController {
             const orderBy = request.query.orderBy
             const order = request.query.order
             const search = request.query.search ??= undefined
-            const filters = this.parseFilters(request.query.filters)
-
-
+            let filters = this.parseFilters(request.query.filters)
             this.applyUserAndTenantFilters(filters, request.rbac);
 
+            filters = await this.preRead(request, filters)
+
             let items = await this.service.find({search, filters, order, orderBy, limit})
 
             items = await this.postReadItems(request, items)
@@ -582,7 +587,8 @@ class AbstractFastifyController<T, C, U> extends CommonController {
             request.rbac.assertPermission(this.permission.View)
 
             const search = request.query.search ??= undefined
-            const filters = this.parseFilters(request.query.filters)
+            let filters = this.parseFilters(request.query.filters)
+            filters = await this.preRead(request, filters)
 
             this.applyUserAndTenantFilters(filters, request.rbac);
 
@@ -610,6 +616,7 @@ class AbstractFastifyController<T, C, U> extends CommonController {
 
             let filters = []
             this.applyUserAndTenantFilters(filters, request.rbac);
+            filters = await this.preRead(request, filters)
 
             let items = await this.service.findBy(field, value, limit, filters)
 
@@ -635,6 +642,7 @@ class AbstractFastifyController<T, C, U> extends CommonController {
 
             let filters = []
             this.applyUserAndTenantFilters(filters, request.rbac);
+            filters = await this.preRead(request, filters)
 
             let item = await this.service.findOneBy(field, value, filters)
 
@@ -652,10 +660,11 @@ class AbstractFastifyController<T, C, U> extends CommonController {
         try {
             request.rbac.assertPermission(this.permission.View)
             const search = request.query.search
-            const filters = []
+            let filters = []
             const limit = this.defaultLimit
 
             this.applyUserAndTenantFilters(filters, request.rbac);
+            filters = await this.preRead(request, filters)
 
             let items = await this.service.search(search, limit, filters)
             items = await this.postReadItems(request, items)
@@ -679,9 +688,9 @@ class AbstractFastifyController<T, C, U> extends CommonController {
             const orderBy = request.query.orderBy
             const order = request.query.order
             const search = request.query.search
-            const filters: IDraxFieldFilter[] = this.parseFilters(request.query.filters)
+            let filters: IDraxFieldFilter[] = this.parseFilters(request.query.filters)
             this.applyUserAndTenantFilters(filters, request.rbac);
-
+            filters = await this.preRead(request, filters)
 
             let paginateResult = await this.service.paginate({page, limit, orderBy, order, search, filters})
             paginateResult = await this.postReadPaginate(request, paginateResult)
@@ -705,9 +714,12 @@ class AbstractFastifyController<T, C, U> extends CommonController {
             const orderBy = request.query.orderBy
             const order = request.query.order
             const search = request.query.search
-            const filters = this.parseFilters(request.query.filters)
+            let filters = this.parseFilters(request.query.filters)
 
             this.applyUserAndTenantFilters(filters, request.rbac);
+            filters = await this.preRead(request, filters)
+
+
 
             const year = (new Date().getFullYear()).toString()
             const month = (new Date().getMonth() + 1).toString().padStart(2, '0')
@@ -760,9 +772,9 @@ class AbstractFastifyController<T, C, U> extends CommonController {
                 throw new BadRequestError('At least one field is required for grouping')
             }
 
-            const filters: IDraxFieldFilter[] = this.parseFilters(request.query.filters)
+            let filters: IDraxFieldFilter[] = this.parseFilters(request.query.filters)
             this.applyUserAndTenantFilters(filters, request.rbac)
-
+            filters = await this.preRead(request, filters)
 
             const result = await this.service.groupBy({fields, filters, dateFormat})
 

package/src/regexs/QueryFilterRegex.ts

@@ -1,4 +1,4 @@
-const QueryFilterRegex = /^(?:[a-zA-Z0-9_.\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte|empty);[a-zA-Z0-9_.\-:\., áéíóúÁÉÍÓÚ]*)(?:\|[a-zA-Z0-9_.\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte|empty);[a-zA-Z0-9_.\-:\., áéíóúÁÉÍÓÚ]*)*$/
+const QueryFilterRegex = /^(?:[a-zA-Z0-9_.\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte|empty);[a-zA-Z0-9_.\-:\., áéíóúÁÉÍÓÚ]*(?:;[a-zA-Z0-9_.\-]+)?)(?:\|[a-zA-Z0-9_.\-]+;(?:eq|like|ne|in|nin|gt|gte|lt|lte|empty);[a-zA-Z0-9_.\-:\., áéíóúÁÉÍÓÚ]*(?:;[a-zA-Z0-9_.\-]+)?)*$/
 
 export default QueryFilterRegex
 export {QueryFilterRegex}

package/src/schemas/FindSchema.ts

@@ -6,7 +6,7 @@ const FindQuerySchema = z.object({
     orderBy: z.string().optional(),
     order: z.enum(["asc", "desc"]).optional(),
     search: z.string().optional(),
-    filters:  z.string().regex(QueryFilterRegex).optional().describe("Format: field;operator;value|field;operator;value|..."),
+    filters:  z.string().regex(QueryFilterRegex).optional().describe("Format: field;operator;value[;orGroup]|field;operator;value[;orGroup]|..."),
 });
 
 

package/src/schemas/GroupBySchema.ts

@@ -3,7 +3,7 @@ import QueryFilterRegex from "../regexs/QueryFilterRegex.js";
 
 const GroupByQuerySchema = z.object({
     fields: z.array(z.string()).min(1).max(10),
-    filters:  z.string().regex(QueryFilterRegex).optional().describe("Format: field;operator;value|field;operator;value|..."),
+    filters:  z.string().regex(QueryFilterRegex).optional().describe("Format: field;operator;value[;orGroup]|field;operator;value[;orGroup]|..."),
 });
 
 

package/src/schemas/PaginateSchema.ts

@@ -7,7 +7,7 @@ const PaginateQuerySchema = z.object({
     orderBy: z.string().optional(),
     order: z.enum(["asc", "desc"]).optional(),
     search: z.string().optional(),
-    filters:  z.string().regex(QueryFilterRegex).optional().describe("Format: field;operator;value|field;operator;value|..."),
+    filters:  z.string().regex(QueryFilterRegex).optional().describe("Format: field;operator;value[;orGroup]|field;operator;value[;orGroup]|..."),
 });
 
 

package/test/controllers/PersonController.test.ts

@@ -466,6 +466,70 @@ describe("Person Controller Test", function () {
         expect(findByResult[0].fullname).toBe("Active Person")
     })
 
+    it("should create and find people with filters grouped by orGroup", async () => {
+        const { accessToken } = await testSetup.rootUserLogin()
+        await testSetup.dropCollection('Person')
+
+        const entityData = [
+            { fullname: "Hero Person", race: "human", live: true, address: defaultAddress },
+            { fullname: "Mage Person", race: "elf", live: true, address: defaultAddress },
+            { fullname: "Hidden Hero", race: "orc", live: false, address: defaultAddress },
+            { fullname: "Hidden Rogue", race: "human", live: false, address: defaultAddress }
+        ]
+
+        for (const data of entityData) {
+            await testSetup.fastifyInstance.inject({
+                method: 'POST',
+                url: '/api/person',
+                payload: data,
+                headers: { Authorization: `Bearer ${accessToken}` }
+            })
+        }
+
+        const findByResp = await testSetup.fastifyInstance.inject({
+            method: 'GET',
+            url: '/api/person/find?filters=fullname;like;Hero;group1|race;eq;elf;group1|live;eq;true',
+            headers: { Authorization: `Bearer ${accessToken}` }
+        })
+
+        const findByResult = await findByResp.json()
+        expect(findByResp.statusCode).toBe(200)
+        expect(findByResult.length).toBe(2)
+        expect(findByResult.map((item: any) => item.fullname).sort()).toEqual(["Hero Person", "Mage Person"])
+    })
+
+    it("should combine search with orGroup filters without overriding either condition", async () => {
+        const { accessToken } = await testSetup.rootUserLogin()
+        await testSetup.dropCollection('Person')
+
+        const entityData = [
+            { fullname: "Searchable Hero", race: "human", live: true, address: defaultAddress },
+            { fullname: "Searchable Elf", race: "elf", live: true, address: defaultAddress },
+            { fullname: "Hidden Elf", race: "elf", live: true, address: defaultAddress },
+            { fullname: "Searchable Rogue", race: "human", live: false, address: defaultAddress }
+        ]
+
+        for (const data of entityData) {
+            await testSetup.fastifyInstance.inject({
+                method: 'POST',
+                url: '/api/person',
+                payload: data,
+                headers: { Authorization: `Bearer ${accessToken}` }
+            })
+        }
+
+        const paginateResp = await testSetup.fastifyInstance.inject({
+            method: 'GET',
+            url: '/api/person?search=Searchable&filters=fullname;like;Hero;group1|race;eq;elf;group1|live;eq;true',
+            headers: { Authorization: `Bearer ${accessToken}` }
+        })
+
+        const paginateResult = await paginateResp.json()
+        expect(paginateResp.statusCode).toBe(200)
+        expect(paginateResult.total).toBe(2)
+        expect(paginateResult.items.map((item: any) => item.fullname).sort()).toEqual(["Searchable Elf", "Searchable Hero"])
+    })
+
     // 8. Create and Group By
     it("should create and groupBy for people", async () => {
         const { accessToken } = await testSetup.rootUserLogin()