Skip to content

Refactor/workspace api routes #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
urjitc merged 14 commits into from
Jan 15, 2026
Merged

Refactor/workspace api routes #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5b7bbe9
feat: add workspace API route helper utilities
urjitc Jan 15, 2026
5b0b40b
refactor: use helper utilities in /api/workspaces route
urjitc Jan 15, 2026
04470bd
refactor: use helper utilities in /api/workspaces/[id] route
urjitc Jan 15, 2026
4ff1059
refactor: use helper utilities in /api/workspaces/slug/[slug] route
urjitc Jan 15, 2026
f530d17
refactor: use helper utilities in /api/workspaces/reorder route
urjitc Jan 15, 2026
f2edd15
refactor: use helper utilities in /api/workspaces/[id]/events route
urjitc Jan 15, 2026
f83e771
refactor: use helper utilities in /api/workspaces/[id]/snapshot route
urjitc Jan 15, 2026
16a01fa
refactor: use helper utilities in /api/workspaces/[id]/snapshots route
urjitc Jan 15, 2026
6ff442a
fix type issues
urjitc Jan 15, 2026
482d2fc
fix: use instanceof Response for error detection
urjitc Jan 15, 2026
d0e88c9
fix: eliminate duplicate session fetch in workspace creation
urjitc Jan 15, 2026
f5537f6
fix: correct timing measurements in events route
urjitc Jan 15, 2026
70f9d7d
perf: add parallelization to snapshots route
urjitc Jan 15, 2026
db0cd57
fix: correct timing measurements to exclude parallel wait time
urjitc Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
162 changes: 59 additions & 103 deletions src/app/api/workspaces/[id]/events/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,36 @@
import { NextRequest, NextResponse } from "next/server";
import { headers } from "next/headers";
import { auth } from "@/lib/auth";
import type { WorkspaceEvent, EventResponse } from "@/lib/workspace/events";
import { checkAndCreateSnapshot } from "@/lib/workspace/snapshot-manager";
import { db, workspaces, workspaceEvents, workspaceSnapshots } from "@/lib/db/client";
import { eq, gt, desc, asc, sql, and } from "drizzle-orm";
import { db, workspaceEvents } from "@/lib/db/client";
import { eq, gt, asc, sql, and } from "drizzle-orm";
import { requireAuth, verifyWorkspaceOwnership, withErrorHandling } from "@/lib/api/workspace-helpers";

/**
* GET /api/workspaces/[id]/events
* Fetch all events for a workspace (owner only)
*/
export async function GET(
async function handleGET(
request: NextRequest,
{ params }: { params: Promise<{ id: string }> }
) {
const startTime = Date.now();
const timings: Record<string, number> = {};
let id: string | undefined;

try {
const paramsResolved = await params;
id = paramsResolved.id;

const authStart = Date.now();
const session = await auth.api.getSession({
headers: await headers(),
});
timings.auth = Date.now() - authStart;

if (!session) {
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
}

const userId = session.user.id;

// Check if user is workspace owner
const workspaceCheckStart = Date.now();
const workspace = await db
.select({ userId: workspaces.userId })
.from(workspaces)
.where(eq(workspaces.id, id))
.limit(1);
timings.workspaceCheck = Date.now() - workspaceCheckStart;

if (!workspace[0]) {
return NextResponse.json({ error: "Workspace not found" }, { status: 404 });
}

// Enforce strict ownership (sharing is fork-based)
if (workspace[0].userId !== userId) {
return NextResponse.json({ error: "Access denied" }, { status: 403 });
}

// Start independent operations in parallel
const paramsPromise = params;
const authPromise = requireAuth();

const paramsResolved = await paramsPromise;
const id = paramsResolved.id;

const authStart = Date.now();

@cubic-dev-ai cubic-dev-ai Bot Jan 15, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2: Timing measurement is inaccurate. authStart is set after requireAuth() has already started executing (it's a promise that begins immediately). This will underreport auth time since it only measures remaining wait time, not total execution time. Move const authStart = Date.now(); back to before const authPromise = requireAuth();.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At src/app/api/workspaces/[id]/events/route.ts, line 26:

<comment>Timing measurement is inaccurate. `authStart` is set after `requireAuth()` has already started executing (it's a promise that begins immediately). This will underreport auth time since it only measures remaining wait time, not total execution time. Move `const authStart = Date.now();` back to before `const authPromise = requireAuth();`.</comment>

<file context>
@@ -18,12 +18,12 @@ async function handleGET(
   const paramsResolved = await paramsPromise;
   const id = paramsResolved.id;
 
+  const authStart = Date.now();
   const userId = await authPromise;
   timings.auth = Date.now() - authStart;
</file context>

const userId = await authPromise;
timings.auth = Date.now() - authStart;
Comment on lines +26 to +28

@greptile-apps greptile-apps Bot Jan 15, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: timing measurement incorrect - measures only promise wait time, not actual auth duration since auth already started at line 21

Prompt To Fix With AI 
This is a comment left during a code review.
Path: src/app/api/workspaces/[id]/events/route.ts
Line: 26:28

Comment:
**logic:** timing measurement incorrect - measures only promise wait time, not actual auth duration since auth already started at line 21

How can I resolve this? If you propose a fix, please make it concise.


// Check if user is workspace owner
const workspaceCheckStart = Date.now();
await verifyWorkspaceOwnership(id, userId);
timings.workspaceCheck = Date.now() - workspaceCheckStart;

// Get only the latest snapshot (not all snapshots - loaded on demand for version history)
// Use optimized function that bypasses RLS (access already verified above)
Expand Down Expand Up @@ -207,71 +187,50 @@ export async function GET(
const totalTime = Date.now() - startTime;
timings.total = totalTime;

return NextResponse.json(response);
} catch (error) {
const totalTime = Date.now() - startTime;
console.error(`[GET /api/workspaces/${id || '[unknown]'}/events] Error after ${totalTime}ms:`, error);
return NextResponse.json({ error: "Internal server error" }, { status: 500 });
}
return NextResponse.json(response);
}

export const GET = withErrorHandling(handleGET, "GET /api/workspaces/[id]/events");

/**
* POST /api/workspaces/[id]/events
* Append new event(s) to workspace event log (owner only)
*/
export async function POST(
async function handlePOST(
request: NextRequest,
{ params }: { params: Promise<{ id: string }> }
) {
const startTime = Date.now();
const timings: Record<string, number> = {};
let id: string | undefined;

try {
const paramsResolved = await params;
id = paramsResolved.id;

const authStart = Date.now();
const session = await auth.api.getSession({
headers: await headers(),
});
timings.auth = Date.now() - authStart;

if (!session) {
return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
}

const userId = session.user.id;

const bodyStart = Date.now();
const body = await request.json();
timings.bodyParse = Date.now() - bodyStart;
const { event, baseVersion } = body;

if (!event || baseVersion === undefined || isNaN(baseVersion)) {
return NextResponse.json(
{ error: "Event and valid baseVersion are required" },
{ status: 400 }
);
}

// Check if user is workspace owner
const workspaceCheckStart = Date.now();
const workspace = await db
.select({ userId: workspaces.userId })
.from(workspaces)
.where(eq(workspaces.id, id))
.limit(1);
timings.workspaceCheck = Date.now() - workspaceCheckStart;

if (!workspace[0]) {
return NextResponse.json({ error: "Workspace not found" }, { status: 404 });
}

// Start independent operations in parallel
const paramsPromise = params;
const authPromise = requireAuth();
const bodyPromise = request.json();

const paramsResolved = await paramsPromise;
const id = paramsResolved.id;

const authStart = Date.now();
const userId = await authPromise;
timings.auth = Date.now() - authStart;

const bodyStart = Date.now();

@cubic-dev-ai cubic-dev-ai Bot Jan 15, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2: Timing measurement is inaccurate. bodyStart is set after request.json() has already started executing (it's a promise that begins immediately). This will underreport body parsing time since it only measures remaining wait time, not total execution time. Move const bodyStart = Date.now(); back to before const bodyPromise = request.json();.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At src/app/api/workspaces/[id]/events/route.ts, line 218:

<comment>Timing measurement is inaccurate. `bodyStart` is set after `request.json()` has already started executing (it's a promise that begins immediately). This will underreport body parsing time since it only measures remaining wait time, not total execution time. Move `const bodyStart = Date.now();` back to before `const bodyPromise = request.json();`.</comment>

<file context>
@@ -205,17 +205,17 @@ async function handlePOST(
   const userId = await authPromise;
   timings.auth = Date.now() - authStart;
 
+  const bodyStart = Date.now();
   const body = await bodyPromise;
   timings.bodyParse = Date.now() - bodyStart;
</file context>

const body = await bodyPromise;
timings.bodyParse = Date.now() - bodyStart;
const { event, baseVersion } = body;

if (!event || baseVersion === undefined || isNaN(baseVersion)) {
return NextResponse.json(
{ error: "Event and valid baseVersion are required" },
{ status: 400 }
);
}

// Enforce strict ownership (sharing is fork-based)
if (workspace[0].userId !== userId) {
return NextResponse.json({ error: "Access denied" }, { status: 403 });
}
// Check if user is workspace owner
const workspaceCheckStart = Date.now();
await verifyWorkspaceOwnership(id, userId);
timings.workspaceCheck = Date.now() - workspaceCheckStart;

// Use the append function to handle versioning and conflicts
const appendStart = Date.now();
Expand Down Expand Up @@ -353,15 +312,12 @@ export async function POST(
const totalTime = Date.now() - startTime;
timings.total = totalTime;

return NextResponse.json({
success: true,
version: appendResult.version,
conflict: false,
});
} catch (error) {
const totalTime = Date.now() - startTime;
console.error(`[POST /api/workspaces/${id || '[unknown]'}/events] Error after ${totalTime}ms:`, error);
return NextResponse.json({ error: "Internal server error" }, { status: 500 });
}
return NextResponse.json({
success: true,
version: appendResult.version,
conflict: false,
});
}

export const POST = withErrorHandling(handlePOST, "POST /api/workspaces/[id]/events");

Loading