Ombrora/convert
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wire the app, worker, and cleanup entry points onto Prisma Client

Browse Source 
Task 4 rewrote src/db.js and src/jobs/jobRepository.js to use Prisma
instead of the hand-rolled mariadb pool. This updates every remaining
call site (app.js, server.js, worker.js, cleanup.js) and the 5 test
files that still referenced getPool/closePool/pool.query, so the app
and full test suite compile and run against Prisma Client.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
anthony
2026-07-31 01:32:54 +02:00
co-authored by Claude Sonnet 5
parent 3a04da3180
commit 4c9fe8f616
9 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/api/endToEnd.test.js
+7 -7
View File
@@ -5,34 +5,34 @@ import path from 'node:path';
import os from 'node:os';
import { Document, Paragraph, TextRun, Packer } from 'docx';
import { createApp } from '../../src/app.js';
import { getPool, closePool } from '../../src/db.js';
import { getPrismaClient, closePrismaClient } from '../../src/db.js';
import { loadConfig } from '../../src/config.js';
import { ensureStorageDirs } from '../../src/storage.js';
import { processPendingJobs } from '../../src/worker.js';
let app;
let pool;
let prisma;
let config;
beforeAll(async () => {
config = { ...loadConfig(), storageDir: await fs.mkdtemp(path.join(os.tmpdir(), 'converter-e2e-')) };
await ensureStorageDirs(config);
pool = getPool(config);
app = createApp(config, pool);
prisma = getPrismaClient(config);
app = createApp(config, prisma);
});
afterAll(async () => {
await closePool();
await closePrismaClient();
await fs.rm(config.storageDir, { recursive: true, force: true });
});
beforeEach(async () => {
await pool.query('DELETE FROM conversion_jobs');
await prisma.conversionJob.deleteMany();
});
async function waitForDone(id, maxAttempts = 20) {
for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
await processPendingJobs(pool, config);
await processPendingJobs(prisma, config);
const response = await request(app).get(`/api/jobs/${id}`);
if (response.body.status === 'done' || response.body.status === 'failed') {
return response.body;
test/api/jobStatus.test.js
+14 -14
View File
@@ -4,29 +4,29 @@ import fs from 'node:fs/promises';
import path from 'node:path';
import os from 'node:os';
import { createApp } from '../../src/app.js';
import { getPool, closePool } from '../../src/db.js';
import { getPrismaClient, closePrismaClient } from '../../src/db.js';
import { loadConfig } from '../../src/config.js';
import { createJob, getJobByUuid, markDone } from '../../src/jobs/jobRepository.js';
import { ensureStorageDirs, outputPath } from '../../src/storage.js';
let app;
let pool;
let prisma;
let config;
beforeAll(async () => {
config = { ...loadConfig(), storageDir: await fs.mkdtemp(path.join(os.tmpdir(), 'converter-status-')) };
await ensureStorageDirs(config);
pool = getPool(config);
app = createApp(config, pool);
prisma = getPrismaClient(config);
app = createApp(config, prisma);
});
afterAll(async () => {
await closePool();
await closePrismaClient();
await fs.rm(config.storageDir, { recursive: true, force: true });
});
beforeEach(async () => {
await pool.query('DELETE FROM conversion_jobs');
await prisma.conversionJob.deleteMany();
});
function baseJob(uuid) {
@@ -46,7 +46,7 @@ function baseJob(uuid) {
describe('GET /api/jobs/:id', () => {
it('returns job status without the error log field', async () => {
const uuid = '66666666-6666-4666-8666-666666666666';
await createJob(pool, baseJob(uuid));
await createJob(prisma, baseJob(uuid));
const response = await request(app).get(`/api/jobs/${uuid}`);
@@ -66,11 +66,11 @@ describe('GET /api/jobs/:id', () => {
describe('GET /api/jobs/:id/download', () => {
it('streams the converted file with correct headers once done', async () => {
const uuid = '77777777-7777-4777-8777-777777777777';
await createJob(pool, baseJob(uuid));
await createJob(prisma, baseJob(uuid));
const filePath = outputPath(config, uuid, 'webp');
await fs.writeFile(filePath, Buffer.from('fake webp bytes'));
const created = await getJobByUuid(pool, uuid);
await markDone(pool, created.id, {
const created = await getJobByUuid(prisma, uuid);
await markDone(prisma, created.id, {
outputPath: `${uuid}.webp`,
outputMimeType: 'image/webp',
outputSizeBytes: 16,
@@ -87,7 +87,7 @@ describe('GET /api/jobs/:id/download', () => {
it('returns 409 when the job is not done yet', async () => {
const uuid = '88888888-8888-4888-8888-888888888888';
await createJob(pool, baseJob(uuid));
await createJob(prisma, baseJob(uuid));
const response = await request(app).get(`/api/jobs/${uuid}/download`);
@@ -102,12 +102,12 @@ describe('GET /api/jobs/:id/download', () => {
describe('unexpected server errors', () => {
it('returns a generic 500 without leaking internal error details', async () => {
const originalQuery = pool.query.bind(pool);
pool.query = () => Promise.reject(new Error('connection reset by peer'));
const originalFindUnique = prisma.conversionJob.findUnique.bind(prisma.conversionJob);
prisma.conversionJob.findUnique = () => Promise.reject(new Error('connection reset by peer'));
const response = await request(app).get('/api/jobs/99999999-9999-4999-8999-999999999999');
pool.query = originalQuery;
prisma.conversionJob.findUnique = originalFindUnique;
expect(response.status).toBe(500);
expect(response.body.error).toBe('Internal server error');
test/api/jobs.test.js
+8 -8
View File
@@ -4,29 +4,29 @@ import fs from 'node:fs/promises';
import path from 'node:path';
import os from 'node:os';
import { createApp } from '../../src/app.js';
import { getPool, closePool } from '../../src/db.js';
import { getPrismaClient, closePrismaClient } from '../../src/db.js';
import { loadConfig } from '../../src/config.js';
import { getJobByUuid } from '../../src/jobs/jobRepository.js';
import { ensureStorageDirs } from '../../src/storage.js';
let app;
let pool;
let prisma;
let config;
beforeAll(async () => {
config = { ...loadConfig(), storageDir: await fs.mkdtemp(path.join(os.tmpdir(), 'converter-api-')) };
await ensureStorageDirs(config);
pool = getPool(config);
app = createApp(config, pool);
prisma = getPrismaClient(config);
app = createApp(config, prisma);
});
afterAll(async () => {
await closePool();
await closePrismaClient();
await fs.rm(config.storageDir, { recursive: true, force: true });
});
beforeEach(async () => {
await pool.query('DELETE FROM conversion_jobs');
await prisma.conversionJob.deleteMany();
});
describe('GET /api/formats', () => {
@@ -60,7 +60,7 @@ describe('POST /api/jobs', () => {
expect(response.body.jobs[0].status).toBe('pending');
expect(response.body.jobs[0].file).toBe('photo.png');
const job = await getJobByUuid(pool, response.body.jobs[0].id);
const job = await getJobByUuid(prisma, response.body.jobs[0].id);
expect(job.status).toBe('pending');
expect(job.sourceFormat).toBe('png');
expect(job.targetFormat).toBe('webp');
@@ -82,7 +82,7 @@ describe('POST /api/jobs', () => {
expect(response.status).toBe(201);
expect(response.body.jobs[0].status).toBe('pending');
const job = await getJobByUuid(pool, response.body.jobs[0].id);
const job = await getJobByUuid(prisma, response.body.jobs[0].id);
expect(job.quality).toBe(45);
});