I dont remember what I was coding

ss220club · Feb 7, 2025 · 91232dc · 91232dc
1 parent 75efc80
commit 91232dc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/app/init.py b/app/init.py
@@ -4,6 +4,5 @@
 def init() -> None:
     init_db()
 
-
 if __name__ == "__main__":
     init()
diff --git a/app/routes/v1/donate.py b/app/routes/v1/donate.py
@@ -1,3 +1,4 @@
+import datetime
 import logging
 from fastapi import APIRouter, Depends, HTTPException, Request, status
 from sqlmodel import select
@@ -15,28 +16,28 @@
 
 router = APIRouter(prefix="/donate", tags=["Donate"])
 
-def filter_donations(selection: SelectOfScalar[Donation], ckey: str | None = None, discord_id: str | None = None, valid_only: bool = True) -> SelectOfScalar[Donation]:
+def filter_donations(selection: SelectOfScalar[Donation], ckey: str | None = None, discord_id: str | None = None, active_only: bool = True) -> SelectOfScalar[Donation]:
     if ckey:
         selection = selection.where(Player.ckey == ckey)
     if discord_id:
         selection = selection.where(Player.discord_id == discord_id)
-    if valid_only:
-        selection = selection.where(Donation.valid)
+    if active_only:
+        selection = selection.where(Donation.valid).where(Donation.expiration_time > datetime.datetime.now())
     return selection
 
 
-@router.get("", status_code=status.HTTP_200_OK)
+@router.get("s", status_code=status.HTTP_200_OK)
 async def get_donations(session: SessionDep,
                         request: Request,
                         ckey: str | None = None,
                         discord_id: str | None = None,
-                        valid_only: bool = True,
+                        active_only: bool = True,
                         page: int = 1,
                         page_size: int = 50) -> PaginatedResponse[Donation]:
     selection = select(Donation).join(
         Player, Player.id == Donation.player_id)
 
-    selection = filter_donations(selection, ckey, discord_id, valid_only)
+    selection = filter_donations(selection, ckey, discord_id, active_only)
 
     return paginate_selection(session, selection, request, page, page_size)
 
@@ -56,9 +57,9 @@ async def create_donation(session: SessionDep, donation: Donation) -> Donation:
 }
 
 @router.post("/by-discord", status_code=status.HTTP_201_CREATED, dependencies=[Depends(verify_bearer)], responses=WHITELIST_POST_RESPONSES)
-async def create_donation_by_discord(session: SessionDep, donation: NewDonationDiscord) -> Donation:
+async def create_donation_by_discord(session: SessionDep, new_donation: NewDonationDiscord) -> Donation:
     player = session.exec(
-        select(Player).where(Player.discord_id == donation.discord_id)
+        select(Player).where(Player.discord_id == new_donation.discord_id)
     ).first()
 
     if player is None:
@@ -67,7 +68,7 @@ async def create_donation_by_discord(session: SessionDep, donation: NewDonationD
 
     donation = Donation(
         player_id=player.id,
-        tier=donation.tier
+        tier=new_donation.tier
         )
 
     return await create_donation(session, donation)