Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Late December Update #935

Merged
merged 91 commits into from
Dec 26, 2024
Merged

Late December Update #935

merged 91 commits into from
Dec 26, 2024

Conversation

MadsNyl
Copy link
Contributor

@MadsNyl MadsNyl commented Dec 26, 2024

Proposed changes

Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue. Remove this part with the description.

Issue number: closes # (remove if not an issue)

Pull request checklist

Please check if your PR fulfills the following requirements:

  • Tests for the changes have been added (for bug fixes / features)
  • API docs on Codex have been reviewed and added / updated if needed (for bug fixes / features)
  • The fixtures have been updated if needed (for migrations)

Further comments

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...

eriskjel and others added 30 commits March 23, 2024 18:04
* added optional image to bookable item model

* added update method in serializer to handle new images

* linting

* remove update method for images
* added approved by field

* endpoint will now set approved by

* serializer will return full user object in approved_by_detail

* created test for approved by

* migration

* remove unnecessary code

* removed write-only field in approved-by context
* added richer reponse on post and put

* added to admin panel

* added filter for minute
* created methods for sending notification to admin and user

* endpoint will now send notification if needed

* add migrations for new notification types
* Created model, serializer and view for user-bio

* Created user bio model and made migrations

* Created user bio serializer + viewsets + added new endpoint

* Tested create method + added bio serializer to user serializer

* Format

* Created update method and started testing

* Debugging test failures in user retrieve

* fixed model error

* Created user_bio_factory + started testing put method

* Created fixture for UserBio

* Created custom excpetion for duplicate user bio

* Added permissions and inherited from BaseModel

* Modularized serializer for bio

* Use correct serializers in viewset + added destroy method

* Finished testing bio viewset integration + format

* Changed environent file to .env to avoid pushing up keys

* Fix: Flipped assertion statement in test, since user bio should not be deleted

* skiped buggy test from kontres

* added mark to pytest.skip

* Moved keys to .env file and reverted docker variables

* Skip buggy kontres test

* format

* Added str method to user_bio

* Removed unused imports

* format

* Changed user relation to a OneToOne-field (same affect as ForeignKey(unique=True) + removed check for duplicate bio in serializer

* Migrations + changed assertion status code in duplicate bio test (could try catch in serializer to produce 400 status code)

* format

* format

* Changed limit for description 50 -> 500 + migrations

* Migrate

* added id to serializer

* merged leaf nodes in migrations

* format

---------

Co-authored-by: Ester2109 <[email protected]>
Co-authored-by: Mads Nylund <[email protected]>
Co-authored-by: Mads Nylund <[email protected]>
Co-authored-by: Tam Le <[email protected]>
added filter for allowed photos
added 400 status code for deleting paid registration
added serializer for category in  event
* added a check for existing user and id on request

* format
* added permissions to qr code and refactored viewset

* format

* removed unused imports
* added read permissions

* added permissions for payment order and tests

* format
chore: updated docs and force https
* started on feide registration endpoint

* made endpoint for creating user with Feide

* added test for parse group

* finished

* format

* removes three years if in digtrans
added feid env variables
* added delete endpoint for file

* Trigger Build

* changed workflow to checkout v4

* changed from docker-compose to docker compose
MadsNyl and others added 29 commits October 1, 2024 08:32
added admin.py to root in new app, and added app dir to tests
added description to form
* Created New App named Index

* created model

* Refactor: Change admin file

* admin

* added serializer and viewsets for list

* fixed typing error for permission_classes

* Started on the create serializer for feedback

* Made tests for create feedback

* Implemented update serializer for feedback

* made destroy method and testing create method as member

* Made destroy method and tests

* Fixed linting

* Fixed linting

---------

Co-authored-by: Tam Le <[email protected]>
Co-authored-by: Josefine Arntsen <[email protected]>
Co-authored-by: Mads Nylund <[email protected]>
Co-authored-by: Mads Nylund <[email protected]>
renamed index app to feedback
Bumps [django](https://github.com/django/django) from 4.2.16 to 5.1.1.
- [Commits](django/django@4.2.16...5.1.1)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mads Nylund <[email protected]>
* started on fixing race condition

* fixed race condition
* filtering by year and study

* linting fix

* added allergy filter

* added filter by allergies and participants with allergy count to event.

* Lint fix

* Add new fixture for admin user

* Start testing filtering + finished allergy filter test

* Added integration test for participants filtering

* lint fix

* removed unused import

* Update changelog

* merge with dev and more filters

* Fixed has_paid filter and added filter combination test

* ran linting script

---------

Co-authored-by: Harry Linrui XU <[email protected]>
Co-authored-by: Mads Nylund <[email protected]>
* filtering by year and study

* linting fix

* added allergy filter

* added filter by allergies and participants with allergy count to event.

* Lint fix

* Add new fixture for admin user

* Start testing filtering + finished allergy filter test

* Added integration test for participants filtering

* lint fix

* removed unused import

* Update changelog

* merge with dev and more filters

* Fixed has_paid filter and added filter combination test

* ran linting script

* fixed has allergy count bug, and has_paid bug

* post linting

---------

Co-authored-by: Harry Linrui XU <[email protected]>
Co-authored-by: Mads Nylund <[email protected]>
Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 2.8.0 to 2.14.0.
- [Release notes](https://github.com/getsentry/sentry-python/releases)
- [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md)
- [Commits](getsentry/sentry-python@2.8.0...2.14.0)

---
updated-dependencies:
- dependency-name: sentry-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mads Nylund <[email protected]>
* Prefix unused variable names with underscore, remove redundant parenthesis, split long lines into several, rename functions to snake_case,

Signed-off-by: Tmpecho <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Tmpecho <[email protected]>

* Make constant uppercase

Signed-off-by: Tmpecho <[email protected]>

* Empty-Commit

---------

Signed-off-by: Tmpecho <[email protected]>
Co-authored-by: Mads Nylund <[email protected]>
Signed-off-by: Tmpecho <[email protected]>
Co-authored-by: Mads Nylund <[email protected]>
Bumps [uvicorn](https://github.com/encode/uvicorn) from 0.30.6 to 0.32.0.
- [Release notes](https://github.com/encode/uvicorn/releases)
- [Changelog](https://github.com/encode/uvicorn/blob/master/CHANGELOG.md)
- [Commits](encode/uvicorn@0.30.6...0.32.0)

---
updated-dependencies:
- dependency-name: uvicorn
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mads Nylund <[email protected]>
Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.8.0 to 4.0.1.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](pre-commit/pre-commit@v3.8.0...v4.0.1)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mads Nylund <[email protected]>
Fixed bugs introduced in an earlier pr

---------

Co-authored-by: Harry Linrui XU <[email protected]>
Co-authored-by: Mads Nylund <[email protected]>
Co-authored-by: haruixu <[email protected]>
* Create files app to manage user uploaded files

Signed-off-by: Tmpecho <[email protected]>

* created serializers for file and gallery

* Move file upload endpoint from content/ to files/, create file and gallery views, add file and gallery model methods

Signed-off-by: Tmpecho <[email protected]>

* updating progress, needed to rename 'Gallery' to 'UserGallery' as a Gallery model already exists

* finished mvp for file project

* updating progress

* mvp for file uploading/deletion

* forgot changelog, oopsie

* fixed error in permissions from allowing non-admins to delete files, fixed 'security threat'

* Minor fixes to file serializer

Signed-off-by: Tmpecho <[email protected]>

* Fix whitespace

Signed-off-by: Tmpecho <[email protected]>

* Add custom exeption with mixins for files class

Signed-off-by: Tmpecho <[email protected]>

* Update custom file exceptions, set max gallery size as global constant, throw custom exceptions

Signed-off-by: Tmpecho <[email protected]>

* create test for creating file when not having a gallery, format

* removed duplicate method

* small refactoring and removed 'url' from file model, changed it to 'OptionalFile'

* fix lint

---------

Signed-off-by: Tmpecho <[email protected]>
Co-authored-by: Tmpecho <[email protected]>
Co-authored-by: Mads Nylund <[email protected]>
Co-authored-by: Johannes Aamot-Skeidsvoll <[email protected]>
* Created factory for album

* Fixed the order method in albums

* Fixed linting

* run migrations

---------

Co-authored-by: Mads Nylund <[email protected]>
added description to serializer for feedback list
* started on V2 of feedback

* Made more tests for retrieveing feedback details

* Started working on the filtering for status and status for feedback

* started on fix for filter

* fixed filtering

* format

* format

* trigger

---------

Co-authored-by: Tam Le <[email protected]>
@MadsNyl MadsNyl merged commit 9af2aa3 into master Dec 26, 2024
10 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.

10 participants