Harden CI and close tooling gaps from code review

.github/workflows/branch-name-check.yml

@@ -17,11 +17,11 @@ jobs:
           result-encoding: string
           script: |
             const enforceSemantic = (branchName) => {
-              const semanticFormat = /(feat\W|feature\/|fix\/|chore\/|refactor\/|dependabot\/|docs\/|style\/|test\/)/
-              if (!semanticFormat.test(currentBranch)) {
+              const semanticFormat = /^(feat|feature|fix|chore|refactor|dependabot|docs|style|test|ci)\//
+              if (!semanticFormat.test(branchName)) {
                 core.setFailed(
-                  `Branch names in PRs should use semantic conventions, e.g. (feat, fix, chore, refactor).  To fix. ` +
-                  `perform: git branch -m <new_branch_name> && git push origin -u <:<old_branch_name> <new_branch_name>` +
+                  `Branch names in PRs should use semantic conventions, e.g. (feat, fix, chore, refactor, ci). ` +
+                  `To fix, run: git branch -m <old_branch_name> <new_branch_name> && git push origin -u <new_branch_name>. ` +
                   `For more details, please review https://www.conventionalcommits.org/ and https://gist.github.com/joshbuchea/6f47e86d2510bce28f8e7f42ae84c716`)
               }
             }

.github/workflows/dependabot-auto-merge.yml

@@ -20,8 +20,7 @@ jobs:
       - name: Auto-merge patch and minor updates
         if: >
           steps.metadata.outputs.update-type == 'version-update:semver-patch' ||
-          steps.metadata.outputs.update-type == 'version-update:semver-minor' ||
-          steps.metadata.outputs.update-type == 'version-update:semver-major'
+          steps.metadata.outputs.update-type == 'version-update:semver-minor'
         run: gh pr merge --auto --squash "$PR_URL"
         env:
           PR_URL: ${{ github.event.pull_request.html_url }}

.github/workflows/pr-validate.yml

@@ -35,6 +35,10 @@ jobs:
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         flake8 . --count --show-source --exit-zero --max-complexity=10 \
           --max-line-length=96 --statistics --per-file-ignore='specs/**/*:E9,F63,F7,F82'
+    - name: Type check with mypy
+      run: |
+        cd backend && find "$(pwd)/src" -type f -name "*.py" ! -name "*test_*" \
+          -exec python -m mypy {} +
     - name: Run pytest tests
       run: |
         chmod +x ./backend/scripts/test-coverage.sh

.husky/pre-commit

@@ -7,4 +7,4 @@ npm run lint:backend
 npm run format:frontend
 npm run lint:frontend
 
-git add .
+git update-index --again

backend/mypy.ini

@@ -0,0 +1,7 @@
+[mypy]
+
+[mypy-jose.*]
+ignore_missing_imports = True
+
+[mypy-asyncpg.*]
+ignore_missing_imports = True

backend/scripts/lint.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 set -e
 flake8 src/ specs/
-find "$(pwd)/src" -type f -name "\"*.py\"" ! -name "\"*test_*\"" \
+find "$(pwd)/src" -type f -name "*.py" ! -name "*test_*" \
     -exec python -m mypy {} +

backend/src/api/resolvers/data.py

@@ -104,7 +104,7 @@ async def fetch_available_rooms(db, checkin_date, checkout_date) -> Dict[str, An
     return {"success": True, "rooms": available_rooms}
 
 
-async def fetch_room(db, room_id: str) -> Room:
+async def fetch_room(db, room_id: str) -> Dict[str, Any]:
     result = await fetch_by_id(db, Room, id=room_id)
     if result["success"]:
         return result

backend/src/api/resolvers/mutations.py

@@ -25,9 +25,9 @@ async def create_reservation_resolver(obj, info, input: dict) -> Dict[str, Any]:
         utils.log_api_message(__name__, str(error))
         return {"success": False, "errors": [str(error)]}
     except Exception as e:
-        error = f"Unexpected error: {str(e)}"
-        utils.log_api_message(__name__, f"Unexpected error: {error}")
-        return {"success": False, "errors": [error]}
+        message = f"Unexpected error: {str(e)}"
+        utils.log_api_message(__name__, message)
+        return {"success": False, "errors": [message]}
     finally:
         await db.close()
 
@@ -41,8 +41,8 @@ async def delete_reservation_resolver(obj, info, reservationId: int) -> Dict[str
         utils.log_api_message(__name__, str(error))
         return {"success": False, "errors": [str(error)]}
     except Exception as e:
-        error = f"Unexpected error: {str(e)}"
-        utils.log_api_message(__name__, f"Unexpected error: {error}")
-        return {"success": False, "errors": [error]}
+        message = f"Unexpected error: {str(e)}"
+        utils.log_api_message(__name__, message)
+        return {"success": False, "errors": [message]}
     finally:
         await db.close()

backend/src/api/resolvers/queries.py

@@ -19,9 +19,9 @@ async def get_reservation_resolver(obj, info, id) -> Dict[str, Any]:
             "errors": [message],
         }
     except Exception as e:
-        error = f"Unexpected error: {str(e)}"
-        utils.log_api_message(__name__, f"Unexpected error: {error}")
-        return {"success": False, "errors": [error]}
+        message = f"Unexpected error: {str(e)}"
+        utils.log_api_message(__name__, message)
+        return {"success": False, "errors": [message]}
     finally:
         await db.close()
 
@@ -34,9 +34,9 @@ async def get_all_reservations_resolver(obj, info) -> Dict[str, Any]:
         utils.log_api_message(__name__, str(error))
         return {"success": False, "errors": [str(error)]}
     except Exception as e:
-        error = f"Unexpected error: {str(e)}"
-        utils.log_api_message(__name__, f"Unexpected error: {error}")
-        return {"success": False, "errors": [error]}
+        message = f"Unexpected error: {str(e)}"
+        utils.log_api_message(__name__, message)
+        return {"success": False, "errors": [message]}
     finally:
         await db.close()
 
@@ -49,9 +49,9 @@ async def get_all_rooms_resolver(obj, info) -> Dict[str, Any]:
         utils.log_api_message(__name__, str(error))
         return {"success": False, "errors": [str(error)]}
     except Exception as e:
-        error = f"Unexpected error: {str(e)}"
-        utils.log_api_message(__name__, f"Unexpected error: {error}")
-        return {"success": False, "errors": [error]}
+        message = f"Unexpected error: {str(e)}"
+        utils.log_api_message(__name__, message)
+        return {"success": False, "errors": [message]}
     finally:
         await db.close()
 
@@ -71,8 +71,8 @@ async def get_available_rooms_resolver(obj, info, input: dict) -> Dict[str, Any]
         utils.log_api_message(__name__, str(error))
         return {"success": False, "errors": [str(error)]}
     except Exception as e:
-        error = f"Unexpected error: {str(e)}"
-        utils.log_api_message(__name__, f"Unexpected error: {error}")
-        return {"success": False, "errors": [error]}
+        message = f"Unexpected error: {str(e)}"
+        utils.log_api_message(__name__, message)
+        return {"success": False, "errors": [message]}
     finally:
         await db.close()

backend/src/requirements_docker.txt

@@ -5,6 +5,7 @@ fastapi==0.139.0
 flake8==7.3.0
 httpx==0.28.1
 isort==8.0.1
+mypy==1.14.1
 psycopg2-binary==2.9.12
 pydantic==2.13.4
 pytest==9.1.1

backend/src/routes/about.py

@@ -1,3 +1,5 @@
+from typing import Any, Dict
+
 from fastapi import APIRouter
 
 import api.utils as utils
@@ -18,7 +20,7 @@ async def about_handler() -> ApiData:
                 desc = """This is a GraphQL API that allows you to create and
                 list reservations as well as the ability to list available rooms
                 for a given date range."""
-                data = {"name": f"{API_NAME}", "description": desc}
+                data: Dict[str, Any] = {"name": f"{API_NAME}", "description": desc}
                 response = ApiData(data=data, status=utils.StatusCode.OK)
             except Exception as error:
                 messages = str(error)

backend/src/routes/graphql.py

@@ -51,8 +51,8 @@ def _setup_routes(self):
         async def graphql_handler(request: Request) -> ApiData:
             try:
                 result = await graphql_app.handle_request(request)
-                result = result.body.decode()
-                inner_data = json.loads(result).get("data", {})
+                body = bytes(result.body).decode()
+                inner_data = json.loads(body).get("data", {})
                 response = ApiData(data=inner_data, status=utils.StatusCode.OK)
             except Exception as error:
                 messages = str(error)

frontend/eslint.config.mjs

@@ -0,0 +1,39 @@
+import js from '@eslint/js';
+import react from 'eslint-plugin-react';
+import comments from 'eslint-plugin-eslint-comments';
+import globals from 'globals';
+
+export default [
+  {
+    ignores: ['node_modules/**', 'public/**', 'build/**', 'dist/**', 'specs/**'],
+  },
+  js.configs.recommended,
+  react.configs.flat['jsx-runtime'],
+  {
+    files: ['src/**/*.{js,jsx}'],
+    plugins: {
+      'eslint-comments': comments,
+    },
+    languageOptions: {
+      ecmaVersion: 'latest',
+      sourceType: 'module',
+      globals: {
+        ...globals.browser,
+      },
+    },
+    settings: {
+      react: { version: '18.2' },
+    },
+    rules: {
+      ...comments.configs.recommended.rules,
+      'react/jsx-uses-react': 'error',
+      'react/jsx-uses-vars': 'error',
+      'react/jsx-no-target-blank': 'off',
+      'no-unused-vars': ['warn', { argsIgnorePattern: '_' }],
+      'no-empty-function': ['error', { allow: ['methods', 'arrowFunctions'] }],
+      'no-case-declarations': 'off',
+      'no-console': 'error',
+      'no-debugger': 'error',
+    },
+  },
+];

requirements.txt

@@ -5,6 +5,7 @@ fastapi==0.136.3
 flake8==6.1.0
 httpx==0.26.0
 isort==8.0.1
+mypy==1.14.1
 psycopg2-binary==2.9.12
 pydantic==2.13.4
 pytest==9.0.3