Merge pull request #91 from hack4impact/feature/checkout-frontend

Feature: checkout frontend

Author: martin0024

.env.example

@@ -8,4 +8,12 @@ NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=
 WORDPRESS_API_URL=http://xxx.com
 WORDPRESS_USERNAME=mcld-dashboard
 WORDPRESS_APP_PASSWORD="xxxx xxxx xxxx xxxx xxxx xxxx"
-WORDPRESS_POST_TYPE=posts
+WORDPRESS_POST_TYPE=posts
+
+BREVO_SMTP_HOST=
+BREVO_SMTP_PORT=
+BREVO_SMTP_USER=
+BREVO_SMTP_PASSWORD=
+EMAIL_FROM=
+EMAIL_TIMEZONE=
+APP_URL=

app/(authenticated)/checkout/cancel/page.tsx

@@ -165,6 +165,7 @@ export async function createService(
    // so they still run when baseFields fails on unrelated fields.
    const typeRaw = formData.get("type")?.toString();
    let scheduledAtValue: ProgramSchedule | null = null;
+   let coachIdValue: string | null = null;
    if (typeRaw === "programs") {
       const result = parseProgramSchedule(formData);
       if (!result.ok) {
@@ -175,6 +176,7 @@ export async function createService(
    } else if (typeRaw === "private_lessons") {
       const coach = parseCoachId(formData);
       if (!coach.ok) Object.assign(errors, coach.errors);
+      else coachIdValue = coach.value;
    }
 
    if (Object.keys(errors).length > 0) {
@@ -203,6 +205,7 @@ export async function createService(
          slots: scheduledAtValue?.slots ?? null,
          durationMinutes: duration_minutes,
          stripeProductId: productId,
+         coachId: coachIdValue,
          status: "active",
       });
    } catch (e) {
@@ -298,13 +301,18 @@ export async function updateService(
    }
 
    let scheduledAtValue: ProgramSchedule | undefined;
+   let coachIdValue: string | undefined;
    if (row.type === "programs" && formData.has("start_date")) {
       const result = parseProgramSchedule(formData);
       if (!result.ok) {
          Object.assign(errors, result.errors);
       } else {
          scheduledAtValue = result.value;
       }
+   } else if (row.type === "private_lessons" && formData.has("coach_id")) {
+      const coach = parseCoachId(formData);
+      if (!coach.ok) Object.assign(errors, coach.errors);
+      else coachIdValue = coach.value;
    }
 
    if (Object.keys(errors).length > 0) {
@@ -334,6 +342,7 @@ export async function updateService(
          dbPatch.endDate = scheduledAtValue.endDate;
          dbPatch.slots = scheduledAtValue.slots;
       }
+      if (coachIdValue !== undefined) dbPatch.coachId = coachIdValue;
 
       if (Object.keys(dbPatch).length > 0) {
          dbPatch.updatedAt = new Date();

app/(authenticated)/checkout/success/page.tsx

@@ -6,6 +6,9 @@ import { getStripeServiceData } from "@/lib/stripe";
 import type { ProgramSchedule } from "@/app/(authenticated)/services/actions";
 
 const SERVICES_TAG = "services";
+
+const UUID_RE =
+   /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 const COACHES_TAG = "coaches";
 
 export type ServiceStatus = "active" | "disabled" | "archived" | "deleted";
@@ -18,6 +21,7 @@ export type ServiceView = {
    durationMinutes: number;
    status: ServiceStatus;
    stripeProductId: string;
+   coachId: string | null;
    createdAt: Date;
    updatedAt: Date;
    title: string | null;
@@ -37,7 +41,9 @@ function rowToSchedule(
    };
 }
 
-async function buildServiceView(row: typeof services.$inferSelect): Promise<ServiceView> {
+async function buildServiceView(
+   row: typeof services.$inferSelect,
+): Promise<ServiceView> {
    const stripeData = await getStripeServiceData(row.stripeProductId);
    return {
       id: row.id,
@@ -46,6 +52,7 @@ async function buildServiceView(row: typeof services.$inferSelect): Promise<Serv
       durationMinutes: row.durationMinutes,
       status: row.status,
       stripeProductId: row.stripeProductId,
+      coachId: row.coachId,
       createdAt: row.createdAt,
       updatedAt: row.updatedAt,
       title: stripeData?.title ?? null,
@@ -93,6 +100,8 @@ export async function getService(id: string): Promise<ServiceView | null> {
    "use cache";
    cacheTag(SERVICES_TAG);
 
+   if (!UUID_RE.test(id)) return null;
+
    const [row] = await db
       .select()
       .from(services)

app/(authenticated)/services/actions.ts

@@ -248,7 +248,9 @@ export function ServiceDialog(props: Props) {
    const [type, setType] = React.useState<"programs" | "private_lessons">(
       service?.type ?? "programs",
    );
-   const [coachId, setCoachId] = React.useState<string>("");
+   const [coachId, setCoachId] = React.useState<string>(
+      service?.coachId ?? "",
+   );
    const [title, setTitle] = React.useState<string>(service?.title ?? "");
    const [description, setDescription] = React.useState<string>(
       service?.description ?? "",
@@ -267,7 +269,7 @@ export function ServiceDialog(props: Props) {
    React.useEffect(() => {
       if (service) {
          setType(service.type);
-         setCoachId("");
+         setCoachId(service.coachId ?? "");
          setTitle(service.title ?? "");
          setDescription(service.description ?? "");
          setDurationMinutes(String(service.durationMinutes ?? 60));

app/(authenticated)/services/queries.ts

@@ -9,6 +9,7 @@ import {
 } from "@/lib/db/schema";
 import { and, eq } from "drizzle-orm";
 import Stripe from "stripe";
+import { notifyCoachOfBooking } from "@/app/scheduling/notifications";
 
 const allowedEvents: Stripe.Event.Type[] = [
    "checkout.session.completed",
@@ -51,15 +52,21 @@ export async function POST(request: NextRequest) {
       const metadata = session.metadata ?? {};
 
       if (metadata.type === "private_lesson" && metadata.coachingSessionId) {
-         await db
+         const updated = await db
             .update(coachingSessions)
             .set({ status: "pending", stripeOrderId: session.id })
             .where(
                and(
                   eq(coachingSessions.id, metadata.coachingSessionId),
                   eq(coachingSessions.status, "awaiting_payment"),
                ),
-            );
+            )
+            .returning({ id: coachingSessions.id });
+
+         const transitioned = updated[0];
+         if (transitioned) {
+            await notifyCoachOfBooking(transitioned.id);
+         }
          return NextResponse.json({ received: true });
       }