refactor(services): centralize AuditMeta + transactional setEntityTags helper
The same `interface AuditMeta { userId; portId; ipAddress; userAgent }`
was duplicated in 26 service files. Move the canonical definition into
`@/lib/audit` next to the related types and update every service to
import it. `ServiceAuditMeta` (the alias used in invoices.ts and
expenses.ts) collapses into the same name.
Tag CRUD across clients/companies/yachts/interests/berths followed an
identical wipe-then-rewrite recipe with two latent issues: the delete
and insert weren't wrapped in a transaction (a partial failure left
the entity with zero tags) and the audit-log payload shape diverged
(`newValue: { tagIds }` for clients/yachts/companies but
`metadata: { type: 'tags_updated', tagIds }` for interests/berths).
Extract `setEntityTags` in `entity-tags.helper.ts` that performs the
delete+insert inside a single transaction, normalizes the audit payload
to `newValue: { tagIds }`, and dispatches the per-entity socket event
through a switch so `ServerToClientEvents` typing stays intact.
The five `setXTags(...)` service functions now do parent-row tenant
verification and delegate the join-table work + side effects.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -10,9 +10,10 @@ import type { Company } from '@/lib/db/schema/companies';
|
||||
import { yachts } from '@/lib/db/schema/yachts';
|
||||
import { withTransaction } from '@/lib/db/utils';
|
||||
import { buildListQuery } from '@/lib/db/query-builder';
|
||||
import { createAuditLog } from '@/lib/audit';
|
||||
import { createAuditLog, type AuditMeta } from '@/lib/audit';
|
||||
import { NotFoundError, ConflictError } from '@/lib/errors';
|
||||
import { emitToRoom } from '@/lib/socket/server';
|
||||
import { setEntityTags } from '@/lib/services/entity-tags.helper';
|
||||
import { diffEntity } from '@/lib/entity-diff';
|
||||
import type { z } from 'zod';
|
||||
import type {
|
||||
@@ -23,13 +24,6 @@ import type {
|
||||
|
||||
type CreateCompanyInput = z.input<typeof createCompanySchema>;
|
||||
|
||||
interface AuditMeta {
|
||||
userId: string;
|
||||
portId: string;
|
||||
ipAddress: string;
|
||||
userAgent: string;
|
||||
}
|
||||
|
||||
export type { Company };
|
||||
|
||||
// ─── Helpers ─────────────────────────────────────────────────────────────────
|
||||
@@ -364,24 +358,16 @@ export async function setCompanyTags(
|
||||
const company = await db.query.companies.findFirst({ where: eq(companies.id, companyId) });
|
||||
if (!company || company.portId !== portId) throw new NotFoundError('Company');
|
||||
|
||||
await db.delete(companyTags).where(eq(companyTags.companyId, companyId));
|
||||
|
||||
if (tagIds.length > 0) {
|
||||
await db.insert(companyTags).values(tagIds.map((tagId) => ({ companyId, tagId })));
|
||||
}
|
||||
|
||||
void createAuditLog({
|
||||
userId: meta.userId,
|
||||
portId,
|
||||
action: 'update',
|
||||
entityType: 'company',
|
||||
await setEntityTags({
|
||||
joinTable: companyTags,
|
||||
entityColumn: companyTags.companyId,
|
||||
tagColumn: companyTags.tagId,
|
||||
entityId: companyId,
|
||||
newValue: { tagIds },
|
||||
ipAddress: meta.ipAddress,
|
||||
userAgent: meta.userAgent,
|
||||
portId,
|
||||
tagIds,
|
||||
meta,
|
||||
entityType: 'company',
|
||||
});
|
||||
|
||||
emitToRoom(`port:${portId}`, 'company:updated', { companyId, changedFields: ['tags'] });
|
||||
}
|
||||
|
||||
// ─── Addresses ────────────────────────────────────────────────────────────────
|
||||
|
||||
Reference in New Issue
Block a user