Require complete player profile details

src/admin.ts

@@ -15,11 +15,16 @@ const profileSchema = z.object({
   academy: z.string().trim().max(150).nullable(), role: z.string().trim().max(50).nullable(),
 }).strict();
 const playerSchema = z.object({
-  fname: z.string().trim().min(1).max(100), lname: z.string().trim().max(100).optional().default(""),
-  age: z.number().int().min(4).max(60).nullable().optional(),
-  heightCm: z.number().min(100).max(230).nullable().optional(), weightKg: z.number().min(20).max(150).nullable().optional(),
-  club: z.string().trim().max(150).nullable().optional(), position: z.string().trim().max(50).nullable().optional(),
-  gender: z.enum(["male", "female"]).nullable().optional(), userId: uuid.nullable().optional(),
+  fname: z.string().trim().min(1).max(100), lname: z.string().trim().max(100).nullable().optional().default(null),
+  bdate: date.refine((value) => {
+    const today = new Date();
+    const [year, month, day] = value.split("-").map(Number);
+    const age = today.getUTCFullYear() - year - Number(today.getUTCMonth() + 1 < month || (today.getUTCMonth() + 1 === month && today.getUTCDate() < day));
+    return age >= 4 && age <= 60;
+  }, "Enter a valid birth date for a player aged 4 to 60."),
+  heightCm: z.number().min(100).max(230), weightKg: z.number().min(20).max(150),
+  club: z.string().trim().max(150).nullable().optional(), position: z.string().trim().min(1).max(50),
+  gender: z.enum(["male", "female"]), userId: uuid,
 }).strict();
 
 function fail(res: Response, status: number, error: string) { return res.status(status).json({ error }); }
@@ -27,13 +32,6 @@ function asyncRoute(handler: (req: Request, res: Response) => Promise<unknown>)
   return (req: Request, res: Response, next: NextFunction) => { void handler(req, res).catch(next); };
 }
 async function admin(req: Request, res: Response) { return requireAdmin(req, res); }
-function ageDate(age?: number | null) {
-  if (age == null) return null;
-  const birth = new Date();
-  birth.setUTCFullYear(birth.getUTCFullYear() - age);
-  return birth.toISOString().slice(0, 10);
-}
-
 async function analysisRequest(path: string, userId: string, method: string, isAdmin = true, body?: unknown) {
   const response = await fetch(`${env.ANALYSIS_API_URL}/api${path}`, {
     method,
@@ -198,15 +196,15 @@ export function registerAdminRoutes(app: Express) {
       if (!data) return fail(res, 404, "Player owner not found.");
     }
     const { data, error } = await supabaseAdmin.rpc("admin_create_player", {
-      p_user_id: input.data.userId ?? null,
+      p_user_id: input.data.userId,
       p_fname: input.data.fname,
-      p_lname: input.data.lname,
-      p_bdate: ageDate(input.data.age),
-      p_height: input.data.heightCm ?? null,
-      p_weight: input.data.weightKg ?? null,
+      p_lname: input.data.lname?.trim() || null,
+      p_bdate: input.data.bdate,
+      p_height: input.data.heightCm,
+      p_weight: input.data.weightKg,
       p_club: input.data.club || null,
-      p_position: input.data.position || null,
-      p_gender: input.data.gender ?? null,
+      p_position: input.data.position,
+      p_gender: input.data.gender,
     });
     if (error) throw new Error(`Unable to add player: ${error.message}`);
     return res.status(201).json({ player: data });
@@ -215,7 +213,7 @@ export function registerAdminRoutes(app: Express) {
   app.patch("/api/admin/players/:playerId", asyncRoute(async (req, res) => {
     if (!await admin(req, res)) return;
     const id = uuid.safeParse(req.params.playerId);
-    const input = z.object({ userId: uuid.nullable() }).strict().safeParse(req.body);
+    const input = z.object({ userId: uuid }).strict().safeParse(req.body);
     if (!id.success || !input.success) return fail(res, 400, "Choose a valid owner.");
     if (input.data.userId) {
       const { data, error } = await supabaseAdmin.from("users").select("user_id").eq("user_id", input.data.userId).maybeSingle();
@@ -357,6 +355,12 @@ export function registerAdminRoutes(app: Express) {
     const { data: target, error } = await supabaseAdmin.from("users").select("user_id,account_role,image_path").eq("user_id", id.data).maybeSingle();
     if (error) throw new Error(`Unable to load account: ${error.message}`);
     if (!target) return res.sendStatus(404);
+    const { count: playerCount, error: playerCountError } = await supabaseAdmin.from("players")
+      .select("player_id", { count: "exact", head: true }).eq("user_id", id.data);
+    if (playerCountError) throw new Error(`Unable to check account players: ${playerCountError.message}`);
+    if ((playerCount ?? 0) > 0) {
+      return fail(res, 409, "Transfer this account's players to another user before deleting the account.");
+    }
     if (String(target.account_role).toLowerCase() === "admin") {
       return fail(res, 409, "Administrator accounts cannot be deleted here. Change administrator access directly in the database first.");
     }

src/server.ts

@@ -73,30 +73,37 @@ const actionReviewSchema = z.object({
 }).strict();
 const playerProfileSchema = z.object({
   fname: z.string().trim().min(1).max(100).optional(),
-  lname: z.string().trim().max(100).optional(),
+  lname: z.string().trim().max(100).nullable().optional(),
   name: z.string().trim().max(200).optional(),
-  age: z.string().regex(/^(|\d{1,2})$/),
-  heightCm: z.string().regex(/^(|\d{2,3}(?:\.\d{1,2})?)$/),
-  weightKg: z.string().regex(/^(|\d{1,3}(?:\.\d{1,2})?)$/),
+  bdate: z.string().regex(/^\d{4}-\d{2}-\d{2}$/),
+  heightCm: z.string().regex(/^\d{2,3}(?:\.\d{1,2})?$/),
+  weightKg: z.string().regex(/^\d{1,3}(?:\.\d{1,2})?$/),
   club: z.string().trim().max(150),
-  position: z.string().trim().max(50),
-  gender: z.union([z.enum(["male", "female"]), z.literal("")]),
+  position: z.string().trim().min(1).max(50),
+  gender: z.enum(["male", "female"]),
 }).strict().transform((input) => {
   const legacyNameParts = (input.name ?? "").split(/\s+/).filter(Boolean);
   const fname = input.fname ?? legacyNameParts.shift() ?? "";
   const lname = input.lname ?? legacyNameParts.join(" ");
   return { ...input, fname, lname };
-}).refine((input) => Boolean(input.fname), { message: "First name is required." });
+}).refine((input) => Boolean(input.fname), { message: "First name is required." })
+  .refine((input) => validPlayerBirthDate(input.bdate), { path: ["bdate"], message: "Enter a valid birth date for a player aged 4 to 60." });
 const playerCreateSchema = z.object({
   fname: z.string().trim().min(1).max(100),
-  lname: z.string().trim().max(100).optional().default(""),
-  age: z.string().regex(/^(|\d{1,2})$/),
-  heightCm: z.string().regex(/^(|\d{2,3}(?:\.\d{1,2})?)$/),
-  weightKg: z.string().regex(/^(|\d{1,3}(?:\.\d{1,2})?)$/),
+  lname: z.string().trim().max(100).nullable().optional().default(null),
+  bdate: z.string().regex(/^\d{4}-\d{2}-\d{2}$/),
+  heightCm: z.string().regex(/^\d{2,3}(?:\.\d{1,2})?$/),
+  weightKg: z.string().regex(/^\d{1,3}(?:\.\d{1,2})?$/),
   club: z.string().trim().max(150),
-  position: z.string().trim().max(50),
-  gender: z.union([z.enum(["male", "female"]), z.literal("")]),
-}).strict();
+  position: z.string().trim().min(1).max(50),
+  gender: z.enum(["male", "female"]),
+}).strict().refine((input) => validPlayerBirthDate(input.bdate), { path: ["bdate"], message: "Enter a valid birth date for a player aged 4 to 60." });
+
+function validPlayerBirthDate(value: string) {
+  const date = new Date(`${value}T00:00:00.000Z`);
+  return !Number.isNaN(date.valueOf()) && date.toISOString().slice(0, 10) === value &&
+    Number(ageFromBirthday(value)) >= 4 && Number(ageFromBirthday(value)) <= 60;
+}
 
 function ageFromBirthday(birthday: string | null): string {
   if (!birthday) return "";
@@ -315,28 +322,21 @@ app.post("/api/players", async (req, res, next) => {
     if (!current) return;
     if (!await enforcePlayerQuota(current.user.id, current.subscription.player_limit == null ? null : Number(current.subscription.player_limit), res)) return;
     const input = playerCreateSchema.parse(req.body);
-    const age = input.age ? Number(input.age) : null;
-    const height = input.heightCm ? Number(input.heightCm) : null;
-    const weight = input.weightKg ? Number(input.weightKg) : null;
-    if ((age !== null && (age < 4 || age > 60)) || (height !== null && (height < 100 || height > 230)) || (weight !== null && (weight < 20 || weight > 150))) {
+    const height = Number(input.heightCm);
+    const weight = Number(input.weightKg);
+    if (height < 100 || height > 230 || weight < 20 || weight > 150) {
       return res.status(400).json({ error: "Check the player's age, height and weight." });
     }
-    let birthday: string | null = null;
-    if (age !== null) {
-      const date = new Date();
-      date.setUTCFullYear(date.getUTCFullYear() - age);
-      birthday = date.toISOString().slice(0, 10);
-    }
     const { data, error } = await supabaseAdmin.from("players").insert({
       user_id: current.user.id,
       fname: input.fname,
-      lname: input.lname || "",
-      bdate: birthday,
+      lname: input.lname?.trim() || null,
+      bdate: input.bdate,
       height,
       weight,
       club: input.club || null,
-      position: input.position || null,
-      gender: input.gender || null,
+      position: input.position,
+      gender: input.gender,
     }).select("player_id,fname,lname,position,club,gender,image_path").single();
     if (error?.code === "P0001" && error.message.includes("subscription_quota_exceeded")) {
       return res.status(403).json({ error: "You have used all player slots included in this plan period. Renew or upgrade your plan to add another player.", code: "quota_exceeded", resource: "players" });
@@ -365,32 +365,24 @@ app.put("/api/players/:playerId", async (req, res, next) => {
     const id = z.string().uuid().safeParse(req.params.playerId);
     if (!id.success) return res.status(404).json({ error: "Player not found." });
     const input = playerProfileSchema.parse(req.body);
-    const age = input.age ? Number(input.age) : null;
-    const height = input.heightCm ? Number(input.heightCm) : null;
-    const weight = input.weightKg ? Number(input.weightKg) : null;
-    if ((age !== null && (age < 4 || age > 60)) || (height !== null && (height < 100 || height > 230)) || (weight !== null && (weight < 20 || weight > 150))) {
+    const height = Number(input.heightCm);
+    const weight = Number(input.weightKg);
+    if (height < 100 || height > 230 || weight < 20 || weight > 150) {
       return res.status(400).json({ error: "Check the player's age, height and weight." });
     }
     const { data: existing, error: readError } = await supabaseAdmin.from("players")
-      .select("player_id,bdate").eq("player_id", id.data).eq("user_id", current.user.id).maybeSingle();
+      .select("player_id").eq("player_id", id.data).eq("user_id", current.user.id).maybeSingle();
     if (readError) throw new Error(`Unable to load player: ${readError.message}`);
     if (!existing) return res.status(404).json({ error: "Player not found." });
-    let birthday = existing.bdate;
-    if (age === null) birthday = null;
-    else if (ageFromBirthday(existing.bdate) !== String(age)) {
-      const date = new Date();
-      date.setUTCFullYear(date.getUTCFullYear() - age);
-      birthday = date.toISOString().slice(0, 10);
-    }
     const { error } = await supabaseAdmin.from("players").update({
       fname: input.fname,
-      lname: input.lname || "",
-      bdate: birthday,
+      lname: input.lname?.trim() || null,
+      bdate: input.bdate,
       height,
       weight,
       club: input.club || null,
-      position: input.position || null,
-      gender: input.gender || null,
+      position: input.position,
+      gender: input.gender,
     }).eq("player_id", id.data).eq("user_id", current.user.id);
     if (error) throw new Error(`Unable to update player: ${error.message}`);
     return res.json({ ok: true });
@@ -503,6 +495,7 @@ app.get("/api/players-overview", async (req, res, next) => {
         lname: row.lname ?? "",
         name: [row.fname, row.lname].filter(Boolean).join(" "),
         age: ageFromBirthday(row.bdate),
+        bdate: row.bdate,
         heightCm: row.height == null ? "" : String(row.height),
         weightKg: row.weight == null ? "" : String(row.weight),
         club: row.club ?? "", position: row.position ?? "", gender: row.gender ?? null,
@@ -586,6 +579,7 @@ app.get("/api/players-overview/:playerId", async (req, res, next) => {
       playerId: player.player_id, fname: player.fname ?? "", lname: player.lname ?? "", name: [player.fname, player.lname].filter(Boolean).join(" "),
       isOwner: player.user_id === current.user.id,
       age: ageFromBirthday(player.bdate),
+      bdate: player.bdate,
       heightCm: player.height == null ? "" : String(player.height), weightKg: player.weight == null ? "" : String(player.weight),
       club: player.club ?? "", position: player.position ?? "", gender: player.gender ?? null,
       imagePath: player.image_path ?? null,