@koalarx/nest 1.13.2 → 1.14.0

package/core/backgroud-services/event-service/event-handler.base.d.ts

@@ -1,5 +1,8 @@
+import { Type } from '@nestjs/common';
 import { EventClass } from './event-class';
-export declare abstract class EventHandlerBase<TEvent extends EventClass<any>> {
+export declare abstract class EventHandlerBase {
+    readonly event: Type<EventClass>;
+    constructor(event: Type<EventClass>);
     setupSubscriptions(): void;
-    abstract handleEvent(event: TEvent): Promise<void>;
+    abstract handleEvent(event: typeof this.event): Promise<void>;
 }

package/core/backgroud-services/event-service/event-handler.base.js

@@ -3,8 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventHandlerBase = void 0;
 const event_queue_1 = require("./event-queue");
 class EventHandlerBase {
+    event;
+    constructor(event) {
+        this.event = event;
+    }
     setupSubscriptions() {
-        event_queue_1.EventQueue.register(this.handleEvent.bind(this), this.constructor.name);
+        event_queue_1.EventQueue.register(this.handleEvent.bind(this), this.constructor.name, this.event.name);
     }
 }
 exports.EventHandlerBase = EventHandlerBase;

package/core/backgroud-services/event-service/event-job.d.ts

@@ -6,7 +6,7 @@ export declare abstract class EventJob<TEntity> {
     _id: `${string}-${string}-${string}-${string}-${string}`;
     private _eventQueue;
     constructor();
-    abstract defineHandlers(): Array<Type<EventHandlerBase<any>>>;
+    abstract defineHandlers(): Array<Type<EventHandlerBase>>;
     get eventQueue(): EventQueue[];
     clearQueue(): void;
     addEvent(event: EventClass<TEntity>): void;

package/core/backgroud-services/event-service/event-queue.d.ts

@@ -6,7 +6,7 @@ export declare class EventQueue {
     private static markedAggregates;
     static markAggregateForDispatch(aggregate: EventJob<any>): void;
     static dispatchEventsForAggregate(id: IComparableId): void;
-    static register(callback: EventJobCallback, eventClassName: string): void;
+    static register(callback: EventJobCallback, handlerClassName: string, eventClassName: string): void;
     static clearHandlers(): void;
     static clearMarkedAggregates(): void;
     private static dispatchAggregateEvents;

package/core/backgroud-services/event-service/event-queue.js

@@ -18,12 +18,15 @@ class EventQueue {
             this.removeAggregateFromMarkedDispatchList(aggregate);
         }
     }
-    static register(callback, eventClassName) {
-        const wasEventRegisteredBefore = eventClassName in this.handlersMap;
+    static register(callback, handlerClassName, eventClassName) {
+        const wasEventRegisteredBefore = handlerClassName in this.handlersMap;
         if (!wasEventRegisteredBefore) {
-            this.handlersMap[eventClassName] = [];
+            this.handlersMap[handlerClassName] = [];
         }
-        this.handlersMap[eventClassName].push(callback);
+        this.handlersMap[handlerClassName].push({
+            eventClassName,
+            callback,
+        });
     }
     static clearHandlers() {
         this.handlersMap = {};
@@ -50,7 +53,9 @@ class EventQueue {
         if (isEventRegistered) {
             const handlers = this.handlersMap[eventHandler];
             for (const handler of handlers) {
-                handler(event);
+                if (event.constructor.name === handler.eventClassName) {
+                    handler.callback(event);
+                }
             }
         }
     }

package/core/database/repository.base.js

@@ -219,7 +219,7 @@ class RepositoryBase {
         Object.keys(entity)
             .filter((key) => key === 'id' || key.includes('Id'))
             .forEach((key) => (where[key] = entity[key]));
-        return client[(0, KlString_1.toCamelCase)(entity.constructor.name)].remove({ where });
+        return client[(0, KlString_1.toCamelCase)(entity.constructor.name)].delete({ where });
     }
     getIdPropName() {
         return Reflect.getMetadata('entity:id', this._modelName.prototype) ?? 'id';

package/core/koala-app.d.ts

@@ -28,7 +28,7 @@ interface ApiDocConfig {
     authorizations?: boolean | ApiDocAuthorizationConfig[];
 }
 type CronJobClass = string | symbol | Function | Type<CronJobHandlerBase>;
-type EventJobClass = string | symbol | Function | Type<EventHandlerBase<any>>;
+type EventJobClass = string | symbol | Function | Type<EventHandlerBase>;
 export declare class KoalaApp {
     private readonly app;
     private _globalExceptionFilter;

package/core/koala-nest.module.d.ts

@@ -9,7 +9,7 @@ interface KoalaNestModuleConfig {
     controllers?: Type<any>[];
     healthCheck?: Type<any>;
     cronJobs?: Type<CronJobHandlerBase>[];
-    eventJobs?: Type<EventHandlerBase<any>>[];
+    eventJobs?: Type<EventHandlerBase>[];
 }
 export declare class KoalaNestModule {
     static register(config?: KoalaNestModuleConfig): DynamicModule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koalarx/nest",
-  "version": "1.13.2",
+  "version": "1.14.0",
   "description": "",
   "repository": {
     "type": "git",