More bad merge fix :(

Author: jon-bell

app/course/[course_id]/manage/assignments/[assignment_id]/security/page.tsx

@@ -58,7 +58,7 @@ const SUBMISSION_FILES_SELECT = `
     repository,
     profile_id,
     assignment_id,
-    grader_results(
+    grader_results!grader_results_submission_id_fkey(
       id,
       score,
       max_score,

app/course/[course_id]/manage/discussion-engagement/page.tsx

@@ -30,8 +30,8 @@ async function getStudentEngagement(course_id: number): Promise<StudentEngagemen
   return data;
 }
 
-export default async function DiscussionEngagementPage({ params }: { params: { course_id: string } }) {
-  const course_id = Number.parseInt(params.course_id);
+export default async function DiscussionEngagementPage({ params }: { params: Promise<{ course_id: string }> }) {
+  const course_id = Number.parseInt((await params).course_id);
   const headersList = await headers();
   const user_id = headersList.get("X-User-ID");
 

supabase/migrations/20260118214344_add_discussion_karma.sql

@@ -108,7 +108,7 @@ BEGIN
     SELECT 1
     FROM public.user_roles ur
     WHERE ur.class_id = p_class_id
-      AND ur.public_profile_id = auth.uid()
+      AND ur.user_id = auth.uid()
       AND ur.role IN ('instructor', 'grader')
       AND ur.disabled = false
   ) INTO v_is_authorized;