Merge pull request #86 from Ashutoshbind15/main

index on the admin table and fix some syntax errors on the play page
webdevcody · Oct 18, 2024 · c475507 · c475507
2 parents e60bc43 + 25cb787
commit c475507
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/convex/maps.ts b/convex/maps.ts
@@ -218,10 +218,12 @@ export const getMaps = query({
         return null;
       }
 
-      const admins = await ctx.db.query("admins").collect();
-      const isAdmin = admins.some((admin) => admin.userId === userId);
+      const admin = await ctx.db
+        .query("admins")
+        .withIndex("by_userId", (q) => q.eq("userId", userId))
+        .first();
 
-      if (isAdmin) {
+      if (admin) {
         return await ctx.db
           .query("maps")
           .filter((q) => q.eq(q.field("isReviewed"), args.isReviewed))
@@ -250,10 +252,12 @@ export const approveMap = mutation({
       throw new Error("Unauthorized");
     }
 
-    const admins = await ctx.db.query("admins").collect();
-    const isAdmin = admins.some((admin) => admin.userId === userId);
+    const admin = await ctx.db
+      .query("admins")
+      .withIndex("by_userId", (q) => q.eq("userId", userId))
+      .first();
 
-    if (!isAdmin) {
+    if (!admin) {
       throw new Error("Unauthorized");
     } else {
       const maps = await ctx.db.query("maps").collect();

diff --git a/convex/schema.ts b/convex/schema.ts
@@ -64,5 +64,5 @@ export default defineSchema({
   }).index("by_mapId_userId", ["mapId", "userId"]),
   admins: defineTable({
     userId: v.id("users"),
-  }),
+  }).index("by_userId", ["userId"]),
 });
diff --git a/convex/users.ts b/convex/users.ts
@@ -34,8 +34,11 @@ export const isAdmin = query({
       return false;
     }
 
-    const admins = await ctx.db.query("admins").collect();
+    const admin = await ctx.db
+      .query("admins")
+      .withIndex("by_userId", (q) => q.eq("userId", userId))
+      .first();
 
-    return admins.some((admin) => admin.userId === userId);
+    return !!admin;
   },
 });