Wave through the remaining audit-final-deferred items that aren't blocked
on the back-burnered Documenso work.
Multi-tenant isolation:
- Storage proxy ProxyTokenPayload gains optional `p` (port slug) claim;
verifier asserts `key.startsWith(${p}/)`. Defense-in-depth against a
buggy issuer in some future code path that mixes port scopes — every
storage key generated by generateStorageKey() already prefixes the
slug. document-sends opts in for 24h emailed download links; other
callers continue working unchanged via the optional field.
DB schema reconciliation:
- Migration 0047 rebuilds system_settings unique index with NULLS NOT
DISTINCT (Postgres 15+) so global settings (port_id IS NULL) are
uniquely keyed by `key` alone. Surfaced + dedupe'd 65 duplicate
(storage_backend, NULL) rows that had accumulated from race-prone
delete-then-insert patterns in ocr-config / settings / residential-
stages / ai-budget services. All four services converted to true
onConflictDoUpdate upserts so the race window is closed.
API uniformity:
- Response shape standardization: 16 routes converted from
`{ success: true }` to 204 No Content. CLAUDE.md documents the
convention (`{ data: <T> }` for content, 204 for empty mutations,
portal-auth retains `{ success: true }` for the frontend's auth chain).
- req.json() → parseBody() migration across 9 admin/CRM routes
(custom-fields, expenses/export ×3, currency convert,
search/recently-viewed, admin/duplicates, berths/pdf-{upload-url,
versions, parse-results}). Uniform 400 error shapes for
ZodError-flagged bodies.
Custom-fields merge tokens (shipped end-to-end):
- merge-fields.ts gains CUSTOM_MERGE_TOKEN_RE + helpers for the
`{{custom.<fieldName>}}` shape.
- document-templates validator accepts the dynamic shape alongside
the static catalog tokens.
- document-sends.service mergeCustomFieldValues resolver fetches
per-port custom_field_definitions for client/interest/berth contexts
and substitutes stored values keyed by `{{custom.fieldName}}`.
- custom-fields-manager amber banner updated to reflect that merge
tokens now expand (search index + entity-diff remain documented
design limitations).
/api/v1/files cross-entity filtering:
- Validator + listFiles + uploadFile accept companyId AND yachtId
alongside clientId. file-upload-zone propagates both.
- New CompanyFilesTab component mirrors ClientFilesTab; restored as a
visible Documents tab in company-tabs.tsx (was a hidden stub).
Inline TODOs:
- Reviewed remaining two TODOs (per-user reminder schedule, import
worker handlers). Both are placeholders for future feature surfaces,
not bugs — per-port digest works for every customer; nothing
currently enqueues import jobs (verified). Annotated in BACKLOG.
BACKLOG.md updated to reflect what landed and what's still pending
(Documenso-related items still bundled with the back-burnered phases).
Tests: 1185/1185 vitest, tsc clean.
273 lines
9.1 KiB
TypeScript
273 lines
9.1 KiB
TypeScript
import { and, arrayContains, eq, or } from 'drizzle-orm';
|
|
|
|
import { db } from '@/lib/db';
|
|
import { files, documents } from '@/lib/db/schema/documents';
|
|
import { expenses } from '@/lib/db/schema/financial';
|
|
import { berthMaintenanceLog } from '@/lib/db/schema/berths';
|
|
import { createAuditLog, type AuditMeta } from '@/lib/audit';
|
|
import { ConflictError, NotFoundError, ValidationError } from '@/lib/errors';
|
|
import { emitToRoom } from '@/lib/socket/server';
|
|
import { getStorageBackend, presignDownloadUrl } from '@/lib/storage';
|
|
import { buildListQuery } from '@/lib/db/query-builder';
|
|
import { env } from '@/lib/env';
|
|
import {
|
|
ALLOWED_MIME_TYPES,
|
|
MAX_FILE_SIZE,
|
|
PREVIEWABLE_MIMES,
|
|
bufferMatchesMime,
|
|
} from '@/lib/constants/file-validation';
|
|
import { generateStorageKey, sanitizeFilename } from '@/lib/services/storage';
|
|
import type { UploadFileInput, UpdateFileInput, ListFilesInput } from '@/lib/validators/files';
|
|
|
|
// ─── Types ────────────────────────────────────────────────────────────────────
|
|
|
|
interface UploadFileParams {
|
|
buffer: Buffer;
|
|
originalName: string;
|
|
mimeType: string;
|
|
size: number;
|
|
}
|
|
|
|
// ─── Upload ───────────────────────────────────────────────────────────────────
|
|
|
|
export async function uploadFile(
|
|
portId: string,
|
|
portSlug: string,
|
|
file: UploadFileParams,
|
|
data: UploadFileInput,
|
|
meta: AuditMeta,
|
|
) {
|
|
if (!ALLOWED_MIME_TYPES.has(file.mimeType)) {
|
|
throw new ValidationError(`File type '${file.mimeType}' is not allowed`);
|
|
}
|
|
|
|
if (file.size > MAX_FILE_SIZE) {
|
|
throw new ValidationError('File exceeds maximum size of 50MB');
|
|
}
|
|
|
|
// Magic-byte verification — without this, the browser-declared MIME is
|
|
// attacker-controlled and a malicious uploader could ship arbitrary
|
|
// bytes through the ALLOWED_MIME_TYPES allow-list (auditor-E3 §27).
|
|
// Berth-PDF and brochure paths already do this; the generic uploader
|
|
// matches their guarantee here.
|
|
if (!bufferMatchesMime(file.buffer, file.mimeType)) {
|
|
throw new ValidationError(`File contents do not match the declared type '${file.mimeType}'`);
|
|
}
|
|
|
|
const entity = data.entityType ?? 'general';
|
|
const entityId = data.entityId ?? portId;
|
|
const storagePath = generateStorageKey(portSlug, entity, entityId, file.mimeType);
|
|
const sanitizedOriginal = sanitizeFilename(file.originalName);
|
|
const sanitizedFilename = sanitizeFilename(data.filename);
|
|
|
|
const backend = await getStorageBackend();
|
|
await backend.put(storagePath, file.buffer, {
|
|
contentType: file.mimeType,
|
|
sizeBytes: file.size,
|
|
});
|
|
|
|
const [record] = await db
|
|
.insert(files)
|
|
.values({
|
|
portId,
|
|
clientId: data.clientId ?? null,
|
|
yachtId: data.yachtId ?? null,
|
|
companyId: data.companyId ?? null,
|
|
filename: sanitizedFilename,
|
|
originalName: sanitizedOriginal,
|
|
mimeType: file.mimeType,
|
|
sizeBytes: String(file.size),
|
|
storagePath,
|
|
storageBucket: env.MINIO_BUCKET,
|
|
category: data.category ?? null,
|
|
uploadedBy: meta.userId,
|
|
})
|
|
.returning();
|
|
|
|
void createAuditLog({
|
|
userId: meta.userId,
|
|
portId,
|
|
action: 'create',
|
|
entityType: 'file',
|
|
entityId: record!.id,
|
|
newValue: { filename: record!.filename, mimeType: file.mimeType, size: file.size },
|
|
ipAddress: meta.ipAddress,
|
|
userAgent: meta.userAgent,
|
|
});
|
|
|
|
emitToRoom(`port:${portId}`, 'file:uploaded', {
|
|
fileId: record!.id,
|
|
filename: record!.filename,
|
|
});
|
|
|
|
return record!;
|
|
}
|
|
|
|
// ─── Download / Preview URLs ──────────────────────────────────────────────────
|
|
|
|
export async function getDownloadUrl(id: string, portId: string) {
|
|
const file = await getFileById(id, portId);
|
|
const url = await presignDownloadUrl(file.storagePath);
|
|
return { url, filename: file.filename };
|
|
}
|
|
|
|
export async function getPreviewUrl(id: string, portId: string) {
|
|
const file = await getFileById(id, portId);
|
|
|
|
if (!file.mimeType || !PREVIEWABLE_MIMES.has(file.mimeType)) {
|
|
throw new ValidationError('This file type cannot be previewed');
|
|
}
|
|
|
|
const url = await presignDownloadUrl(file.storagePath);
|
|
return { url, mimeType: file.mimeType };
|
|
}
|
|
|
|
// ─── Update ───────────────────────────────────────────────────────────────────
|
|
|
|
export async function updateFile(
|
|
id: string,
|
|
portId: string,
|
|
data: UpdateFileInput,
|
|
meta: AuditMeta,
|
|
) {
|
|
const existing = await getFileById(id, portId);
|
|
|
|
const updates: { filename?: string; category?: string } = {};
|
|
if (data.filename !== undefined) updates.filename = sanitizeFilename(data.filename);
|
|
if (data.category !== undefined) updates.category = data.category;
|
|
|
|
const [updated] = await db
|
|
.update(files)
|
|
.set(updates)
|
|
.where(and(eq(files.id, id), eq(files.portId, portId)))
|
|
.returning();
|
|
|
|
void createAuditLog({
|
|
userId: meta.userId,
|
|
portId,
|
|
action: 'update',
|
|
entityType: 'file',
|
|
entityId: id,
|
|
oldValue: { filename: existing.filename, category: existing.category },
|
|
newValue: updates,
|
|
ipAddress: meta.ipAddress,
|
|
userAgent: meta.userAgent,
|
|
});
|
|
|
|
emitToRoom(`port:${portId}`, 'file:updated', { fileId: id });
|
|
|
|
return updated!;
|
|
}
|
|
|
|
// ─── Delete (BR-091) ──────────────────────────────────────────────────────────
|
|
|
|
export async function deleteFile(id: string, portId: string, meta: AuditMeta) {
|
|
const existing = await getFileById(id, portId);
|
|
|
|
// BR-091: check references before deleting
|
|
const [docRefs, expenseRefs, maintenanceRefs] = await Promise.all([
|
|
db
|
|
.select({ id: documents.id })
|
|
.from(documents)
|
|
.where(
|
|
and(
|
|
eq(documents.portId, portId),
|
|
or(eq(documents.fileId, id), eq(documents.signedFileId, id)),
|
|
),
|
|
)
|
|
.limit(1),
|
|
db
|
|
.select({ id: expenses.id })
|
|
.from(expenses)
|
|
.where(and(eq(expenses.portId, portId), arrayContains(expenses.receiptFileIds, [id])))
|
|
.limit(1),
|
|
db
|
|
.select({ id: berthMaintenanceLog.id })
|
|
.from(berthMaintenanceLog)
|
|
.where(
|
|
and(
|
|
eq(berthMaintenanceLog.portId, portId),
|
|
arrayContains(berthMaintenanceLog.photoFileIds, [id]),
|
|
),
|
|
)
|
|
.limit(1),
|
|
]);
|
|
|
|
if (docRefs.length > 0 || expenseRefs.length > 0 || maintenanceRefs.length > 0) {
|
|
throw new ConflictError('File cannot be deleted because it is referenced by other records');
|
|
}
|
|
|
|
// Delete the blob first, then DB. The storage backend's delete is
|
|
// idempotent, so a partial replay (worker crashed mid-delete) does not
|
|
// throw on the missing-object retry.
|
|
await (await getStorageBackend()).delete(existing.storagePath);
|
|
|
|
await db.delete(files).where(and(eq(files.id, id), eq(files.portId, portId)));
|
|
|
|
void createAuditLog({
|
|
userId: meta.userId,
|
|
portId,
|
|
action: 'delete',
|
|
entityType: 'file',
|
|
entityId: id,
|
|
oldValue: { filename: existing.filename },
|
|
ipAddress: meta.ipAddress,
|
|
userAgent: meta.userAgent,
|
|
});
|
|
|
|
emitToRoom(`port:${portId}`, 'file:deleted', { fileId: id });
|
|
}
|
|
|
|
// ─── List ─────────────────────────────────────────────────────────────────────
|
|
|
|
export async function listFiles(portId: string, query: ListFilesInput) {
|
|
const { page, limit, sort, order, search, clientId, yachtId, companyId, category } = query;
|
|
|
|
const filters = [];
|
|
|
|
if (clientId) {
|
|
filters.push(eq(files.clientId, clientId));
|
|
}
|
|
if (yachtId) {
|
|
filters.push(eq(files.yachtId, yachtId));
|
|
}
|
|
if (companyId) {
|
|
filters.push(eq(files.companyId, companyId));
|
|
}
|
|
if (category) {
|
|
filters.push(eq(files.category, category));
|
|
}
|
|
|
|
const sortColumn =
|
|
sort === 'filename' ? files.filename : sort === 'sizeBytes' ? files.sizeBytes : files.createdAt;
|
|
|
|
return buildListQuery({
|
|
table: files,
|
|
portIdColumn: files.portId,
|
|
portId,
|
|
idColumn: files.id,
|
|
updatedAtColumn: files.createdAt, // no updatedAt on files
|
|
searchColumns: [files.filename, files.originalName],
|
|
searchTerm: search,
|
|
filters,
|
|
sort: sort ? { column: sortColumn, direction: order } : undefined,
|
|
page,
|
|
pageSize: limit,
|
|
// no archivedAtColumn - files are immutable records
|
|
});
|
|
}
|
|
|
|
// ─── Get by ID ────────────────────────────────────────────────────────────────
|
|
|
|
export async function getFileById(id: string, portId: string) {
|
|
const file = await db.query.files.findFirst({
|
|
where: eq(files.id, id),
|
|
});
|
|
|
|
if (!file || file.portId !== portId) {
|
|
throw new NotFoundError('File');
|
|
}
|
|
|
|
return file;
|
|
}
|