Compare commits

...

2 Commits

Author SHA1 Message Date
Gitea Actions
ae0040e092 ci: Bump version to 0.5.4 [skip ci] 2025-12-31 03:57:03 +05:00
1f3f99d430 fix tests + flyer upload (anon)
All checks were successful
Deploy to Test Environment / deploy-to-test (push) Successful in 15m0s
2025-12-30 14:56:25 -08:00
5 changed files with 82 additions and 18 deletions

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "flyer-crawler",
"version": "0.5.3",
"version": "0.5.4",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "flyer-crawler",
"version": "0.5.3",
"version": "0.5.4",
"dependencies": {
"@bull-board/api": "^6.14.2",
"@bull-board/express": "^6.14.2",

View File

@@ -1,7 +1,7 @@
{
"name": "flyer-crawler",
"private": true,
"version": "0.5.3",
"version": "0.5.4",
"type": "module",
"scripts": {
"dev": "concurrently \"npm:start:dev\" \"vite\"",

View File

@@ -4,13 +4,14 @@ import { Job } from 'bullmq';
import type { Dirent } from 'node:fs';
import sharp from 'sharp';
import { FlyerFileHandler, ICommandExecutor, IFileSystem } from './flyerFileHandler.server';
import { PdfConversionError, UnsupportedFileTypeError } from './processingErrors';
import { ImageConversionError, PdfConversionError, UnsupportedFileTypeError } from './processingErrors';
import { logger } from './logger.server';
import type { FlyerJobData } from '../types/job-data';
// Mock dependencies
vi.mock('sharp', () => {
const mockSharpInstance = {
jpeg: vi.fn().mockReturnThis(),
png: vi.fn().mockReturnThis(),
toFile: vi.fn().mockResolvedValue({}),
};
@@ -88,20 +89,6 @@ describe('FlyerFileHandler', () => {
);
});
it('should handle supported image types directly', async () => {
const job = createMockJob({ filePath: '/tmp/flyer.jpg' });
const { imagePaths, createdImagePaths } = await service.prepareImageInputs(
'/tmp/flyer.jpg',
job,
logger,
);
expect(imagePaths).toEqual([{ path: '/tmp/flyer.jpg', mimetype: 'image/jpeg' }]);
expect(createdImagePaths).toEqual([]);
expect(mockExec).not.toHaveBeenCalled();
expect(sharp).not.toHaveBeenCalled();
});
it('should convert convertible image types to PNG', async () => {
const job = createMockJob({ filePath: '/tmp/flyer.gif' });
const mockSharpInstance = sharp('/tmp/flyer.gif');
@@ -126,4 +113,73 @@ describe('FlyerFileHandler', () => {
UnsupportedFileTypeError,
);
});
describe('Image Processing', () => {
it('should process a JPEG to strip EXIF data', async () => {
const job = createMockJob({ filePath: '/tmp/flyer.jpg' });
const mockSharpInstance = sharp('/tmp/flyer.jpg');
vi.mocked(mockSharpInstance.toFile).mockResolvedValue({} as any);
const { imagePaths, createdImagePaths } = await service.prepareImageInputs(
'/tmp/flyer.jpg',
job,
logger,
);
expect(sharp).toHaveBeenCalledWith('/tmp/flyer.jpg');
expect(mockSharpInstance.jpeg).toHaveBeenCalledWith({ quality: 90 });
expect(mockSharpInstance.toFile).toHaveBeenCalledWith('/tmp/flyer-processed.jpeg');
expect(imagePaths).toEqual([{ path: '/tmp/flyer-processed.jpeg', mimetype: 'image/jpeg' }]);
expect(createdImagePaths).toEqual(['/tmp/flyer-processed.jpeg']);
});
it('should process a PNG to strip metadata', async () => {
const job = createMockJob({ filePath: '/tmp/flyer.png' });
const mockSharpInstance = sharp('/tmp/flyer.png');
vi.mocked(mockSharpInstance.toFile).mockResolvedValue({} as any);
const { imagePaths, createdImagePaths } = await service.prepareImageInputs(
'/tmp/flyer.png',
job,
logger,
);
expect(sharp).toHaveBeenCalledWith('/tmp/flyer.png');
expect(mockSharpInstance.png).toHaveBeenCalledWith({ quality: 90 });
expect(mockSharpInstance.toFile).toHaveBeenCalledWith('/tmp/flyer-processed.png');
expect(imagePaths).toEqual([{ path: '/tmp/flyer-processed.png', mimetype: 'image/png' }]);
expect(createdImagePaths).toEqual(['/tmp/flyer-processed.png']);
});
it('should handle other supported image types (e.g. webp) directly without processing', async () => {
const job = createMockJob({ filePath: '/tmp/flyer.webp' });
const { imagePaths, createdImagePaths } = await service.prepareImageInputs(
'/tmp/flyer.webp',
job,
logger,
);
expect(imagePaths).toEqual([{ path: '/tmp/flyer.webp', mimetype: 'image/webp' }]);
expect(createdImagePaths).toEqual([]);
expect(sharp).not.toHaveBeenCalled();
});
it('should throw ImageConversionError if sharp fails during JPEG processing', async () => {
const job = createMockJob({ filePath: '/tmp/flyer.jpg' });
const sharpError = new Error('Sharp failed');
const mockSharpInstance = sharp('/tmp/flyer.jpg');
vi.mocked(mockSharpInstance.toFile).mockRejectedValue(sharpError);
await expect(service.prepareImageInputs('/tmp/flyer.jpg', job, logger)).rejects.toThrow(ImageConversionError);
});
it('should throw ImageConversionError if sharp fails during PNG processing', async () => {
const job = createMockJob({ filePath: '/tmp/flyer.png' });
const sharpError = new Error('Sharp failed');
const mockSharpInstance = sharp('/tmp/flyer.png');
vi.mocked(mockSharpInstance.toFile).mockRejectedValue(sharpError);
await expect(service.prepareImageInputs('/tmp/flyer.png', job, logger)).rejects.toThrow(ImageConversionError);
});
});
});

View File

@@ -110,6 +110,10 @@ describe('Flyer Processing Background Job Integration Test', () => {
expect(savedFlyer).toBeDefined();
expect(savedFlyer?.flyer_id).toBe(flyerId);
expect(savedFlyer?.file_name).toBe(uniqueFileName);
// Also add the final processed image path to the cleanup list.
// This is important because JPEGs are re-processed to strip EXIF data, creating a new file.
const savedImagePath = path.join(uploadDir, path.basename(savedFlyer!.image_url));
createdFilePaths.push(savedImagePath);
const items = await db.flyerRepo.getFlyerItems(flyerId, logger);
// The stubbed AI response returns items, so we expect them to be here.

View File

@@ -95,6 +95,10 @@ describe('Gamification Flow Integration Test', () => {
const savedFlyer = await db.flyerRepo.findFlyerByChecksum(checksum, logger);
expect(savedFlyer).toBeDefined();
expect(savedFlyer?.file_name).toBe(uniqueFileName);
// Also add the final processed image path to the cleanup list.
// This is important because JPEGs are re-processed to strip EXIF data, creating a new file.
const savedImagePath = path.join(uploadDir, path.basename(savedFlyer!.image_url));
createdFilePaths.push(savedImagePath);
// --- Act 3: Fetch the user's achievements ---
const achievementsResponse = await request