fix unit tests
All checks were successful
Deploy to Test Environment / deploy-to-test (push) Successful in 13m4s

This commit is contained in:
2025-12-29 15:14:44 -08:00
parent ab3fc318a0
commit a0dbefbfa0
13 changed files with 196 additions and 66 deletions

View File

@@ -11,6 +11,8 @@ import { createTestApp } from '../tests/utils/createTestApp';
vi.mock('../services/backgroundJobService', () => ({
backgroundJobService: {
runDailyDealCheck: vi.fn(),
triggerAnalyticsReport: vi.fn(),
triggerWeeklyAnalyticsReport: vi.fn(),
},
}));
@@ -142,22 +144,17 @@ describe('Admin Job Trigger Routes (/api/admin/trigger)', () => {
describe('POST /trigger/analytics-report', () => {
it('should trigger the analytics report job and return 202 Accepted', async () => {
const mockJob = { id: 'manual-report-job-123' } as Job;
vi.mocked(analyticsQueue.add).mockResolvedValue(mockJob);
vi.mocked(backgroundJobService.triggerAnalyticsReport).mockResolvedValue('manual-report-job-123');
const response = await supertest(app).post('/api/admin/trigger/analytics-report');
expect(response.status).toBe(202);
expect(response.body.message).toContain('Analytics report generation job has been enqueued');
expect(analyticsQueue.add).toHaveBeenCalledWith(
'generate-daily-report',
expect.objectContaining({ reportDate: expect.any(String) }),
expect.any(Object),
);
expect(backgroundJobService.triggerAnalyticsReport).toHaveBeenCalledTimes(1);
});
it('should return 500 if enqueuing the analytics job fails', async () => {
vi.mocked(analyticsQueue.add).mockRejectedValue(new Error('Queue error'));
vi.mocked(backgroundJobService.triggerAnalyticsReport).mockRejectedValue(new Error('Queue error'));
const response = await supertest(app).post('/api/admin/trigger/analytics-report');
expect(response.status).toBe(500);
});
@@ -165,22 +162,17 @@ describe('Admin Job Trigger Routes (/api/admin/trigger)', () => {
describe('POST /trigger/weekly-analytics', () => {
it('should trigger the weekly analytics job and return 202 Accepted', async () => {
const mockJob = { id: 'manual-weekly-report-job-123' } as Job;
vi.mocked(weeklyAnalyticsQueue.add).mockResolvedValue(mockJob);
vi.mocked(backgroundJobService.triggerWeeklyAnalyticsReport).mockResolvedValue('manual-weekly-report-job-123');
const response = await supertest(app).post('/api/admin/trigger/weekly-analytics');
expect(response.status).toBe(202);
expect(response.body.message).toContain('Successfully enqueued weekly analytics job');
expect(weeklyAnalyticsQueue.add).toHaveBeenCalledWith(
'generate-weekly-report',
expect.objectContaining({ reportYear: expect.any(Number), reportWeek: expect.any(Number) }),
expect.any(Object),
);
expect(backgroundJobService.triggerWeeklyAnalyticsReport).toHaveBeenCalledTimes(1);
});
it('should return 500 if enqueuing the weekly analytics job fails', async () => {
vi.mocked(weeklyAnalyticsQueue.add).mockRejectedValue(new Error('Queue error'));
vi.mocked(backgroundJobService.triggerWeeklyAnalyticsReport).mockRejectedValue(new Error('Queue error'));
const response = await supertest(app).post('/api/admin/trigger/weekly-analytics');
expect(response.status).toBe(500);
});

View File

@@ -349,7 +349,8 @@ router.get(
validateRequest(activityLogSchema),
async (req: Request, res: Response, next: NextFunction) => {
// Apply ADR-003 pattern for type safety.
const { limit, offset } = (req as unknown as z.infer<typeof activityLogSchema>).query;
// We parse the query here to apply Zod's coercions (string to number) and defaults.
const { limit, offset } = activityLogSchema.shape.query.parse(req.query);
try {
const logs = await db.adminRepo.getActivityLog(limit!, offset!, req.log);

View File

@@ -30,6 +30,9 @@ const { mockedDb } = vi.hoisted(() => ({
adminRepo: {
logActivity: vi.fn(),
},
personalizationRepo: {
getAllMasterItems: vi.fn(),
},
// This function is a standalone export, not part of a repo
createFlyerAndItems: vi.fn(),
},
@@ -40,6 +43,7 @@ vi.mock('../services/db/flyer.db', () => ({ createFlyerAndItems: mockedDb.create
vi.mock('../services/db/index.db', () => ({
flyerRepo: mockedDb.flyerRepo,
adminRepo: mockedDb.adminRepo,
personalizationRepo: mockedDb.personalizationRepo,
}));
// Mock the queue service

View File

@@ -13,10 +13,12 @@ const adminGamificationRouter = express.Router(); // Create a new router for adm
// --- Zod Schemas for Gamification Routes (as per ADR-003) ---
const leaderboardQuerySchema = z.object({
limit: optionalNumeric({ default: 10, integer: true, positive: true, max: 50 }),
});
const leaderboardSchema = z.object({
query: z.object({
limit: optionalNumeric({ default: 10, integer: true, positive: true, max: 50 }),
}),
query: leaderboardQuerySchema,
});
const awardAchievementSchema = z.object({
@@ -50,12 +52,11 @@ router.get(
'/leaderboard',
validateRequest(leaderboardSchema),
async (req, res, next: NextFunction): Promise<void> => {
// Apply ADR-003 pattern for type safety.
// The `validateRequest` middleware handles coercion and defaults.
const { query } = req as unknown as z.infer<typeof leaderboardSchema>;
try {
const leaderboard = await gamificationService.getLeaderboard(query.limit!, req.log);
// The `validateRequest` middleware ensures `req.query` is valid.
// We parse it here to apply Zod's coercions (string to number) and defaults.
const { limit } = leaderboardQuerySchema.parse(req.query);
const leaderboard = await gamificationService.getLeaderboard(limit!, req.log);
res.json(leaderboard);
} catch (error) {
logger.error({ error }, 'Error fetching leaderboard:');

View File

@@ -28,7 +28,9 @@ router.get(
validateRequest(mostFrequentSalesSchema),
async (req: Request, res: Response, next: NextFunction) => {
try {
const { days, limit } = (req as unknown as z.infer<typeof mostFrequentSalesSchema>).query;
// The `validateRequest` middleware ensures `req.query` is valid.
// We parse it here to apply Zod's coercions (string to number) and defaults.
const { days, limit } = statsQuerySchema.parse(req.query);
const items = await db.adminRepo.getMostFrequentSaleItems(days!, limit!, req.log);
res.json(items);
} catch (error) {