[user] add age_verified field and single user upsert route

dbschema/migrations/00048-m1fjqfw.edgeql

@@ -0,0 +1,9 @@
+CREATE MIGRATION m1fjqfwzmxszvkdaqxd3ygmk75xhfd35kmfkr4xmgswlkh7xxoddaq
+    ONTO m1axeqqxygv6gealfrhk6kvfbjd3eoj3rw3xzb6r6wujjaegng5mpq
+{
+  ALTER TYPE user::User {
+      CREATE REQUIRED PROPERTY age_verified: std::bool {
+          SET default := true;
+      };
+  };
+};

dbschema/user.esdl

@@ -4,6 +4,9 @@ module user {
       constraint exclusive;
     }
     required property discord_username -> str;
+    required property age_verified -> bool {
+        default := true;
+    };
     link profile := .<user[is Profile];
     link amq := .<user[is amq::Account];
     link anilist := .<user[is anilist::Account];

nanapi/database/calendar/guild_event_delete.py

@@ -32,12 +32,14 @@ class GuildEventDeleteResultProjection(BaseModel):
 
 
 class GuildEventDeleteResultParticipants(BaseModel):
+    age_verified: bool
     discord_id: str
     discord_username: str
     id: UUID
 
 
 class GuildEventDeleteResultOrganizer(BaseModel):
+    age_verified: bool
     discord_id: str
     discord_username: str
     id: UUID

nanapi/database/calendar/guild_event_merge.py

@@ -76,12 +76,14 @@ class GuildEventMergeResultProjection(BaseModel):
 
 
 class GuildEventMergeResultParticipants(BaseModel):
+    age_verified: bool
     discord_id: str
     discord_username: str
     id: UUID
 
 
 class GuildEventMergeResultOrganizer(BaseModel):
+    age_verified: bool
     discord_id: str
     discord_username: str
     id: UUID

nanapi/database/calendar/guild_event_select.py

@@ -32,12 +32,14 @@ class GuildEventSelectResultProjection(BaseModel):
 
 
 class GuildEventSelectResultParticipants(BaseModel):
+    age_verified: bool
     discord_id: str
     discord_username: str
     id: UUID
 
 
 class GuildEventSelectResultOrganizer(BaseModel):
+    age_verified: bool
     discord_id: str
     discord_username: str
     id: UUID

nanapi/database/calendar/user_calendar_select.py

@@ -14,6 +14,7 @@
 
 
 class UserCalendarSelectResultUser(BaseModel):
+    age_verified: bool
     discord_id: str
     discord_username: str
     id: UUID

nanapi/database/calendar/user_calendar_select_all.py

@@ -11,6 +11,7 @@
 
 
 class UserCalendarSelectAllResultUser(BaseModel):
+    age_verified: bool
     discord_id: str
     discord_username: str
     id: UUID

nanapi/database/projection/projo_select.py

@@ -59,6 +59,7 @@ class ProjectionStatus(StrEnum):
 
 
 class ProjoSelectResultParticipants(BaseModel):
+    age_verified: bool
     discord_id: str
     discord_username: str
     id: UUID

nanapi/database/user/user_select.edgeql

@@ -1,4 +1,5 @@
 select user::User {
   discord_id,
   discord_username,
+  age_verified,
 }

nanapi/database/user/user_select.py

@@ -8,11 +8,13 @@
 select user::User {
   discord_id,
   discord_username,
+  age_verified,
 }
 """
 
 
 class UserSelectResult(BaseModel):
+    age_verified: bool
     discord_id: str
     discord_username: str
 

nanapi/database/user/user_upsert.edgeql

@@ -0,0 +1,12 @@
+insert user::User {
+    discord_id := <str>$discord_id,
+    age_verified := <bool>$age_verified,
+    discord_username := <str>$discord_username,
+}
+unless conflict on .discord_id
+else (
+    update user::User set {
+        age_verified := <bool>$age_verified,
+        discord_username := <str>$discord_username,
+    }
+)

nanapi/database/user/user_upsert.py

@@ -0,0 +1,44 @@
+# Generated by gel-pydantic-codegen
+# pyright: strict
+from uuid import UUID
+
+from gel import AsyncIOExecutor
+from pydantic import BaseModel, TypeAdapter
+
+EDGEQL_QUERY = r"""
+insert user::User {
+    discord_id := <str>$discord_id,
+    age_verified := <bool>$age_verified,
+    discord_username := <str>$discord_username,
+}
+unless conflict on .discord_id
+else (
+    update user::User set {
+        age_verified := <bool>$age_verified,
+        discord_username := <str>$discord_username,
+    }
+)
+"""
+
+
+class UserUpsertResult(BaseModel):
+    id: UUID
+
+
+adapter = TypeAdapter[UserUpsertResult](UserUpsertResult)
+
+
+async def user_upsert(
+    executor: AsyncIOExecutor,
+    *,
+    discord_id: str,
+    age_verified: bool,
+    discord_username: str,
+) -> UserUpsertResult:
+    resp = await executor.query_single_json(  # pyright: ignore[reportUnknownMemberType]
+        EDGEQL_QUERY,
+        discord_id=discord_id,
+        age_verified=age_verified,
+        discord_username=discord_username,
+    )
+    return adapter.validate_json(resp, strict=False)

nanapi/database/waicolle/player_get_by_user.edgeql

@@ -8,5 +8,6 @@ select player {
   *,
   user: {
     discord_id,
+    age_verified,
   },
 }

nanapi/database/waicolle/player_get_by_user.py

@@ -18,6 +18,7 @@
   *,
   user: {
     discord_id,
+    age_verified,
   },
 }
 """
@@ -30,6 +31,7 @@ class WaicolleGameMode(StrEnum):
 
 
 class PlayerGetByUserResultUser(BaseModel):
+    age_verified: bool
     discord_id: str
 
 

nanapi/models/user.py

@@ -10,6 +10,12 @@ class UpsertDiscordAccountBodyItem(BaseModel):
     discord_username: str
 
 
+class UpsertUser(BaseModel):
+    discord_id: str
+    discord_username: str
+    age_verified: bool
+
+
 class ProfileSearchResult(ProfileGetByDiscordIdResult):
     pass
 

nanapi/routers/user.py

@@ -6,7 +6,13 @@
 from nanapi.database.user.profile_select_ilike import profile_select_ilike
 from nanapi.database.user.user_bulk_merge import UserBulkMergeResult, user_bulk_merge
 from nanapi.database.user.user_select import UserSelectResult, user_select
-from nanapi.models.user import ProfileSearchResult, UpsertDiscordAccountBodyItem, UpsertProfileBody
+from nanapi.database.user.user_upsert import UserUpsertResult, user_upsert
+from nanapi.models.user import (
+    ProfileSearchResult,
+    UpsertDiscordAccountBodyItem,
+    UpsertProfileBody,
+    UpsertUser,
+)
 from nanapi.utils.clients import get_edgedb
 from nanapi.utils.fastapi import HTTPExceptionModel, NanAPIRouter
 
@@ -25,6 +31,17 @@ async def upsert_discord_accounts(body: list[UpsertDiscordAccountBodyItem]):
     return await user_bulk_merge(get_edgedb(), users=[i.model_dump() for i in body])
 
 
+@router.oauth2.patch('/account', response_model=UserUpsertResult)
+async def upsert_user(body: UpsertUser):
+    """upsert an user."""
+    return await user_upsert(
+        get_edgedb(),
+        discord_id=body.discord_id,
+        discord_username=body.discord_username,
+        age_verified=body.age_verified,
+    )
+
+
 @router.oauth2.get('/profiles/search', response_model=list[ProfileSearchResult])
 async def profile_search(discord_ids: str | None = None, pattern: str | None = None):
     """Search user profiles by Discord IDs or pattern."""

nanapi/routers/waicolle.py

@@ -291,6 +291,7 @@ async def donate_player_coins(
         status.HTTP_400_BAD_REQUEST: dict(model=HTTPExceptionModel),
         status.HTTP_404_NOT_FOUND: dict(model=HTTPExceptionModel),
         status.HTTP_409_CONFLICT: dict(model=HTTPExceptionModel),
+        status.HTTP_418_IM_A_TEAPOT: dict(model=HTTPExceptionModel),
     },
 )
 async def player_roll(
@@ -317,9 +318,16 @@ async def player_roll(
                 raise HTTPException(
                     status_code=status.HTTP_404_NOT_FOUND, detail='Player Not Found'
                 )
+
             if player.frozen_at is not None:
                 return Response(status_code=status.HTTP_204_NO_CONTENT)
 
+            if player.user.age_verified:
+                raise HTTPException(
+                    status_code=status.HTTP_418_IM_A_TEAPOT,
+                    detail='Player is underage, no gambling allowed.',
+                )
+
             # Get Roll
             if roll_id is not None:
                 roll_getter = ROLLS.get(roll_id, None)