working unit and lesson but need to work on displaying the data

Author: adanrsantos

drizzle.config.ts

@@ -6,7 +6,8 @@ export default defineConfig({
   dialect: "turso",
   out: "./src/db/drizzle",
   dbCredentials: {
-    url: process.env.TURSO_DATABASE_URL!,
-    authToken: process.env.TURSO_AUTH_TOKEN!,
+    url: "http://127.0.0.1:8080"
+    // url: process.env.TURSO_DATABASE_URL!,
+    // authToken: process.env.TURSO_AUTH_TOKEN!,
   },
 });

package.json

@@ -20,6 +20,7 @@
   "dependencies": {
     "@hookform/resolvers": "^5.2.2",
     "@libsql/client": "^0.15.15",
+    "@radix-ui/react-accordion": "^1.2.12",
     "@radix-ui/react-alert-dialog": "^1.1.15",
     "@radix-ui/react-aspect-ratio": "^1.1.7",
     "@radix-ui/react-avatar": "^1.1.11",

pnpm-lock.yaml

@@ -1,46 +1,48 @@
 'use server';
+import { adminClient } from "@/lib/safe-action";
 import { coursesTags, courses, users, tags } from "@/db/schema";
-import { type CourseFormValues } from "@/lib/validations/course";
+import { courseSchema, type CourseFormValues } from "@/lib/validations/course";
 import { db } from "@/db";
-import { auth } from "@/lib/auth";
-import { headers } from "next/headers";
 import { eq } from "drizzle-orm";
-import { CreateResponse, CourseWithData } from "@/lib/types";
+import { CourseWithData } from "@/lib/types";
 
-export async function createCourse(data: CourseFormValues): Promise<CreateResponse> {
-    const user = await auth.api.getSession({
-        headers: await headers()
-    });
-    if (!user) throw new Error("Unauthorized");
-    try {
-        const existingCourse = await db.select().from(courses).where(eq(courses.title, data.title));
-        if (existingCourse.length > 0) {
-            return { success: false, message: "Course with title already made."}
-        }
-        const [newCourse] = await db.insert(courses).values({
-            title: data.title,
-            description: data.description,
-            difficulty: data.difficulty,
-            createdBy: user.user.id,
-        }).returning({ id: courses.id});
-        const courseId = newCourse.id;
-        if (data.tags && data.tags.length > 0) {
-            for (const tagName of data.tags) {
-                const tag = await db.select({ id: tags.id }).from(tags).where(eq(tags.tagName, tagName)).limit(1);
-                if (tag.length > 0) {
-                    await db.insert(coursesTags).values({
-                        courseId: courseId,
-                        tagId: tag[0].id,
-                    });
-                }
-            }
+export const createCourseAction = adminClient
+  .schema(courseSchema)
+  .action(async ({ parsedInput, ctx }) => {
+    const { title, description, difficulty, tags: tagNames } = parsedInput;
+    const existing = await db
+      .select()
+      .from(courses)
+      .where(eq(courses.title, title));
+    if (existing.length > 0) {
+      return { success: false, message: "Course with this title already exists.",}
+    }
+    const [created] = await db
+      .insert(courses)
+      .values({
+        title,
+        description,
+        difficulty,
+        createdBy: ctx.userId,
+      })
+      .returning();
+    if (tagNames?.length) {
+      for (const tagName of tagNames) {
+        const [tag] = await db
+          .select()
+          .from(tags)
+          .where(eq(tags.tagName, tagName));
+
+        if (tag) {
+          await db.insert(coursesTags).values({
+            courseId: created.id,
+            tagId: tag.id,
+          });
         }
-        return { success: true, message: "Course created successfully!" };
-    } catch (error) {
-        console.error(error);
-        return { success: false, message: "Failed to create course." };
+      }
     }
-}
+    return { success: true, message: "Course created!",};
+  });
 
 export async function getAllCourses(): Promise<CourseWithData[]> {
   const rows = await db
@@ -77,4 +79,34 @@ export async function getAllCourses(): Promise<CourseWithData[]> {
   }
 
   return Object.values(coursesMap);
+}
+
+export async function getCourseById(id: number) {
+  const rows = await db
+    .select({
+      id: courses.id,
+      title: courses.title,
+      description: courses.description,
+      difficulty: courses.difficulty,
+      createdBy: users.name,
+      tagName: tags.tagName,
+    })
+    .from(courses)
+    .leftJoin(users, eq(users.id, courses.createdBy))
+    .leftJoin(coursesTags, eq(coursesTags.courseId, courses.id))
+    .leftJoin(tags, eq(tags.id, coursesTags.tagId))
+    .where(eq(courses.id, id));
+
+  if (rows.length === 0) return null;
+
+  const course = {
+    id: rows[0].id,
+    title: rows[0].title,
+    description: rows[0].description,
+    difficulty: rows[0].difficulty,
+    createdBy: rows[0].createdBy,
+    tags: rows.map((r) => r.tagName).filter(Boolean),
+  };
+
+  return course;
 }

src/actions/admin/course.ts

@@ -1,9 +1,10 @@
 'use server';
 import { revalidatePath } from "next/cache";
 import { db } from "@/db/index";
-import { lessons } from "@/db/schema";
+import { lessons, units } from "@/db/schema";
 import { lessonFormSchema } from "@/lib/validations/lesson";
 import { actionClient } from "@/lib/safe-action";
+import { eq, asc } from "drizzle-orm";
 
 export const createLessonAction = actionClient
   .schema(lessonFormSchema)
@@ -33,4 +34,22 @@ export const createLessonAction = actionClient
     revalidatePath(`/admin/courses/${courseId}`);
 
     return { success: true };
-});
+});
+
+export async function getLessonsForCourse(courseId: number) {
+  return await db
+    .select({
+      lessonId: lessons.id,
+      unitId: lessons.unitId,
+      mediaType: lessons.mediaType,
+      contentUrl: lessons.contentUrl,
+      contentBlobId: lessons.contentBlobId,
+      metadata: lessons.metadata,
+      lessonPosition: lessons.position,
+      unitPosition: units.position,
+    })
+    .from(units)
+    .innerJoin(lessons, eq(units.id, lessons.unitId))
+    .where(eq(units.courseId, courseId))
+    .orderBy(asc(units.position), asc(lessons.position));
+}

src/actions/admin/lesson.ts

@@ -1,31 +1,50 @@
-// src/app/admin/courses/[courseId]/lesson/create/actions.ts
 'use server';
-
-import { revalidatePath } from "next/cache";
 import { db } from "@/db/index";
 import { units } from "@/db/schema";
-import { createUnitSchema } from "@/lib/validations/unit";
-import { actionClient } from "@/lib/safe-action";
+import { unitFormSchema } from "@/lib/validations/unit";
+import { adminClient } from "@/lib/safe-action";
+import { eq, asc, sql, and } from "drizzle-orm";
 
-// Create unit (for the modal)
-export const createUnitAction = actionClient
-  .schema(createUnitSchema)
+export const createUnitAction = adminClient
+  .schema(unitFormSchema)
   .action(async ({ parsedInput }) => {
     const { title, courseId } = parsedInput;
-    // Minimal insert: courseId (text) + title; position defaults to 1
-    const [unit] = await db
+    const [maxPositionRow] = await db
+    .select({ maxPosition: sql<number>`MAX(${units.position})` })
+    .from(units)
+    .where(eq(units.courseId, courseId));
+    
+    const newPosition = (maxPositionRow?.maxPosition ?? 0) + 1;
+
+    const existing = await db
+      .select()
+      .from(units)
+      .where(and(eq(units.title, title), eq(units.courseId, courseId)));
+    if (existing.length > 0) {
+      return { success: false, message: "Unit with this title already exists.", }
+    }
+    const [newUnit] = await db
       .insert(units)
       .values({
         courseId,
         title,
+        position: newPosition,
       })
-      .returning();
-
-    revalidatePath(`/admin/courses/${courseId}`);
+      .returning({ id: units.id, title: units.title});
 
-    return {
-      success: true,
-      unitId: unit.id,
-      unitTitle: unit.title,
+    return { 
+      success: true, 
+      message: "Success",
+      unitId: newUnit.id,
+      unitTitle: newUnit.title,
     };
 });
+
+
+export async function getUnitsForCourse(courseId: number) {
+  return await db
+    .select()
+    .from(units)
+    .where(eq(units.courseId, courseId))
+    .orderBy(asc(units.position));
+}

src/actions/admin/units.ts

@@ -1,7 +1,7 @@
 import { db } from "@/db/index";
 import { units } from "@/db/schema";
 import { eq } from "drizzle-orm";
-import { CreateLessonForm } from "@/components/admin/CreateLessonForm";
+import CreateLessonForm from "@/components/admin/CreateLessonForm";
 import {
   Card,
   CardHeader,
@@ -16,11 +16,12 @@ type PageProps = {
 
 export default async function CreateLessonPage({ params }: PageProps) {
   const { courseId } = await params;
+  const id = Number(courseId);
 
   const courseUnits = await db
     .select()
     .from(units)
-    .where(eq(units.courseId, courseId));
+    .where(eq(units.courseId, id));
 
   return (
     <div className="mx-auto flex max-w-3xl flex-col gap-6">
@@ -44,7 +45,7 @@ export default async function CreateLessonPage({ params }: PageProps) {
         </CardHeader>
         <CardContent className="pt-2">
           <CreateLessonForm
-            courseId={courseId}
+            courseId={id}
             initialUnits={courseUnits.map((u) => ({
               id: u.id,
               title: u.title ?? `Unit ${u.id}`,