Skip to content

Deployment#757

Merged
TheStrgamer merged 7 commits into
mainfrom
dev
May 3, 2025
Merged

Deployment#757
TheStrgamer merged 7 commits into
mainfrom
dev

Conversation

@TheStrgamer

Copy link
Copy Markdown
Member

The dev branch has been deployed to makentnu.dev and can be manually tested there before merging.


Brings in the changes from the following PRs:

Gunvor4 and others added 6 commits February 20, 2025 20:14
...instead of machine type.
The rest of the code was working with the assumption that the URL path's
`<int:pk>` segment should be the PK of a machine type, like https://github.com/MAKENTNU/web/blob/2024-05-10/src/make_queue/static/make_queue/js/calendar.js#L393
…based-on-machine

Fix incorrect and failing reservation rule lists
* Added CoursePermission and CourseType

* Implemented cource permission class

* migrated data

* Updated views and admin to use new permission

* fixed bug with auth requirement

* added coursepermission to admin

* Updated course page

* Updated form ui for courses

* Made 3dpr permission automatic

* updated url tests

* update machine tests

* updated reservation test

* updated machine and reservation tests

* code cleanup

* Added translations

* Fixed api bug

* Removed print

* fixed line endings hopefully

* Fixed naming in migrations

* Fixed usage hint and translation typo

* fixed some codeclimate cleanup

* removed some whitespace

* Added changes to unreleased in changelog

* Made some fixes according to review comments

* Removed unused if statement

* Added if statement to prevent when a user has no registered course

* updated more code according to feedback

* removed whitespace

* i removed one too many whitespace lines, whoops

* fixed bug where course list used old get_permission_names method

* removed atomic flag

* merged migrations

* Switched to using enum instead of "3DPR" and similar strings

---------

Co-authored-by: Anders <6058745+ddabble@users.noreply.github.com>
Co-authored-by: Sigrid <55406589+sigtheidiot@users.noreply.github.com>
Co-authored-by: Gunvor4 <114504373+Gunvor4@users.noreply.github.com>
@make-bot make-bot Bot added the deployment Pull requests from another branch (usually `dev`) into the `main` branch label May 3, 2025
@make-bot make-bot Bot added this to web May 3, 2025
@make-bot make-bot Bot moved this to Ready for Review in web May 3, 2025
@codecov

codecov Bot commented May 3, 2025

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 96.55172% with 2 lines in your changes missing coverage. Please review.

Project coverage is 88.28%. Comparing base (4d85a53) to head (d44a4a1).
Report is 27 commits behind head on main.

Files with missing lines Patch % Lines
src/make_queue/forms/course.py 88.88% 1 Missing ⚠️
src/make_queue/models/machine.py 91.66% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #757      +/-   ##
==========================================
+ Coverage   88.17%   88.28%   +0.11%     
==========================================
  Files         152      152              
  Lines        6198     6207       +9     
==========================================
+ Hits         5465     5480      +15     
+ Misses        733      727       -6     
Files with missing lines Coverage Δ
src/checkin/views.py 40.47% <100.00%> (ø)
src/make_queue/admin.py 100.00% <100.00%> (ø)
src/make_queue/api/views.py 96.87% <100.00%> (ø)
src/make_queue/models/course.py 95.89% <100.00%> (+1.06%) ⬆️
src/make_queue/forms/course.py 83.67% <88.88%> (+0.74%) ⬆️
src/make_queue/models/machine.py 91.47% <91.66%> (+3.23%) ⬆️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@TheStrgamer TheStrgamer merged commit 6a19544 into main May 3, 2025
13 checks passed
@github-project-automation github-project-automation Bot moved this from Ready for Review to Done in web May 3, 2025
@ddabble ddabble deleted the dev branch September 7, 2025 19:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

deployment Pull requests from another branch (usually `dev`) into the `main` branch

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants