Address code review: extract helpers, fix template nesting, format

Co-authored-by: madebygps <6733686+madebygps@users.noreply.github.com>

Author: Copilot

app/main.py

@@ -2,13 +2,14 @@
 
 import uuid
 from pathlib import Path
+from typing import Any
 
 from fastapi import FastAPI, Request, Response
 from fastapi.responses import HTMLResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 
-from app.game_service import get_session
+from app.game_service import GameSession, get_session
 from app.models import GameState
 
 BASE_DIR = Path(__file__).resolve().parent
@@ -21,103 +22,80 @@
 SESSION_COOKIE = "soc_ops_session"
 
 
-def _get_session_id(request: Request, response: Response) -> str:
-    """Get or create a session ID from cookies."""
+def _session_from_request(
+    request: Request,
+) -> tuple[GameSession, Response]:
+    """Get or create session, returning the session and a Response for cookies."""
+    response = Response()
     session_id = request.cookies.get(SESSION_COOKIE)
     if not session_id:
         session_id = uuid.uuid4().hex
         response.set_cookie(SESSION_COOKIE, session_id, httponly=True, samesite="lax")
-    return session_id
+    return get_session(session_id), response
+
+
+def _render(
+    request: Request,
+    response: Response,
+    template: str,
+    context: dict[str, Any],
+) -> Response:
+    """Render a template, copying any set-cookie headers from response."""
+    content = templates.TemplateResponse(request, template, context)
+    for key, value in response.headers.items():
+        if key.lower() == "set-cookie":
+            content.headers.append(key, value)
+    return content
 
 
 @app.get("/", response_class=HTMLResponse)
 async def home(request: Request) -> Response:
-    response = Response()
-    session_id = _get_session_id(request, response)
-    session = get_session(session_id)
-
-    content = templates.TemplateResponse(
+    session, response = _session_from_request(request)
+    return _render(
         request,
+        response,
         "home.html",
         {"session": session, "GameState": GameState},
     )
-    # Copy cookies from our response to the template response
-    for key, morsel in response.headers.items():
-        if key.lower() == "set-cookie":
-            content.headers.append(key, morsel)
-    return content
 
 
 @app.post("/start", response_class=HTMLResponse)
 async def start_game(request: Request) -> Response:
-    response = Response()
-    session_id = _get_session_id(request, response)
-    session = get_session(session_id)
+    session, response = _session_from_request(request)
     session.start_game()
-
-    content = templates.TemplateResponse(
-        request,
-        "components/game_screen.html",
-        {"session": session},
+    return _render(
+        request, response, "components/game_screen.html", {"session": session}
     )
-    for key, morsel in response.headers.items():
-        if key.lower() == "set-cookie":
-            content.headers.append(key, morsel)
-    return content
 
 
 @app.post("/toggle/{square_id}", response_class=HTMLResponse)
 async def toggle_square(request: Request, square_id: int) -> Response:
-    response = Response()
-    session_id = _get_session_id(request, response)
-    session = get_session(session_id)
+    session, response = _session_from_request(request)
     session.handle_square_click(square_id)
-
-    content = templates.TemplateResponse(
-        request,
-        "components/game_screen.html",
-        {"session": session},
+    return _render(
+        request, response, "components/game_screen.html", {"session": session}
     )
-    for key, morsel in response.headers.items():
-        if key.lower() == "set-cookie":
-            content.headers.append(key, morsel)
-    return content
 
 
 @app.post("/reset", response_class=HTMLResponse)
 async def reset_game(request: Request) -> Response:
-    response = Response()
-    session_id = _get_session_id(request, response)
-    session = get_session(session_id)
+    session, response = _session_from_request(request)
     session.reset_game()
-
-    content = templates.TemplateResponse(
+    return _render(
         request,
+        response,
         "components/start_screen.html",
         {"session": session, "GameState": GameState},
     )
-    for key, morsel in response.headers.items():
-        if key.lower() == "set-cookie":
-            content.headers.append(key, morsel)
-    return content
 
 
 @app.post("/dismiss-modal", response_class=HTMLResponse)
 async def dismiss_modal(request: Request) -> Response:
-    response = Response()
-    session_id = _get_session_id(request, response)
-    session = get_session(session_id)
+    session, response = _session_from_request(request)
     session.dismiss_modal()
-
-    content = templates.TemplateResponse(
-        request,
-        "components/game_screen.html",
-        {"session": session},
+    return _render(
+        request, response, "components/game_screen.html", {"session": session}
     )
-    for key, morsel in response.headers.items():
-        if key.lower() == "set-cookie":
-            content.headers.append(key, morsel)
-    return content
 
 
 def run() -> None:

app/templates/home.html

@@ -1,11 +1,9 @@
 {% extends "base.html" %}
 
 {% block content %}
-<div id="game-container">
-    {% if session.game_state == GameState.START %}
-        {% include "components/start_screen.html" %}
-    {% else %}
-        {% include "components/game_screen.html" %}
-    {% endif %}
-</div>
+{% if session.game_state == GameState.START %}
+    {% include "components/start_screen.html" %}
+{% else %}
+    {% include "components/game_screen.html" %}
+{% endif %}
 {% endblock %}