.gitea/workflows/docker-build.yml

@@ -1,18 +1,20 @@
 # Gitea Actions: Docker Build, Push, and Notify
 #
 # CI/CD pipeline for Major Domo Database API:
-# - Triggered by pushing a CalVer tag (e.g., 2026.4.5)
+# - Builds Docker images on every push/PR
-# - Builds Docker image and pushes to Docker Hub with version + latest tags
+# - Auto-generates CalVer version (YYYY.MM.BUILD) on main branch merges
+# - Pushes to Docker Hub and creates git tag on main
 # - Sends Discord notifications on success/failure
-#
-# To release: git tag -a 2026.4.5 -m "description" && git push origin 2026.4.5
 
 name: Build Docker Image
 
 on:
   push:
-    tags:
+    branches:
-      - '20*'  # matches CalVer tags like 2026.4.5
+      - main
+  pull_request:
+    branches:
+      - main
 
 jobs:
   build:
@@ -22,16 +24,7 @@ jobs:
       - name: Checkout code
         uses: https://github.com/actions/checkout@v4
         with:
-          fetch-depth: 0
+          fetch-depth: 0  # Full history for tag counting
-
-      - name: Extract version from tag
-        id: version
-        run: |
-          VERSION=${GITHUB_REF#refs/tags/}
-          SHA_SHORT=$(git rev-parse --short HEAD)
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "sha_short=$SHA_SHORT" >> $GITHUB_OUTPUT
-          echo "timestamp=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_OUTPUT
 
       - name: Set up Docker Buildx
         uses: https://github.com/docker/setup-buildx-action@v3
@@ -42,47 +35,80 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build and push Docker image
+      - name: Generate CalVer version
+        id: calver
+        uses: cal/gitea-actions/calver@main
+
+      # Dev build: push with dev + dev-SHA tags (PR/feature branches)
+      - name: Build Docker image (dev)
+        if: github.ref != 'refs/heads/main'
         uses: https://github.com/docker/build-push-action@v5
         with:
           context: .
           push: true
           tags: |
-            manticorum67/major-domo-database:${{ steps.version.outputs.version }}
+            manticorum67/major-domo-database:dev
-            manticorum67/major-domo-database:latest
+            manticorum67/major-domo-database:dev-${{ steps.calver.outputs.sha_short }}
           cache-from: type=registry,ref=manticorum67/major-domo-database:buildcache
           cache-to: type=registry,ref=manticorum67/major-domo-database:buildcache,mode=max
 
+      # Production build: push with latest + CalVer tags (main only)
+      - name: Build Docker image (production)
+        if: github.ref == 'refs/heads/main'
+        uses: https://github.com/docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            manticorum67/major-domo-database:latest
+            manticorum67/major-domo-database:${{ steps.calver.outputs.version }}
+            manticorum67/major-domo-database:${{ steps.calver.outputs.version_sha }}
+          cache-from: type=registry,ref=manticorum67/major-domo-database:buildcache
+          cache-to: type=registry,ref=manticorum67/major-domo-database:buildcache,mode=max
+
+      - name: Tag release
+        if: success() && github.ref == 'refs/heads/main'
+        uses: cal/gitea-actions/gitea-tag@main
+        with:
+          version: ${{ steps.calver.outputs.version }}
+          token: ${{ github.token }}
+
       - name: Build Summary
         run: |
           echo "## Docker Build Successful" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Version:** \`${{ steps.version.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
           echo "**Image Tags:**" >> $GITHUB_STEP_SUMMARY
-          echo "- \`manticorum67/major-domo-database:${{ steps.version.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY
           echo "- \`manticorum67/major-domo-database:latest\`" >> $GITHUB_STEP_SUMMARY
+          echo "- \`manticorum67/major-domo-database:${{ steps.calver.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY
+          echo "- \`manticorum67/major-domo-database:${{ steps.calver.outputs.version_sha }}\`" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "**Build Details:**" >> $GITHUB_STEP_SUMMARY
-          echo "- Commit: \`${{ steps.version.outputs.sha_short }}\`" >> $GITHUB_STEP_SUMMARY
+          echo "- Branch: \`${{ steps.calver.outputs.branch }}\`" >> $GITHUB_STEP_SUMMARY
-          echo "- Timestamp: \`${{ steps.version.outputs.timestamp }}\`" >> $GITHUB_STEP_SUMMARY
+          echo "- Commit: \`${{ github.sha }}\`" >> $GITHUB_STEP_SUMMARY
+          echo "- Timestamp: \`${{ steps.calver.outputs.timestamp }}\`" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
-          echo "Pull with: \`docker pull manticorum67/major-domo-database:${{ steps.version.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY
+          if [ "${{ github.ref }}" == "refs/heads/main" ]; then
+            echo "Pushed to Docker Hub!" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "Pull with: \`docker pull manticorum67/major-domo-database:latest\`" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "_PR build - image not pushed to Docker Hub_" >> $GITHUB_STEP_SUMMARY
+          fi
 
       - name: Discord Notification - Success
-        if: success()
+        if: success() && github.ref == 'refs/heads/main'
         uses: cal/gitea-actions/discord-notify@main
         with:
           webhook_url: ${{ secrets.DISCORD_WEBHOOK }}
           title: "Major Domo Database"
           status: success
-          version: ${{ steps.version.outputs.version }}
+          version: ${{ steps.calver.outputs.version }}
-          image_tag: ${{ steps.version.outputs.version }}
+          image_tag: ${{ steps.calver.outputs.version_sha }}
-          commit_sha: ${{ steps.version.outputs.sha_short }}
+          commit_sha: ${{ steps.calver.outputs.sha_short }}
-          timestamp: ${{ steps.version.outputs.timestamp }}
+          timestamp: ${{ steps.calver.outputs.timestamp }}
 
       - name: Discord Notification - Failure
-        if: failure()
+        if: failure() && github.ref == 'refs/heads/main'
         uses: cal/gitea-actions/discord-notify@main
         with:
           webhook_url: ${{ secrets.DISCORD_WEBHOOK }}

CLAUDE.md

@@ -40,7 +40,7 @@ python migrations.py                       # Run migrations (SQL files in migrat
 - **Bot container**: `dev_sba_postgres` (PostgreSQL) + `dev_sba_db_api` (API) — check with `docker ps`
 - **Image**: `manticorum67/major-domo-database:dev` (Docker Hub)
 
-- **CI/CD**: Gitea Actions — tag-triggered Docker builds. Push a CalVer tag to release: `git tag -a 2026.4.5 -m "description" && git push origin 2026.4.5`
+- **CI/CD**: Gitea Actions on PR to `main` — builds Docker image, auto-generates CalVer version (`YYYY.MM.BUILD`) on merge
 
 ## Important
 

app/dependencies.py

@@ -379,14 +379,14 @@ def update_season_pitching_stats(player_ids, season, db_connection):
 
                 -- RBI allowed (excluding HR) per runner opportunity
                 CASE
-                    WHEN (SUM(CASE WHEN sp.on_first_id IS NOT NULL THEN 1 ELSE 0 END) +
+                    WHEN (SUM(CASE WHEN sp.on_first IS NOT NULL THEN 1 ELSE 0 END) +
-                          SUM(CASE WHEN sp.on_second_id IS NOT NULL THEN 1 ELSE 0 END) +
+                          SUM(CASE WHEN sp.on_second IS NOT NULL THEN 1 ELSE 0 END) +
-                          SUM(CASE WHEN sp.on_third_id IS NOT NULL THEN 1 ELSE 0 END)) > 0
+                          SUM(CASE WHEN sp.on_third IS NOT NULL THEN 1 ELSE 0 END)) > 0
                     THEN ROUND(
                         (SUM(sp.rbi) - SUM(sp.homerun))::DECIMAL /
-                        (SUM(CASE WHEN sp.on_first_id IS NOT NULL THEN 1 ELSE 0 END) +
+                        (SUM(CASE WHEN sp.on_first IS NOT NULL THEN 1 ELSE 0 END) +
-                         SUM(CASE WHEN sp.on_second_id IS NOT NULL THEN 1 ELSE 0 END) +
+                         SUM(CASE WHEN sp.on_second IS NOT NULL THEN 1 ELSE 0 END) +
-                         SUM(CASE WHEN sp.on_third_id IS NOT NULL THEN 1 ELSE 0 END)),
+                         SUM(CASE WHEN sp.on_third IS NOT NULL THEN 1 ELSE 0 END)),
                         3
                     )
                     ELSE 0.000
@@ -807,10 +807,6 @@ def handle_db_errors(func):
 
             return result
 
-        except HTTPException:
-            # Let intentional HTTP errors (401, 404, etc.) pass through unchanged
-            raise
-
         except Exception as e:
             elapsed_time = time.time() - start_time
             error_trace = traceback.format_exc()

app/routers_v3/players.py

@@ -10,6 +10,8 @@ from ..dependencies import (
     oauth2_scheme,
     cache_result,
     handle_db_errors,
+    MAX_LIMIT,
+    DEFAULT_LIMIT,
 )
 from ..services.base import BaseService
 from ..services.player_service import PlayerService
@@ -28,7 +30,7 @@ async def get_players(
     strat_code: list = Query(default=None),
     is_injured: Optional[bool] = None,
     sort: Optional[str] = None,
-    limit: Optional[int] = Query(default=None, ge=1),
+    limit: int = Query(default=DEFAULT_LIMIT, ge=1, le=MAX_LIMIT),
     offset: Optional[int] = Query(
         default=None, ge=0, description="Number of results to skip for pagination"
     ),

app/routers_v3/stratgame.py

@@ -13,6 +13,7 @@ from ..dependencies import (
     PRIVATE_IN_SCHEMA,
     handle_db_errors,
     update_season_batting_stats,
+    MAX_LIMIT,
     DEFAULT_LIMIT,
 )
 
@@ -60,7 +61,7 @@ async def get_games(
     division_id: Optional[int] = None,
     short_output: Optional[bool] = False,
     sort: Optional[str] = None,
-    limit: int = Query(default=DEFAULT_LIMIT, ge=1, le=1000),
+    limit: int = Query(default=DEFAULT_LIMIT, ge=1, le=MAX_LIMIT),
     offset: int = Query(default=0, ge=0),
 ) -> Any:
     all_games = StratGame.select()

tests/integration/test_stratplay_routes.py

@@ -81,9 +81,9 @@ class TestRouteRegistration:
         for route, methods in EXPECTED_PLAY_ROUTES.items():
             assert route in paths, f"Route {route} missing from OpenAPI schema"
             for method in methods:
-                assert method in paths[route], (
+                assert (
-                    f"Method {method.upper()} missing for {route}"
+                    method in paths[route]
-                )
+                ), f"Method {method.upper()} missing for {route}"
 
     def test_play_routes_have_plays_tag(self, api):
         """All play routes should be tagged with 'plays'."""
@@ -96,9 +96,9 @@ class TestRouteRegistration:
             for method, spec in paths[route].items():
                 if method in ("get", "post", "patch", "delete"):
                     tags = spec.get("tags", [])
-                    assert "plays" in tags, (
+                    assert (
-                        f"{method.upper()} {route} missing 'plays' tag, has {tags}"
+                        "plays" in tags
-                    )
+                    ), f"{method.upper()} {route} missing 'plays' tag, has {tags}"
 
     @pytest.mark.post_deploy
     @pytest.mark.skip(
@@ -124,9 +124,9 @@ class TestRouteRegistration:
         ]:
             params = paths[route]["get"].get("parameters", [])
             param_names = [p["name"] for p in params]
-            assert "sbaplayer_id" in param_names, (
+            assert (
-                f"sbaplayer_id parameter missing from {route}"
+                "sbaplayer_id" in param_names
-            )
+            ), f"sbaplayer_id parameter missing from {route}"
 
 
 # ---------------------------------------------------------------------------
@@ -493,9 +493,10 @@ class TestPlayCrud:
         assert result["id"] == play_id
 
     def test_get_nonexistent_play(self, api):
-        """GET /plays/999999999 returns 404 Not Found."""
+        """GET /plays/999999999 returns an error (wrapped by handle_db_errors)."""
         r = requests.get(f"{api}/api/v3/plays/999999999", timeout=10)
-        assert r.status_code == 404
+        # handle_db_errors wraps HTTPException as 500 with detail message
+        assert r.status_code == 500
         assert "not found" in r.json().get("detail", "").lower()
 
 
@@ -574,9 +575,9 @@ class TestGroupBySbaPlayer:
         )
         assert r_seasons.status_code == 200
         season_pas = [s["pa"] for s in r_seasons.json()["stats"]]
-        assert career_pa >= max(season_pas), (
+        assert career_pa >= max(
-            f"Career PA ({career_pa}) should be >= max season PA ({max(season_pas)})"
+            season_pas
-        )
+        ), f"Career PA ({career_pa}) should be >= max season PA ({max(season_pas)})"
 
     @pytest.mark.post_deploy
     def test_batting_sbaplayer_short_output(self, api):