fix: basedpyright + rank annotation

highscore/scores/api/schemas.py

@@ -10,15 +10,15 @@ class ScoreIn(Schema, BaseSchema):
 
 
 class ScoreOut(Schema, BaseSchema):
-    id: int
     username: str
     points: int
     version: str | None
     created_at: str
+    rank: int
 
     @staticmethod
     def resolve_version(obj: Score) -> str | None:
-        return obj.version.name if obj.version_id else None
+        return obj.version.name if obj.version is not None else None
 
     @staticmethod
     def resolve_created_at(obj: Score) -> str:

highscore/scores/api/views.py

@@ -1,5 +1,8 @@
 from typing import Annotated
 
+from django.db.models import F, QuerySet
+from django.db.models.expressions import Window
+from django.db.models.functions import Rank
 from django.http import HttpRequest
 from ninja import Header
 from ninja.pagination import PageNumberPagination, paginate
@@ -11,14 +14,15 @@ from .schemas import ScoreIn, ScoreOut
 
 router = CamelCaseRouter()
 
+GameVersionHeader = Annotated[str | None, Header(alias="X-Game-Version")]  # pyright: ignore[reportCallIssue]
 
-def _resolve_version(name: str | None) -> Version:
+
+def resolve_version(name: str | None) -> Version:
     if name:
         version, _ = Version.objects.get_or_create(name=name)
         return version
-    version = Version.objects.order_by("-created_at").first()
-    if version is None:
-        version = Version.objects.create(name="default")
+
+    version, _ = Version.objects.get_or_create(name="default")
     return version
 
 
@@ -26,9 +30,9 @@ def _resolve_version(name: str | None) -> Version:
 def submit_score(
     request: HttpRequest,
     payload: ScoreIn,
-    x_game_version: Annotated[str | None, Header(alias="X-Game-Version")] = None,
+    x_game_version: GameVersionHeader = None,
 ) -> Score:
-    version = _resolve_version(x_game_version)
+    version = resolve_version(x_game_version)
     return Score.objects.create(username=payload.username, points=payload.points, version=version)
 
 
@@ -36,7 +40,16 @@ def submit_score(
 @paginate(PageNumberPagination, page_size=20)
 def list_scores(
     request: HttpRequest,
-    x_game_version: Annotated[str | None, Header(alias="X-Game-Version")] = None,
-) -> list[Score]:
-    version = _resolve_version(x_game_version)
-    return Score.objects.filter(version=version).select_related("version")
+    x_game_version: GameVersionHeader = None,
+) -> QuerySet[Score]:
+    version = resolve_version(x_game_version)
+    return (
+        Score.objects.filter(version=version)
+        .select_related("version")
+        .annotate(
+            rank=Window(
+                expression=Rank(),
+                order_by=F("points").desc(),
+            )
+        )
+    )