@flusys/nestjs-notification 5.1.1 → 5.1.3

package/adapters/notification.adapter.d.ts

@@ -1,10 +1,9 @@
-import { INotificationAdapter, NotificationSendOptions, NotificationBulkSendOptions, NotificationType } from '@flusys/nestjs-shared';
+import { INotificationAdapter, INotificationBulkSendOptions, INotificationSendOptions } from '@flusys/nestjs-shared';
 import { NotificationHelperService } from '../services/notification-helper.service';
 export declare class NotificationAdapter implements INotificationAdapter {
     private readonly notificationHelper;
     constructor(notificationHelper: NotificationHelperService);
-    send(options: NotificationSendOptions): Promise<void>;
-    sendToMany(options: NotificationBulkSendOptions): Promise<void>;
-    broadcastToCompany(companyId: string, title: string, message?: string, type?: NotificationType, data?: Record<string, unknown>): Promise<void>;
+    send(options: INotificationSendOptions): Promise<void>;
+    sendToMany(options: INotificationBulkSendOptions): Promise<void>;
     isUserOnline(userId: string): boolean;
 }

package/cjs/adapters/notification.adapter.js

@@ -39,27 +39,10 @@ function _ts_param(paramIndex, decorator) {
 }
 let NotificationAdapter = class NotificationAdapter {
     async send(options) {
-        await this.notificationHelper.send({
-            userId: options.userId,
-            title: options.title,
-            message: options.message,
-            type: options.type,
-            data: options.data,
-            companyId: options.companyId
-        });
+        await this.notificationHelper.send(options);
     }
     async sendToMany(options) {
-        await this.notificationHelper.sendToMany({
-            userIds: options.userIds,
-            title: options.title,
-            message: options.message,
-            type: options.type,
-            data: options.data,
-            companyId: options.companyId
-        });
-    }
-    async broadcastToCompany(companyId, title, message, type, data) {
-        await this.notificationHelper.sendToCompany(companyId, title, message, type, data);
+        await this.notificationHelper.sendToMany(options);
     }
     isUserOnline(userId) {
         return this.notificationHelper.isUserOnline(userId);

package/cjs/controllers/notification.controller.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "NotificationController", {
     }
 });
 const _classes = require("@flusys/nestjs-shared/classes");
-const _config = require("../config");
 const _decorators = require("@flusys/nestjs-shared/decorators");
 const _dtos = require("@flusys/nestjs-shared/dtos");
 const _guards = require("@flusys/nestjs-shared/guards");
@@ -17,6 +16,7 @@ const _interfaces = require("@flusys/nestjs-shared/interfaces");
 const _common = require("@nestjs/common");
 const _swagger = require("@nestjs/swagger");
 const _classtransformer = require("class-transformer");
+const _config = require("../config");
 const _dtos1 = require("../dtos");
 const _notificationhelperservice = require("../services/notification-helper.service");
 const _notificationservice = require("../services/notification.service");
@@ -93,11 +93,14 @@ let NotificationController = class NotificationController extends (0, _classes.c
 }) {
     async markAsRead(dto, user) {
         const notification = await this.service.markAsRead(dto.id, user);
+        const plainOptions = {
+            excludeExtraneousValues: true
+        };
         return {
             success: true,
             message: 'Notification marked as read',
             messageKey: _config.NOTIFICATION_MESSAGES.MARK_READ_SUCCESS,
-            data: (0, _classtransformer.plainToInstance)(_dtos1.NotificationResponseDto, notification)
+            data: (0, _classtransformer.plainToInstance)(_dtos1.NotificationResponseDto, notification, plainOptions)
         };
     }
     async markAllAsRead(user) {
@@ -131,11 +134,14 @@ let NotificationController = class NotificationController extends (0, _classes.c
             data: dto.data,
             companyId: dto.companyId
         });
+        const plainOptions = {
+            excludeExtraneousValues: true
+        };
         return {
             success: true,
             message: 'Notification sent successfully',
             messageKey: _config.NOTIFICATION_MESSAGES.SEND_SUCCESS,
-            data: (0, _classtransformer.plainToInstance)(_dtos1.NotificationResponseDto, notification)
+            data: (0, _classtransformer.plainToInstance)(_dtos1.NotificationResponseDto, notification, plainOptions)
         };
     }
     async sendBulkNotification(dto) {
@@ -147,6 +153,9 @@ let NotificationController = class NotificationController extends (0, _classes.c
             data: dto.data,
             companyId: dto.companyId
         });
+        const plainOptions = {
+            excludeExtraneousValues: true
+        };
         return {
             success: true,
             message: `${notifications.length} notifications sent successfully`,
@@ -154,7 +163,7 @@ let NotificationController = class NotificationController extends (0, _classes.c
             messageVariables: {
                 count: notifications.length
             },
-            data: notifications.map((n)=>(0, _classtransformer.plainToInstance)(_dtos1.NotificationResponseDto, n)),
+            data: notifications.map((n)=>(0, _classtransformer.plainToInstance)(_dtos1.NotificationResponseDto, n, plainOptions)),
             meta: {
                 count: notifications.length,
                 total: dto.userIds.length

package/cjs/dtos/notification.dto.js

@@ -31,10 +31,10 @@ _export(exports, {
         return UpdateNotificationDto;
     }
 });
+const _enums = require("@flusys/nestjs-shared/enums");
 const _swagger = require("@nestjs/swagger");
 const _classtransformer = require("class-transformer");
 const _classvalidator = require("class-validator");
-const _enums = require("@flusys/nestjs-shared/enums");
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -173,59 +173,106 @@ let NotificationResponseDto = class NotificationResponseDto {
 };
 _ts_decorate([
     (0, _classtransformer.Expose)(),
-    (0, _swagger.ApiProperty)(),
+    (0, _swagger.ApiProperty)({
+        description: 'Unique identifier of the notification',
+        example: '018e1b2c-3d4e-5f6a-7b8c-9d0e1f2a3b4c'
+    }),
     _ts_metadata("design:type", String)
 ], NotificationResponseDto.prototype, "id", void 0);
 _ts_decorate([
     (0, _classtransformer.Expose)(),
-    (0, _swagger.ApiProperty)(),
+    (0, _swagger.ApiProperty)({
+        description: 'ID of the user this notification belongs to',
+        example: '018e1b2c-3d4e-5f6a-7b8c-9d0e1f2a3b4c'
+    }),
     _ts_metadata("design:type", String)
 ], NotificationResponseDto.prototype, "userId", void 0);
 _ts_decorate([
     (0, _classtransformer.Expose)(),
     (0, _swagger.ApiProperty)({
-        enum: _enums.NotificationType
+        description: 'Category of the notification',
+        enum: _enums.NotificationType,
+        example: _enums.NotificationType.SUCCESS
     }),
-    _ts_metadata("design:type", String)
+    _ts_metadata("design:type", typeof _enums.NotificationType === "undefined" ? Object : _enums.NotificationType)
 ], NotificationResponseDto.prototype, "type", void 0);
 _ts_decorate([
     (0, _classtransformer.Expose)(),
-    (0, _swagger.ApiProperty)(),
+    (0, _swagger.ApiProperty)({
+        description: 'Short title of the notification',
+        example: 'Your export is ready'
+    }),
     _ts_metadata("design:type", String)
 ], NotificationResponseDto.prototype, "title", void 0);
 _ts_decorate([
     (0, _classtransformer.Expose)(),
-    (0, _swagger.ApiPropertyOptional)(),
+    (0, _swagger.ApiPropertyOptional)({
+        description: 'Optional longer body text for the notification',
+        example: 'Your CSV export has finished processing and is ready to download.',
+        nullable: true
+    }),
     _ts_metadata("design:type", Object)
 ], NotificationResponseDto.prototype, "message", void 0);
 _ts_decorate([
     (0, _classtransformer.Expose)(),
-    (0, _swagger.ApiPropertyOptional)(),
+    (0, _swagger.ApiPropertyOptional)({
+        description: 'Arbitrary JSON payload attached to the notification',
+        type: 'object',
+        additionalProperties: true,
+        nullable: true,
+        example: {
+            exportId: 'abc123',
+            fileUrl: 'https://cdn.example.com/export.csv'
+        }
+    }),
     _ts_metadata("design:type", Object)
 ], NotificationResponseDto.prototype, "data", void 0);
 _ts_decorate([
     (0, _classtransformer.Expose)(),
-    (0, _swagger.ApiProperty)(),
+    (0, _swagger.ApiProperty)({
+        description: 'Whether the user has read this notification',
+        example: false
+    }),
     _ts_metadata("design:type", Boolean)
 ], NotificationResponseDto.prototype, "isRead", void 0);
 _ts_decorate([
     (0, _classtransformer.Expose)(),
-    (0, _swagger.ApiPropertyOptional)(),
+    (0, _swagger.ApiPropertyOptional)({
+        description: 'Timestamp when the notification was marked as read; null if unread',
+        type: 'string',
+        format: 'date-time',
+        nullable: true,
+        example: '2024-03-15T10:30:00.000Z'
+    }),
     _ts_metadata("design:type", Object)
 ], NotificationResponseDto.prototype, "readAt", void 0);
 _ts_decorate([
     (0, _classtransformer.Expose)(),
-    (0, _swagger.ApiPropertyOptional)(),
+    (0, _swagger.ApiPropertyOptional)({
+        description: 'Company scope for the notification; null for personal notifications',
+        example: '018e1b2c-3d4e-5f6a-7b8c-9d0e1f2a3b4c',
+        nullable: true
+    }),
     _ts_metadata("design:type", Object)
 ], NotificationResponseDto.prototype, "companyId", void 0);
 _ts_decorate([
     (0, _classtransformer.Expose)(),
-    (0, _swagger.ApiProperty)(),
+    (0, _swagger.ApiProperty)({
+        description: 'Timestamp when the notification was created',
+        type: 'string',
+        format: 'date-time',
+        example: '2024-03-15T10:00:00.000Z'
+    }),
     _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
 ], NotificationResponseDto.prototype, "createdAt", void 0);
 _ts_decorate([
     (0, _classtransformer.Expose)(),
-    (0, _swagger.ApiProperty)(),
+    (0, _swagger.ApiProperty)({
+        description: 'Timestamp when the notification was last updated',
+        type: 'string',
+        format: 'date-time',
+        example: '2024-03-15T10:30:00.000Z'
+    }),
     _ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
 ], NotificationResponseDto.prototype, "updatedAt", void 0);
 let UnreadCountResponseDto = class UnreadCountResponseDto {
@@ -235,7 +282,11 @@ let UnreadCountResponseDto = class UnreadCountResponseDto {
 };
 _ts_decorate([
     (0, _classtransformer.Expose)(),
-    (0, _swagger.ApiProperty)(),
+    (0, _swagger.ApiProperty)({
+        description: 'Total number of unread notifications for the user',
+        example: 5,
+        minimum: 0
+    }),
     _ts_metadata("design:type", Number)
 ], UnreadCountResponseDto.prototype, "count", void 0);
 let SendNotificationDto = class SendNotificationDto extends (0, _swagger.IntersectionType)(UserIdDto, NotificationContentDto) {

package/cjs/modules/notification.module.js

@@ -37,10 +37,6 @@ const ADAPTER_PROVIDER = {
 };
 let NotificationModule = class NotificationModule {
     static forRoot(options) {
-        const enableRealtime = options.config?.enableRealtime !== false;
-        const gatewayProviders = enableRealtime ? [
-            _gateways.NotificationGateway
-        ] : [];
         return {
             module: NotificationModule,
             global: options.global ?? false,
@@ -51,13 +47,13 @@ let NotificationModule = class NotificationModule {
             controllers: options.includeController !== false ? CONTROLLERS : [],
             providers: [
                 ...this.buildProviders(options),
-                ...gatewayProviders,
+                _gateways.NotificationGateway,
                 _adapters.NotificationAdapter,
                 ADAPTER_PROVIDER
             ],
             exports: [
                 ...EXPORTED_SERVICES,
-                ...gatewayProviders,
+                _gateways.NotificationGateway,
                 _interfaces.NOTIFICATION_ADAPTER
             ]
         };

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

@@ -48,9 +48,6 @@ let NotificationConfigService = class NotificationConfigService {
     isMultiTenant() {
         return this.getDatabaseMode() === 'multi-tenant';
     }
-    isRealtimeEnabled() {
-        return this.options.config?.enableRealtime !== false;
-    }
     getJwtSecret() {
         return this.options.config?.jwtSecret;
     }

package/cjs/services/notification-datasource.provider.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "NotificationDataSourceProvider", {
     }
 });
 const _modules = require("@flusys/nestjs-shared/modules");
-const _constants = require("@flusys/nestjs-shared/constants");
 const _common = require("@nestjs/common");
 const _core = require("@nestjs/core");
 const _express = require("express");
@@ -109,50 +108,6 @@ let NotificationDataSourceProvider = class NotificationDataSourceProvider extend
         const entities = await this.getNotificationEntities(enableCompanyFeature);
         return super.createDataSourceFromConfig(config, entities);
     }
-    async getSingleDataSource() {
-        if (NotificationDataSourceProvider.singleDataSource?.isInitialized) {
-            return NotificationDataSourceProvider.singleDataSource;
-        }
-        if (NotificationDataSourceProvider.singleConnectionLock) {
-            return NotificationDataSourceProvider.singleConnectionLock;
-        }
-        const config = this.getDefaultDatabaseConfig();
-        if (!config) {
-            throw new _common.InternalServerErrorException({
-                message: 'No database config available. Provide defaultDatabaseConfig or tenantDefaultDatabaseConfig.',
-                messageKey: _constants.SYSTEM_MESSAGES.DATABASE_CONFIG_NOT_AVAILABLE
-            });
-        }
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        NotificationDataSourceProvider.singleConnectionLock = connectionPromise;
-        try {
-            const dataSource = await connectionPromise;
-            NotificationDataSourceProvider.singleDataSource = dataSource;
-            return dataSource;
-        } finally{
-            NotificationDataSourceProvider.singleConnectionLock = null;
-        }
-    }
-    async getOrCreateTenantConnection(tenant) {
-        const existing = NotificationDataSourceProvider.tenantConnections.get(tenant.id);
-        if (existing?.isInitialized) {
-            return existing;
-        }
-        const pendingConnection = NotificationDataSourceProvider.connectionLocks.get(tenant.id);
-        if (pendingConnection) {
-            return pendingConnection;
-        }
-        const config = this.buildTenantDatabaseConfig(tenant);
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        NotificationDataSourceProvider.connectionLocks.set(tenant.id, connectionPromise);
-        try {
-            const dataSource = await connectionPromise;
-            NotificationDataSourceProvider.tenantConnections.set(tenant.id, dataSource);
-            return dataSource;
-        } finally{
-            NotificationDataSourceProvider.connectionLocks.delete(tenant.id);
-        }
-    }
     constructor(configService, request){
         super(NotificationDataSourceProvider.buildParentOptions(configService.getOptions()), request), _define_property(this, "configService", void 0), this.configService = configService;
     }

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

@@ -8,15 +8,15 @@ Object.defineProperty(exports, "NotificationHelperService", {
         return NotificationHelperService;
     }
 });
-const _common = require("@nestjs/common");
-const _classes = require("@flusys/nestjs-shared/classes");
 const _nestjsshared = require("@flusys/nestjs-shared");
+const _classes = require("@flusys/nestjs-shared/classes");
+const _enums = require("@flusys/nestjs-shared/enums");
 const _modules = require("@flusys/nestjs-shared/modules");
+const _common = require("@nestjs/common");
+const _entities = require("../entities");
+const _gateways = require("../gateways");
 const _notificationconfigservice = require("./notification-config.service");
 const _notificationdatasourceprovider = require("./notification-datasource.provider");
-const _gateways = require("../gateways");
-const _entities = require("../entities");
-const _enums = require("@flusys/nestjs-shared/enums");
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -45,90 +45,68 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let NotificationHelperService = class NotificationHelperService {
-    async getDataSource() {
-        if (!this.dataSource) {
-            this.dataSource = await this.dataSourceProvider.getDataSource();
-        }
-        return this.dataSource;
-    }
-    async getRepository() {
-        const ds = await this.getDataSource();
-        const EntityClass = this.configService.isCompanyFeatureEnabled() ? _entities.NotificationWithCompany : _entities.Notification;
-        return ds.getRepository(EntityClass);
-    }
     async send(options) {
-        const { userId, title, message = null, type = _enums.NotificationType.INFO, data = null, companyId } = options;
         const repo = await this.getRepository();
-        const entity = {
-            userId,
-            type,
-            title,
-            message,
-            data,
-            isRead: false
-        };
-        if (this.configService.isCompanyFeatureEnabled() && companyId) {
-            entity.companyId = companyId;
-        }
+        const entity = this.buildEntity(options.userId, options);
         const saved = await repo.save(entity);
         await this.clearCache();
-        this.emitRealtime(saved);
+        this.emitToUser(saved, options.realtime !== false);
         return saved;
     }
     async sendToMany(options) {
-        const { userIds, title, message = null, type = _enums.NotificationType.INFO, data = null, companyId } = options;
         const repo = await this.getRepository();
-        const entities = userIds.map((userId)=>({
-                userId,
-                type,
-                title,
-                message,
-                data,
-                isRead: false,
-                ...this.configService.isCompanyFeatureEnabled() && companyId ? {
-                    companyId
-                } : {}
-            }));
+        const entities = options.userIds.map((userId)=>this.buildEntity(userId, options));
         const saved = await repo.save(entities);
         await this.clearCache();
-        for (const notification of saved){
-            this.emitRealtime(notification);
+        if (options.realtime !== false) {
+            setImmediate(()=>{
+                for (const notification of saved){
+                    this.emitToUser(notification, true);
+                }
+            });
         }
         return saved;
     }
-    async sendToCompany(companyId, title, message, type = _enums.NotificationType.INFO, data) {
-        if (!this.configService.isCompanyFeatureEnabled()) {
-            return;
-        }
-        if (this.configService.isRealtimeEnabled() && this.gateway) {
-            const payload = {
-                id: `broadcast-${Date.now()}`,
-                type,
-                title,
-                message: message ?? null,
-                data: data ?? null,
-                createdAt: new Date()
-            };
-            this.gateway.emitToCompany(companyId, 'notification:new', payload);
-        }
-    }
     isUserOnline(userId) {
         return this.gateway?.isUserOnline(userId) ?? false;
     }
     getOnlineUserCount() {
         return this.gateway?.getOnlineUserCount() ?? 0;
     }
-    emitRealtime(notification) {
-        if (!this.configService.isRealtimeEnabled() || !this.gateway) {
+    async getDataSource() {
+        if (!this.dataSource) {
+            this.dataSource = await this.dataSourceProvider.getDataSource();
+        }
+        return this.dataSource;
+    }
+    async getRepository() {
+        const ds = await this.getDataSource();
+        const EntityClass = this.configService.isCompanyFeatureEnabled() ? _entities.NotificationWithCompany : _entities.Notification;
+        return ds.getRepository(EntityClass);
+    }
+    buildEntity(userId, content) {
+        const entity = {
+            userId,
+            type: content.type ?? _enums.NotificationType.INFO,
+            title: content.title,
+            message: content.message ?? null,
+            data: content.data ?? null,
+            isRead: false
+        };
+        if (this.configService.isCompanyFeatureEnabled() && content.companyId) {
+            entity.companyId = content.companyId;
+        }
+        return entity;
+    }
+    emitToUser(notification, realtime) {
+        if (!realtime || !this.gateway) {
             return;
         }
         const ext = notification;
         const payload = this.toPayload(notification);
         if (this.configService.isCompanyFeatureEnabled() && ext.companyId) {
-            // Company feature enabled - emit only to sockets in matching company context
             this.gateway.emitToUserInCompany(notification.userId, ext.companyId, 'notification:new', payload);
         } else {
-            // No company feature or no companyId - emit to all user's sockets
             this.gateway.emitToUser(notification.userId, 'notification:new', payload);
         }
     }
@@ -143,7 +121,7 @@ let NotificationHelperService = class NotificationHelperService {
         };
     }
     async clearCache() {
-        await this.utilsService.clearCache(this.entityName, this.cacheManager);
+        await this.utilsService.clearCache('notification', this.cacheManager);
     }
     constructor(cacheManager, utilsService, configService, dataSourceProvider, gateway){
         _define_property(this, "cacheManager", void 0);
@@ -151,14 +129,12 @@ let NotificationHelperService = class NotificationHelperService {
         _define_property(this, "configService", void 0);
         _define_property(this, "dataSourceProvider", void 0);
         _define_property(this, "gateway", void 0);
-        _define_property(this, "entityName", void 0);
         _define_property(this, "dataSource", void 0);
         this.cacheManager = cacheManager;
         this.utilsService = utilsService;
         this.configService = configService;
         this.dataSourceProvider = dataSourceProvider;
         this.gateway = gateway;
-        this.entityName = 'notification';
         this.dataSource = null;
     }
 };
@@ -169,7 +145,7 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
-        typeof SendNotificationOptions === "undefined" ? Object : SendNotificationOptions
+        typeof _nestjsshared.INotificationSendOptions === "undefined" ? Object : _nestjsshared.INotificationSendOptions
     ]),
     _ts_metadata("design:returntype", Promise)
 ], NotificationHelperService.prototype, "send", null);
@@ -180,25 +156,10 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
-        typeof SendBulkNotificationOptions === "undefined" ? Object : SendBulkNotificationOptions
+        typeof _nestjsshared.INotificationBulkSendOptions === "undefined" ? Object : _nestjsshared.INotificationBulkSendOptions
     ]),
     _ts_metadata("design:returntype", Promise)
 ], NotificationHelperService.prototype, "sendToMany", null);
-_ts_decorate([
-    (0, _nestjsshared.LogAction)({
-        action: 'notification.sendToCompany',
-        module: 'notification'
-    }),
-    _ts_metadata("design:type", Function),
-    _ts_metadata("design:paramtypes", [
-        String,
-        String,
-        Object,
-        Object,
-        Object
-    ]),
-    _ts_metadata("design:returntype", Promise)
-], NotificationHelperService.prototype, "sendToCompany", null);
 NotificationHelperService = _ts_decorate([
     (0, _common.Injectable)(),
     _ts_param(0, (0, _common.Inject)('CACHE_INSTANCE')),

package/cjs/services/notification.service.js

@@ -46,13 +46,10 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let NotificationService = class NotificationService extends _classes.RequestScopedApiService {
+let NotificationService = class NotificationService extends _classes.ApiService {
     resolveEntity() {
         return this.notificationConfig.isCompanyFeatureEnabled() ? _entities.NotificationWithCompany : _entities.Notification;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     async convertSingleDtoToEntity(dto, user) {
         let entity = {};
         if ('id' in dto && dto.id) {
@@ -125,11 +122,11 @@ let NotificationService = class NotificationService extends _classes.RequestScop
     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,
@@ -153,13 +150,13 @@ let NotificationService = class NotificationService extends _classes.RequestScop
         ]);
         // 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
@@ -173,11 +170,11 @@ let NotificationService = class NotificationService extends _classes.RequestScop
         });
         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
@@ -199,24 +196,18 @@ let NotificationService = class NotificationService extends _classes.RequestScop
             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([