Skip to content

dev into main#29

Merged
joefarrelly merged 10 commits into
mainfrom
dev
Jun 18, 2026
Merged

dev into main#29
joefarrelly merged 10 commits into
mainfrom
dev

Conversation

@joefarrelly

@joefarrelly joefarrelly commented Jun 17, 2026

Copy link
Copy Markdown
Owner
  • enforce-session-permissions
  • fix/dev-to-main-pr-head
  • fix/n-plus-one-queries
  • add-tests-and-cleanup

Merge enforce-session-permissions into dev
_list_all: materialise DataEquipmentVariant into a dict before the
loop — was calling variants.filter().first() per slot per alt.

_list_single: batch-fetch DataEquipment and DataEquipmentVariant in
two queries before the loop — was hitting the DB twice per slot
(36 queries per request for 18 slots).

Add REST_FRAMEWORK pagination (PageNumberPagination, page_size=100)
to settings for the raw ModelViewSet data endpoints.
Fix dev→main PR workflow head filter and null body guard
Fix N+1 queries in equipment views, add DRF pagination
- 47 pytest tests across LuaParser, IsSessionUser, keybind helpers,
  and key view behaviours (all passing, 52% coverage)
- pytest-cov wired with term-missing + XML output; CI uploads to Codecov
- Extract keybind logic from views.py into libs/keybind_builder.py
- Add backend/test_settings.py (SQLite in-memory) and conftest.py
- Expand lint.yml with test job (Python 3.12, no DB services needed)
- Add Lint/Test, Codecov, and Ruff badges to readme.md
- Remove dump.txt (personal data), gitignore it
- Remove redundant apicore/tests.py
Add test suite, coverage, keybind refactor, and repo cleanup
@gitguardian

gitguardian Bot commented Jun 18, 2026

Copy link
Copy Markdown

⚠️ GitGuardian has uncovered 1 secret following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secret in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
34103880 Triggered Generic Password b9c9fdb .github/workflows/lint.yml View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secret safely. Learn here the best practices.
  3. Revoke and rotate this secret.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

@codecov-commenter

Copy link
Copy Markdown

Welcome to Codecov 🎉

Once you merge this PR into your default branch, you're all set! Codecov will compare coverage reports and display results in all future pull requests.

ℹ️ You can also turn on project coverage checks and project coverage reporting on Pull Request comment

Thanks for integrating Codecov - We've got you covered ☂️

@joefarrelly joefarrelly merged commit 007bf6c into main Jun 18, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants