fix(status): reset review state on a new version, and derive shot status everywhere
Requesting changes on a shot and then re-rendering it through the render queue left every layer of the app still showing the old verdict. Three independent causes, all on the pipeline path. finalizePreview inherited the superseded version's approvalStatus unconditionally. The carry-over exists so a re-export of a signed-off shot does not reappear as awaiting review, but it applied equally to NEEDS_CHANGES and REJECTED, so the render queued to address a note arrived already wearing that note and nothing registered that the work had been redone. carryApproval now carries only APPROVED. The pipeline never moved the task. One left on CHANGES by a review or a QC fail stayed there through every re-render, with no way out but a manual kanban drag. A genuinely new version now moves it to INTERNAL_REVIEW, as actions/versions.ts and batch-upload already did. A replaced version is excluded: regeneratePreview re-delivers the same version after a slate fix and is not a new submission. The pipeline never called recalcShotStatus at all, so shot boards went stale the moment a render changed a task. finalizePreview and the QC fail path both recalculate now; the latter already documented the REVISIONS derivation it was relying on and never triggering. Shot.status is derived from tasks and approval flags, but six call sites wrote it directly with the status they expected: internallyApproveShot, shareWithClient, unshareFromClient, clientApproveShot, unapproveShot and the client approve route. Rule 1 of the derivation is that any CHANGES task outranks an approval, so a shot could be pushed past open rework and then snap back to REVISIONS on the next unrelated recalc, which is close to unreportable as a bug. They now set the approval inputs and let recalcShotStatus derive. unshareFromClient additionally hardcoded READY_FOR_CLIENT even for a client-approved shot. updateShotStatus keeps its direct write as the deliberate manual override, now documented as transient for the same reason. markShotForRevisions replaces the duplicated change-request logic. Both copies marked all non-DONE tasks CHANGES, which matches nothing on the shot this is most often called for: one out for client review precisely because all its tasks are finished. The request then derived to INTERNAL_REVIEW and had no visible effect anywhere. When nothing is picked up it now reopens the task behind the shot's latest version, which is the deliverable the reviewer was looking at. A client's shot-level change request also marks the versions and writes Approval rows now. The dashboard counters, the version badges and the portal's own filters all read Version.approvalStatus, so a shot-level verdict was invisible everywhere those look. clearStaleShotApproval covers the reverse case: uploading a new version onto an approved shot moved the task to INTERNAL_REVIEW and changed nothing visible, because the derivation short-circuits on shotApprovalStatus. The shot kept reading COMPLETE while carrying work nobody had looked at. This is the one user-visible behaviour change here, so watch the boards on a live show: an approved shot now drops back to INTERNAL_REVIEW on a new upload. sharedWithClient is deliberately left alone, since revoking client access stays a separate act. submitApproval and unapproveVersion are transactional now. The verdict, the version, the task and the derived shot status are one decision, and a failure partway through left the three layers disagreeing with no way to tell which one was right. KanbanCard compared approvalStatus against "CHANGES_REQUESTED", which is not a member of the enum, so the changes-requested icon never rendered at all. Thirteen tests cover carryApproval, markShotForRevisions including the all-DONE regression, and clearStaleShotApproval. What is not covered is the pipeline transaction itself, which needs a database: queue a render against a shot in REVISIONS and confirm the task and shot both move before trusting this on a show. Version.reviewStatus is still written nowhere while being published through ext/shots/lookup and EXT_API_REFERENCE.md as a permanent "PENDING". Left alone deliberately: removing a field from that contract could break the connector. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
+82
-72
@@ -5,7 +5,7 @@ import { db } from "@/lib/db";
|
||||
import { revalidatePath } from "next/cache";
|
||||
import { z } from "zod";
|
||||
import { ApprovalStatus } from "@prisma/client";
|
||||
import { recalcShotStatus } from "@/lib/shot-status";
|
||||
import { recalcShotStatus, clearStaleShotApproval } from "@/lib/shot-status";
|
||||
import { notifyApprovalChange } from "@/lib/notifications";
|
||||
import { slackNotifyApproval } from "@/lib/slack";
|
||||
import { versionLabel } from "@/lib/utils";
|
||||
@@ -29,57 +29,62 @@ export async function submitApproval(data: z.infer<typeof approvalSchema>) {
|
||||
throw new Error("Insufficient permissions to review versions");
|
||||
}
|
||||
|
||||
// Create the approval record
|
||||
const approval = await db.approval.create({
|
||||
data: {
|
||||
versionId: parsed.versionId,
|
||||
userId: session.user.id,
|
||||
status: parsed.status,
|
||||
notes: parsed.notes,
|
||||
},
|
||||
});
|
||||
// The verdict, the version, the task and the derived shot status are one
|
||||
// decision and are written as one: a failure partway through used to leave the
|
||||
// three layers disagreeing, with no way to tell which one was right.
|
||||
const { approval, version } = await db.$transaction(async (tx) => {
|
||||
const approval = await tx.approval.create({
|
||||
data: {
|
||||
versionId: parsed.versionId,
|
||||
userId: session.user.id,
|
||||
status: parsed.status,
|
||||
notes: parsed.notes,
|
||||
},
|
||||
});
|
||||
|
||||
// Update version approval status
|
||||
await db.version.update({
|
||||
where: { id: parsed.versionId },
|
||||
data: { approvalStatus: parsed.status },
|
||||
});
|
||||
await tx.version.update({
|
||||
where: { id: parsed.versionId },
|
||||
data: { approvalStatus: parsed.status },
|
||||
});
|
||||
|
||||
// Load version + task + shot + project for downstream effects
|
||||
const version = await db.version.findUnique({
|
||||
where: { id: parsed.versionId },
|
||||
include: {
|
||||
task: {
|
||||
include: {
|
||||
shot: true,
|
||||
project: true,
|
||||
// Load version + task + shot + project for downstream effects
|
||||
const version = await tx.version.findUnique({
|
||||
where: { id: parsed.versionId },
|
||||
include: {
|
||||
task: {
|
||||
include: {
|
||||
shot: true,
|
||||
project: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
if (!version) throw new Error("Version not found");
|
||||
|
||||
// Update task status based on approval result
|
||||
if (version.task && parsed.status !== "PENDING_REVIEW") {
|
||||
if (parsed.status === "APPROVED") {
|
||||
await tx.task.update({
|
||||
where: { id: version.task.id },
|
||||
data: { status: "DONE" },
|
||||
});
|
||||
} else if (parsed.status === "REJECTED" || parsed.status === "NEEDS_CHANGES") {
|
||||
await tx.task.update({
|
||||
where: { id: version.task.id },
|
||||
data: { status: "CHANGES" },
|
||||
});
|
||||
}
|
||||
|
||||
// Recalculate shot status from updated task states
|
||||
if (version.task.shot) {
|
||||
await recalcShotStatus(version.task.shot.id, tx);
|
||||
}
|
||||
}
|
||||
|
||||
return { approval, version };
|
||||
});
|
||||
|
||||
if (!version) throw new Error("Version not found");
|
||||
|
||||
// Update task status based on approval result
|
||||
if (version.task && parsed.status !== "PENDING_REVIEW") {
|
||||
if (parsed.status === "APPROVED") {
|
||||
await db.task.update({
|
||||
where: { id: version.task.id },
|
||||
data: { status: "DONE" },
|
||||
});
|
||||
} else if (parsed.status === "REJECTED" || parsed.status === "NEEDS_CHANGES") {
|
||||
await db.task.update({
|
||||
where: { id: version.task.id },
|
||||
data: { status: "CHANGES" },
|
||||
});
|
||||
}
|
||||
|
||||
// Recalculate shot status from updated task states
|
||||
if (version.task.shot) {
|
||||
await recalcShotStatus(version.task.shot.id).catch(() => {});
|
||||
}
|
||||
}
|
||||
|
||||
// Notifications
|
||||
const reviewer = await db.user.findUnique({ where: { id: session.user.id } });
|
||||
const reviewerName = reviewer?.name ?? "Reviewer";
|
||||
@@ -166,34 +171,39 @@ export async function unapproveVersion(versionId: string) {
|
||||
throw new Error("Only approved versions can be unapproved");
|
||||
}
|
||||
|
||||
// Create an audit record for the unapproval
|
||||
await db.approval.create({
|
||||
data: {
|
||||
versionId,
|
||||
userId: session.user.id,
|
||||
status: "PENDING_REVIEW",
|
||||
notes: "Approval undone",
|
||||
},
|
||||
});
|
||||
|
||||
// Reset version approval status
|
||||
await db.version.update({
|
||||
where: { id: versionId },
|
||||
data: { approvalStatus: "PENDING_REVIEW" },
|
||||
});
|
||||
|
||||
// Reset task back to INTERNAL_REVIEW if it was moved to DONE
|
||||
if (version.task && version.task.status === "DONE") {
|
||||
await db.task.update({
|
||||
where: { id: version.task.id },
|
||||
data: { status: "INTERNAL_REVIEW" },
|
||||
// One decision, one write — same reasoning as submitApproval.
|
||||
await db.$transaction(async (tx) => {
|
||||
// Create an audit record for the unapproval
|
||||
await tx.approval.create({
|
||||
data: {
|
||||
versionId,
|
||||
userId: session.user.id,
|
||||
status: "PENDING_REVIEW",
|
||||
notes: "Approval undone",
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
// Recalculate shot status
|
||||
if (version.task?.shot) {
|
||||
await recalcShotStatus(version.task.shot.id).catch(() => {});
|
||||
}
|
||||
// Reset version approval status
|
||||
await tx.version.update({
|
||||
where: { id: versionId },
|
||||
data: { approvalStatus: "PENDING_REVIEW" },
|
||||
});
|
||||
|
||||
// Reset task back to INTERNAL_REVIEW if it was moved to DONE
|
||||
if (version.task && version.task.status === "DONE") {
|
||||
await tx.task.update({
|
||||
where: { id: version.task.id },
|
||||
data: { status: "INTERNAL_REVIEW" },
|
||||
});
|
||||
}
|
||||
|
||||
// Undoing a version approval also invalidates any shot-level sign-off that
|
||||
// rested on it, otherwise the shot keeps reading COMPLETE / READY_FOR_CLIENT.
|
||||
if (version.task?.shot) {
|
||||
await clearStaleShotApproval(tx, version.task.shot.id);
|
||||
await recalcShotStatus(version.task.shot.id, tx);
|
||||
}
|
||||
});
|
||||
|
||||
revalidatePath(`/review/${versionId}`);
|
||||
if (version.task) {
|
||||
|
||||
+51
-46
@@ -5,7 +5,7 @@ import { db } from "@/lib/db";
|
||||
import { revalidatePath } from "next/cache";
|
||||
import { z } from "zod";
|
||||
import { ShotStatus, ShotPriority, ShotApprovalStatus, Prisma } from "@prisma/client";
|
||||
import { recalcShotStatus } from "@/lib/shot-status";
|
||||
import { recalcShotStatus, markShotForRevisions } from "@/lib/shot-status";
|
||||
|
||||
const createShotSchema = z.object({
|
||||
scene: z.string().min(1).max(50).regex(/^[A-Z0-9_]+$/i, "Alphanumeric and underscore only"),
|
||||
@@ -341,6 +341,15 @@ export async function importShotsFromCsv(
|
||||
return { success: true, created, errors };
|
||||
}
|
||||
|
||||
/**
|
||||
* Manual override of the shot's status.
|
||||
*
|
||||
* Deliberately the one place that writes Shot.status without deriving it — but
|
||||
* note the override is transient: Shot.status is a derived field, so the next
|
||||
* recalc (any task move, approval, upload or render) recomputes it from the
|
||||
* tasks and approval flags and discards whatever was set here. Change the
|
||||
* underlying task states if the new status needs to stick.
|
||||
*/
|
||||
export async function updateShotStatus(
|
||||
shotId: string,
|
||||
status: ShotStatus
|
||||
@@ -737,13 +746,19 @@ export async function internallyApproveShot(shotId: string) {
|
||||
});
|
||||
if (!shot) throw new Error("Shot not found");
|
||||
|
||||
await db.shot.update({
|
||||
where: { id: shotId },
|
||||
data: {
|
||||
shotApprovalStatus: "INTERNALLY_APPROVED",
|
||||
sharedWithClient: false,
|
||||
status: "READY_FOR_CLIENT",
|
||||
},
|
||||
// Set the approval inputs and let the derivation pick the status. Writing
|
||||
// READY_FOR_CLIENT directly skipped the rule that an outstanding CHANGES task
|
||||
// outranks any approval, so a shot could be pushed past open rework and then
|
||||
// snap back to REVISIONS on the next unrelated recalc.
|
||||
await db.$transaction(async (tx) => {
|
||||
await tx.shot.update({
|
||||
where: { id: shotId },
|
||||
data: {
|
||||
shotApprovalStatus: "INTERNALLY_APPROVED",
|
||||
sharedWithClient: false,
|
||||
},
|
||||
});
|
||||
await recalcShotStatus(shotId, tx);
|
||||
});
|
||||
|
||||
revalidatePath(`/projects/${shot.projectId}`);
|
||||
@@ -786,7 +801,7 @@ export async function shareWithClient(shotId: string) {
|
||||
// Mark shot as shared
|
||||
await tx.shot.update({
|
||||
where: { id: shotId },
|
||||
data: { sharedWithClient: true, status: "CLIENT_REVIEW" },
|
||||
data: { sharedWithClient: true },
|
||||
});
|
||||
|
||||
// For each task, make the latest version client-visible
|
||||
@@ -806,6 +821,8 @@ export async function shareWithClient(shotId: string) {
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
await recalcShotStatus(shotId, tx);
|
||||
});
|
||||
|
||||
revalidatePath(`/projects/${shot.projectId}`);
|
||||
@@ -838,7 +855,7 @@ export async function unshareFromClient(shotId: string) {
|
||||
await db.$transaction(async (tx) => {
|
||||
await tx.shot.update({
|
||||
where: { id: shotId },
|
||||
data: { sharedWithClient: false, status: "READY_FOR_CLIENT" },
|
||||
data: { sharedWithClient: false },
|
||||
});
|
||||
|
||||
// Hide all client-visible versions on this shot's tasks
|
||||
@@ -849,6 +866,8 @@ export async function unshareFromClient(shotId: string) {
|
||||
data: { isClientVisible: false },
|
||||
});
|
||||
}
|
||||
|
||||
await recalcShotStatus(shotId, tx);
|
||||
});
|
||||
|
||||
revalidatePath(`/projects/${shot.projectId}`);
|
||||
@@ -877,9 +896,12 @@ export async function clientApproveShot(shotId: string) {
|
||||
if (!shot) throw new Error("Shot not found");
|
||||
if (!shot.sharedWithClient) throw new Error("Shot is not shared with client");
|
||||
|
||||
await db.shot.update({
|
||||
where: { id: shotId },
|
||||
data: { shotApprovalStatus: "CLIENT_APPROVED", status: "COMPLETE" },
|
||||
await db.$transaction(async (tx) => {
|
||||
await tx.shot.update({
|
||||
where: { id: shotId },
|
||||
data: { shotApprovalStatus: "CLIENT_APPROVED" },
|
||||
});
|
||||
await recalcShotStatus(shotId, tx);
|
||||
});
|
||||
|
||||
revalidatePath(`/projects/${shot.projectId}`);
|
||||
@@ -909,14 +931,15 @@ export async function unapproveShot(shotId: string) {
|
||||
throw new Error("Shot is not client-approved");
|
||||
}
|
||||
|
||||
const newStatus = shot.sharedWithClient ? "CLIENT_REVIEW" : "READY_FOR_CLIENT";
|
||||
|
||||
await db.shot.update({
|
||||
where: { id: shotId },
|
||||
data: {
|
||||
shotApprovalStatus: "INTERNALLY_APPROVED",
|
||||
status: newStatus,
|
||||
},
|
||||
// The derivation already encodes "CLIENT_REVIEW if still shared, else
|
||||
// READY_FOR_CLIENT" for an INTERNALLY_APPROVED shot, and additionally honours
|
||||
// any open CHANGES task.
|
||||
await db.$transaction(async (tx) => {
|
||||
await tx.shot.update({
|
||||
where: { id: shotId },
|
||||
data: { shotApprovalStatus: "INTERNALLY_APPROVED" },
|
||||
});
|
||||
await recalcShotStatus(shotId, tx);
|
||||
});
|
||||
|
||||
revalidatePath(`/projects/${shot.projectId}`);
|
||||
@@ -1217,9 +1240,12 @@ export async function assignShotGroups(
|
||||
}
|
||||
|
||||
/**
|
||||
* Internal: handle client requesting changes on a shot.
|
||||
* Resets shotApprovalStatus = PENDING, sharedWithClient = false.
|
||||
* Recalculates shot status (will become REVISIONS if tasks set to CHANGES).
|
||||
* Session-authenticated wrapper for requesting changes on a shot — a supervisor
|
||||
* or producer relaying a client note from inside the app.
|
||||
*
|
||||
* The client portal cannot use this: it runs on a review token, not a session,
|
||||
* so it calls markShotForRevisions directly from its route. Both go through that
|
||||
* one helper so the two entry points cannot drift apart again.
|
||||
*/
|
||||
export async function clientRequestShotChanges(shotId: string, taskId?: string) {
|
||||
const session = await auth();
|
||||
@@ -1234,28 +1260,7 @@ export async function clientRequestShotChanges(shotId: string, taskId?: string)
|
||||
});
|
||||
if (!shot) throw new Error("Shot not found");
|
||||
|
||||
await db.$transaction(async (tx) => {
|
||||
// Reset shot approval
|
||||
await tx.shot.update({
|
||||
where: { id: shotId },
|
||||
data: { shotApprovalStatus: "PENDING", sharedWithClient: false },
|
||||
});
|
||||
|
||||
// If a specific task is called out, mark it CHANGES; otherwise mark all non-DONE tasks
|
||||
if (taskId) {
|
||||
await tx.task.update({
|
||||
where: { id: taskId },
|
||||
data: { status: "CHANGES" },
|
||||
});
|
||||
} else {
|
||||
await tx.task.updateMany({
|
||||
where: { shotId, status: { not: "DONE" } },
|
||||
data: { status: "CHANGES" },
|
||||
});
|
||||
}
|
||||
|
||||
await recalcShotStatus(shotId, tx);
|
||||
});
|
||||
await db.$transaction((tx) => markShotForRevisions(tx, shotId, taskId));
|
||||
|
||||
revalidatePath(`/projects/${shot.projectId}`);
|
||||
revalidatePath(`/projects/${shot.projectId}/shots/${shotId}`);
|
||||
|
||||
+10
-3
@@ -4,7 +4,7 @@ import { auth } from "@/auth";
|
||||
import { db } from "@/lib/db";
|
||||
import { revalidatePath } from "next/cache";
|
||||
import { z } from "zod";
|
||||
import { recalcShotStatus } from "@/lib/shot-status";
|
||||
import { recalcShotStatus, clearStaleShotApproval } from "@/lib/shot-status";
|
||||
import { notifyNewVersionUploaded } from "@/lib/notifications";
|
||||
import { slackNotifyVersionUploaded } from "@/lib/slack";
|
||||
|
||||
@@ -50,9 +50,16 @@ export async function createVersion(data: z.infer<typeof createVersionSchema>) {
|
||||
data: { status: "INTERNAL_REVIEW" },
|
||||
});
|
||||
|
||||
// Recalculate shot status
|
||||
// Recalculate shot status — clearing any stale sign-off first, so a new
|
||||
// version does not land under a shot still reading COMPLETE.
|
||||
if (task.shot) {
|
||||
await recalcShotStatus(task.shot.id).catch(() => {});
|
||||
const shotId = task.shot.id;
|
||||
await db
|
||||
.$transaction(async (tx) => {
|
||||
await clearStaleShotApproval(tx, shotId);
|
||||
await recalcShotStatus(shotId, tx);
|
||||
})
|
||||
.catch(() => {});
|
||||
}
|
||||
|
||||
// Get the next version number for this task
|
||||
|
||||
Reference in New Issue
Block a user