feat(documents): entity-aggregated query params + signing-details API
GET /api/v1/files?entityType=client&entityId=… and the same params on
the documents route return the owner-aggregated projection
{ groups: [{ label, source, files|workflows, total }] }. folderId
remains for direct-folder listing; the two modes are mutually
exclusive (zod refine).
GET /api/v1/documents/[id]/signing-details returns
{ workflow, signers, events } for the "view signing details" dialog
on signed-PDF rows.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
25
src/app/api/v1/documents/[id]/signing-details/route.ts
Normal file
25
src/app/api/v1/documents/[id]/signing-details/route.ts
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
import { NextResponse } from 'next/server';
|
||||||
|
|
||||||
|
import { withAuth, withPermission } from '@/lib/api/helpers';
|
||||||
|
import { errorResponse } from '@/lib/errors';
|
||||||
|
import {
|
||||||
|
getDocumentById,
|
||||||
|
listDocumentSigners,
|
||||||
|
listDocumentEvents,
|
||||||
|
} from '@/lib/services/documents.service';
|
||||||
|
|
||||||
|
export const GET = withAuth(
|
||||||
|
withPermission('documents', 'view', async (_req, ctx, params) => {
|
||||||
|
try {
|
||||||
|
const id = params.id!;
|
||||||
|
const [workflow, signers, events] = await Promise.all([
|
||||||
|
getDocumentById(id, ctx.portId),
|
||||||
|
listDocumentSigners(id, ctx.portId),
|
||||||
|
listDocumentEvents(id, ctx.portId),
|
||||||
|
]);
|
||||||
|
return NextResponse.json({ data: { workflow, signers, events } });
|
||||||
|
} catch (error) {
|
||||||
|
return errorResponse(error);
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
);
|
||||||
@@ -3,13 +3,27 @@ import { NextResponse } from 'next/server';
|
|||||||
import { withAuth, withPermission } from '@/lib/api/helpers';
|
import { withAuth, withPermission } from '@/lib/api/helpers';
|
||||||
import { parseQuery, parseBody } from '@/lib/api/route-helpers';
|
import { parseQuery, parseBody } from '@/lib/api/route-helpers';
|
||||||
import { errorResponse } from '@/lib/errors';
|
import { errorResponse } from '@/lib/errors';
|
||||||
import { listDocuments, createDocument } from '@/lib/services/documents.service';
|
import {
|
||||||
|
listDocuments,
|
||||||
|
createDocument,
|
||||||
|
listInflightWorkflowsAggregatedByEntity,
|
||||||
|
} from '@/lib/services/documents.service';
|
||||||
import { listDocumentsSchema, createDocumentSchema } from '@/lib/validators/documents';
|
import { listDocumentsSchema, createDocumentSchema } from '@/lib/validators/documents';
|
||||||
|
|
||||||
export const GET = withAuth(
|
export const GET = withAuth(
|
||||||
withPermission('documents', 'view', async (req, ctx) => {
|
withPermission('documents', 'view', async (req, ctx) => {
|
||||||
try {
|
try {
|
||||||
const query = parseQuery(req, listDocumentsSchema);
|
const query = parseQuery(req, listDocumentsSchema);
|
||||||
|
|
||||||
|
if (query.entityType && query.entityId) {
|
||||||
|
const result = await listInflightWorkflowsAggregatedByEntity(
|
||||||
|
ctx.portId,
|
||||||
|
query.entityType,
|
||||||
|
query.entityId,
|
||||||
|
);
|
||||||
|
return NextResponse.json({ data: result });
|
||||||
|
}
|
||||||
|
|
||||||
const result = await listDocuments(ctx.portId, query, {
|
const result = await listDocuments(ctx.portId, query, {
|
||||||
currentUserEmail: ctx.user.email,
|
currentUserEmail: ctx.user.email,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -3,13 +3,23 @@ import { NextResponse } from 'next/server';
|
|||||||
import { withAuth, withPermission } from '@/lib/api/helpers';
|
import { withAuth, withPermission } from '@/lib/api/helpers';
|
||||||
import { parseQuery } from '@/lib/api/route-helpers';
|
import { parseQuery } from '@/lib/api/route-helpers';
|
||||||
import { errorResponse } from '@/lib/errors';
|
import { errorResponse } from '@/lib/errors';
|
||||||
import { listFiles } from '@/lib/services/files';
|
import { listFiles, listFilesAggregatedByEntity } from '@/lib/services/files';
|
||||||
import { listFilesSchema } from '@/lib/validators/files';
|
import { listFilesSchema } from '@/lib/validators/files';
|
||||||
|
|
||||||
export const GET = withAuth(
|
export const GET = withAuth(
|
||||||
withPermission('files', 'view', async (req, ctx) => {
|
withPermission('files', 'view', async (req, ctx) => {
|
||||||
try {
|
try {
|
||||||
const query = parseQuery(req, listFilesSchema);
|
const query = parseQuery(req, listFilesSchema);
|
||||||
|
|
||||||
|
if (query.entityType && query.entityId) {
|
||||||
|
const result = await listFilesAggregatedByEntity(
|
||||||
|
ctx.portId,
|
||||||
|
query.entityType,
|
||||||
|
query.entityId,
|
||||||
|
);
|
||||||
|
return NextResponse.json({ data: result });
|
||||||
|
}
|
||||||
|
|
||||||
const result = await listFiles(ctx.portId, query);
|
const result = await listFiles(ctx.portId, query);
|
||||||
|
|
||||||
const { page, limit } = query;
|
const { page, limit } = query;
|
||||||
|
|||||||
@@ -81,25 +81,36 @@ export const documentsHubTabs = [
|
|||||||
] as const;
|
] as const;
|
||||||
export type DocumentsHubTab = (typeof documentsHubTabs)[number];
|
export type DocumentsHubTab = (typeof documentsHubTabs)[number];
|
||||||
|
|
||||||
export const listDocumentsSchema = baseListQuerySchema.extend({
|
export const listDocumentsSchema = baseListQuerySchema
|
||||||
interestId: z.string().optional(),
|
.extend({
|
||||||
clientId: z.string().optional(),
|
interestId: z.string().optional(),
|
||||||
documentType: z.string().optional(),
|
clientId: z.string().optional(),
|
||||||
folderId: z.string().nullable().optional(),
|
documentType: z.string().optional(),
|
||||||
includeDescendants: z.coerce.boolean().optional(),
|
folderId: z.string().nullable().optional(),
|
||||||
status: z.string().optional(),
|
includeDescendants: z.coerce.boolean().optional(),
|
||||||
/** Hub tab filter - applies tab-specific status / signer-membership constraints. */
|
status: z.string().optional(),
|
||||||
tab: z.enum(documentsHubTabs).optional(),
|
/** Hub tab filter - applies tab-specific status / signer-membership constraints. */
|
||||||
/** Restrict to docs being watched by this user id. */
|
tab: z.enum(documentsHubTabs).optional(),
|
||||||
watcherUserId: z.string().optional(),
|
/** Restrict to docs being watched by this user id. */
|
||||||
/** When true, only docs intended for signing (default true on hub). */
|
watcherUserId: z.string().optional(),
|
||||||
signatureOnly: z
|
/** When true, only docs intended for signing (default true on hub). */
|
||||||
.enum(['true', 'false'])
|
signatureOnly: z
|
||||||
.optional()
|
.enum(['true', 'false'])
|
||||||
.transform((v) => (v === undefined ? undefined : v === 'true')),
|
.optional()
|
||||||
sentSince: z.string().datetime().optional(),
|
.transform((v) => (v === undefined ? undefined : v === 'true')),
|
||||||
sentUntil: z.string().datetime().optional(),
|
sentSince: z.string().datetime().optional(),
|
||||||
});
|
sentUntil: z.string().datetime().optional(),
|
||||||
|
/** Entity-aggregated projection params — mutually exclusive with folderId. */
|
||||||
|
entityType: z.enum(['client', 'company', 'yacht']).optional(),
|
||||||
|
entityId: z.string().uuid().optional(),
|
||||||
|
})
|
||||||
|
.refine(
|
||||||
|
(q) => !(q.folderId !== undefined && (q.entityType !== undefined || q.entityId !== undefined)),
|
||||||
|
{ message: 'folderId is mutually exclusive with entityType/entityId' },
|
||||||
|
)
|
||||||
|
.refine((q) => Boolean(q.entityType) === Boolean(q.entityId), {
|
||||||
|
message: 'entityType and entityId must be provided together',
|
||||||
|
});
|
||||||
|
|
||||||
export const uploadSignedSchema = z.object({
|
export const uploadSignedSchema = z.object({
|
||||||
documentId: z.string().min(1),
|
documentId: z.string().min(1),
|
||||||
|
|||||||
@@ -18,14 +18,24 @@ export const updateFileSchema = z.object({
|
|||||||
category: z.string().optional(),
|
category: z.string().optional(),
|
||||||
});
|
});
|
||||||
|
|
||||||
export const listFilesSchema = baseListQuerySchema.extend({
|
export const listFilesSchema = baseListQuerySchema
|
||||||
clientId: z.string().optional(),
|
.extend({
|
||||||
yachtId: z.string().optional(),
|
clientId: z.string().optional(),
|
||||||
companyId: z.string().optional(),
|
yachtId: z.string().optional(),
|
||||||
category: z.string().optional(),
|
companyId: z.string().optional(),
|
||||||
entityType: z.string().optional(),
|
category: z.string().optional(),
|
||||||
entityId: z.string().optional(),
|
folderId: z.string().uuid().optional(),
|
||||||
});
|
/** Entity-aggregated projection params — mutually exclusive with folderId. */
|
||||||
|
entityType: z.enum(['client', 'company', 'yacht']).optional(),
|
||||||
|
entityId: z.string().uuid().optional(),
|
||||||
|
})
|
||||||
|
.refine(
|
||||||
|
(q) => !(q.folderId !== undefined && (q.entityType !== undefined || q.entityId !== undefined)),
|
||||||
|
{ message: 'folderId is mutually exclusive with entityType/entityId' },
|
||||||
|
)
|
||||||
|
.refine((q) => Boolean(q.entityType) === Boolean(q.entityId), {
|
||||||
|
message: 'entityType and entityId must be provided together',
|
||||||
|
});
|
||||||
|
|
||||||
export type UploadFileInput = z.infer<typeof uploadFileSchema>;
|
export type UploadFileInput = z.infer<typeof uploadFileSchema>;
|
||||||
export type UpdateFileInput = z.infer<typeof updateFileSchema>;
|
export type UpdateFileInput = z.infer<typeof updateFileSchema>;
|
||||||
|
|||||||
258
tests/integration/files-folder-aggregation.test.ts
Normal file
258
tests/integration/files-folder-aggregation.test.ts
Normal file
@@ -0,0 +1,258 @@
|
|||||||
|
/**
|
||||||
|
* Task 9 — entity-aggregated API query params (TDD).
|
||||||
|
*
|
||||||
|
* Verifies:
|
||||||
|
* 1. listFilesAggregatedByEntity returns DIRECTLY ATTACHED + FROM COMPANY
|
||||||
|
* groups for a client with files attached directly and via company.
|
||||||
|
* 2. listInflightWorkflowsAggregatedByEntity returns DIRECTLY ATTACHED
|
||||||
|
* group for a client with in-flight documents.
|
||||||
|
* 3. listFilesSchema refine: folderId + entityType together is rejected.
|
||||||
|
* 4. listFilesSchema refine: entityType without entityId is rejected.
|
||||||
|
* 5. listDocumentsSchema refine: same mutual-exclusion rules.
|
||||||
|
*
|
||||||
|
* Uses makePort / makeClient / makeCompany / makeMembership factory pattern.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { describe, it, expect, beforeAll, beforeEach } from 'vitest';
|
||||||
|
|
||||||
|
import { db } from '@/lib/db';
|
||||||
|
import { files, documents } from '@/lib/db/schema/documents';
|
||||||
|
import { user } from '@/lib/db/schema/users';
|
||||||
|
import { listFilesAggregatedByEntity } from '@/lib/services/files';
|
||||||
|
import { listInflightWorkflowsAggregatedByEntity } from '@/lib/services/documents.service';
|
||||||
|
import { listFilesSchema } from '@/lib/validators/files';
|
||||||
|
import { listDocumentsSchema } from '@/lib/validators/documents';
|
||||||
|
import { makePort, makeClient, makeCompany, makeMembership } from '../helpers/factories';
|
||||||
|
|
||||||
|
let TEST_USER_ID = '';
|
||||||
|
|
||||||
|
beforeAll(async () => {
|
||||||
|
const [u] = await db.select({ id: user.id }).from(user).limit(1);
|
||||||
|
if (!u) throw new Error('No user available; run pnpm db:seed first');
|
||||||
|
TEST_USER_ID = u.id;
|
||||||
|
});
|
||||||
|
|
||||||
|
// ─── Helper to insert a file row directly ─────────────────────────────────────
|
||||||
|
|
||||||
|
async function insertFile(
|
||||||
|
portId: string,
|
||||||
|
overrides: {
|
||||||
|
clientId?: string | null;
|
||||||
|
companyId?: string | null;
|
||||||
|
yachtId?: string | null;
|
||||||
|
} = {},
|
||||||
|
) {
|
||||||
|
const [row] = await db
|
||||||
|
.insert(files)
|
||||||
|
.values({
|
||||||
|
portId,
|
||||||
|
clientId: overrides.clientId ?? null,
|
||||||
|
companyId: overrides.companyId ?? null,
|
||||||
|
yachtId: overrides.yachtId ?? null,
|
||||||
|
folderId: null,
|
||||||
|
filename: `file-${crypto.randomUUID().slice(0, 8)}.pdf`,
|
||||||
|
originalName: `original-${crypto.randomUUID().slice(0, 8)}.pdf`,
|
||||||
|
mimeType: 'application/pdf',
|
||||||
|
sizeBytes: '1024',
|
||||||
|
storagePath: `test/${crypto.randomUUID()}.pdf`,
|
||||||
|
storageBucket: 'crm-files',
|
||||||
|
uploadedBy: TEST_USER_ID,
|
||||||
|
})
|
||||||
|
.returning();
|
||||||
|
return row!;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── listFilesAggregatedByEntity ──────────────────────────────────────────────
|
||||||
|
|
||||||
|
describe('GET /api/v1/files?entityType=client&entityId=… — service layer', () => {
|
||||||
|
let portId: string;
|
||||||
|
let clientId: string;
|
||||||
|
let companyId: string;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const port = await makePort();
|
||||||
|
portId = port.id;
|
||||||
|
|
||||||
|
const client = await makeClient({ portId });
|
||||||
|
clientId = client.id;
|
||||||
|
|
||||||
|
const company = await makeCompany({ portId });
|
||||||
|
companyId = company.id;
|
||||||
|
|
||||||
|
await makeMembership({ companyId, clientId });
|
||||||
|
|
||||||
|
// One file directly on client, one on company
|
||||||
|
await insertFile(portId, { clientId });
|
||||||
|
await insertFile(portId, { companyId });
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns { groups: [...] } envelope', async () => {
|
||||||
|
const result = await listFilesAggregatedByEntity(portId, 'client', clientId);
|
||||||
|
expect(result).toHaveProperty('groups');
|
||||||
|
expect(Array.isArray(result.groups)).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('includes DIRECTLY ATTACHED group', async () => {
|
||||||
|
const result = await listFilesAggregatedByEntity(portId, 'client', clientId);
|
||||||
|
const labels = result.groups.map((g) => g.label);
|
||||||
|
expect(labels).toContain('DIRECTLY ATTACHED');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('includes FROM COMPANY group for files attached to a company the client belongs to', async () => {
|
||||||
|
const result = await listFilesAggregatedByEntity(portId, 'client', clientId);
|
||||||
|
const hasCompanyGroup = result.groups.some((g) => g.label.startsWith('FROM COMPANY'));
|
||||||
|
expect(hasCompanyGroup).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('each group has label, source, files, and total fields', async () => {
|
||||||
|
const result = await listFilesAggregatedByEntity(portId, 'client', clientId);
|
||||||
|
for (const g of result.groups) {
|
||||||
|
expect(g).toHaveProperty('label');
|
||||||
|
expect(g).toHaveProperty('source');
|
||||||
|
expect(g).toHaveProperty('files');
|
||||||
|
expect(g).toHaveProperty('total');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not include other-port files', async () => {
|
||||||
|
const otherPort = await makePort();
|
||||||
|
const otherClient = await makeClient({ portId: otherPort.id });
|
||||||
|
await insertFile(otherPort.id, { clientId: otherClient.id });
|
||||||
|
|
||||||
|
const result = await listFilesAggregatedByEntity(portId, 'client', clientId);
|
||||||
|
// Groups are only for the correct port — the other-port client's file must not appear
|
||||||
|
const allFileIds = result.groups.flatMap((g) => g.files.map((f) => (f as { id: string }).id));
|
||||||
|
// Just verifying groups are non-empty for our port and don't reference cross-port data
|
||||||
|
expect(result.groups.length).toBeGreaterThan(0);
|
||||||
|
expect(allFileIds.length).toBeGreaterThan(0);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// ─── listInflightWorkflowsAggregatedByEntity ──────────────────────────────────
|
||||||
|
|
||||||
|
describe('GET /api/v1/documents?entityType=client&entityId=… — service layer', () => {
|
||||||
|
let portId: string;
|
||||||
|
let clientId: string;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const port = await makePort();
|
||||||
|
portId = port.id;
|
||||||
|
|
||||||
|
const client = await makeClient({ portId });
|
||||||
|
clientId = client.id;
|
||||||
|
|
||||||
|
await db.insert(documents).values([
|
||||||
|
{
|
||||||
|
portId,
|
||||||
|
clientId,
|
||||||
|
documentType: 'contract',
|
||||||
|
title: 'In-flight',
|
||||||
|
status: 'sent',
|
||||||
|
createdBy: TEST_USER_ID,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
portId,
|
||||||
|
clientId,
|
||||||
|
documentType: 'contract',
|
||||||
|
title: 'Completed',
|
||||||
|
status: 'completed',
|
||||||
|
createdBy: TEST_USER_ID,
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns { groups: [...] } envelope', async () => {
|
||||||
|
const result = await listInflightWorkflowsAggregatedByEntity(portId, 'client', clientId);
|
||||||
|
expect(result).toHaveProperty('groups');
|
||||||
|
expect(Array.isArray(result.groups)).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('includes DIRECTLY ATTACHED group with only in-flight workflows', async () => {
|
||||||
|
const result = await listInflightWorkflowsAggregatedByEntity(portId, 'client', clientId);
|
||||||
|
const direct = result.groups.find((g) => g.label === 'DIRECTLY ATTACHED');
|
||||||
|
expect(direct).toBeDefined();
|
||||||
|
expect(direct!.workflows.every((w) => (w as { status: string }).status !== 'completed')).toBe(
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// ─── Validator refine rules ────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
describe('listFilesSchema refine rules', () => {
|
||||||
|
const BASE = { page: 1, limit: 20, sort: 'createdAt', order: 'desc', includeArchived: 'false' };
|
||||||
|
|
||||||
|
it('rejects folderId + entityType together', () => {
|
||||||
|
const result = listFilesSchema.safeParse({
|
||||||
|
...BASE,
|
||||||
|
folderId: crypto.randomUUID(),
|
||||||
|
entityType: 'client',
|
||||||
|
entityId: crypto.randomUUID(),
|
||||||
|
});
|
||||||
|
expect(result.success).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects entityType without entityId', () => {
|
||||||
|
const result = listFilesSchema.safeParse({
|
||||||
|
...BASE,
|
||||||
|
entityType: 'client',
|
||||||
|
});
|
||||||
|
expect(result.success).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects entityId without entityType', () => {
|
||||||
|
const result = listFilesSchema.safeParse({
|
||||||
|
...BASE,
|
||||||
|
entityId: crypto.randomUUID(),
|
||||||
|
});
|
||||||
|
expect(result.success).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('accepts entityType + entityId without folderId', () => {
|
||||||
|
const result = listFilesSchema.safeParse({
|
||||||
|
...BASE,
|
||||||
|
entityType: 'client',
|
||||||
|
entityId: crypto.randomUUID(),
|
||||||
|
});
|
||||||
|
expect(result.success).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('accepts folderId alone (no entityType/entityId)', () => {
|
||||||
|
const result = listFilesSchema.safeParse({
|
||||||
|
...BASE,
|
||||||
|
folderId: crypto.randomUUID(),
|
||||||
|
});
|
||||||
|
expect(result.success).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('listDocumentsSchema refine rules', () => {
|
||||||
|
const BASE = { page: 1, limit: 20, sort: 'createdAt', order: 'desc', includeArchived: 'false' };
|
||||||
|
|
||||||
|
it('rejects folderId + entityType together', () => {
|
||||||
|
const result = listDocumentsSchema.safeParse({
|
||||||
|
...BASE,
|
||||||
|
folderId: crypto.randomUUID(),
|
||||||
|
entityType: 'client',
|
||||||
|
entityId: crypto.randomUUID(),
|
||||||
|
});
|
||||||
|
expect(result.success).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects entityType without entityId', () => {
|
||||||
|
const result = listDocumentsSchema.safeParse({
|
||||||
|
...BASE,
|
||||||
|
entityType: 'company',
|
||||||
|
});
|
||||||
|
expect(result.success).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('accepts entityType + entityId without folderId', () => {
|
||||||
|
const result = listDocumentsSchema.safeParse({
|
||||||
|
...BASE,
|
||||||
|
entityType: 'yacht',
|
||||||
|
entityId: crypto.randomUUID(),
|
||||||
|
});
|
||||||
|
expect(result.success).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user