rhythia-api 74.0.0 → 76.0.0

package/api/getProfile.ts

@@ -1,12 +1,13 @@
 import { NextResponse } from "next/server";
 import z from "zod";
+import { Database } from "../types/database";
 import { protectedApi, validUser } from "../utils/requestUtils";
 import { supabase } from "../utils/supabase";
 
 export const Schema = {
   input: z.object({
     session: z.string(),
-    id: z.number(),
+    id: z.number().optional(),
   }),
   output: z.object({
     error: z.string().optional(),
@@ -21,6 +22,10 @@ export const Schema = {
         uid: z.string().nullable(),
         username: z.string().nullable(),
         verified: z.boolean().nullable(),
+        play_count: z.number().nullable(),
+        skill_points: z.number().nullable(),
+        squares_hit: z.number().nullable(),
+        total_score: z.number().nullable(),
       })
       .optional(),
   }),
@@ -38,20 +43,46 @@ export async function POST(res: Response): Promise<NextResponse> {
 export async function handler(
   data: (typeof Schema)["input"]["_type"]
 ): Promise<NextResponse<(typeof Schema)["output"]["_type"]>> {
-  let { data: profiles, error } = await supabase
-    .from("profiles")
-    .select("*")
-    .eq("id", data.id);
-
-  console.log(profiles, error);
-
-  if (!profiles?.length) {
-    return NextResponse.json(
-      {
-        error: "User not found",
-      },
-      { status: 404 }
-    );
+  let profiles: Database["public"]["Tables"]["profiles"]["Row"][] = [];
+
+  // Fetch by id
+  if (data.id) {
+    let { data: queryData, error } = await supabase
+      .from("profiles")
+      .select("*")
+      .eq("id", data.id);
+
+    console.log(profiles, error);
+
+    if (!queryData?.length) {
+      return NextResponse.json(
+        {
+          error: "User not found",
+        },
+        { status: 404 }
+      );
+    }
+
+    profiles = queryData;
+  } else {
+    // Fetch by session id
+    const user = (await supabase.auth.getUser(data.session)).data.user!;
+
+    let { data: queryData, error } = await supabase
+      .from("profiles")
+      .select("*")
+      .eq("uid", user.id);
+
+    console.log(profiles, error);
+
+    if (!queryData?.length) {
+      return NextResponse.json(
+        {
+          error: "User cannot be retrieved from session",
+        },
+        { status: 404 }
+      );
+    }
   }
 
   const user = profiles[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythia-api",
-  "version": "74.0.0",
+  "version": "76.0.0",
   "main": "index.ts",
   "scripts": {
     "update": "bun ./scripts/update.ts",