Hartmut/CapaKraken
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(api): harden broadcast transactions and estimate fallbacks

Browse Source
This commit is contained in:
Hartmut Nörenberg
2026-03-30 12:18:10 +02:00
parent c82a146f84
commit 649c8feb22
4 changed files with 580 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/api/src/router/assistant-tools.ts
+49 -5
View File
@@ -622,6 +622,27 @@ function toAssistantEstimateNotFoundError(
return null;
}
function toAssistantEstimateReadError(
error: unknown,
context: "weeklyPhasing" | "commercialTerms",
): AssistantToolErrorResult | null {
const notFound = toAssistantEstimateNotFoundError(error);
if (notFound) {
return notFound;
}
if (
context === "weeklyPhasing"
&& error instanceof TRPCError
&& error.code === "PRECONDITION_FAILED"
&& error.message === "Estimate has no versions"
) {
return { error: "Estimate version not found with the given criteria." };
}
return null;
}
function toAssistantHolidayCalendarNotFoundError(
error: unknown,
identifier?: string,
@@ -1708,6 +1729,9 @@ function toAssistantNotificationCreationError(
}
if (trpcError?.code === "NOT_FOUND") {
if (trpcError.message.includes("broadcast")) {
return { error: "Broadcast not found with the given criteria." };
}
if (trpcError.message.includes("Sender user not found")) {
return { error: "Sender user not found with the given criteria." };
}
@@ -1742,6 +1766,10 @@ function toAssistantNotificationCreationError(
return { error: "Sender user not found with the given criteria." };
}
if (context === "broadcast" && (errorText.includes("notificationbroadcast") || errorText.includes("broadcast"))) {
return { error: "Broadcast not found with the given criteria." };
}
if (context === "task") {
return { error: "Task recipient user not found with the given criteria." };
}
@@ -7400,7 +7428,15 @@ const executors = {
estimateId: string;
}, ctx: ToolContext) {
const caller = createEstimateCaller(createScopedCallerContext(ctx));
return caller.getWeeklyPhasing({ estimateId: params.estimateId });
try {
return await caller.getWeeklyPhasing({ estimateId: params.estimateId });
} catch (error) {
const mapped = toAssistantEstimateReadError(error, "weeklyPhasing");
if (mapped) {
return mapped;
}
throw error;
}
},
async get_estimate_commercial_terms(params: {
@@ -7408,10 +7444,18 @@ const executors = {
versionId?: string;
}, ctx: ToolContext) {
const caller = createEstimateCaller(createScopedCallerContext(ctx));
return caller.getCommercialTerms({
estimateId: params.estimateId,
...(params.versionId !== undefined ? { versionId: params.versionId } : {}),
});
try {
return await caller.getCommercialTerms({
estimateId: params.estimateId,
...(params.versionId !== undefined ? { versionId: params.versionId } : {}),
});
} catch (error) {
const mapped = toAssistantEstimateReadError(error, "commercialTerms");
if (mapped) {
return mapped;
}
throw error;
}
},
async update_estimate_commercial_terms(params: {
packages/api/src/router/notification.ts
+137 -57
View File
@@ -63,26 +63,92 @@ async function sendNotificationEmail(
}
}
function rethrowNotificationReferenceError(error: unknown): never {
const candidate = error as {
function getNotificationErrorCandidates(error: unknown): Array<{
code?: unknown;
message?: unknown;
meta?: { field_name?: unknown; modelName?: unknown };
cause?: unknown;
}> {
const queue: unknown[] = [error];
const seen = new Set<unknown>();
const candidates: Array<{
code?: unknown;
message?: unknown;
meta?: { field_name?: unknown };
};
const fieldName = typeof candidate.meta?.field_name === "string"
? candidate.meta.field_name.toLowerCase()
: "";
meta?: { field_name?: unknown; modelName?: unknown };
cause?: unknown;
}> = [];
if (
typeof candidate.code === "string"
&& (candidate.code === "P2003" || candidate.code === "P2025")
&& fieldName.includes("sender")
) {
throw new TRPCError({
code: "NOT_FOUND",
message: "Sender user not found",
cause: error,
});
while (queue.length > 0) {
const current = queue.shift();
if (!current || seen.has(current) || typeof current !== "object") {
continue;
}
seen.add(current);
const candidate = current as {
code?: unknown;
message?: unknown;
meta?: { field_name?: unknown; modelName?: unknown };
cause?: unknown;
shape?: { message?: unknown; data?: { cause?: unknown } };
};
candidates.push(candidate);
if ("cause" in candidate) {
queue.push(candidate.cause);
}
if (candidate.shape?.data?.cause) {
queue.push(candidate.shape.data.cause);
}
}
return candidates;
}
function rethrowNotificationReferenceError(error: unknown): never {
for (const candidate of getNotificationErrorCandidates(error)) {
const fieldName = typeof candidate.meta?.field_name === "string"
? candidate.meta.field_name.toLowerCase()
: "";
const modelName = typeof candidate.meta?.modelName === "string"
? candidate.meta.modelName.toLowerCase()
: "";
if (
typeof candidate.code === "string"
&& (candidate.code === "P2003" || candidate.code === "P2025")
&& fieldName.includes("sender")
) {
throw new TRPCError({
code: "NOT_FOUND",
message: "Sender user not found",
cause: error,
});
}
if (
typeof candidate.code === "string"
&& (candidate.code === "P2003" || candidate.code === "P2025")
&& fieldName.includes("userid")
) {
throw new TRPCError({
code: "NOT_FOUND",
message: "Broadcast recipient user not found",
cause: error,
});
}
if (
typeof candidate.code === "string"
&& (candidate.code === "P2003" || candidate.code === "P2025")
&& (modelName.includes("notificationbroadcast") || fieldName.includes("broadcast"))
) {
throw new TRPCError({
code: "NOT_FOUND",
message: "Notification broadcast not found",
cause: error,
});
}
}
throw error;
@@ -649,9 +715,9 @@ export const notificationRouter = createTRPCRouter({
});
}
let broadcast;
try {
broadcast = await ctx.db.notificationBroadcast.create({
const isTask = input.category === "TASK" || input.category === "APPROVAL";
const runImmediateBroadcast = async (db: typeof ctx.db) => {
const broadcast = await db.notificationBroadcast.create({
data: {
senderId,
title: input.title,
@@ -665,58 +731,72 @@ export const notificationRouter = createTRPCRouter({
...(input.scheduledAt !== undefined ? { scheduledAt: input.scheduledAt } : {}),
},
});
const createdNotificationIds: Array<{ id: string; userId: string }> = [];
for (const recipientUserId of recipientIds) {
const nId = await createNotification({
db,
userId: recipientUserId,
type: `BROADCAST_${input.category}`,
title: input.title,
body: input.body,
link: input.link,
category: input.category,
priority: input.priority,
channel: input.channel,
sourceId: broadcast.id,
senderId,
taskStatus: isTask ? "OPEN" : undefined,
taskAction: input.taskAction,
dueDate: input.dueDate,
emit: false,
});
createdNotificationIds.push({ id: nId, userId: recipientUserId });
}
const updatedBroadcast = await db.notificationBroadcast.update({
where: { id: broadcast.id },
data: {
sentAt,
recipientCount: createdNotificationIds.length,
},
});
return { broadcast: updatedBroadcast, notificationIds: createdNotificationIds };
};
let persistedBroadcast: Awaited<ReturnType<typeof runImmediateBroadcast>>["broadcast"];
let notificationIds: Array<{ id: string; userId: string }> = [];
const sentAt = new Date();
try {
const transactionResult = typeof ctx.db.$transaction === "function"
? await ctx.db.$transaction((tx) => runImmediateBroadcast(tx as typeof ctx.db))
: await runImmediateBroadcast(ctx.db);
persistedBroadcast = transactionResult.broadcast;
notificationIds = transactionResult.notificationIds;
} catch (error) {
rethrowNotificationReferenceError(error);
}
// 4. Create individual notifications for each recipient
const isTask = input.category === "TASK" || input.category === "APPROVAL";
// SSE emit handled by createNotification; task events need separate emit
const notificationIds: Array<{ id: string; userId: string }> = [];
for (const recipientUserId of recipientIds) {
const nId = await createNotification({
db: ctx.db,
userId: recipientUserId,
type: `BROADCAST_${input.category}`,
title: input.title,
body: input.body,
link: input.link,
category: input.category,
priority: input.priority,
channel: input.channel,
sourceId: broadcast.id,
senderId,
taskStatus: isTask ? "OPEN" : undefined,
taskAction: input.taskAction,
dueDate: input.dueDate,
});
notificationIds.push({ id: nId, userId: recipientUserId });
// 5. Emit side effects only after the transaction commits.
for (const notification of notificationIds) {
emitNotificationCreated(notification.userId, notification.id);
if (isTask) {
emitTaskAssigned(recipientUserId, nId);
emitTaskAssigned(notification.userId, notification.id);
}
}
// 5. Update broadcast with sent info
await ctx.db.notificationBroadcast.update({
where: { id: broadcast.id },
data: {
sentAt: new Date(),
recipientCount: notificationIds.length,
},
});
emitBroadcastSent(persistedBroadcast.id, notificationIds.length);
// 6. Broadcast-level SSE event
emitBroadcastSent(broadcast.id, notificationIds.length);
// 7. Send emails if channel includes email (non-blocking)
// 6. Send emails if channel includes email (non-blocking)
if (input.channel === "email" || input.channel === "both") {
for (const n of notificationIds) {
void sendNotificationEmail(ctx.db, n.userId, input.title, input.body);
}
}
return { ...broadcast, recipientCount: notificationIds.length, sentAt: new Date() };
return persistedBroadcast;
}),
/** List broadcasts */