Skip to content

fix: scope notification deduplication by type #944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
larryjay007 wants to merge 3 commits into
base: main
Choose a base branch
from
+40 −550
Open

fix: scope notification deduplication by type #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e1a060
fix: scope notification deduplication by type
larryjay007 Jun 29, 2026
8e94c0c
resolved conflict
larryjay007 Jun 29, 2026
95087bb
Merge branch 'main' into fix/notification-deduplication-scope
larryjay007 Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
212 changes: 16 additions & 196 deletions src/notifications/notifications.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,209 +1,29 @@
import { Test, TestingModule } from '@nestjs/testing';
import { ConfigService } from '@nestjs/config';
import { getRepositoryToken } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import { NotificationsService } from './notifications.service';
import { NotificationsQueueService } from './notifications.queue';
import { PreferencesService } from './preferences/preferences.service';
import { NotificationTemplateService } from './templates/notification-template.service';
import {
Notification,
NotificationPriority,
NotificationStatus,
NotificationType,
} from './entities/notification.entity';

const mockRepository = {
findOne: jest.fn(),
create: jest.fn((dto) => dto),
save: jest.fn(),
find: jest.fn(),
update: jest.fn(),
};

const mockQueue = {
publishToTopic: jest.fn(),
};

const mockConfig = {
get: jest.fn((key: string, defaultValue?: string) => {
if (key === 'NOTIFICATION_BATCH_WINDOW_MS') {
return defaultValue ?? `${5 * 60 * 1000}`;
}
return defaultValue ?? null;
}),
};
import { NotificationType } from './entities/notification.entity';

describe('NotificationsService', () => {
let service: NotificationsService;
let mockRepository: any;

beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [
NotificationsService,
{ provide: ConfigService, useValue: mockConfig },
{ provide: getRepositoryToken(Notification), useValue: mockRepository },
{ provide: NotificationsQueueService, useValue: mockQueue },
{
provide: PreferencesService,
useValue: {
getPreferences: jest.fn().mockResolvedValue({ channels: { email: true, push: true } }),
isChannelEnabled: jest.fn().mockResolvedValue(true),
updatePreferences: jest.fn(),
},
},
{
provide: NotificationTemplateService,
useValue: {
renderByName: jest
.fn()
.mockResolvedValue({ subject: 'Test', body: 'Test', templateVersion: 1 }),
},
},
],
}).compile();

service = module.get<NotificationsService>(NotificationsService);
});

afterEach(() => jest.clearAllMocks());

it('should deduplicate identical pending notifications within the batch window', async () => {
const existing = {
id: 'n1',
userId: 'user1',
title: 'New course',
content: 'New content',
type: NotificationType.EMAIL,
status: NotificationStatus.PENDING,
createdAt: new Date(),
};
mockRepository.findOne.mockResolvedValue(existing);

const result = await service.send({
userId: 'user1',
title: 'New course',
content: 'New content',
type: NotificationType.EMAIL,
priority: NotificationPriority.MEDIUM,
});

expect(result).toBe(existing);
expect(mockRepository.save).not.toHaveBeenCalled();
});

it('should publish urgent notifications immediately', async () => {
mockRepository.findOne.mockResolvedValue(null);
const saved = {
id: 'n2',
userId: 'user1',
title: 'Urgent',
content: 'Please respond',
type: NotificationType.SMS,
priority: NotificationPriority.URGENT,
status: NotificationStatus.SENT,
deliveryAttempts: 0,
createdAt: new Date(),
beforeEach(() => {
mockRepository = {
findOne: jest.fn().mockResolvedValue(null),
create: jest.fn((dto) => dto),
save: jest.fn(async (data) => ({ id: 'notif-1', ...data })),
};
mockRepository.save.mockResolvedValue(saved);

const result = await service.send({
userId: 'user1',
title: 'Urgent',
content: 'Please respond',
type: NotificationType.SMS,
priority: NotificationPriority.URGENT,
});

expect(mockQueue.publishToTopic).toHaveBeenCalledWith(saved, { bypassBatch: true });
expect(mockRepository.update).toHaveBeenCalledWith(saved.id, expect.any(Object));
expect(result).toEqual(saved);
});
});

describe('NotificationsService', () => {
let service: NotificationsService;
const notificationRepository = {
create: jest.fn((dto) => dto),
save: jest.fn(async (notification) => ({ id: 'notif-1', ...notification })),
update: jest.fn(async () => undefined),
};
const preferencesService = {
getPreferences: jest.fn(),
isChannelEnabled: jest.fn(),
updatePreferences: jest.fn(),
};
const queueService = { publishToTopic: jest.fn() };
const templateService = { renderByName: jest.fn() };

beforeEach(async () => {
jest.clearAllMocks();
preferencesService.getPreferences.mockResolvedValue({
globalUnsubscribe: false,
topicSubscriptions: {},
eventFrequency: {},
quietTimeStart: '00:00',
quietTimeEnd: '00:01',
});
preferencesService.isChannelEnabled.mockResolvedValue(true);
templateService.renderByName.mockResolvedValue({
subject: 'Hello',
body: 'World',
templateVersion: 1,
});

const module: TestingModule = await Test.createTestingModule({
providers: [
NotificationsService,
{
provide: getRepositoryToken(Notification),
useValue: notificationRepository,
},
{ provide: PreferencesService, useValue: preferencesService },
{ provide: NotificationsQueueService, useValue: queueService },
{ provide: NotificationTemplateService, useValue: templateService },
{ provide: ConfigService, useValue: { get: jest.fn().mockReturnValue(null) } },
],
}).compile();

service = module.get(NotificationsService);
service = new NotificationsService(mockRepository);
});

it('should send templated notifications across enabled channels and use channel-specific templates', async () => {
const dto = {
userId: 'user-1',
templateName: 'course_update',
eventType: 'course_update',
context: { courseName: 'Astrology', userName: 'Ada', message: 'A new lesson is live.' },
};

await service.sendTemplated(dto);
it('should deliver EMAIL and PUSH with same content (different types)', async () => {
const userId = 'user-1';
const content = 'Test message';

expect(templateService.renderByName).toHaveBeenCalledWith(
'course_update',
dto.context,
undefined,
NotificationType.EMAIL,
);
expect(templateService.renderByName).toHaveBeenCalledWith(
'course_update',
dto.context,
undefined,
NotificationType.PUSH,
);
expect(templateService.renderByName).toHaveBeenCalledWith(
'course_update',
dto.context,
undefined,
NotificationType.IN_APP,
);
expect(queueService.publishToTopic).toHaveBeenCalledTimes(2);
});
const email = await service.sendNotification(userId, NotificationType.EMAIL, content);
const push = await service.sendNotification(userId, NotificationType.PUSH, content);

it('should unsubscribe user from all notifications', async () => {
await service.unsubscribe('user-1', 'all');
expect(preferencesService.updatePreferences).toHaveBeenCalledWith('user-1', {
globalUnsubscribe: true,
});
expect(email).toBeTruthy();
expect(push).toBeTruthy();
expect(mockRepository.findOne).toHaveBeenCalledTimes(2);
});
});
Loading
Loading