fully switched to beanie

Author: peterrauscher

src/api/__about__.py

@@ -1 +1 @@
-__version__ = "1.0.2"
+__version__ = "1.0.3"

src/api/data/models.py

@@ -1,5 +1,15 @@
 from enum import Enum
 
+from beanie import Document
+
+
+class Token(Document):
+    type: str
+    token: str
+
+    class Settings:
+        collection = "OAuth"
+
 
 class SortKey(str, Enum):
     BRAND = "brand"

src/api/data/queries.py

@@ -6,20 +6,20 @@
     load_dotenv(os.path.join(os.getcwd(), ".env"))
 
 from beanie import init_beanie
+from core.models.shoes import Sneaker
 from fastapi import FastAPI
 from mangum import Mangum
 from starlette.middleware.sessions import SessionMiddleware
 
 from api.data.instance import DATABASE_NAME, client
 from api.routes import auth, sneakers
-from core.models.shoes import Sneaker
 
 app = FastAPI(
     redoc_url=None,
     responses={404: {"description": "Not found"}},
 )
 
-app.add_middleware(SessionMiddleware, secret_key="some secret key here")
+app.add_middleware(SessionMiddleware, secret_key="vT!y!r5s#bwcDxDG")
 
 
 @app.on_event("startup")

src/api/main.py

@@ -6,7 +6,7 @@
 from fastapi import APIRouter, HTTPException, Request
 from fastapi.responses import RedirectResponse
 
-from api.data.queries import update_tokens
+from api.data.models import Token
 
 STOCKX_CLIENT_ID = os.environ.get("SOLESEARCH_STOCKX_CLIENT_ID", None)
 STOCKX_CLIENT_SECRET = os.environ.get("SOLESEARCH_STOCKX_CLIENT_SECRET", None)
@@ -62,7 +62,12 @@ async def stockx_oauth_callback(state: str, code: str, request: Request):
                 headers=headers,
             )
         ).json()
-        await update_tokens(tokens)
+        for token_type in ["id_token", "access_token", "refresh_token"]:
+            if token_type in tokens:
+                await Token.find_one(Token.type == token_type).set(
+                    {"$set": {"token": tokens[token_type]}}
+                )
+                logging.info(f"Updated {token_type}")
         return tokens
     except Exception as e:
         logging.error(e)

src/api/routes/auth.py

@@ -1,12 +1,12 @@
+from datetime import UTC, datetime
 from typing import Annotated
 
+from core.models.details import Audience
+from core.models.shoes import Sneaker
 from fastapi import APIRouter, HTTPException, Query
 
 from api.data.instance import DEFAULT_LIMIT, DEFAULT_OFFSET
 from api.data.models import SortKey, SortOrder
-from api.data.queries import find_sneakers
-from core.models.details import Audience
-from core.models.shoes import Sneaker
 
 router = APIRouter(
     prefix="/sneakers",
@@ -16,30 +16,49 @@
 @router.get("/")
 async def get_sneakers(
     brand: str | None = None,
-    sku: str | None = None,
     name: str | None = None,
-    colorway: str | None = None,
     audience: Audience | None = None,
     releaseDate: str | None = None,
     released: bool | None = None,
     sort: SortKey = SortKey.RELEASE_DATE,
-    sortOrder: SortOrder = SortOrder.DESCENDING,
+    order: SortOrder = SortOrder.DESCENDING,
     offset: Annotated[int, Query(gte=DEFAULT_OFFSET)] = DEFAULT_OFFSET,
     limit: Annotated[int, Query(gte=1, lte=100)] = DEFAULT_LIMIT,
 ):
-    return await find_sneakers(
-        brand=brand,
-        sku=sku,
-        name=name,
-        colorway=colorway,
-        audience=audience,
-        release_date=releaseDate,
-        released=released,
-        sort_by=sort,
-        sort_order=sortOrder,
-        offset=offset,
-        limit=limit,
+    query = Sneaker.find()
+    if brand:
+        query = query.find(Sneaker.brand == brand)
+    if name:
+        query = query.find(Sneaker.name == name)
+    if audience:
+        query = query.find(Sneaker.audience == audience)
+    if released is not None:
+        now = datetime.now(UTC)
+        if released:
+            query = query.find(Sneaker.releaseDate <= now)
+        else:
+            query = query.find(Sneaker.releaseDate > now)
+    elif releaseDate:
+        if ":" in releaseDate:
+            inequality_operator, date_str = releaseDate.split(":")
+            date_obj = datetime.strptime(date_str, "%Y-%m-%d")
+            if inequality_operator == "lt":
+                query = query.find(Sneaker.releaseDate < date_obj)
+            elif inequality_operator == "lte":
+                query = query.find(Sneaker.releaseDate <= date_obj)
+            elif inequality_operator == "gt":
+                query = query.find(Sneaker.releaseDate > date_obj)
+            elif inequality_operator == "gte":
+                query = query.find(Sneaker.releaseDate >= date_obj)
+        else:
+            date_obj = datetime.strptime(releaseDate, "%Y-%m-%d")
+            query = query.find(Sneaker.releaseDate == date_obj)
+
+    order = "+" if order == SortOrder.ASCENDING else "-"
+    sneakers_list = (
+        await query.sort(f"{order}{sort.value}").skip(offset).limit(limit).to_list()
     )
+    return sneakers_list
 
 
 @router.get("/{product_id}")