Cleanup openapi.json

Author: jontyms

app/main.py

@@ -7,6 +7,7 @@
 from urllib.parse import urlparse
 
 from fastapi import Cookie, Depends, FastAPI, Request, Response, status
+from fastapi.openapi.utils import get_openapi
 from fastapi.responses import FileResponse, RedirectResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
@@ -75,6 +76,57 @@
 templates = Jinja2Templates(directory="app/templates")
 
 
+def custom_openapi():
+    if app.openapi_schema:
+        return app.openapi_schema
+
+    openapi_schema = get_openapi(
+        title="OnboardLite API",
+        version="1.0.0",
+        description="Hack@UCF's in-house membership management suite",
+        routes=app.routes,
+    )
+
+    # Fix parameter type issues
+    for path, path_item in openapi_schema.get("paths", {}).items():
+        for method, operation in path_item.items():
+            if method in ["get", "post", "put", "delete", "patch"]:
+                # Fix operation IDs to ensure uniqueness
+                if "operationId" in operation:
+                    operation_id = operation["operationId"]
+                    if operation_id.endswith("_post") and method == "get":
+                        operation["operationId"] = operation_id.replace("_post", "_get")
+
+                # Fix parameter schemas
+                if "parameters" in operation:
+                    for param in operation["parameters"]:
+                        if "schema" in param:
+                            schema = param["schema"]
+                            # Fix anyOf nullable patterns
+                            if "anyOf" in schema:
+                                any_of = schema["anyOf"]
+                                if len(any_of) == 2:
+                                    string_type = None
+                                    null_type = None
+                                    for item in any_of:
+                                        if item.get("type") == "string":
+                                            string_type = item
+                                        elif item.get("type") == "null":
+                                            null_type = item
+
+                                    if string_type and null_type:
+                                        # Convert to nullable string
+                                        param["schema"] = {"type": "string", "nullable": True, "title": schema.get("title", "")}
+                                        if not param.get("required", True):
+                                            param["required"] = False
+
+    app.openapi_schema = openapi_schema
+    return app.openapi_schema
+
+
+app.openapi = custom_openapi
+
+
 def global_context(request: Request):
     return {
         "sentry_url": Settings().telemetry.url if Settings().telemetry.enable else None,

app/routes/stripe.py

@@ -56,12 +56,50 @@ async def get_root(
     )
 
 
-@router.api_route("/checkout", methods=["GET", "POST"])
+@router.get("/checkout")
+async def get_checkout_session(
+    request: Request,
+    current_user: CurrentMember,
+    session: Session = Depends(get_session),
+):
+    """Get checkout session information or redirect to existing session."""
+    if Settings().stripe.pause_payments:
+        raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail="Payments are currently paused")
+
+    user_data = session.exec(select(UserModel).where(UserModel.id == uuid.UUID(current_user.get("id")))).one_or_none()
+    if not user_data.email:
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="No email associated with account")
+    user_id = user_data.id
+    try:
+        stripe_email = user_data.email
+        checkout_session = stripe.checkout.Session.create(
+            line_items=[
+                {
+                    # Provide the exact Price ID (for example, pr_1234) of the product you want to sell
+                    "price": Settings().stripe.price_id,
+                    "quantity": 1,
+                },
+            ],
+            customer_email=stripe_email,
+            mode="payment",
+            success_url=Settings().stripe.url_success,
+            cancel_url=Settings().stripe.url_failure,
+            metadata={"user_id": str(user_id)},
+        )
+    except Exception as e:
+        logger.exception("Error creating checkout session in stripe.py", e)
+        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR, detail="Error creating checkout session")
+
+    return RedirectResponse(checkout_session.url, status_code=303)
+
+
+@router.post("/checkout")
 async def create_checkout_session(
     request: Request,
     current_user: CurrentMember,
     session: Session = Depends(get_session),
 ):
+    """Create a new Stripe checkout session."""
     if Settings().stripe.pause_payments:
         raise HTTPException(status_code=status.HTTP_503_SERVICE_UNAVAILABLE, detail="Payments are currently paused")