@flusys/nestjs-notification 7.0.0-beta.1 → 7.0.1

package/cjs/services/notification-helper.service.js

@@ -139,7 +139,7 @@ let NotificationHelperService = class NotificationHelperService {
         };
     }
     async clearCache() {
-        await this.utilsService.clearCache('notification', this.cacheManager);
+        await this.utilsService.clearCache(_config.NOTIFICATION_EVENT_ENTITIES.NOTIFICATION, this.cacheManager);
     }
     constructor(cacheManager, utilsService, configService, dataSourceProvider, gateway){
         _define_property(this, "cacheManager", void 0);

package/cjs/services/notification.service.js

@@ -47,9 +47,6 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let NotificationService = class NotificationService extends _classes.ApiService {
-    resolveEntity() {
-        return this.notificationConfig.isCompanyFeatureEnabled() ? _entities.NotificationWithCompany : _entities.Notification;
-    }
     async convertSingleDtoToEntity(dto, user) {
         let entity = {};
         if ('id' in dto && dto.id) {
@@ -237,7 +234,7 @@ let NotificationService = class NotificationService extends _classes.ApiService
         }
     }
     constructor(cacheManager, utilsService, notificationConfig, dataSourceProvider, gateway){
-        super('notification', cacheManager, utilsService, NotificationService.name, false, 'notification', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "notificationConfig", void 0), _define_property(this, "gateway", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.notificationConfig = notificationConfig, this.gateway = gateway;
+        super(_config.NOTIFICATION_EVENT_ENTITIES.NOTIFICATION, cacheManager, utilsService, NotificationService.name, false, _config.NOTIFICATION_EVENT_MODULE, dataSourceProvider, notificationConfig.isCompanyFeatureEnabled() ? _entities.NotificationWithCompany : _entities.Notification), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "notificationConfig", void 0), _define_property(this, "gateway", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.notificationConfig = notificationConfig, this.gateway = gateway;
     }
 };
 _ts_decorate([

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

@@ -43,11 +43,11 @@ describe('NotificationService', ()=>{
     let mockRepo;
     let mockConfig;
     let mockGateway;
-    async function buildService(withGateway = true) {
+    async function buildService(withGateway = true, companyFeatureEnabled = false) {
         mockRepo = (0, _repositorymock.createMockRepository)();
         const mockDataSourceProvider = (0, _repositorymock.createMockDataSourceProvider)(mockRepo);
         mockConfig = {
-            isCompanyFeatureEnabled: jest.fn().mockReturnValue(false)
+            isCompanyFeatureEnabled: jest.fn().mockReturnValue(companyFeatureEnabled)
         };
         mockGateway = {
             emitToUser: jest.fn(),
@@ -90,13 +90,14 @@ describe('NotificationService', ()=>{
     beforeEach(async ()=>{
         service = await buildService();
     });
-    describe('resolveEntity', ()=>{
-        it('returns Notification when the company feature is disabled', ()=>{
-            expect(service.resolveEntity()).toBe(_entities.Notification);
-        });
-        it('returns NotificationWithCompany when the company feature is enabled', ()=>{
-            mockConfig.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(_entities.NotificationWithCompany);
+    describe('entity selection', ()=>{
+        it('uses Notification when the company feature is disabled', async ()=>{
+            const built = await buildService(true, false);
+            expect(built['_entity']).toBe(_entities.Notification);
+        });
+        it('uses NotificationWithCompany when the company feature is enabled', async ()=>{
+            const built = await buildService(true, true);
+            expect(built['_entity']).toBe(_entities.NotificationWithCompany);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

package/fesm/services/notification-helper.service.js

@@ -129,7 +129,7 @@ export class NotificationHelperService {
         };
     }
     async clearCache() {
-        await this.utilsService.clearCache('notification', this.cacheManager);
+        await this.utilsService.clearCache(NOTIFICATION_EVENT_ENTITIES.NOTIFICATION, this.cacheManager);
     }
     constructor(cacheManager, utilsService, configService, dataSourceProvider, gateway){
         _define_property(this, "cacheManager", void 0);

package/fesm/services/notification.service.js

@@ -31,15 +31,12 @@ import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
 import { Inject, Injectable, NotFoundException, Optional, Scope } from '@nestjs/common';
-import { NOTIFICATION_EVENT_ACTIONS, NOTIFICATION_MESSAGES } from '../config';
+import { NOTIFICATION_EVENT_ACTIONS, NOTIFICATION_EVENT_ENTITIES, NOTIFICATION_EVENT_MODULE, NOTIFICATION_MESSAGES } from '../config';
 import { Notification, NotificationWithCompany } from '../entities';
 import { NotificationGateway } from '../gateways';
 import { NotificationConfigService } from './notification-config.service';
 import { NotificationDataSourceProvider } from './notification-datasource.provider';
 export class NotificationService extends ApiService {
-    resolveEntity() {
-        return this.notificationConfig.isCompanyFeatureEnabled() ? NotificationWithCompany : Notification;
-    }
     async convertSingleDtoToEntity(dto, user) {
         let entity = {};
         if ('id' in dto && dto.id) {
@@ -227,7 +224,7 @@ export class NotificationService extends ApiService {
         }
     }
     constructor(cacheManager, utilsService, notificationConfig, dataSourceProvider, gateway){
-        super('notification', cacheManager, utilsService, NotificationService.name, false, 'notification', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "notificationConfig", void 0), _define_property(this, "gateway", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.notificationConfig = notificationConfig, this.gateway = gateway;
+        super(NOTIFICATION_EVENT_ENTITIES.NOTIFICATION, cacheManager, utilsService, NotificationService.name, false, NOTIFICATION_EVENT_MODULE, dataSourceProvider, notificationConfig.isCompanyFeatureEnabled() ? NotificationWithCompany : Notification), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "notificationConfig", void 0), _define_property(this, "gateway", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.notificationConfig = notificationConfig, this.gateway = gateway;
     }
 }
 _ts_decorate([

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

@@ -39,11 +39,11 @@ describe('NotificationService', ()=>{
     let mockRepo;
     let mockConfig;
     let mockGateway;
-    async function buildService(withGateway = true) {
+    async function buildService(withGateway = true, companyFeatureEnabled = false) {
         mockRepo = createMockRepository();
         const mockDataSourceProvider = createMockDataSourceProvider(mockRepo);
         mockConfig = {
-            isCompanyFeatureEnabled: jest.fn().mockReturnValue(false)
+            isCompanyFeatureEnabled: jest.fn().mockReturnValue(companyFeatureEnabled)
         };
         mockGateway = {
             emitToUser: jest.fn(),
@@ -86,13 +86,14 @@ describe('NotificationService', ()=>{
     beforeEach(async ()=>{
         service = await buildService();
     });
-    describe('resolveEntity', ()=>{
-        it('returns Notification when the company feature is disabled', ()=>{
-            expect(service.resolveEntity()).toBe(Notification);
-        });
-        it('returns NotificationWithCompany when the company feature is enabled', ()=>{
-            mockConfig.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(NotificationWithCompany);
+    describe('entity selection', ()=>{
+        it('uses Notification when the company feature is disabled', async ()=>{
+            const built = await buildService(true, false);
+            expect(built['_entity']).toBe(Notification);
+        });
+        it('uses NotificationWithCompany when the company feature is enabled', async ()=>{
+            const built = await buildService(true, true);
+            expect(built['_entity']).toBe(NotificationWithCompany);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

package/interfaces/notification-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 INotificationModuleConfig extends IDataSourceServiceOptions {
@@ -9,7 +9,7 @@ export interface NotificationModuleOptions extends IDynamicModuleConfig {
     bootstrapAppConfig?: IBootstrapAppConfig;
     config?: INotificationModuleConfig;
 }
-export interface NotificationOptionsFactory extends IModuleOptionsFactory<INotificationModuleConfig> {
+export interface NotificationOptionsFactory {
     createNotificationOptions(): Promise<INotificationModuleConfig> | INotificationModuleConfig;
 }
 export interface NotificationModuleAsyncOptions extends Pick<ModuleMetadata, 'imports'>, IDynamicModuleConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-notification",
-  "version": "7.0.0-beta.1",
+  "version": "7.0.1",
   "description": "Notification module with real-time Socket.IO support",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -93,7 +93,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/notification.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 { CreateNotificationDto, UpdateNotificationDto } from '../dtos';
 import { NotificationBase } from '../entities';
 import { NotificationGateway } from '../gateways';
@@ -14,7 +14,6 @@ export declare class NotificationService extends ApiService<CreateNotificationDt
     private readonly notificationConfig;
     private readonly gateway?;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, notificationConfig: NotificationConfigService, dataSourceProvider: NotificationDataSourceProvider, gateway?: NotificationGateway | undefined);
-    protected resolveEntity(): EntityTarget<NotificationBase>;
     convertSingleDtoToEntity(dto: CreateNotificationDto | UpdateNotificationDto, user: ILoggedUserInfo | null): Promise<NotificationBase>;
     protected getSelectQuery(query: SelectQueryBuilder<NotificationBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<NotificationBase>;