@flusys/nestjs-event-manager 7.0.0-beta.1 → 7.0.1

package/cjs/config/event-actions.js

@@ -17,6 +17,9 @@ _export(exports, {
     },
     get EVENT_MANAGER_EVENT_ENTITIES () {
         return EVENT_MANAGER_EVENT_ENTITIES;
+    },
+    get EVENT_MANAGER_EVENT_MODULE () {
+        return EVENT_MANAGER_EVENT_MODULE;
     }
 });
 const EVENT_MANAGER_EVENT_ACTIONS = {
@@ -25,3 +28,4 @@ const EVENT_MANAGER_EVENT_ACTIONS = {
 const EVENT_MANAGER_EVENT_ENTITIES = {
     EVENT: 'event'
 };
+const EVENT_MANAGER_EVENT_MODULE = 'event-manager';

package/cjs/services/event.service.js

@@ -48,9 +48,6 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let EventService = class EventService extends _classes.ApiService {
-    resolveEntity() {
-        return this.eventConfig.isCompanyFeatureEnabled() ? _entities.EventWithCompany : _entities.Event;
-    }
     // Override methods
     async convertSingleDtoToEntity(dto, user) {
         await this.ensureDataSourceRepository();
@@ -451,7 +448,7 @@ let EventService = class EventService extends _classes.ApiService {
         };
     }
     constructor(cacheManager, utilsService, eventConfig, dataSourceProvider){
-        super('event', cacheManager, utilsService, EventService.name, true, 'event-manager', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "eventConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "participantRepository", void 0), _define_property(this, "pendingParticipantsList", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.eventConfig = eventConfig, this.dataSourceProvider = dataSourceProvider, this.participantRepository = null, this.pendingParticipantsList = [];
+        super(_config.EVENT_MANAGER_EVENT_ENTITIES.EVENT, cacheManager, utilsService, EventService.name, true, _config.EVENT_MANAGER_EVENT_MODULE, dataSourceProvider, eventConfig.isCompanyFeatureEnabled() ? _entities.EventWithCompany : _entities.Event), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "eventConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "participantRepository", void 0), _define_property(this, "pendingParticipantsList", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.eventConfig = eventConfig, this.dataSourceProvider = dataSourceProvider, this.participantRepository = null, this.pendingParticipantsList = [];
     }
 };
 _ts_decorate([

package/cjs/services/event.service.spec.js

@@ -84,14 +84,16 @@ describe('EventService', ()=>{
         };
         service = new _eventservice.EventService({}, mockUtilsService, mockConfigService, mockDataSourceProvider);
     });
-    describe('resolveEntity', ()=>{
-        it('resolves to the company-scoped entity when the company feature is enabled', ()=>{
-            mockConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(_entities.EventWithCompany);
+    describe('entity selection', ()=>{
+        function buildWithCompanyFeature(enabled) {
+            mockConfigService.isCompanyFeatureEnabled.mockReturnValue(enabled);
+            return new _eventservice.EventService({}, mockUtilsService, mockConfigService, mockDataSourceProvider);
+        }
+        it('uses the company-scoped entity when the company feature is enabled', ()=>{
+            expect(buildWithCompanyFeature(true)['_entity']).toBe(_entities.EventWithCompany);
         });
-        it('resolves to the core entity when the company feature is disabled', ()=>{
-            mockConfigService.isCompanyFeatureEnabled.mockReturnValue(false);
-            expect(service.resolveEntity()).toBe(_entities.Event);
+        it('uses the core entity when the company feature is disabled', ()=>{
+            expect(buildWithCompanyFeature(false)['_entity']).toBe(_entities.Event);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

package/config/event-actions.d.ts

@@ -4,3 +4,4 @@ export declare const EVENT_MANAGER_EVENT_ACTIONS: {
 export declare const EVENT_MANAGER_EVENT_ENTITIES: {
     readonly EVENT: "event";
 };
+export declare const EVENT_MANAGER_EVENT_MODULE = "event-manager";

package/fesm/config/event-actions.js

@@ -7,3 +7,4 @@
 /** Every entity the event manager module publishes under */ export const EVENT_MANAGER_EVENT_ENTITIES = {
     EVENT: 'event'
 };
+export const EVENT_MANAGER_EVENT_MODULE = 'event-manager';

package/fesm/services/event.service.js

@@ -32,15 +32,12 @@ import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
 import { Inject, Injectable, NotFoundException, Scope } from '@nestjs/common';
 import { In, IsNull } from 'typeorm';
-import { EVENT_MANAGER_EVENT_ACTIONS, EVENT_MESSAGES, EVENT_PARTICIPANT_MESSAGES } from '../config';
+import { EVENT_MANAGER_EVENT_ACTIONS, EVENT_MANAGER_EVENT_ENTITIES, EVENT_MANAGER_EVENT_MODULE, EVENT_MESSAGES, EVENT_PARTICIPANT_MESSAGES } from '../config';
 import { UpdateParticipantStatusDto } from '../dtos';
 import { Event, EventParticipant, EventWithCompany } from '../entities';
 import { EventManagerConfigService } from './event-manager-config.service';
 import { EventManagerDataSourceProvider } from './event-manager-datasource.provider';
 export class EventService extends ApiService {
-    resolveEntity() {
-        return this.eventConfig.isCompanyFeatureEnabled() ? EventWithCompany : Event;
-    }
     // Override methods
     async convertSingleDtoToEntity(dto, user) {
         await this.ensureDataSourceRepository();
@@ -441,7 +438,7 @@ export class EventService extends ApiService {
         };
     }
     constructor(cacheManager, utilsService, eventConfig, dataSourceProvider){
-        super('event', cacheManager, utilsService, EventService.name, true, 'event-manager', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "eventConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "participantRepository", void 0), _define_property(this, "pendingParticipantsList", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.eventConfig = eventConfig, this.dataSourceProvider = dataSourceProvider, this.participantRepository = null, this.pendingParticipantsList = [];
+        super(EVENT_MANAGER_EVENT_ENTITIES.EVENT, cacheManager, utilsService, EventService.name, true, EVENT_MANAGER_EVENT_MODULE, dataSourceProvider, eventConfig.isCompanyFeatureEnabled() ? EventWithCompany : Event), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "eventConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "participantRepository", void 0), _define_property(this, "pendingParticipantsList", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.eventConfig = eventConfig, this.dataSourceProvider = dataSourceProvider, this.participantRepository = null, this.pendingParticipantsList = [];
     }
 }
 _ts_decorate([

package/fesm/services/event.service.spec.js

@@ -80,14 +80,16 @@ describe('EventService', ()=>{
         };
         service = new EventService({}, mockUtilsService, mockConfigService, mockDataSourceProvider);
     });
-    describe('resolveEntity', ()=>{
-        it('resolves to the company-scoped entity when the company feature is enabled', ()=>{
-            mockConfigService.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(EventWithCompany);
+    describe('entity selection', ()=>{
+        function buildWithCompanyFeature(enabled) {
+            mockConfigService.isCompanyFeatureEnabled.mockReturnValue(enabled);
+            return new EventService({}, mockUtilsService, mockConfigService, mockDataSourceProvider);
+        }
+        it('uses the company-scoped entity when the company feature is enabled', ()=>{
+            expect(buildWithCompanyFeature(true)['_entity']).toBe(EventWithCompany);
         });
-        it('resolves to the core entity when the company feature is disabled', ()=>{
-            mockConfigService.isCompanyFeatureEnabled.mockReturnValue(false);
-            expect(service.resolveEntity()).toBe(Event);
+        it('uses the core entity when the company feature is disabled', ()=>{
+            expect(buildWithCompanyFeature(false)['_entity']).toBe(Event);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

package/interfaces/event-manager-module.interface.d.ts

@@ -1,4 +1,4 @@
-import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig, IModuleOptionsFactory } from '@flusys/nestjs-core';
+import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig } from '@flusys/nestjs-core';
 import { IModuleEventsConfig } from '@flusys/nestjs-shared/interfaces';
 import { ModuleMetadata, Type } from '@nestjs/common';
 export interface IEventManagerModuleConfig extends IDataSourceServiceOptions {
@@ -10,7 +10,7 @@ export interface EventManagerModuleOptions extends IDynamicModuleConfig {
     bootstrapAppConfig?: IBootstrapAppConfig;
     config?: IEventManagerModuleConfig;
 }
-export interface EventManagerOptionsFactory extends IModuleOptionsFactory<IEventManagerModuleConfig> {
+export interface EventManagerOptionsFactory {
     createEventManagerOptions(): Promise<IEventManagerModuleConfig> | IEventManagerModuleConfig;
 }
 export interface EventManagerModuleAsyncOptions extends Pick<ModuleMetadata, 'imports'>, IDynamicModuleConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-event-manager",
-  "version": "7.0.0-beta.1",
+  "version": "7.0.1",
   "description": "Event manager module with calendar support and recurrence",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -84,7 +84,7 @@
     "express": "^5.0.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "7.0.0-beta.1",
-    "@flusys/nestjs-shared": "7.0.0-beta.1"
+    "@flusys/nestjs-core": "7.0.1",
+    "@flusys/nestjs-shared": "7.0.1"
   }
 }

package/services/event.service.d.ts

@@ -1,7 +1,7 @@
 import { ApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { EntityTarget, QueryRunner, SelectQueryBuilder } from 'typeorm';
+import { QueryRunner, SelectQueryBuilder } from 'typeorm';
 import { CalendarQueryDto, CreateEventDto, UpdateEventDto, UpdateParticipantStatusDto } from '../dtos';
 import { EventBase, EventParticipant } from '../entities';
 import { ICalendarEvent, IEvent } from '../interfaces';
@@ -15,7 +15,6 @@ export declare class EventService extends ApiService<CreateEventDto, UpdateEvent
     private participantRepository;
     private pendingParticipantsList;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, eventConfig: EventManagerConfigService, dataSourceProvider: EventManagerDataSourceProvider);
-    protected resolveEntity(): EntityTarget<EventBase>;
     convertSingleDtoToEntity(dto: CreateEventDto | UpdateEventDto, user: ILoggedUserInfo | null): Promise<EventBase>;
     protected getFilterQuery(query: SelectQueryBuilder<EventBase>, filter: Record<string, unknown>, _user: ILoggedUserInfo | null): Promise<{
         query: SelectQueryBuilder<EventBase>;