Merge pull request #63 from acmutsa/admin/course-crud

Completed [courseId] Page

Author: adanrsantos

src/actions/admin/course.ts

@@ -3,8 +3,10 @@ import { adminClient } from "@/lib/safe-action";
 import { coursesTags, courses, users, tags } from "@/db/schema";
 import { courseSchema, type CourseFormValues } from "@/lib/validations/course";
 import { db } from "@/db";
-import { eq } from "drizzle-orm";
+import { eq, inArray } from "drizzle-orm";
 import { CourseWithData } from "@/lib/types";
+import { units, lessons } from "@/db/schema";
+import { z } from "zod";
 
 export const createCourseAction = adminClient
   .schema(courseSchema)
@@ -109,4 +111,90 @@ export async function getCourseById(id: number) {
   };
 
   return course;
-}
+}
+
+export const updateLessonUnitOrder = adminClient
+  .schema(
+    z.object({
+      updatedUnits: z.array(
+        z.object({
+          id: z.number(),
+          position: z.number(),
+        })
+      ),
+      updatedLessons: z.array(
+        z.object({
+          id: z.number(),
+          unitId: z.number(),
+          position: z.number(),
+        })
+      ),
+    })
+  )
+  .action(async ({ parsedInput, ctx }) => {
+    const { updatedUnits, updatedLessons } = parsedInput;
+
+    try {
+      // --- Step 1: Validate unit IDs exist ---
+      const dbUnits = await db.select().from(units).where(inArray(units.id, updatedUnits.map(u => u.id)));
+      if (dbUnits.length !== updatedUnits.length) {
+        return { success: false, message: "One or more units are invalid." };
+      }
+
+      // --- Step 2: Validate lesson IDs exist ---
+      const dbLessons = await db.select().from(lessons).where(inArray(lessons.id, updatedLessons.map(l => l.id)));
+      if (dbLessons.length !== updatedLessons.length) {
+        return { success: false, message: "One or more lessons are invalid." };
+      }
+
+      // --- Step 3: Check unique and sequential positions for units ---
+      const unitPositions = updatedUnits.map(u => u.position);
+      const uniqueUnitPositions = new Set(unitPositions);
+      if (uniqueUnitPositions.size !== updatedUnits.length) {
+        return { success: false, message: "Duplicate positions found for units." };
+      }
+
+      const sortedUnitPositions = [...unitPositions].sort((a, b) => a - b);
+      for (let i = 0; i < sortedUnitPositions.length; i++) {
+        if (sortedUnitPositions[i] !== i + 1) {
+          return { success: false, message: "Unit positions must be sequential starting from 1." };
+        }
+      }
+
+      // --- Step 4: Check unique and sequential positions for lessons within each unit ---
+      const lessonsByUnit = updatedLessons.reduce((acc: Record<number, number[]>, l) => {
+        if (!acc[l.unitId]) acc[l.unitId] = [];
+        acc[l.unitId].push(l.position);
+        return acc;
+      }, {} as Record<number, number[]>);
+
+      for (const unitId in lessonsByUnit) {
+        const positions = lessonsByUnit[unitId].sort((a, b) => a - b);
+        for (let i = 0; i < positions.length; i++) {
+          if (positions[i] !== i + 1) {
+            return { success: false, message: `Lesson positions in unit ${unitId} must be sequential starting from 1.` };
+          }
+        }
+      }
+
+      // --- Step 5: Update within a transaction ---
+      await db.transaction(async (tx) => {
+        for (const unit of updatedUnits) {
+          await tx.update(units)
+            .set({ position: unit.position })
+            .where(eq(units.id, unit.id));
+        }
+
+        for (const lesson of updatedLessons) {
+          await tx.update(lessons)
+            .set({ position: lesson.position, unitId: lesson.unitId })
+            .where(eq(lessons.id, lesson.id));
+        }
+      });
+
+      return { success: true, message: "Units and lessons order updated successfully." };
+    } catch (error) {
+      console.error("Failed to update lesson/unit order", error);
+      return { success: false, message: "Failed to update order." };
+    }
+  });

src/actions/admin/units.ts

@@ -40,7 +40,6 @@ export const createUnitAction = adminClient
     };
 });
 
-
 export async function getUnitsForCourse(courseId: number) {
   return await db
     .select()

src/app/admin/courses/[courseId]/edit/page.tsx

@@ -1,8 +1,6 @@
-export default async function Page({
-    params,
-}: {
-    params: Promise<{ courseId: string }>;
-}) {
+import type { CourseIdPageProps } from "@/lib/types";
+
+export default async function Page({ params }: CourseIdPageProps) {
     const { courseId } = await params;
     return <div>Edit page for courseID: {courseId}</div>;
 }

src/app/admin/courses/[courseId]/lesson/create/page.tsx

@@ -9,12 +9,9 @@ import {
   CardDescription,
   CardContent,
 } from "@/components/ui/card";
+import type { CourseIdPageProps } from "@/lib/types"; 
 
-type PageProps = {
-  params: Promise<{ courseId: string }>;
-};
-
-export default async function CreateLessonPage({ params }: PageProps) {
+export default async function CreateLessonPage({ params }: CourseIdPageProps) {
   const { courseId } = await params;
   const id = Number(courseId);
 

src/app/admin/courses/[courseId]/lesson/edit/[lessonId]/page.tsx

@@ -0,0 +1,10 @@
+import React from 'react'
+import type { CourseIdPageProps } from '@/lib/types'
+
+export default async function page({ params }: CourseIdPageProps) {
+  const { courseId } = await params; 
+  const id = Number(courseId);
+  return (
+    <div>{id}</div>
+  )
+}

src/app/admin/courses/[courseId]/page.tsx

@@ -12,12 +12,9 @@ import { getCourseById } from "@/actions/admin/course";
 import { getUnitsForCourse } from "@/actions/admin/units";
 import { getLessonsForCourse } from "@/actions/admin/lesson";
 import Link from "next/link";
+import type { CourseIdPageProps } from "@/lib/types";
 
-export default async function CourseIdPage({ 
-  params 
-}: { 
-  params: Promise<{ courseId: string}> 
-}) {
+export default async function CourseIdPage({ params }: CourseIdPageProps) {
   const { courseId } = await params; 
   const id = Number(courseId);
   const [course, units, lessons] = await Promise.all([
@@ -34,7 +31,7 @@ export default async function CourseIdPage({
   }
 
   return (
-    <div className="flex flex-col gap-4 min-h-[500px] h-[85vh]">
+    <div className="flex flex-col gap-4 min-h-[500px] h-full">
       <div className="flex justify-end gap-4">
         <Link href={`/admin/courses/${id}/lesson/create`}>
           <Button variant={"outline"} className="cursor-pointer">Create Lesson</Button>
@@ -50,7 +47,7 @@ export default async function CourseIdPage({
         </CardTitle>
         <CardDescription className="px-6 text-md">{course.description}</CardDescription>
         <CardContent className="h-full">
-          <CourseController units={units} lessons={lessons} />
+          <CourseController courseId={id} units={units} lessons={lessons} />
         </CardContent>
       </Card>
     </div>

src/app/admin/courses/[courseId]/units/create/page.tsx

@@ -1,10 +1,7 @@
 import UnitForm from "@/components/admin/unit/UnitForm";
+import type { CourseIdPageProps } from "@/lib/types";
 
-export default async function Page({
-  params,
-}: {
-  params: Promise<{ courseId: string }>;
-}) {
+export default async function Page({ params }: CourseIdPageProps) {
   const { courseId } = await params;
   const id = Number(courseId);
   return (

src/app/admin/courses/[courseId]/units/edit/[unitId]/page.tsx

@@ -0,0 +1,9 @@
+import type { CourseIdPageProps } from '@/lib/types'
+
+export default async function page({ params }: CourseIdPageProps) {
+  const { courseId } = await params; 
+  const id = Number(courseId);
+  return (
+    <div>{id}</div>
+  )
+}