@drax/crud-back 0.38.1 → 0.40.0

package/dist/controllers/AbstractFastifyController.js

@@ -99,71 +99,79 @@ class AbstractFastifyController extends CommonController {
     extractRequestData(request) {
         return {
             user: {
-                id: request.rbac.userId,
-                username: request.rbac.username,
+                id: request?.rbac?.userId,
+                username: request?.rbac?.username,
                 role: {
-                    id: request.rbac.roleId,
-                    name: request.rbac.roleName,
+                    id: request?.rbac?.roleId,
+                    name: request?.rbac?.roleName,
                 },
                 tenant: {
-                    id: request.rbac.tenantId,
-                    name: request.rbac.tenantName,
+                    id: request?.rbac?.tenantId,
+                    name: request?.rbac?.tenantName,
                 },
                 apiKey: {
-                    id: request.rbac.apiKeyId,
-                    name: request.rbac.apiKeyName,
-                }
+                    id: request?.rbac?.apiKeyId,
+                    name: request?.rbac?.apiKeyName,
+                },
+                session: request?.rbac?.session,
             },
             ip: request.ip,
             userAgent: request.headers['user-agent'],
-            sessionId: request.rbac.session,
             requestId: request.id,
         };
     }
     async onCreated(request, item) {
         const requestData = this.extractRequestData(request);
+        const detail = `User ${requestData.user.username} created ${this.entityName}.`;
         const eventData = {
             action: 'created',
             entity: this.entityName,
             postItem: item,
             preItem: null,
             timestamp: new Date(),
+            detail: detail,
             ...requestData
         };
         this.eventEmitter.emitCrudEvent(eventData);
     }
     async onUpdated(request, preItem, postItem) {
         const requestData = this.extractRequestData(request);
+        const detail = `User ${requestData.user.username} updated ${this.entityName}.`;
         const eventData = {
             action: 'updated',
             entity: this.entityName,
             postItem: postItem,
             preItem: preItem,
             timestamp: new Date(),
+            detail: detail,
             ...requestData
         };
         this.eventEmitter.emitCrudEvent(eventData);
     }
     async onDeleted(request, item) {
         const requestData = this.extractRequestData(request);
+        const detail = `User ${requestData.user.username} deleted ${this.entityName}.`;
         const eventData = {
             action: 'deleted',
             entity: this.entityName,
             postItem: null,
             preItem: item,
             timestamp: new Date(),
+            detail: detail,
             ...requestData
         };
         this.eventEmitter.emitCrudEvent(eventData);
     }
     async onExported(request, response) {
         const requestData = this.extractRequestData(request);
+        const detail = `User ${requestData.user.username} exported ${this.entityName}.`;
         const eventData = {
             action: 'exported',
             entity: this.entityName,
             postItem: null,
             preItem: null,
             timestamp: new Date(),
+            detail: detail,
             ...requestData
         };
         this.eventEmitter.emitCrudEvent(eventData);
@@ -174,7 +182,7 @@ class AbstractFastifyController extends CommonController {
             const payload = request.body;
             this.applyUserAndTenantSetters(payload, request.rbac);
             let item = await this.service.create(payload);
-            await this.onCreated(request, item);
+            this.onCreated(request, item);
             return item;
         }
         catch (e) {
@@ -205,7 +213,7 @@ class AbstractFastifyController extends CommonController {
             if (!item) {
                 throw new NotFoundError();
             }
-            await this.onUpdated(request, preItem, item);
+            this.onUpdated(request, preItem, item);
             return item;
         }
         catch (e) {
@@ -236,7 +244,7 @@ class AbstractFastifyController extends CommonController {
             if (!item) {
                 throw new NotFoundError();
             }
-            await this.onUpdated(request, preItem, item);
+            this.onUpdated(request, preItem, item);
             return item;
         }
         catch (e) {
@@ -261,7 +269,7 @@ class AbstractFastifyController extends CommonController {
             }
             this.assertTenant(item, request.rbac);
             await this.service.delete(id);
-            await this.onDeleted(request, item);
+            this.onDeleted(request, item);
             reply.send({
                 id: id,
                 message: 'Item deleted successfully',

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.38.1",
+  "version": "0.40.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.38.0",
-    "@drax/common-share": "^0.38.0",
-    "@drax/identity-share": "^0.38.0",
-    "@drax/media-back": "^0.38.1",
+    "@drax/common-back": "^0.40.0",
+    "@drax/common-share": "^0.40.0",
+    "@drax/identity-share": "^0.40.0",
+    "@drax/media-back": "^0.40.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": "33404c9f1b3df6a3f86624389916d1cae0c56904"
+  "gitHead": "269ec7921d83364dfba091cd74bd3f45a8135c26"
 }

package/src/controllers/AbstractFastifyController.ts

@@ -180,39 +180,43 @@ class AbstractFastifyController<T, C, U> extends CommonController {
         }
     }
 
-    protected extractRequestData(request: CustomRequest) {
+    protected extractRequestData(request: FastifyRequest) {
         return {
             user:  {
-                id: request.rbac.userId,
-                username: request.rbac.username,
+                id: request?.rbac?.userId,
+                username: request?.rbac?.username,
                 role:{
-                    id: request.rbac.roleId,
-                    name: request.rbac.roleName,
+                    id: request?.rbac?.roleId,
+                    name: request?.rbac?.roleName,
                 },
                 tenant: {
-                    id: request.rbac.tenantId,
-                    name: request.rbac.tenantName,
+                    id: request?.rbac?.tenantId,
+                    name: request?.rbac?.tenantName,
                 },
                 apiKey: {
-                    id: request.rbac.apiKeyId,
-                    name: request.rbac.apiKeyName,
-                }
+                    id: request?.rbac?.apiKeyId,
+                    name: request?.rbac?.apiKeyName,
+                },
+                session: request?.rbac?.session,
             },
             ip: request.ip,
             userAgent: request.headers['user-agent'],
-            sessionId: request.rbac.session,
             requestId: request.id,
         };
     }
 
+
+
     async onCreated(request: CustomRequest, item:T){
         const requestData = this.extractRequestData(request)
+        const detail = `User ${requestData.user.username} created ${this.entityName}.`
         const eventData : IDraxCrudEvent = {
             action: 'created',
             entity: this.entityName,
             postItem: item,
             preItem: null,
             timestamp: new Date(),
+            detail: detail,
             ...requestData
         }
         this.eventEmitter.emitCrudEvent(eventData)
@@ -220,12 +224,14 @@ class AbstractFastifyController<T, C, U> extends CommonController {
 
     async onUpdated(request: CustomRequest, preItem: T, postItem:T){
         const requestData = this.extractRequestData(request)
+        const detail = `User ${requestData.user.username} updated ${this.entityName}.`
         const eventData : IDraxCrudEvent = {
             action: 'updated',
             entity: this.entityName,
             postItem: postItem,
             preItem: preItem,
             timestamp: new Date(),
+            detail: detail,
             ...requestData
         }
         this.eventEmitter.emitCrudEvent(eventData)
@@ -233,12 +239,14 @@ class AbstractFastifyController<T, C, U> extends CommonController {
 
     async onDeleted(request: CustomRequest, item: T) {
         const requestData = this.extractRequestData(request)
+        const detail = `User ${requestData.user.username} deleted ${this.entityName}.`
         const eventData : IDraxCrudEvent = {
             action: 'deleted',
             entity: this.entityName,
             postItem: null,
             preItem: item,
             timestamp: new Date(),
+            detail: detail,
             ...requestData
         }
         this.eventEmitter.emitCrudEvent(eventData)
@@ -246,12 +254,14 @@ class AbstractFastifyController<T, C, U> extends CommonController {
 
     async onExported(request: CustomRequest, response: IDraxExportResponse) {
         const requestData = this.extractRequestData(request)
+        const detail = `User ${requestData.user.username} exported ${this.entityName}.`
         const eventData : IDraxCrudEvent = {
             action: 'exported',
             entity: this.entityName,
             postItem: null,
             preItem: null,
             timestamp: new Date(),
+            detail: detail,
             ...requestData
         }
         this.eventEmitter.emitCrudEvent(eventData)
@@ -264,7 +274,7 @@ class AbstractFastifyController<T, C, U> extends CommonController {
             const payload = request.body
             this.applyUserAndTenantSetters(payload, request.rbac)
             let item = await this.service.create(payload as C)
-            await this.onCreated(request, item)
+            this.onCreated(request, item)
             return item
         } catch (e) {
             this.handleError(e, reply)
@@ -305,7 +315,7 @@ class AbstractFastifyController<T, C, U> extends CommonController {
                 throw new NotFoundError()
             }
 
-            await this.onUpdated(request, preItem, item)
+            this.onUpdated(request, preItem, item)
 
             return item
         } catch (e) {
@@ -343,7 +353,7 @@ class AbstractFastifyController<T, C, U> extends CommonController {
             if (!item) {
                 throw new NotFoundError()
             }
-            await this.onUpdated(request, preItem, item)
+            this.onUpdated(request, preItem, item)
             return item
         } catch (e) {
             this.handleError(e, reply)
@@ -378,7 +388,7 @@ class AbstractFastifyController<T, C, U> extends CommonController {
 
             await this.service.delete(id)
 
-            await this.onDeleted(request, item)
+            this.onDeleted(request, item)
 
             reply.send({
                 id: id,