@flusys/nestjs-notification 5.1.1 → 5.1.3

package/fesm/services/notification.service.js

@@ -26,7 +26,7 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 import { LogAction } from '@flusys/nestjs-shared';
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
@@ -36,13 +36,10 @@ 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 RequestScopedApiService {
+export class NotificationService extends ApiService {
     resolveEntity() {
         return this.notificationConfig.isCompanyFeatureEnabled() ? NotificationWithCompany : Notification;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     async convertSingleDtoToEntity(dto, user) {
         let entity = {};
         if ('id' in dto && dto.id) {
@@ -115,11 +112,11 @@ export class NotificationService extends RequestScopedApiService {
     async afterInsertOperation(entities, _user, _qr) {
         for (const entity of entities){
             const ext = entity;
-            this.emitToUserInCompanyIfRealtime(entity.userId, ext.companyId, 'notification:new', this.toPayload(entity));
+            this.emitToUser(entity.userId, ext.companyId, 'notification:new', this.toPayload(entity));
         }
     }
     async markAsRead(id, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const notification = await this.repository.findOne({
             where: {
                 id,
@@ -143,13 +140,13 @@ export class NotificationService extends RequestScopedApiService {
         ]);
         // Emit to user's sockets in the same company context
         const ext = notification;
-        this.emitToUserInCompanyIfRealtime(user.id, ext.companyId ?? user.companyId, 'notification:read', {
+        this.emitToUser(user.id, ext.companyId ?? user.companyId, 'notification:read', {
             id
         });
         return notification;
     }
     async markAllAsRead(user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const where = {
             userId: user.id,
             isRead: false
@@ -163,11 +160,11 @@ export class NotificationService extends RequestScopedApiService {
         });
         await this.clearCacheForAll();
         // Emit to user's sockets in the current company context
-        this.emitToUserInCompanyIfRealtime(user.id, user.companyId, 'notification:read-all', {});
+        this.emitToUser(user.id, user.companyId, 'notification:read-all', {});
         return result.affected ?? 0;
     }
     async getUnreadCount(user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const where = {
             userId: user.id,
             isRead: false
@@ -189,24 +186,18 @@ export class NotificationService extends RequestScopedApiService {
             createdAt: entity.createdAt
         };
     }
-    /**
-   * Emit to user's sockets within a specific company context.
-   * If company feature is enabled and companyId is provided, only sockets
-   * connected with that company will receive the event.
-   */ emitToUserInCompanyIfRealtime(userId, companyId, event, payload) {
-        if (!this.notificationConfig.isRealtimeEnabled() || !this.gateway) {
+    emitToUser(userId, companyId, event, payload) {
+        if (!this.gateway) {
             return;
         }
         if (this.notificationConfig.isCompanyFeatureEnabled() && companyId) {
-            // Company feature enabled - emit only to sockets in matching company context
             this.gateway.emitToUserInCompany(userId, companyId, event, payload);
         } else {
-            // No company feature or no companyId - emit to all user's sockets
             this.gateway.emitToUser(userId, event, payload);
         }
     }
     constructor(cacheManager, utilsService, notificationConfig, dataSourceProvider, gateway){
-        super('notification', null, cacheManager, utilsService, NotificationService.name, false, 'notification'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "notificationConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "gateway", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.notificationConfig = notificationConfig, this.dataSourceProvider = dataSourceProvider, this.gateway = 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;
     }
 }
 _ts_decorate([

package/interfaces/notification-module.interface.d.ts

@@ -1,7 +1,6 @@
 import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig, IModuleOptionsFactory } from '@flusys/nestjs-core';
 import { ModuleMetadata, Type } from '@nestjs/common';
 export interface INotificationModuleConfig extends IDataSourceServiceOptions {
-    enableRealtime?: boolean;
     jwtSecret?: string;
 }
 export interface NotificationModuleOptions extends IDynamicModuleConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-notification",
-  "version": "5.1.1",
+  "version": "5.1.3",
   "description": "Notification module with real-time Socket.IO support",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -77,23 +77,23 @@
     }
   },
   "peerDependencies": {
-    "@nestjs/common": "^10.0.0 || ^11.0.0",
-    "@nestjs/config": "^3.0.0 || ^4.0.0",
-    "@nestjs/core": "^10.0.0 || ^11.0.0",
-    "@nestjs/platform-express": "^10.0.0 || ^11.0.0",
-    "@nestjs/swagger": "^7.0.0 || ^11.0.0",
-    "@nestjs/typeorm": "^10.0.0 || ^11.0.0",
-    "@nestjs/websockets": "^10.0.0 || ^11.0.0",
-    "@nestjs/platform-socket.io": "^10.0.0 || ^11.0.0",
-    "class-transformer": "^0.5.0",
-    "class-validator": "^0.14.0",
-    "socket.io": "^4.0.0",
+    "@nestjs/common": "^11.0.0",
+    "@nestjs/config": "^4.0.0",
+    "@nestjs/core": "^11.0.0",
+    "@nestjs/platform-express": "^11.0.0",
+    "@nestjs/swagger": "^11.0.0",
+    "@nestjs/typeorm": "^11.0.0",
+    "@nestjs/websockets": "^11.0.0",
+    "@nestjs/platform-socket.io": "^11.0.0",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.0 || ^0.15.0",
+    "socket.io": "^4.8.0",
     "typeorm": "^0.3.0",
-    "express": "^4.18.0"
+    "express": "^4.18.0 || ^5.0.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "5.1.1",
-    "@flusys/nestjs-shared": "5.1.1",
+    "@flusys/nestjs-core": "5.1.3",
+    "@flusys/nestjs-shared": "5.1.3",
     "jsonwebtoken": "^9.0.0"
   }
 }

package/services/notification-config.service.d.ts

@@ -7,7 +7,6 @@ export declare class NotificationConfigService implements IModuleConfigService {
     isCompanyFeatureEnabled(): boolean;
     getDatabaseMode(): DatabaseMode;
     isMultiTenant(): boolean;
-    isRealtimeEnabled(): boolean;
     getJwtSecret(): string | undefined;
     getOptions(): NotificationModuleOptions;
 }

package/services/notification-datasource.provider.d.ts

@@ -16,6 +16,4 @@ export declare class NotificationDataSourceProvider extends MultiTenantDataSourc
     getEnableCompanyFeatureForTenant(tenant?: ITenantDatabaseConfig): boolean;
     getNotificationEntities(enableCompanyFeature?: boolean): Promise<any[]>;
     protected createDataSourceFromConfig(config: IDatabaseConfig): Promise<DataSource>;
-    protected getSingleDataSource(): Promise<DataSource>;
-    protected getOrCreateTenantConnection(tenant: ITenantDatabaseConfig): Promise<DataSource>;
 }

package/services/notification-helper.service.d.ts

@@ -1,43 +1,26 @@
+import { INotificationBulkSendOptions, INotificationSendOptions } from '@flusys/nestjs-shared';
 import { HybridCache } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
+import { NotificationBase } from '../entities';
+import { NotificationGateway } from '../gateways';
 import { NotificationConfigService } from './notification-config.service';
 import { NotificationDataSourceProvider } from './notification-datasource.provider';
-import { NotificationGateway } from '../gateways';
-import { NotificationBase } from '../entities';
-import { NotificationType } from '@flusys/nestjs-shared/enums';
-export interface SendNotificationOptions {
-    userId: string;
-    title: string;
-    message?: string | null;
-    type?: NotificationType | string;
-    data?: Record<string, unknown> | null;
-    companyId?: string | null;
-}
-export interface SendBulkNotificationOptions {
-    userIds: string[];
-    title: string;
-    message?: string | null;
-    type?: NotificationType | string;
-    data?: Record<string, unknown> | null;
-    companyId?: string | null;
-}
 export declare class NotificationHelperService {
     private readonly cacheManager;
     private readonly utilsService;
     private readonly configService;
     private readonly dataSourceProvider;
     private readonly gateway?;
-    private readonly entityName;
     private dataSource;
-    constructor(cacheManager: HybridCache, utilsService: UtilsService, configService: NotificationConfigService, dataSourceProvider: NotificationDataSourceProvider, gateway?: NotificationGateway);
-    private getDataSource;
-    private getRepository;
-    send(options: SendNotificationOptions): Promise<NotificationBase>;
-    sendToMany(options: SendBulkNotificationOptions): Promise<NotificationBase[]>;
-    sendToCompany(companyId: string, title: string, message?: string | null, type?: NotificationType | string, data?: Record<string, unknown> | null): Promise<void>;
+    constructor(cacheManager: HybridCache, utilsService: UtilsService, configService: NotificationConfigService, dataSourceProvider: NotificationDataSourceProvider, gateway?: NotificationGateway | undefined);
+    send(options: INotificationSendOptions): Promise<NotificationBase>;
+    sendToMany(options: INotificationBulkSendOptions): Promise<NotificationBase[]>;
     isUserOnline(userId: string): boolean;
     getOnlineUserCount(): number;
-    private emitRealtime;
+    private getDataSource;
+    private getRepository;
+    private buildEntity;
+    private emitToUser;
     private toPayload;
     private clearCache;
 }

package/services/notification.service.d.ts

@@ -1,4 +1,4 @@
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } 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';
@@ -8,15 +8,13 @@ import { NotificationGateway } from '../gateways';
 import { INotification } from '../interfaces';
 import { NotificationConfigService } from './notification-config.service';
 import { NotificationDataSourceProvider } from './notification-datasource.provider';
-export declare class NotificationService extends RequestScopedApiService<CreateNotificationDto, UpdateNotificationDto, INotification, NotificationBase> {
+export declare class NotificationService extends ApiService<CreateNotificationDto, UpdateNotificationDto, INotification, NotificationBase> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly notificationConfig;
-    private readonly dataSourceProvider;
     private readonly gateway?;
-    constructor(cacheManager: HybridCache, utilsService: UtilsService, notificationConfig: NotificationConfigService, dataSourceProvider: NotificationDataSourceProvider, gateway?: NotificationGateway);
+    constructor(cacheManager: HybridCache, utilsService: UtilsService, notificationConfig: NotificationConfigService, dataSourceProvider: NotificationDataSourceProvider, gateway?: NotificationGateway | undefined);
     protected resolveEntity(): EntityTarget<NotificationBase>;
-    protected getDataSourceProvider(): NotificationDataSourceProvider;
     convertSingleDtoToEntity(dto: CreateNotificationDto | UpdateNotificationDto, user: ILoggedUserInfo | null): Promise<NotificationBase>;
     protected getFilterQuery(query: SelectQueryBuilder<NotificationBase>, filter: Record<string, unknown>, _user: ILoggedUserInfo | null): Promise<{
         query: SelectQueryBuilder<NotificationBase>;
@@ -31,5 +29,5 @@ export declare class NotificationService extends RequestScopedApiService<CreateN
     markAllAsRead(user: ILoggedUserInfo): Promise<number>;
     getUnreadCount(user: ILoggedUserInfo): Promise<number>;
     private toPayload;
-    private emitToUserInCompanyIfRealtime;
+    private emitToUser;
 }