@drax/crud-back 0.45.0 → 0.47.0

package/dist/controllers/AbstractFastifyController.js

@@ -175,11 +175,15 @@ class AbstractFastifyController extends CommonController {
         };
         this.eventEmitter.emitCrudEvent(eventData);
     }
+    async preCreate(request, payload) {
+        return payload;
+    }
     async create(request, reply) {
         try {
             request.rbac.assertPermission(this.permission.Create);
             const payload = request.body;
             this.applyUserAndTenantSetters(payload, request.rbac);
+            await this.preCreate(request, payload);
             let item = await this.service.create(payload);
             this.onCreated(request, item);
             return item;
@@ -188,6 +192,9 @@ class AbstractFastifyController extends CommonController {
             this.handleError(e, reply);
         }
     }
+    async preUpdate(request, payload) {
+        return payload;
+    }
     async update(request, reply) {
         try {
             request.rbac.assertPermission(this.permission.Update);
@@ -208,6 +215,7 @@ class AbstractFastifyController extends CommonController {
             //Definido el tenant/user en el create no debe modificarse en un update
             delete payload[this.tenantField];
             delete payload[this.userField];
+            await this.preUpdate(request, payload);
             let item = await this.service.update(id, payload);
             if (!item) {
                 throw new NotFoundError();
@@ -219,6 +227,9 @@ class AbstractFastifyController extends CommonController {
             this.handleError(e, reply);
         }
     }
+    async preUpdatePartial(request, payload) {
+        return payload;
+    }
     async updatePartial(request, reply) {
         try {
             request.rbac.assertPermission(this.permission.Update);
@@ -239,6 +250,7 @@ class AbstractFastifyController extends CommonController {
             //Definido el tenant/user en el create no debe modificarse en un update
             delete payload[this.tenantField];
             delete payload[this.userField];
+            await this.preUpdatePartial(request, payload);
             let item = await this.service.updatePartial(id, payload);
             if (!item) {
                 throw new NotFoundError();
@@ -250,6 +262,9 @@ class AbstractFastifyController extends CommonController {
             this.handleError(e, reply);
         }
     }
+    async preDelete(request, item) {
+        return item;
+    }
     async delete(request, reply) {
         try {
             request.rbac.assertPermission(this.permission.Delete);
@@ -267,6 +282,7 @@ class AbstractFastifyController extends CommonController {
                 this.assertUser(item, request.rbac);
             }
             this.assertTenant(item, request.rbac);
+            await this.preDelete(request, item);
             await this.service.delete(id);
             this.onDeleted(request, item);
             reply.send({
@@ -483,10 +499,6 @@ class AbstractFastifyController extends CommonController {
             const filters = this.parseFilters(request.query.filters);
             this.applyUserAndTenantFilters(filters, request.rbac);
             const result = await this.service.groupBy({ fields, filters, dateFormat });
-            // console.log("groupby fields",fields)
-            // console.log("groupby dateFormat",dateFormat)
-            // console.log("groupby filters",filters)
-            // console.log("groupby result",result)
             return result;
         }
         catch (e) {

package/dist/schemas/ErrorBodyResponseSchema.js

@@ -1,16 +1,16 @@
 import z from "zod";
 const ErrorBodyResponseSchema = z.object({
-    statusCode: z.string(),
-    error: z.string(),
-    message: z.string(),
-    i18nMessage: z.string()
-});
+    statusCode: z.string().optional(),
+    error: z.string().optional(),
+    message: z.string().optional(),
+    i18nMessage: z.string().optional()
+}).passthrough();
 const ValidationErrorBodyResponseSchema = ErrorBodyResponseSchema.extend({
     inputErrors: z.array(z.object({
         field: z.string(),
         reason: z.string(),
         value: z.any().optional(),
     })).optional()
-});
+}).passthrough();
 export default ErrorBodyResponseSchema;
 export { ErrorBodyResponseSchema, ValidationErrorBodyResponseSchema };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.45.0",
+  "version": "0.47.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": "^0.45.0",
-    "@drax/common-share": "^0.45.0",
-    "@drax/identity-share": "^0.45.0",
-    "@drax/media-back": "^0.45.0",
+    "@drax/common-back": "^0.47.0",
+    "@drax/common-share": "^0.47.0",
+    "@drax/identity-share": "^0.47.0",
+    "@drax/media-back": "^0.47.0",
     "@graphql-tools/load-files": "^7.0.0",
     "@graphql-tools/merge": "^9.0.4",
     "mongoose": "^8.6.3",
@@ -45,5 +45,5 @@
     "tsc-alias": "^1.8.10",
     "typescript": "^5.6.2"
   },
-  "gitHead": "b05b1b2c982bad40a6d93496266c652f77749279"
+  "gitHead": "65a17b06254404866deb9fb81daf42fbe3d2db3c"
 }

package/src/controllers/AbstractFastifyController.ts

@@ -266,12 +266,16 @@ class AbstractFastifyController<T, C, U> extends CommonController {
         this.eventEmitter.emitCrudEvent(eventData)
     }
 
+    async preCreate(request: CustomRequest, payload:any){
+        return payload
+    }
 
     async create(request: CustomRequest, reply: FastifyReply) {
         try {
             request.rbac.assertPermission(this.permission.Create)
             const payload = request.body
             this.applyUserAndTenantSetters(payload, request.rbac)
+            await this.preCreate(request, payload as C)
             let item = await this.service.create(payload as C)
             this.onCreated(request, item)
             return item
@@ -280,7 +284,9 @@ class AbstractFastifyController<T, C, U> extends CommonController {
         }
     }
 
-
+    async preUpdate(request: CustomRequest, payload:any):Promise<C>{
+        return payload
+    }
 
     async update(request: CustomRequest, reply: FastifyReply) {
         try {
@@ -308,6 +314,7 @@ class AbstractFastifyController<T, C, U> extends CommonController {
             delete payload[this.tenantField]
             delete payload[this.userField]
 
+            await this.preUpdate(request, payload)
             let item = await this.service.update(id, payload as U)
 
             if (!item) {
@@ -322,6 +329,10 @@ class AbstractFastifyController<T, C, U> extends CommonController {
         }
     }
 
+    async preUpdatePartial(request: CustomRequest, payload:any):Promise<C>{
+        return payload
+    }
+
     async updatePartial(request: CustomRequest, reply: FastifyReply) {
         try {
             request.rbac.assertPermission(this.permission.Update)
@@ -348,6 +359,7 @@ class AbstractFastifyController<T, C, U> extends CommonController {
             delete payload[this.tenantField]
             delete payload[this.userField]
 
+            await this.preUpdatePartial(request, payload)
             let item = await this.service.updatePartial(id, payload as U)
             if (!item) {
                 throw new NotFoundError()
@@ -359,6 +371,9 @@ class AbstractFastifyController<T, C, U> extends CommonController {
         }
     }
 
+    async preDelete(request: CustomRequest, item:T){
+        return item
+    }
 
 
     async delete(request: CustomRequest, reply: FastifyReply) {
@@ -384,7 +399,7 @@ class AbstractFastifyController<T, C, U> extends CommonController {
 
             this.assertTenant(item, request.rbac)
 
-
+            await this.preDelete(request, item)
             await this.service.delete(id)
 
             this.onDeleted(request, item)
@@ -652,10 +667,7 @@ class AbstractFastifyController<T, C, U> extends CommonController {
 
 
             const result = await this.service.groupBy({fields, filters, dateFormat})
-            // console.log("groupby fields",fields)
-            // console.log("groupby dateFormat",dateFormat)
-            // console.log("groupby filters",filters)
-            // console.log("groupby result",result)
+
             return result
         } catch (e) {
             this.handleError(e, reply)

package/src/schemas/ErrorBodyResponseSchema.ts

@@ -1,11 +1,11 @@
 import z from "zod"
 
 const ErrorBodyResponseSchema = z.object({
-    statusCode: z.string(),
-    error: z.string(),
-    message: z.string(),
-    i18nMessage: z.string()
-});
+    statusCode: z.string().optional(),
+    error: z.string().optional(),
+    message: z.string().optional(),
+    i18nMessage: z.string().optional()
+}).passthrough();
 
 const ValidationErrorBodyResponseSchema = ErrorBodyResponseSchema.extend({
     inputErrors: z.array(z.object({
@@ -13,7 +13,7 @@ const ValidationErrorBodyResponseSchema = ErrorBodyResponseSchema.extend({
         reason: z.string(),
         value: z.any().optional(),
     })).optional()
-});
+}).passthrough();
 
 export default ErrorBodyResponseSchema
 

package/src/services/AbstractService.ts

@@ -144,7 +144,7 @@ abstract class AbstractService<T, C, U> implements IDraxCrudService<T, C, U> {
         }
     }
 
-    async findOneBy(field: string, value: string): Promise<T | null> {
+    async findOneBy(field: string, value: any): Promise<T | null> {
         try {
             let item: T = await this._repository.findOneBy(field, value);
             if (item && this.transformRead) {
@@ -158,7 +158,7 @@ abstract class AbstractService<T, C, U> implements IDraxCrudService<T, C, U> {
 
     }
 
-    async findBy(field: string, value: string, limit: number = 1000): Promise<T[] | null> {
+    async findBy(field: string, value: any, limit: number = 1000): Promise<T[] | null> {
         try {
 
             let items: T[] = await this._repository.findBy(field, value, limit);