mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-06-22 06:41:46 +00:00
chore: apply prettier on the entire project
This commit is contained in:
@@ -7,11 +7,19 @@
|
||||
* - File uploads create real files in uploads/files/ — tests clean up after themselves where possible
|
||||
* - FILE-009 (ephemeral token download) is covered via the /api/auth/resource-token endpoint
|
||||
*/
|
||||
import { describe, it, expect, vi, beforeAll, beforeEach, afterAll } from 'vitest';
|
||||
import request from 'supertest';
|
||||
import { createApp } from '../../src/app';
|
||||
import { runMigrations } from '../../src/db/migrations';
|
||||
import { createTables } from '../../src/db/schema';
|
||||
import { loginAttempts, mfaAttempts } from '../../src/routes/auth';
|
||||
import { authCookie, generateToken } from '../helpers/auth';
|
||||
import { createUser, createTrip, createReservation, addTripMember } from '../helpers/factories';
|
||||
import { resetTestDb } from '../helpers/test-db';
|
||||
|
||||
import type { Application } from 'express';
|
||||
import path from 'path';
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import request from 'supertest';
|
||||
import { describe, it, expect, vi, beforeAll, beforeEach, afterAll } from 'vitest';
|
||||
|
||||
const { testDb, dbMock } = vi.hoisted(() => {
|
||||
const Database = require('better-sqlite3');
|
||||
@@ -24,13 +32,29 @@ const { testDb, dbMock } = vi.hoisted(() => {
|
||||
closeDb: () => {},
|
||||
reinitialize: () => {},
|
||||
getPlaceWithTags: (placeId: number) => {
|
||||
const place: any = db.prepare(`SELECT p.*, c.name as category_name, c.color as category_color, c.icon as category_icon FROM places p LEFT JOIN categories c ON p.category_id = c.id WHERE p.id = ?`).get(placeId);
|
||||
const place: any = db
|
||||
.prepare(
|
||||
`SELECT p.*, c.name as category_name, c.color as category_color, c.icon as category_icon FROM places p LEFT JOIN categories c ON p.category_id = c.id WHERE p.id = ?`,
|
||||
)
|
||||
.get(placeId);
|
||||
if (!place) return null;
|
||||
const tags = db.prepare(`SELECT t.* FROM tags t JOIN place_tags pt ON t.id = pt.tag_id WHERE pt.place_id = ?`).all(placeId);
|
||||
return { ...place, category: place.category_id ? { id: place.category_id, name: place.category_name, color: place.category_color, icon: place.category_icon } : null, tags };
|
||||
const tags = db
|
||||
.prepare(`SELECT t.* FROM tags t JOIN place_tags pt ON t.id = pt.tag_id WHERE pt.place_id = ?`)
|
||||
.all(placeId);
|
||||
return {
|
||||
...place,
|
||||
category: place.category_id
|
||||
? { id: place.category_id, name: place.category_name, color: place.category_color, icon: place.category_icon }
|
||||
: null,
|
||||
tags,
|
||||
};
|
||||
},
|
||||
canAccessTrip: (tripId: any, userId: number) =>
|
||||
db.prepare(`SELECT t.id, t.user_id FROM trips t LEFT JOIN trip_members m ON m.trip_id = t.id AND m.user_id = ? WHERE t.id = ? AND (t.user_id = ? OR m.user_id IS NOT NULL)`).get(userId, tripId, userId),
|
||||
db
|
||||
.prepare(
|
||||
`SELECT t.id, t.user_id FROM trips t LEFT JOIN trip_members m ON m.trip_id = t.id AND m.user_id = ? WHERE t.id = ? AND (t.user_id = ? OR m.user_id IS NOT NULL)`,
|
||||
)
|
||||
.get(userId, tripId, userId),
|
||||
isOwner: (tripId: any, userId: number) =>
|
||||
!!db.prepare('SELECT id FROM trips WHERE id = ? AND user_id = ?').get(tripId, userId),
|
||||
};
|
||||
@@ -44,14 +68,6 @@ vi.mock('../../src/config', () => ({
|
||||
updateJwtSecret: () => {},
|
||||
}));
|
||||
|
||||
import { createApp } from '../../src/app';
|
||||
import { createTables } from '../../src/db/schema';
|
||||
import { runMigrations } from '../../src/db/migrations';
|
||||
import { resetTestDb } from '../helpers/test-db';
|
||||
import { createUser, createTrip, createReservation, addTripMember } from '../helpers/factories';
|
||||
import { authCookie, generateToken } from '../helpers/auth';
|
||||
import { loginAttempts, mfaAttempts } from '../../src/routes/auth';
|
||||
|
||||
const app: Application = createApp();
|
||||
const FIXTURE_PDF = path.join(__dirname, '../fixtures/test.pdf');
|
||||
const FIXTURE_IMG = path.join(__dirname, '../fixtures/small-image.jpg');
|
||||
@@ -147,9 +163,7 @@ describe('List files', () => {
|
||||
await uploadFile(trip.id, user.id, FIXTURE_PDF);
|
||||
await uploadFile(trip.id, user.id, FIXTURE_IMG);
|
||||
|
||||
const res = await request(app)
|
||||
.get(`/api/trips/${trip.id}/files`)
|
||||
.set('Cookie', authCookie(user.id));
|
||||
const res = await request(app).get(`/api/trips/${trip.id}/files`).set('Cookie', authCookie(user.id));
|
||||
expect(res.status).toBe(200);
|
||||
expect(res.body.files.length).toBeGreaterThanOrEqual(2);
|
||||
});
|
||||
@@ -161,13 +175,9 @@ describe('List files', () => {
|
||||
const fileId = upload.body.file.id;
|
||||
|
||||
// Soft-delete it
|
||||
await request(app)
|
||||
.delete(`/api/trips/${trip.id}/files/${fileId}`)
|
||||
.set('Cookie', authCookie(user.id));
|
||||
await request(app).delete(`/api/trips/${trip.id}/files/${fileId}`).set('Cookie', authCookie(user.id));
|
||||
|
||||
const trash = await request(app)
|
||||
.get(`/api/trips/${trip.id}/files?trash=true`)
|
||||
.set('Cookie', authCookie(user.id));
|
||||
const trash = await request(app).get(`/api/trips/${trip.id}/files?trash=true`).set('Cookie', authCookie(user.id));
|
||||
expect(trash.status).toBe(200);
|
||||
const trashIds = (trash.body.files as any[]).map((f: any) => f.id);
|
||||
expect(trashIds).toContain(fileId);
|
||||
@@ -210,16 +220,12 @@ describe('Soft delete, restore, permanent delete', () => {
|
||||
const upload = await uploadFile(trip.id, user.id, FIXTURE_PDF);
|
||||
const fileId = upload.body.file.id;
|
||||
|
||||
const del = await request(app)
|
||||
.delete(`/api/trips/${trip.id}/files/${fileId}`)
|
||||
.set('Cookie', authCookie(user.id));
|
||||
const del = await request(app).delete(`/api/trips/${trip.id}/files/${fileId}`).set('Cookie', authCookie(user.id));
|
||||
expect(del.status).toBe(200);
|
||||
expect(del.body.success).toBe(true);
|
||||
|
||||
// Should not appear in normal list
|
||||
const list = await request(app)
|
||||
.get(`/api/trips/${trip.id}/files`)
|
||||
.set('Cookie', authCookie(user.id));
|
||||
const list = await request(app).get(`/api/trips/${trip.id}/files`).set('Cookie', authCookie(user.id));
|
||||
const ids = (list.body.files as any[]).map((f: any) => f.id);
|
||||
expect(ids).not.toContain(fileId);
|
||||
});
|
||||
@@ -230,9 +236,7 @@ describe('Soft delete, restore, permanent delete', () => {
|
||||
const upload = await uploadFile(trip.id, user.id, FIXTURE_PDF);
|
||||
const fileId = upload.body.file.id;
|
||||
|
||||
await request(app)
|
||||
.delete(`/api/trips/${trip.id}/files/${fileId}`)
|
||||
.set('Cookie', authCookie(user.id));
|
||||
await request(app).delete(`/api/trips/${trip.id}/files/${fileId}`).set('Cookie', authCookie(user.id));
|
||||
|
||||
const restore = await request(app)
|
||||
.post(`/api/trips/${trip.id}/files/${fileId}/restore`)
|
||||
@@ -247,9 +251,7 @@ describe('Soft delete, restore, permanent delete', () => {
|
||||
const upload = await uploadFile(trip.id, user.id, FIXTURE_PDF);
|
||||
const fileId = upload.body.file.id;
|
||||
|
||||
await request(app)
|
||||
.delete(`/api/trips/${trip.id}/files/${fileId}`)
|
||||
.set('Cookie', authCookie(user.id));
|
||||
await request(app).delete(`/api/trips/${trip.id}/files/${fileId}`).set('Cookie', authCookie(user.id));
|
||||
|
||||
const perm = await request(app)
|
||||
.delete(`/api/trips/${trip.id}/files/${fileId}/permanent`)
|
||||
@@ -285,9 +287,7 @@ describe('Soft delete, restore, permanent delete', () => {
|
||||
.set('Cookie', authCookie(user.id));
|
||||
expect(empty.status).toBe(200);
|
||||
|
||||
const trash = await request(app)
|
||||
.get(`/api/trips/${trip.id}/files?trash=true`)
|
||||
.set('Cookie', authCookie(user.id));
|
||||
const trash = await request(app).get(`/api/trips/${trip.id}/files?trash=true`).set('Cookie', authCookie(user.id));
|
||||
expect(trash.body.files).toHaveLength(0);
|
||||
});
|
||||
});
|
||||
@@ -360,8 +360,7 @@ describe('File download', () => {
|
||||
const upload = await uploadFile(trip.id, user.id, FIXTURE_PDF);
|
||||
const fileId = upload.body.file.id;
|
||||
|
||||
const res = await request(app)
|
||||
.get(`/api/trips/${trip.id}/files/${fileId}/download`);
|
||||
const res = await request(app).get(`/api/trips/${trip.id}/files/${fileId}/download`);
|
||||
expect(res.status).toBe(401);
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user