Promote stage → main (prod deploy) #370
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,169 @@ | ||
| import { NextRequest } from "next/server"; | ||
| import { authenticateRequest } from "@/lib/api/auth"; | ||
| import { | ||
| apiSuccess, | ||
| apiUnauthorized, | ||
| apiForbidden, | ||
| apiError, | ||
| apiValidationError, | ||
| } from "@/lib/api/response"; | ||
| import { validate, required } from "@/lib/api/validation"; | ||
| import { createRequestLogger } from "@/lib/logger"; | ||
| import { scopedClient } from "@/lib/supabase/scoped"; | ||
| import { getFeatureAccess } from "@/industries/_loader"; | ||
| import { FEATURES } from "@/industries/_registry"; | ||
| import { createAuditLog, emitEvent } from "@/lib/api/audit"; | ||
|
|
||
| interface ClassManagerRow { | ||
| tenant_id: string; | ||
| user_id: string; | ||
| enroll_students: boolean; | ||
| mark_attendance: boolean; | ||
| view_roster: boolean; | ||
| granted_by: string | null; | ||
| created_at: string; | ||
| updated_at: string; | ||
| } | ||
|
|
||
| // GET /api/v1/class-managers — list all class_managers grants for the tenant, | ||
| // enriched with user email/display name for the settings table. Owner/admin only. | ||
| export async function GET() { | ||
| const auth = await authenticateRequest(); | ||
| if (!auth) return apiUnauthorized(); | ||
| if (!getFeatureAccess(auth.industryId, FEATURES.CLASSES)) return apiForbidden(); | ||
| if (auth.role !== "owner" && auth.role !== "admin") return apiForbidden(); | ||
|
|
||
| const db = await scopedClient(auth); | ||
|
|
||
| const { data: grants, error } = await db | ||
| .from("class_managers") | ||
| .select("*") | ||
| .order("created_at", { ascending: true }); | ||
|
|
||
| if (error) return apiError("DB_ERROR", "Failed to fetch class managers", 500); | ||
|
|
||
| const rows = (grants ?? []) as unknown as ClassManagerRow[]; | ||
|
|
||
| // Enrich with user email/name via auth.admin — same pattern as /api/v1/team. | ||
| const { data: authData } = await db.raw().auth.admin.listUsers({ perPage: 1000 }); | ||
| const userMap = new Map<string, string>(); | ||
| const nameMap = new Map<string, string | null>(); | ||
| for (const u of authData?.users || []) { | ||
| userMap.set(u.id, u.email || ""); | ||
| const meta = u.user_metadata as Record<string, unknown> | undefined; | ||
| nameMap.set(u.id, (meta?.name ?? meta?.full_name ?? null) as string | null); | ||
| } | ||
|
|
||
| const enriched = rows.map((r) => ({ | ||
| userId: r.user_id, | ||
| email: userMap.get(r.user_id) || "Unknown", | ||
| name: nameMap.get(r.user_id) ?? null, | ||
| enrollStudents: r.enroll_students, | ||
| markAttendance: r.mark_attendance, | ||
| viewRoster: r.view_roster, | ||
| grantedBy: r.granted_by, | ||
| createdAt: r.created_at, | ||
| updatedAt: r.updated_at, | ||
| })); | ||
|
|
||
| return apiSuccess(enriched); | ||
| } | ||
|
|
||
| // PATCH /api/v1/class-managers — upsert a single user's grant. | ||
| // Body: { userId, enrollStudents, markAttendance, viewRoster }. Owner/admin only. | ||
| export async function PATCH(request: NextRequest) { | ||
| const requestId = crypto.randomUUID(); | ||
| const log = createRequestLogger({ requestId, method: "PATCH", path: "/api/v1/class-managers" }); | ||
|
|
||
| const auth = await authenticateRequest(); | ||
| if (!auth) return apiUnauthorized(); | ||
| if (!getFeatureAccess(auth.industryId, FEATURES.CLASSES)) return apiForbidden(); | ||
| if (auth.role !== "owner" && auth.role !== "admin") return apiForbidden(); | ||
|
|
||
| let body: Record<string, unknown>; | ||
| try { | ||
| body = await request.json(); | ||
| } catch { | ||
| return apiError("INVALID_JSON", "Request body must be valid JSON", 400); | ||
| } | ||
|
|
||
| const { valid, errors } = validate(body, { | ||
| userId: [required("userId")], | ||
| }); | ||
| if (!valid) return apiValidationError(errors); | ||
|
|
||
| const userId = String(body.userId); | ||
| const enrollStudents = Boolean(body.enrollStudents); | ||
| const markAttendance = Boolean(body.markAttendance); | ||
| const viewRoster = Boolean(body.viewRoster); | ||
|
|
||
| const db = await scopedClient(auth); | ||
|
|
||
| // Confirm the target user belongs to this tenant before granting. | ||
| const { data: member } = await db | ||
| .from("tenant_users") | ||
| .select("user_id") | ||
| .eq("user_id", userId) | ||
| .maybeSingle(); | ||
| if (!member) return apiError("NOT_FOUND", "User is not a member of this tenant", 404); | ||
|
|
||
| const { data: existing } = await db | ||
| .from("class_managers") | ||
| .select("enroll_students, mark_attendance, view_roster") | ||
| .eq("user_id", userId) | ||
| .maybeSingle() as { data: Pick<ClassManagerRow, "enroll_students" | "mark_attendance" | "view_roster"> | null }; | ||
|
|
||
| const { data: upserted, error } = await db | ||
| .from("class_managers") | ||
| .upsert( | ||
| { | ||
| user_id: userId, | ||
| enroll_students: enrollStudents, | ||
| mark_attendance: markAttendance, | ||
| view_roster: viewRoster, | ||
| granted_by: auth.userId, | ||
| }, | ||
| { onConflict: "tenant_id,user_id" } | ||
| ) | ||
| .select("*") | ||
| .single(); | ||
|
Comment on lines
+116
to
+129
There was a problem hiding this comment. 🔒 Security & Privacy | 🟠 Major | 🏗️ Heavy lift Prevent stale capability snapshots from overwriting grants. The PATCH handler treats all three capability values as an authoritative snapshot. The UI can send false defaults after a failed grants request. Two field toggles can also complete out of order because
📍 Affects 2 files
🤖 Prompt for AI Agents |
||
|
|
||
| if (error) { | ||
| log.error({ error }, "Failed to upsert class manager grant"); | ||
| return apiError("DB_ERROR", "Failed to update class manager grant", 500); | ||
| } | ||
|
|
||
| await Promise.all([ | ||
| createAuditLog({ | ||
| tenantId: auth.tenantId, | ||
| userId: auth.userId, | ||
| action: "class_manager.updated", | ||
| entityType: "class_manager", | ||
| entityId: userId, | ||
| changes: { | ||
| grant: { | ||
| old: existing | ||
| ? { | ||
| enrollStudents: existing.enroll_students, | ||
| markAttendance: existing.mark_attendance, | ||
| viewRoster: existing.view_roster, | ||
| } | ||
| : null, | ||
| new: { enrollStudents, markAttendance, viewRoster }, | ||
| }, | ||
| }, | ||
| requestId, | ||
| }), | ||
| emitEvent({ | ||
| tenantId: auth.tenantId, | ||
| type: "class_manager.updated", | ||
| entityType: "class_manager", | ||
| entityId: userId, | ||
| requestId, | ||
| payload: { enrollStudents, markAttendance, viewRoster }, | ||
| }), | ||
| ]); | ||
|
|
||
| log.info({ userId }, "Class manager grant updated"); | ||
| return apiSuccess(upserted); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
Calculate fee percentage per student.
A lead can have both demo and actual enrollment rows. This loop counts both rows in
paidandpayable, but the workspace displays student counts and treats actual enrollment as primary. The fee percentage can therefore be incorrect.Deduplicate by
(class_id, lead_id)and prefer the actual enrollment before calculatingpaidandpayable.🤖 Prompt for AI Agents