* Fall back to displayName when username is null for Discord webhook Users who sign up via OAuth (Google, GitHub, etc.) without setting a Clerk username have a null `username` field but always have a `displayName` (computed from firstName+lastName or email). Previously, `usernameByClerkId` was filtered to only include users with a non-null username, causing those owners to appear without any identifier in Discord standings messages (e.g. "Liverpool def. Galatasaray" instead of "Liverpool def. Galatasaray (Madmike)"). https://claude.ai/code/session_01VAkeDDVZMYS1DweQnUrRnH * Extract getUserDisplayName helper and use consistently throughout Add a single getUserDisplayName(user) function to app/models/user.ts that encapsulates the username → displayName fallback logic. Replace 9 scattered inline expressions across the codebase (owner-map, scoring-calculator, league routes, settings, invite flow, draft API, Clerk webhook) with calls to the shared helper. No behaviour change — all existing logic preserved, just centralised. https://claude.ai/code/session_01VAkeDDVZMYS1DweQnUrRnH * Fix N+1 user queries in league loader and settings loader Add findUsersByClerkIds() batch function to the user model and replace two separate Promise.all+findUserByClerkId loops (one for owners, one for commissioners) with a single inArray query in both $leagueId.server.ts and $leagueId.settings.tsx. The merged query covers both owner and commissioner IDs in one round-trip. https://claude.ai/code/session_01VAkeDDVZMYS1DweQnUrRnH * Fix N+1 user queries in buildOwnerMap Replace the Promise.all+findUserByClerkId loop with a single findUsersByClerkIds batch query, consistent with the league loader and settings loader fixes. https://claude.ai/code/session_01VAkeDDVZMYS1DweQnUrRnH --------- Co-authored-by: Claude <noreply@anthropic.com>
175 lines
5.5 KiB
TypeScript
175 lines
5.5 KiB
TypeScript
import { Form, redirect } from "react-router";
|
|
import { getAuth } from "@clerk/react-router/server";
|
|
import { SignInButton } from "@clerk/react-router";
|
|
import type { Route } from "./+types/i.$inviteCode";
|
|
|
|
import {
|
|
findSeasonByInviteCode,
|
|
findLeagueById,
|
|
findCommissionersByLeagueId,
|
|
findAvailableTeams,
|
|
claimTeam,
|
|
isUserLeagueMember,
|
|
findUserByClerkId,
|
|
getUserDisplayName,
|
|
} from "~/models";
|
|
import { Button } from "~/components/ui/button";
|
|
import {
|
|
Card,
|
|
CardContent,
|
|
CardDescription,
|
|
CardHeader,
|
|
CardTitle,
|
|
} from "~/components/ui/card";
|
|
|
|
export function meta(): Route.MetaDescriptors {
|
|
return [{ title: "Join League - Brackt" }];
|
|
}
|
|
|
|
export async function loader(args: Route.LoaderArgs) {
|
|
const { params } = args;
|
|
const { inviteCode } = params;
|
|
const { userId } = await getAuth(args);
|
|
|
|
// Find season by invite code
|
|
const season = await findSeasonByInviteCode(inviteCode);
|
|
|
|
if (!season) {
|
|
throw new Response("Invalid invite code", { status: 404 });
|
|
}
|
|
|
|
// Find the league
|
|
const league = await findLeagueById(season.leagueId);
|
|
|
|
if (!league) {
|
|
throw new Response("League not found", { status: 404 });
|
|
}
|
|
|
|
// Find commissioners to get the commissioner's name
|
|
const commissioners = await findCommissionersByLeagueId(league.id);
|
|
const firstCommissioner = commissioners[0];
|
|
|
|
// Check if user is already a member
|
|
let isAlreadyMember = false;
|
|
if (userId) {
|
|
isAlreadyMember = await isUserLeagueMember(league.id, userId);
|
|
}
|
|
|
|
return {
|
|
league,
|
|
season,
|
|
inviteCode,
|
|
firstCommissioner,
|
|
isAlreadyMember,
|
|
isLoggedIn: !!userId,
|
|
};
|
|
}
|
|
|
|
export async function action(args: Route.ActionArgs) {
|
|
const { params } = args;
|
|
const { inviteCode } = params;
|
|
const { userId } = await getAuth(args);
|
|
|
|
if (!userId) {
|
|
throw new Response("You must be logged in to join a league", { status: 401 });
|
|
}
|
|
|
|
// Find season by invite code
|
|
const season = await findSeasonByInviteCode(inviteCode);
|
|
|
|
if (!season) {
|
|
throw new Response("Invalid invite code", { status: 404 });
|
|
}
|
|
|
|
// Check if user is already a member
|
|
const isAlreadyMember = await isUserLeagueMember(season.leagueId, userId);
|
|
|
|
if (isAlreadyMember) {
|
|
// Already a member, redirect to league page
|
|
return redirect(`/leagues/${season.leagueId}`);
|
|
}
|
|
|
|
// Find an available team
|
|
const availableTeams = await findAvailableTeams(season.id);
|
|
|
|
if (availableTeams.length === 0) {
|
|
throw new Response("No available teams in this league", { status: 400 });
|
|
}
|
|
|
|
// Look up user before claiming to fail fast and get their name
|
|
const user = await findUserByClerkId(userId);
|
|
if (!user) {
|
|
throw new Response("User account not found. Please try again.", { status: 500 });
|
|
}
|
|
|
|
// Claim the first available team, setting owner and name atomically
|
|
const team = availableTeams[0];
|
|
const teamName = `Team ${getUserDisplayName(user) ?? "Member"}`;
|
|
await claimTeam(team.id, userId, teamName);
|
|
|
|
// Redirect to league page
|
|
return redirect(`/leagues/${season.leagueId}?joined=true`);
|
|
}
|
|
|
|
export default function InvitePage({ loaderData }: Route.ComponentProps) {
|
|
const { league, firstCommissioner, isAlreadyMember, isLoggedIn } = loaderData;
|
|
|
|
return (
|
|
<div className="container mx-auto py-16 px-4">
|
|
<div className="max-w-2xl mx-auto">
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle className="text-3xl">You're Invited!</CardTitle>
|
|
<CardDescription className="text-base">
|
|
{firstCommissioner ? "A commissioner" : "Someone"} has invited you to join{" "}
|
|
<span className="font-semibold">{league.name}</span>
|
|
</CardDescription>
|
|
</CardHeader>
|
|
<CardContent className="space-y-6">
|
|
<div className="space-y-2">
|
|
<h3 className="font-semibold text-lg">League Details</h3>
|
|
<div className="space-y-1 text-sm text-muted-foreground">
|
|
<p>
|
|
<span className="font-medium text-foreground">League:</span> {league.name}
|
|
</p>
|
|
<p>
|
|
<span className="font-medium text-foreground">Created:</span>{" "}
|
|
{new Date(league.createdAt).toLocaleDateString()}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
|
|
{isAlreadyMember ? (
|
|
<div className="space-y-4">
|
|
<p className="text-sm text-muted-foreground">
|
|
You're already a member of this league!
|
|
</p>
|
|
<Button asChild className="w-full">
|
|
<a href={`/leagues/${league.id}`}>Go to League</a>
|
|
</Button>
|
|
</div>
|
|
) : isLoggedIn ? (
|
|
<Form method="post" className="space-y-4">
|
|
<p className="text-sm text-muted-foreground">
|
|
Click the button below to join this league and claim your team.
|
|
</p>
|
|
<Button type="submit" className="w-full">
|
|
Join League
|
|
</Button>
|
|
</Form>
|
|
) : (
|
|
<div className="space-y-4">
|
|
<p className="text-sm text-muted-foreground">
|
|
You'll need to sign in or create an account to join this league.
|
|
</p>
|
|
<SignInButton mode="modal" forceRedirectUrl={`/i/${loaderData.inviteCode}`}>
|
|
<Button className="w-full">Sign In to Join</Button>
|
|
</SignInButton>
|
|
</div>
|
|
)}
|
|
</CardContent>
|
|
</Card>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|