Revert "pre-release 3 (#244)"

This reverts commit a83dfcf.
SELab-2 · May 23, 2024 · 12334e6 · 12334e6
1 parent a83dfcf
commit 12334e6
Show file tree

Hide file tree

Showing 225 changed files with 2,451 additions and 14,509 deletions.
diff --git a/README.md b/README.md
@@ -1,55 +1,26 @@
-# Apollo
+# UGent-5
 
-Apollo is an online submission platform where instructors can flexibly set requirements for
-student submissions. These requirements can range from simple checks on the submitted
-file structure to test scripts that run when a submission is made.
+## Rolverdeling
 
-Students quickly receive feedback on their submission, allowing them to know if it meets
-the project requirements.
-
-This repository hosts the web application's source code. To use Apollo, visit https://sel2-5.ugent.be.
+| Rol  | Verantwoordelijke |
+| ------------- | ------------- |
+| Groepsleider                                       | Marieke Sinnaeve  |
+| Technische lead                                    | Bram Reyniers     |
+| Systeembeheerder                                   | Xander Bil        |
+| Customer Relations Officer                         | Pieter Janin      |
+| Frontendbeheerder                                  | Mattis Cauwel     |
+| Backendbeheerder                                   | Dries Huybens     |
+| Documentatiebeheerder                              | Pieter Janin      |
+| Testbeheerder                                      | Michaël Boelaert  |
 
 ## Wiki
 
-Documentation, including a user manual for teachers, can be found in the
-[Apollo wiki](https://github.com/SELab-2/UGent-5/wiki).
-
-## For Developers
+Informatie over de gebruikte technologieën, de gebruikershandleiding en meer kan je vinden in de [wiki](https://github.com/SELab-2/UGent-5/wiki).
 
-Instructions for setting up the frontend development environment can be found
-[here](frontend/README.md).
+## Setup ontwikkelomgeving
 
-Instructions for the backend are located [here](backend/README.md).
+De instructies voor het opzetten van de ontwikkelomgeving van de frontend kan je [hier](frontend/README.md) vinden. De instructies voor de backend staan [hier](backend/REAMDE.md).
 
 ## API
 
-Automated clients can interact with the web application via the [API](https://sel2-5.ugent.be/api/docs).
-
-## Used tools and frameworks
-
-### Database
- - Database system: [PostgreSQL](https://www.postgresql.org/)
- - Database migrations: [alembic](https://github.com/sqlalchemy/alembic).
-
-### Backend
- - Backend framework: [FastAPI](https://fastapi.tiangolo.com/)
- - Database interface: [SQLAlchemy](https://www.sqlalchemy.org/)
- - JSON-validation: [Pydantic](https://github.com/pydantic/pydantic)
- - Test framework: [pytest](https://github.com/pytest-dev/pytest)
-
-### Frontend
- - Frontend framework: [Vue.js](https://vuejs.org/) (Composition API) + [TypeScript](https://www.typescriptlang.org/)
- - Component library: [Vuetify](https://dev.vuetifyjs.com/en/)
- - Test framework: [Vitest](https://vitest.dev/)
-
-## The team
-
-|                  |                                                   |
-|------------------|---------------------------------------------------|
-| Xander Bil       | System Administrator                              |
-| Michaël Boelaert | Test Manager                                      |
-| Mattis Cauwel    | Frontend Manager                                  |
-| Dries Huybens    | Backend Manager                                   |
-| Pieter Janin     | Customer Relations Officer, Documentation Manager |
-| Bram Reyniers    | Technical Lead                                    |
-| Marieke Sinnaeve | Team Lead                                         |
+Geautomatiseerde clients kunnen interageren met de webapplicatie via de [API](https://sel2-5.ugent.be/api/docs).
diff --git a/backend/README.md b/backend/README.md
@@ -6,7 +6,7 @@
 
 ```sh
 # Create a python virtual environment
-python3.12 -m venv venv
+python -m venv venv
 # Activate the environment
 source venv/bin/activate
 # Install dependencies
@@ -71,8 +71,6 @@ DATABASE_URI="postgresql://username:password@localhost:5432/dbname"
 alembic upgrade head
 ```
 
-You can find more info about alembic [here](alembic/README.md).
-
 #### Managing the database
 ```sh
 # Stop the database container

diff --git a/backend/alembic/README b/backend/alembic/README
@@ -0,0 +1 @@
+Generic single-database configuration.
diff --git a/backend/alembic/README.md b/backend/alembic/README.md
diff --git a/backend/alembic/versions/18fb90307213_project_requirements_fix.py b/backend/alembic/versions/18fb90307213_project_requirements_fix.py
diff --git a/backend/alembic/versions/566f33fb161f_add_user_surname.py b/backend/alembic/versions/566f33fb161f_add_user_surname.py
diff --git a/backend/alembic/versions/937c04aa37a1_add_group_num_column.py b/backend/alembic/versions/937c04aa37a1_add_group_num_column.py
diff --git a/backend/alembic/versions/e0c97995e669_add_optional_email_to_subject.py b/backend/alembic/versions/e0c97995e669_add_optional_email_to_subject.py
diff --git a/backend/src/auth/router.py b/backend/src/auth/router.py
@@ -48,19 +48,15 @@ async def token(
     if not user or not attributes:
         raise UnAuthenticated(detail="Invalid CAS ticket")
     # Create user if not exists
-    resolved_user = await user_service.get_by_id(db, attributes["uid"])
-    if not resolved_user:
+    if not await user_service.get_by_id(db, attributes["uid"]):
         await user_service.create_user(
             db,
             UserCreate(
                 given_name=attributes["givenname"],
-                surname=attributes["surname"],
                 uid=attributes["uid"],
                 mail=attributes["mail"],
             ),
         )
-    elif resolved_user.surname == 'SURNAME_DEFAULT':
-        resolved_user.surname = attributes["surname"]
 
     # Create JWT token
     jwt_token = create_jwt_token(attributes["uid"])

diff --git a/backend/src/docker_tests/dependencies.py b/backend/src/docker_tests/dependencies.py