fix: enhance base delete event to support permanent deletion

Author: younocode

apps/nestjs-backend/src/event-emitter/events/base/base.event.ts

@@ -5,7 +5,7 @@ import { CoreEvent } from '../core-event';
 import { Events } from '../event.enum';
 
 type IBaseCreatePayload = { base: ICreateBaseVo };
-type IBaseDeletePayload = { baseId: string };
+type IBaseDeletePayload = { baseId: string; permanent?: boolean };
 type IBaseUpdatePayload = IBaseCreatePayload;
 type IBasePermissionUpdatePayload = { baseId: string };
 
@@ -19,8 +19,8 @@ export class BaseCreateEvent extends CoreEvent<IBaseCreatePayload> {
 
 export class BaseDeleteEvent extends CoreEvent<IBaseDeletePayload> {
   public readonly name = Events.BASE_DELETE;
-  constructor(baseId: string, context: IEventContext) {
-    super({ baseId }, context);
+  constructor(payload: IBaseDeletePayload, context: IEventContext) {
+    super(payload, context);
   }
 }
 
@@ -52,8 +52,8 @@ export class BaseEventFactory {
         return new BaseCreateEvent(base, context);
       })
       .with(Events.BASE_DELETE, () => {
-        const { baseId } = payload as IBaseDeletePayload;
-        return new BaseDeleteEvent(baseId, context);
+        const { baseId, permanent } = payload as IBaseDeletePayload;
+        return new BaseDeleteEvent({ baseId, permanent }, context);
       })
       .with(Events.BASE_UPDATE, () => {
         const { base } = payload as IBaseUpdatePayload;

apps/nestjs-backend/src/event-emitter/interceptor/event.Interceptor.ts

@@ -57,14 +57,11 @@ export class EventMiddleware implements NestInterceptor {
     };
 
     return match(eventName)
-      .with(
-        P.union(
-          Events.BASE_CREATE,
-          Events.BASE_DELETE,
-          Events.BASE_UPDATE,
-          Events.BASE_PERMISSION_UPDATE
-        ),
-        () => BaseEventFactory.create(eventName, { base: resolveData, ...reqParams }, eventContext)
+      .with(Events.BASE_DELETE, () =>
+        BaseEventFactory.create(eventName, { ...resolveData, ...reqParams }, eventContext)
+      )
+      .with(P.union(Events.BASE_CREATE, Events.BASE_UPDATE, Events.BASE_PERMISSION_UPDATE), () =>
+        BaseEventFactory.create(eventName, { base: resolveData, ...reqParams }, eventContext)
       )
       .with(P.union(Events.SPACE_CREATE, Events.SPACE_DELETE, Events.SPACE_UPDATE), () =>
         SpaceEventFactory.create(eventName, { space: resolveData, ...reqParams }, eventContext)

apps/nestjs-backend/src/event-emitter/listeners/trash.listener.ts

@@ -34,6 +34,10 @@ export class TrashListener {
       case Events.BASE_DELETE: {
         resourceId = payload.baseId;
         resourceType = ResourceType.Base;
+        // Skip trash creation for permanent delete
+        if (payload.permanent) {
+          return;
+        }
         const base = await this.prismaService.base.findUniqueOrThrow({
           where: { id: resourceId },
           select: { id: true, spaceId: true, deletedTime: true },

apps/nestjs-backend/src/features/base/base.controller.ts

@@ -297,8 +297,11 @@ export class BaseController {
   }
 
   @Delete(':baseId/permanent')
+  @Permissions('base|delete')
+  @EmitControllerEvent(Events.BASE_DELETE)
   async permanentDeleteBase(@Param('baseId') baseId: string) {
-    return await this.baseService.permanentDeleteBase(baseId);
+    await this.baseService.permanentDeleteBase(baseId);
+    return { baseId, permanent: true };
   }
 
   @Post(':baseId/collaborator')