Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions backend/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
process.env.PORT = '0';
process.env.DATABASE_URL = 'postgresql://postgres:postgres@localhost:5432/inboxos_test';
process.env.NODE_ENV = 'test';

module.exports = {
preset: 'ts-jest',
Expand Down
14 changes: 14 additions & 0 deletions backend/src/__tests__/calendar-routes.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
import request from 'supertest';
jest.mock('../worker', () => ({
registerWorkerHandlers: () => Promise.resolve(),
}));

const mockPrisma = {
calendarEvent: {
findMany: jest.fn(),
},
};

jest.mock('@prisma/client', () => ({
PrismaClient: jest.fn().mockImplementation(() => mockPrisma),
}));

import { app, server, prisma } from '../server';
import { AuthService } from '../services/auth.service';
import { EventBus } from '../services/event-bus.service';
Expand Down
16 changes: 11 additions & 5 deletions backend/src/__tests__/digest.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,17 @@ jest.mock('@prisma/client', () => {
});

// Mock EmailSenderService
jest.mock('../services/email-sender.service', () => ({
EmailSenderService: {
send: jest.fn(),
},
}));
jest.mock('../services/email-sender.service', () => {
class MockGmailAuthError extends Error {
name = 'GmailAuthError';
}
return {
EmailSenderService: {
send: jest.fn(),
},
GmailAuthError: MockGmailAuthError,
};
});

const prisma = new PrismaClient();

Expand Down
34 changes: 32 additions & 2 deletions backend/src/__tests__/feedback.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
import request from 'supertest';
jest.mock('../worker', () => ({
registerWorkerHandlers: () => Promise.resolve(),
}));

const mockPrisma = {
email: {
findFirst: jest.fn(),
findUnique: jest.fn(),
},
userFeedback: {
count: jest.fn(),
create: jest.fn(),
},
userSettings: {
findUnique: jest.fn(),
update: jest.fn(),
},
};

jest.mock('@prisma/client', () => ({
PrismaClient: jest.fn().mockImplementation(() => mockPrisma),
}));

import { app, server, prisma } from '../server';
import { AuthService } from '../services/auth.service';
import { EventBus } from '../services/event-bus.service';
Expand All @@ -24,6 +47,13 @@
const mockToken = AuthService.generateToken(mockUserId, 'user@example.com');

describe('POST /api/feedback', () => {
beforeEach(() => {
jest.spyOn(prisma.email, 'findFirst').mockResolvedValue({
id: mockEmailId,
userId: mockUserId,
} as any);
});

it('should return 401 if unauthorized', async () => {
await request(app)
.post('/api/feedback')
Expand Down Expand Up @@ -198,7 +228,7 @@

expect(settingsUpdateSpy).toHaveBeenCalled();
const updatedData = JSON.parse(
settingsUpdateSpy.mock.calls[0][0].data.aiPreferenceProfile as string
(settingsUpdateSpy as any).mock.calls[0][0].data.aiPreferenceProfile as string

Check failure on line 231 in backend/src/__tests__/feedback.test.ts

View workflow job for this annotation

GitHub Actions / build-and-test

Insert `⏎··········`
);

const weekKey = FeedbackCollectorService.getStartOfWeek();
Expand Down Expand Up @@ -244,7 +274,7 @@

expect(settingsUpdateSpy).toHaveBeenCalled();
const updatedData = JSON.parse(
settingsUpdateSpy.mock.calls[0][0].data.aiPreferenceProfile as string
(settingsUpdateSpy as any).mock.calls[0][0].data.aiPreferenceProfile as string

Check failure on line 277 in backend/src/__tests__/feedback.test.ts

View workflow job for this annotation

GitHub Actions / build-and-test

Insert `⏎··········`
);

const weekKey = FeedbackCollectorService.getStartOfWeek();
Expand Down
3 changes: 3 additions & 0 deletions backend/src/__tests__/health.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import request from 'supertest';
jest.mock('../worker', () => ({
registerWorkerHandlers: () => Promise.resolve(),
}));
import { app, server, prisma } from '../server';
import { EventBus } from '../services/event-bus.service';

Expand Down
3 changes: 3 additions & 0 deletions backend/src/__tests__/profile.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import request from 'supertest';
jest.mock('../worker', () => ({
registerWorkerHandlers: () => Promise.resolve(),
}));
import { app, server, prisma } from '../server';
import { AuthService } from '../services/auth.service';
import { EventBus } from '../services/event-bus.service';
Expand Down
3 changes: 3 additions & 0 deletions backend/src/__tests__/search.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import request from 'supertest';
jest.mock('../worker', () => ({
registerWorkerHandlers: () => Promise.resolve(),
}));
import { app, server, prisma } from '../server';
import { AuthService } from '../services/auth.service';
import { EventBus } from '../services/event-bus.service';
Expand Down Expand Up @@ -110,7 +113,7 @@
const userId = 'test-user-id';
const token = AuthService.generateToken(userId, 'test@example.com');

const countSpy = jest.spyOn(prisma.email, 'count').mockResolvedValue(50);

Check warning on line 116 in backend/src/__tests__/search.test.ts

View workflow job for this annotation

GitHub Actions / build-and-test

'countSpy' is assigned a value but never used
const findManySpy = jest
.spyOn(prisma.email, 'findMany')
.mockResolvedValue([]);
Expand Down Expand Up @@ -141,8 +144,8 @@
const userId = 'test-user-id';
const token = AuthService.generateToken(userId, 'test@example.com');

const countSpy = jest.spyOn(prisma.email, 'count').mockResolvedValue(10);

Check warning on line 147 in backend/src/__tests__/search.test.ts

View workflow job for this annotation

GitHub Actions / build-and-test

'countSpy' is assigned a value but never used
const findManySpy = jest

Check warning on line 148 in backend/src/__tests__/search.test.ts

View workflow job for this annotation

GitHub Actions / build-and-test

'findManySpy' is assigned a value but never used
.spyOn(prisma.email, 'findMany')
.mockResolvedValue([]);

Expand Down
41 changes: 36 additions & 5 deletions backend/src/routes/feedback.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
} from '../middleware/auth.middleware';
import { logger } from '../utils/logger';
import { z } from 'zod';
import { FeedbackCollectorService } from '../services/ai/feedback-collector.service';

export const feedbackRouter = Router();
const prisma = new PrismaClient();
Expand Down Expand Up @@ -41,6 +42,25 @@ feedbackRouter.post(

const { feedbackType, feature, emailId, comment } = validation.data;

// Rate limit check: max 100 feedbacks per day per user
const startOfDay = new Date();
startOfDay.setHours(0, 0, 0, 0);

const count = await prisma.userFeedback.count({
where: {
userId,
createdAt: {
gte: startOfDay,
},
},
});

if (count >= 100) {
return res.status(429).json({
error: 'Rate limit exceeded: 100 feedbacks per day',
});
}

// Verify emailId belongs to user if provided
if (emailId) {
const email = await prisma.email.findFirst({
Expand All @@ -51,19 +71,30 @@ feedbackRouter.post(
}
}

const feedback = await prisma.userFeedback.create({
data: { userId, feedbackType, feature, emailId, comment },
});
let feedbackId = '';
if (emailId) {
const feedback = await FeedbackCollectorService.recordFeedback(
userId,
emailId,
feedbackType
);
feedbackId = feedback?.id || '';
} else {
const feedback = await prisma.userFeedback.create({
data: { userId, feedbackType, feature, emailId, comment },
});
feedbackId = feedback.id;
}

logger.info('[Feedback] Recorded', {
id: feedback.id,
id: feedbackId,
userId,
feedbackType,
feature,
});
return res
.status(201)
.json({ message: 'Feedback recorded', id: feedback.id });
.json({ message: 'Feedback recorded', id: feedbackId });
} catch (err: any) {
logger.error('[Feedback] POST / error:', err.message);
return res.status(500).json({ error: 'Failed to record feedback' });
Expand Down
10 changes: 6 additions & 4 deletions backend/src/services/ai/feedback-collector.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ export class FeedbackCollectorService {
| 'category_correction'
| 'priority_adjustment',
correctedValue?: string
): Promise<void> {
// 1. Fetch email by emailId
): Promise<any> {
// 1. Find email
const email = await this.prisma.email.findUnique({
where: { id: emailId },
});
Expand All @@ -43,14 +43,14 @@ export class FeedbackCollectorService {
console.warn(
`[FeedbackCollector] Email not found for feedback (emailId: ${emailId}). Ignoring feedback.`
);
return;
return null;
}

// 3. Determine original value
const originalValue = email.category || 'unclassified';

// 4. Save feedback in the database
await this.prisma.userFeedback.create({
const feedback = await this.prisma.userFeedback.create({
data: {
userId,
emailId,
Expand Down Expand Up @@ -137,5 +137,7 @@ export class FeedbackCollectorService {
aiPreferenceProfile: JSON.stringify(profile),
},
});

return feedback;
}
}
Loading