-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #67 from Ashutoshbind15/main
Add the winstate, # of players who beat a map, and the user tries functionality
- Loading branch information
Showing
7 changed files
with
259 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| import { v } from "convex/values"; | ||
| import { mutation, query } from "./_generated/server"; | ||
| import { getAuthUserId } from "@convex-dev/auth/server"; | ||
|
|
||
| export const getUserMapStatus = query({ | ||
| handler: async (ctx) => { | ||
| const userId = await getAuthUserId(ctx); | ||
|
|
||
| if (!userId) { | ||
| return []; | ||
| } | ||
| const res = await ctx.db | ||
| .query("userResults") | ||
| .filter((q) => q.eq(q.field("userId"), userId)) | ||
| .collect(); | ||
|
|
||
| return res.map((r) => { | ||
| return { | ||
| mapId: r.mapId, | ||
| hasWon: r.hasWon, | ||
| }; | ||
| }); | ||
| }, | ||
| }); | ||
|
|
||
| export const getMapsWins = query({ | ||
| handler: async ({ db }) => { | ||
| const wonCounts = await db | ||
| .query("userResults") | ||
| .filter((q) => q.eq(q.field("hasWon"), true)) // Only users who have won | ||
| .collect(); | ||
|
|
||
| // Format the results as a count per map | ||
| const mapWinCounts = wonCounts.reduce( | ||
| (counts, result) => { | ||
| const mapId = result.mapId; | ||
| if (mapId) { | ||
| counts[mapId] = (counts[mapId] || 0) + 1; | ||
| } | ||
| return counts; | ||
| }, | ||
| {} as Record<string, number>, | ||
| ); | ||
|
|
||
| const res = []; | ||
|
|
||
| for (const [mapId, count] of Object.entries(mapWinCounts)) { | ||
| res.push({ mapId, count }); | ||
| } | ||
|
|
||
| return res; | ||
| }, | ||
| }); | ||
|
|
||
| export const getPlayerRecordsForAMap = query({ | ||
| args: { | ||
| mapId: v.optional(v.id("maps")), | ||
| }, | ||
| handler: async (ctx, { mapId }) => { | ||
| const userId = await getAuthUserId(ctx); | ||
|
|
||
| if (!userId) { | ||
| return null; | ||
| } | ||
|
|
||
| if (!mapId) { | ||
| return {}; | ||
| } | ||
|
|
||
| const res = await ctx.db | ||
| .query("userResults") | ||
| .withIndex("by_mapId_userId", (q) => | ||
| q.eq("mapId", mapId).eq("userId", userId), | ||
| ) | ||
| .collect(); | ||
|
|
||
| if (res.length === 0) { | ||
| return null; | ||
| } | ||
|
|
||
| const resPopulated = Promise.all( | ||
| (res[0].attempts ?? []).map((attemptId) => ctx.db.get(attemptId)), | ||
| ); | ||
|
|
||
| const resolvedAttempts = await resPopulated; | ||
|
|
||
| return { | ||
| hasWon: res[0].hasWon, | ||
| attempts: resolvedAttempts, | ||
| }; | ||
| }, | ||
| }); | ||
|
|
||
| export const updateUserResult = mutation({ | ||
| args: { | ||
| mapId: v.id("maps"), | ||
| hasWon: v.boolean(), | ||
| placedGrid: v.array(v.array(v.string())), | ||
| }, | ||
| handler: async (ctx, { mapId, hasWon, placedGrid }) => { | ||
| const userId = await getAuthUserId(ctx); | ||
|
|
||
| if (userId == null) { | ||
| throw new Error("Not signed in"); | ||
| } | ||
|
|
||
| const res = await ctx.db | ||
| .query("userResults") | ||
| .withIndex("by_mapId_userId", (q) => | ||
| q.eq("mapId", mapId).eq("userId", userId), | ||
| ) | ||
| .collect(); | ||
|
|
||
| const attemptId = await ctx.db.insert("attempts", { | ||
| grid: placedGrid, | ||
| didWin: hasWon, | ||
| }); | ||
|
|
||
| if (res.length === 0) { | ||
| await ctx.db.insert("userResults", { | ||
| userId, | ||
| mapId, | ||
| attempts: [attemptId], | ||
| hasWon, | ||
| }); | ||
| } else { | ||
| await ctx.db.patch(res[0]._id, { | ||
| attempts: [...res[0].attempts, attemptId], | ||
| hasWon: res[0].hasWon || hasWon, | ||
| }); | ||
| } | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters