diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml index 7b6e7eab..94746ef5 100644 --- a/.github/workflows/build_docker.yml +++ b/.github/workflows/build_docker.yml @@ -18,11 +18,11 @@ jobs: matrix: include: - dockerfile: ./client.Dockerfile - image: ghcr.io/ls1intum/thesis-track/thesis-track-client + image: ghcr.io/ls1intum/thesis-management/thesis-management-client context: ./ path: client - dockerfile: ./server.Dockerfile - image: ghcr.io/ls1intum/thesis-track/thesis-track-server + image: ghcr.io/ls1intum/thesis-management/thesis-management-server context: ./ path: server outputs: diff --git a/README.md b/README.md index a27c276b..c48a6a6b 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# ThesisTrack +# ThesisManagement (previously ThesisTrack) -ThesisTrack is a web-based thesis management system designed to streamline the thesis process in academic institutions by integrating essential stages into a single platform. +ThesisManagement is a web-based thesis management system designed to streamline the thesis process in academic institutions by integrating essential stages into a single platform. Developed to address challenges in managing large volumes of theses, it facilitates seamless interactions between students, advisors, and supervisors. Key features include a centralized application process, guided workflows for thesis writing, automated notifications, and a comprehensive Gantt chart for tracking progress. -By consolidating communication, feedback, and file management, ThesisTrack enhances transparency, reduces administrative burdens, and fosters efficient thesis supervision and assessment. +By consolidating communication, feedback, and file management, ThesisManagement enhances transparency, reduces administrative burdens, and fosters efficient thesis supervision and assessment. -ThesisTrack was developed as part of this [bachelor's thesis](docs/files/ba-thesis-fabian-emilius.pdf). +ThesisManagement was developed as part of this [bachelor's thesis](docs/files/ba-thesis-fabian-emilius.pdf). ## User Documentation @@ -102,7 +102,7 @@ Supervisor, Advisor and Student means that the user is directly assigned to the ## Features -The following flowchart diagrams provide a visual overview of the thesis processes implemented in ThesisTrack. +The following flowchart diagrams provide a visual overview of the thesis processes implemented in ThesisManagement. These diagrams illustrate the step-by-step workflows involved, from thesis topic selection and application submission to the final grading and completion stages. They highlight key actions, decision points, and interactions between students, advisors, and supervisors, clarifying how tasks are sequenced and managed within the system. These flowcharts offer a quick reference for understanding how each role engages in the thesis process, ensuring transparency and consistency in task progression and responsibilities across different stages. diff --git a/client/package-lock.json b/client/package-lock.json index 003c0bc1..0f2f5862 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,11 +1,11 @@ { - "name": "thesis-track", + "name": "thesis-management", "version": "3.0.4", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "thesis-track", + "name": "thesis-management", "version": "3.0.4", "license": "MIT", "dependencies": { diff --git a/client/package.json b/client/package.json index bdb672ec..22e8d959 100644 --- a/client/package.json +++ b/client/package.json @@ -1,5 +1,5 @@ { - "name": "thesis-track", + "name": "thesis-management", "version": "3.0.4", "description": "Management of the Thesis Lifecycle in Universities", "private": true, diff --git a/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx b/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx index 4f4a3725..095c27f5 100644 --- a/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx +++ b/client/src/app/layout/AuthenticatedArea/AuthenticatedArea.tsx @@ -182,7 +182,7 @@ const AuthenticatedArea = (props: PropsWithChildren) => style={{ cursor: 'pointer' }} onClick={() => navigate('/')} > - ThesisTrack + ThesisManagement diff --git a/client/src/components/Footer/Footer.tsx b/client/src/components/Footer/Footer.tsx index adf50926..a92a81af 100644 --- a/client/src/components/Footer/Footer.tsx +++ b/client/src/components/Footer/Footer.tsx @@ -28,7 +28,7 @@ const Footer = (props: IFooterProps) => { {GLOBAL_CONFIG.chair_name} diff --git a/client/src/config/global.ts b/client/src/config/global.ts index 64e21321..01f66f7a 100644 --- a/client/src/config/global.ts +++ b/client/src/config/global.ts @@ -15,9 +15,9 @@ const getEnvironmentVariable = (key: string, useJson = false): T | u } export const GLOBAL_CONFIG: IGlobalConfig = { - title: getEnvironmentVariable('APPLICATION_TITLE') || 'ThesisTrack', + title: getEnvironmentVariable('APPLICATION_TITLE') || 'ThesisManagement', - chair_name: getEnvironmentVariable('CHAIR_NAME') || 'ThesisTrack', + chair_name: getEnvironmentVariable('CHAIR_NAME') || 'ThesisManagement', chair_url: getEnvironmentVariable('CHAIR_URL') || window.origin, allow_suggested_topics: (getEnvironmentVariable('ALLOW_SUGGESTED_TOPICS') || 'true') === 'true', @@ -100,7 +100,7 @@ export const GLOBAL_CONFIG: IGlobalConfig = { keycloak: { host: getEnvironmentVariable('KEYCLOAK_HOST') || 'http://localhost:8081', - realm: getEnvironmentVariable('KEYCLOAK_REALM_NAME') || 'thesis-track', - client_id: getEnvironmentVariable('KEYCLOAK_CLIENT_ID') || 'thesis-track-app', + realm: getEnvironmentVariable('KEYCLOAK_REALM_NAME') || 'thesis-management', + client_id: getEnvironmentVariable('KEYCLOAK_CLIENT_ID') || 'thesis-management-app', }, } diff --git a/client/src/index.html b/client/src/index.html index 65a2a92a..f4be0d4a 100644 --- a/client/src/index.html +++ b/client/src/index.html @@ -6,7 +6,7 @@ - ThesisTrack + ThesisManagement diff --git a/client/src/pages/AboutPage/AboutPage.tsx b/client/src/pages/AboutPage/AboutPage.tsx index 1c2446a8..a0980fbb 100644 --- a/client/src/pages/AboutPage/AboutPage.tsx +++ b/client/src/pages/AboutPage/AboutPage.tsx @@ -40,9 +40,9 @@ const AboutPage = () => { return ( - ThesisTrack + ThesisManagement - ThesisTrack addresses inefficient manual thesis management processes at large universities + ThesisManagement addresses inefficient manual thesis management processes at large universities through a web-based platform. The system digitizes the entire lifecycle from student applications to final grading, serving three key stakeholders: supervisors (professors), advisors (doctoral candidates), and students. Key features include: @@ -89,7 +89,7 @@ const AboutPage = () => { Features The following flowchart diagram provides a visual overview of the thesis processes - implemented in ThesisTrack. These diagram illustrates the step-by-step workflows involved, + implemented in ThesisManagement. These diagram illustrates the step-by-step workflows involved, from thesis topic selection and application submission to the final grading and completion stages. It highlights key actions, decision points, and interactions between students, advisors, and supervisors, clarifying how tasks are sequenced and managed within the diff --git a/client/src/pages/LandingPage/components/HeroSection/HeroSection.tsx b/client/src/pages/LandingPage/components/HeroSection/HeroSection.tsx index 5f3c57f8..dce7ac2c 100644 --- a/client/src/pages/LandingPage/components/HeroSection/HeroSection.tsx +++ b/client/src/pages/LandingPage/components/HeroSection/HeroSection.tsx @@ -21,7 +21,7 @@ export function HeroSection() { - Whether you're looking for inspiration or have a unique idea in mind, ThesisTrack + Whether you're looking for inspiration or have a unique idea in mind, ThesisManagement makes it easy. Explore topics posted by instructors or suggest your own. diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 8fb056b3..062dbd0b 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -6,7 +6,7 @@ services: command: - "--providers.docker=true" - "--providers.docker.exposedByDefault=false" - - "--providers.docker.network=thesis-track-network" + - "--providers.docker.network=thesis-management-network" - "--entrypoints.web.address=:80" - "--entrypoints.websecure.address=:443" - "--entrypoints.web.http.redirections.entryPoint.to=websecure" @@ -22,11 +22,11 @@ services: - /var/run/docker.sock:/var/run/docker.sock - ./letsencrypt:/letsencrypt networks: - - thesis-track-network + - thesis-management-network server: - image: "ghcr.io/ls1intum/thesis-track/thesis-track-server:${SERVER_IMAGE_TAG}" - container_name: thesis-track-server + image: "ghcr.io/ls1intum/thesis-management/thesis-management-server:${SERVER_IMAGE_TAG}" + container_name: thesis-management-server labels: - "traefik.enable=true" - "traefik.http.routers.server.rule=Host(`${APP_HOSTNAME}`) && PathPrefix(`/api`)" @@ -77,11 +77,11 @@ services: - GIT_COMMIT - GIT_BRANCH networks: - - thesis-track-network + - thesis-management-network client: - image: "ghcr.io/ls1intum/thesis-track/thesis-track-client:${CLIENT_IMAGE_TAG}" - container_name: thesis-track-client + image: "ghcr.io/ls1intum/thesis-management/thesis-management-client:${CLIENT_IMAGE_TAG}" + container_name: thesis-management-client labels: - "traefik.enable=true" - "traefik.http.routers.client.rule=Host(`${APP_HOSTNAME}`)" @@ -112,11 +112,11 @@ services: depends_on: - server networks: - - thesis-track-network + - thesis-management-network db: image: "postgres:17.1-alpine" - container_name: thesis-track-db + container_name: thesis-management-db environment: - POSTGRES_USER=${SPRING_DATASOURCE_USERNAME} - POSTGRES_PASSWORD=${SPRING_DATASOURCE_PASSWORD} @@ -128,20 +128,20 @@ services: timeout: 5s retries: 5 networks: - - thesis-track-network + - thesis-management-network postfix: image: ghcr.io/ls1admin/postfix:latest - container_name: thesis-track-postfix + container_name: thesis-management-postfix restart: unless-stopped volumes: - ./postfix-config:/config hostname: ${APP_HOSTNAME} networks: - - thesis-track-network + - thesis-management-network networks: - # Create network manually in advance: docker network create thesis-track-network - thesis-track-network: - name: thesis-track-network + # Create network manually in advance: docker network create thesis-management-network + thesis-management-network: + name: thesis-management-network external: true diff --git a/docker-compose.yml b/docker-compose.yml index 50727275..084f8b60 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,15 +1,15 @@ services: db: image: 'postgres:17.1-alpine' - container_name: thesis-track-db + container_name: thesis-management-db volumes: - ./db_backups:/db_backups environment: - - POSTGRES_USER=thesis-track-postgres - - POSTGRES_PASSWORD=thesis-track-postgres - - POSTGRES_DB=thesis-track + - POSTGRES_USER=thesis-management-postgres + - POSTGRES_PASSWORD=thesis-management-postgres + - POSTGRES_DB=thesis-management healthcheck: - test: ["CMD-SHELL", "pg_isready -d thesis-track -U thesis-track-postgres"] + test: ["CMD-SHELL", "pg_isready -d thesis-management -U thesis-management-postgres"] interval: 5s timeout: 5s retries: 5 @@ -18,7 +18,7 @@ services: #postfix: # image: ghcr.io/ls1admin/postfix:latest - # container_name: thesis-track-postfix + # container_name: thesis-management-postfix # restart: unless-stopped # volumes: # - ./postfix-config:/config # See https://github.com/ls1admin/postfix-container-tum-mailrelay/tree/main for details @@ -28,13 +28,13 @@ services: caldav: image: tomsquest/docker-radicale:3.3.0.1 - container_name: thesis-track-caldav + container_name: thesis-management-caldav ports: - "5232:5232" keycloak: image: quay.io/keycloak/keycloak:26.0 - container_name: thesis-track-keycloak + container_name: thesis-management-keycloak environment: KEYCLOAK_ADMIN: admin KEYCLOAK_ADMIN_PASSWORD: admin diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md index 515ecd29..2caadb44 100644 --- a/docs/CONFIGURATION.md +++ b/docs/CONFIGURATION.md @@ -6,12 +6,12 @@ These are all environment variables that can be used to configure the applicatio | Variable Name | Services | Default Value | Description | |-------------------------------------|----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------| -| SPRING_DATASOURCE_URL | server | jdbc:postgresql://localhost:5432/thesis-track | Postgres connection url | -| SPRING_DATASOURCE_USERNAME | server | thesis-track-postgres | Postgres username | -| SPRING_DATASOURCE_PASSWORD | server | thesis-track-postgres | Postgres password | +| SPRING_DATASOURCE_URL | server | jdbc:postgresql://localhost:5432/thesis-management | Postgres connection url | +| SPRING_DATASOURCE_USERNAME | server | thesis-management-postgres | Postgres username | +| SPRING_DATASOURCE_PASSWORD | server | thesis-management-postgres | Postgres password | | KEYCLOAK_HOST | server, client | http://localhost:8081 | Keycloak hostname | -| KEYCLOAK_REALM_NAME | server, client | thesis-track | Keycloak realm name | -| KEYCLOAK_CLIENT_ID | server, client | thesis-track-app | Keycloak client id | +| KEYCLOAK_REALM_NAME | server, client | thesis-management | Keycloak realm name | +| KEYCLOAK_CLIENT_ID | server, client | thesis-management-app | Keycloak client id | | KEYCLOAK_SERVICE_CLIENT_ID | server | | Keycloak service client id | | KEYCLOAK_SERVICE_CLIENT_SECRET | server | | Keycloak service client secret | | KEYCLOAK_SERVICE_STUDENT_GROUP_NAME | server | | Keycloak group name that should be assigned when a student starts writing a thesis | @@ -33,7 +33,7 @@ These are all environment variables that can be used to configure the applicatio | MAIL_TEMPLATE_FOLDER | server | /default-mail-templates | Folder where mail templates are stored. If not set, it will use the default emails of the repository | | UPLOAD_FOLDER | server | uploads | Folder where uploaded files will be stored | | SCIENTIFIC_WRITING_GUIDE | server | | Link to a guide that explains scientific writing at the chair | -| APPLICATION_TITLE | client | Thesis Track | HTML title of the client | +| APPLICATION_TITLE | client | Thesis Management | HTML title of the client | | GENDERS | client | `{"MALE":"Male","FEMALE":"Female","OTHER":"Other","PREFER_NOT_TO_SAY":"Prefer not to say"}` | Available genders that a user can configure | | STUDY_DEGREES | client | `{"BACHELOR":"Bachelor","MASTER":"Master"}` | Available study degrees | | STUDY_PROGRAMS | client | `{"COMPUTER_SCIENCE":"Computer Science","INFORMATION_SYSTEMS":"Information Systems","GAMES_ENGINEERING":"Games Engineering","MANAGEMENT_AND_TECHNOLOGY":"Management and Technology","OTHER":"Other"}` | Available study programs | @@ -42,5 +42,5 @@ These are all environment variables that can be used to configure the applicatio | CUSTOM_DATA | client | `{"GITHUB":{"label":"Github Profile","required":false}}` | Additional data the user can add to the profile | | THESIS_FILES | client | `{"PRESENTATION":{"label":"Presentation","description":"Presentation (PDF)","accept":"pdf","required":true},"PRESENTATION_SOURCE":{"label":"Presentation Source","description":"Presentation Source (KEY, PPTX)","accept":"any","required":false},"FEEDBACK_LOG":{"label":"Feedback Log","description":"Feedback Log (PDF)","accept":"pdf","required":false}}` | Additional files the student can add to the thesis | | DEFAULT_SUPERVISOR_UUID | client | | The user UUID from the database if a default supervisor should be selected when creating topics or theses | -| CHAIR_NAME | client | Thesis Track | Chair name | +| CHAIR_NAME | client | Thesis Management | Chair name | | CHAIR_URL | client | window.origin | URL to chair website | \ No newline at end of file diff --git a/docs/DATABASE.md b/docs/DATABASE.md index 7c3ec8a7..089f817a 100644 --- a/docs/DATABASE.md +++ b/docs/DATABASE.md @@ -1,6 +1,6 @@ # Database Changes -ThesisTrack employs liquibase technology for database migrations. Upon a database schema change, follow the steps: +ThesisManagement employs liquibase technology for database migrations. Upon a database schema change, follow the steps: 1. Create a new changeset by adding a new script in the [changelog folder](/server/src/main/resources/db/changelog/changes) 2. Include the new changeset script into the [master changelog file](/server/src/main/resources/db/changelog/db.changelog-master.xml) diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md index 6ccd645b..79886fcc 100644 --- a/docs/DEVELOPMENT.md +++ b/docs/DEVELOPMENT.md @@ -15,11 +15,11 @@ docker compose up keycloak -d * Username: `admin` * Password: `admin` 3. Click on the drowdown in the top left and go to [Create realm](http://localhost:8081/admin/master/console/#/master/add-realm) -4. Import the [keycloak-realm-config-example-json](/keycloak-realm-config-example.json) or create a new realm `thesis-track` manually. -5. Select the newly created realm and create your user in [Users](http://localhost:8081/admin/master/console/#/thesis-track/users) (username, email, first name, last name) +4. Import the [keycloak-realm-config-example-json](/keycloak-realm-config-example.json) or create a new realm `thesis-management` manually. +5. Select the newly created realm and create your user in [Users](http://localhost:8081/admin/master/console/#/thesis-management/users) (username, email, first name, last name) 6. Go to "Credentials" for the new user and set a non temporary password 7. Go to "Role mapping" and assign the client roles `admin`, `supervisor`, `advisor` to the new user - * Select "Filter by clients" and search for "thesis-track-app" to find the roles + * Select "Filter by clients" and search for "thesis-management-app" to find the roles ## PostgreSQL Database @@ -35,8 +35,8 @@ Notice: local development does not support mailing functionality. The mails are ## Server ### Preconditions -* Database available at `jdbc:postgresql://db:5144/thesis-track` -* Keycloak realm `thesis-track` is available under http://localhost:8081 (See [Keycloak Setup](#keycloak-setup)) +* Database available at `jdbc:postgresql://db:5144/thesis-management` +* Keycloak realm `thesis-management` is available under http://localhost:8081 (See [Keycloak Setup](#keycloak-setup)) To start the sever application for local development, navigate to /server folder and execute the following command from the terminal: ``` @@ -49,7 +49,7 @@ Server is served at http://localhost:8080. #### Preconditions * Server running at http://localhost:8080 -* Keycloak realm `thesis-track` is available under http://localhost:8081 (See [Keycloak Setup](#keycloak-setup)) +* Keycloak realm `thesis-management` is available under http://localhost:8081 (See [Keycloak Setup](#keycloak-setup)) To start the client application for local development, navigate to /client folder and execute the following command from the terminal: ``` diff --git a/docs/PRODUCTION.md b/docs/PRODUCTION.md index 2376a254..cceb9690 100644 --- a/docs/PRODUCTION.md +++ b/docs/PRODUCTION.md @@ -12,8 +12,8 @@ You can follow the steps in [deploy_docker.yml](../.github/workflows/deploy_dock ## Running Server Minimal docker configuration to start a server ```yaml -image: "ghcr.io/ls1intum/thesis-track/thesis-track-server:latest" -container_name: thesis-track-server +image: "ghcr.io/ls1intum/thesis-management/thesis-management-server:latest" +container_name: thesis-management-server labels: - "traefik.enable=true" - "traefik.http.routers.server.rule=Host(`${APP_HOSTNAME}`) && PathPrefix(`/api`)" @@ -30,7 +30,7 @@ expose: - "8080" environment: - TZ=Europe/Berlin - - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/thesis-track + - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/thesis-management - SPRING_DATASOURCE_USERNAME= - SPRING_DATASOURCE_PASSWORD= - MAIL_ENABLED=true @@ -49,8 +49,8 @@ environment: ## Running Client Minimal docker configuration to start the client ```yaml -image: "ghcr.io/ls1intum/thesis-track/thesis-track-client:latest" -container_name: thesis-track-client +image: "ghcr.io/ls1intum/thesis-management/thesis-management-client:latest" +container_name: thesis-management-client labels: - "traefik.enable=true" - "traefik.http.routers.client.rule=Host(`${APP_HOSTNAME}`)" @@ -79,7 +79,7 @@ image: traefik:v3.2 command: - "--providers.docker=true" - "--providers.docker.exposedByDefault=false" - - "--providers.docker.network=thesis-track-network" + - "--providers.docker.network=thesis-management-network" - "--entrypoints.web.address=:80" - "--entrypoints.websecure.address=:443" - "--entrypoints.web.http.redirections.entryPoint.to=websecure" @@ -99,11 +99,11 @@ volumes: ## Backup Strategy There are 2 places that require backups: - The PostgreSQL database. The backup strategy depends on the database setup, but the whole public schema of the connected database should be included in the backup. - - Example backup command: `pg_dump -U thesistrack --schema="public" thesistrack > backup_thesistrack.sql` - - Example import command: `psql -U thesistrack -d thesistrack -f backup_thesistrack.sql` + - Example backup command: `pg_dump -U thesismanagement --schema="public" thesismanagement > backup_thesismanagement.sql` + - Example import command: `psql -U thesismanagement -d thesismanagement -f backup_thesismanagement.sql` - The files stored at `/uploads`. In the docker example, these files are mounted to `./thesis_uploads` and backup system should collect the files from the mounted folder -There is an example script [thesis-track-backup.sh](../thesis-track-backup.sh) that you can call in a cronjob to create regular backups. +There is an example script [thesis-management-backup.sh](../thesis-management-backup.sh) that you can call in a cronjob to create regular backups. ## Further Configuration diff --git a/docs/files/subsystem-decomposition.svg b/docs/files/subsystem-decomposition.svg index 424881d3..089d3fb2 100644 --- a/docs/files/subsystem-decomposition.svg +++ b/docs/files/subsystem-decomposition.svg @@ -1,4 +1,4 @@ -
Postfix
Database
Keycloak
Authentication
ThesisTrack Client
ThesisTrack Server
WebCal
Administration
Student Application
Thesis Management
Application
Thesis
Presentation
Topic
Application Data
Thesis Data
Authentication
API
Calendar
API
Mailing
Service
Persistence
Service
Assessment
Proposal
Manage
Users API
 \ No newline at end of file +
Postfix
Database
Keycloak
Authentication
ThesisManagement Client
ThesisManagement Server
WebCal
Administration
Student Application
Thesis Management
Application
Thesis
Presentation
Topic
Application Data
Thesis Data
Authentication
API
Calendar
API
Mailing
Service
Persistence
Service
Assessment
Proposal
Manage
Users API
 \ No newline at end of file diff --git a/docs/files/thesis-application-flowchart.svg b/docs/files/thesis-application-flowchart.svg index 9d3638ea..e43948af 100644 --- a/docs/files/thesis-application-flowchart.svg +++ b/docs/files/thesis-application-flowchart.svg @@ -1,4 +1,4 @@ -
Student
Apply for Topic
Advisor
Create Topic
Review Application
Yes
Accepted
Assign Advisor, Supervisor
ThesisTrack
Notify student about rejection
Notify student about thesis and advisor
No
 \ No newline at end of file +
Student
Apply for Topic
Advisor
Create Topic
Review Application
Yes
Accepted
Assign Advisor, Supervisor
ThesisManagement
Notify student about rejection
Notify student about thesis and advisor
No
 \ No newline at end of file diff --git a/docs/files/thesis-writing-flowchart.svg b/docs/files/thesis-writing-flowchart.svg index 6bf3a0d3..badb0018 100644 --- a/docs/files/thesis-writing-flowchart.svg +++ b/docs/files/thesis-writing-flowchart.svg @@ -1,4 +1,4 @@ -
Student
Write proposal
Write Thesis
Present Thesis
Submit final thesis (Changes state to Submitted)
Advisor
Give Feedback
Yes
Sufficient
Change Thesis State to Writing
Give Feedback
Write assessment (Changes state to Assessed)
Supervisor
Submit final grade
(Changes state to Graded)
Submit grade to university (Changes state to Finished)
ThesisTrack
Create thesis with state Proposal
Invite students to
presentation
No
 \ No newline at end of file +
Student
Write proposal
Write Thesis
Present Thesis
Submit final thesis (Changes state to Submitted)
Advisor
Give Feedback
Yes
Sufficient
Change Thesis State to Writing
Give Feedback
Write assessment (Changes state to Assessed)
Supervisor
Submit final grade
(Changes state to Graded)
Submit grade to university (Changes state to Finished)
ThesisManagement
Create thesis with state Proposal
Invite students to
presentation
No
 \ No newline at end of file diff --git a/keycloak-realm-config-example.json b/keycloak-realm-config-example.json index f663129a..41e4d69a 100644 --- a/keycloak-realm-config-example.json +++ b/keycloak-realm-config-example.json @@ -1,6 +1,6 @@ { "id": "12de14fa-724f-4e74-98e7-0a27089abda0", - "realm": "thesis-track", + "realm": "thesis-management", "notBefore": 0, "defaultSignatureAlgorithm": "RS256", "revokeRefreshToken": false, @@ -47,7 +47,7 @@ "realm": [ { "id": "c2042cd5-b3d8-4860-975b-5165623b099c", - "name": "default-roles-thesis-track", + "name": "default-roles-thesis-management", "description": "${role_default-roles}", "composite": true, "composites": { @@ -299,7 +299,7 @@ } ], "security-admin-console": [], - "thesis-track-app": [ + "thesis-management-app": [ { "id": "bc6dcfe5-250e-42e7-9eec-59de8eb25ba8", "name": "admin", @@ -350,7 +350,7 @@ "attributes": {} } ], - "thesis-track-service-client": [], + "thesis-management-service-client": [], "account": [ { "id": "20a35168-0fdf-41fa-97c6-3a1c00769421", @@ -449,7 +449,7 @@ "attributes": {}, "realmRoles": [], "clientRoles": { - "thesis-track-app": [ + "thesis-management-app": [ "student" ] }, @@ -458,7 +458,7 @@ ], "defaultRole": { "id": "c2042cd5-b3d8-4860-975b-5165623b099c", - "name": "default-roles-thesis-track", + "name": "default-roles-thesis-management", "description": "${role_default-roles}", "composite": true, "clientRole": false, @@ -507,15 +507,15 @@ { "id": "7751d41a-a788-4f6b-9af9-b0b10ec91e98", "createdTimestamp": 1725225797997, - "username": "service-account-thesis-track-service-client", + "username": "service-account-thesis-management-service-client", "enabled": true, "totp": false, "emailVerified": false, - "serviceAccountClientId": "thesis-track-service-client", + "serviceAccountClientId": "thesis-management-service-client", "disableableCredentialTypes": [], "requiredActions": [], "realmRoles": [ - "default-roles-thesis-track" + "default-roles-thesis-management" ], "clientRoles": { "realm-management": [ @@ -556,13 +556,13 @@ "clientId": "account", "name": "${client_account}", "rootUrl": "${authBaseUrl}", - "baseUrl": "/realms/thesis-track/account/", + "baseUrl": "/realms/thesis-management/account/", "surrogateAuthRequired": false, "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", "redirectUris": [ - "/realms/thesis-track/account/*" + "/realms/thesis-management/account/*" ], "webOrigins": [], "notBefore": 0, @@ -600,13 +600,13 @@ "clientId": "account-console", "name": "${client_account-console}", "rootUrl": "${authBaseUrl}", - "baseUrl": "/realms/thesis-track/account/", + "baseUrl": "/realms/thesis-management/account/", "surrogateAuthRequired": false, "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", "redirectUris": [ - "/realms/thesis-track/account/*" + "/realms/thesis-management/account/*" ], "webOrigins": [], "notBefore": 0, @@ -769,13 +769,13 @@ "clientId": "security-admin-console", "name": "${client_security-admin-console}", "rootUrl": "${authAdminUrl}", - "baseUrl": "/admin/thesis-track/console/", + "baseUrl": "/admin/thesis-management/console/", "surrogateAuthRequired": false, "enabled": true, "alwaysDisplayInConsole": false, "clientAuthenticatorType": "client-secret", "redirectUris": [ - "/admin/thesis-track/console/*" + "/admin/thesis-management/console/*" ], "webOrigins": [ "+" @@ -830,7 +830,7 @@ }, { "id": "6ad0df84-52d0-4a3e-b2f5-26bfd7aea7f2", - "clientId": "thesis-track-app", + "clientId": "thesis-management-app", "name": "", "description": "", "rootUrl": "", @@ -882,7 +882,7 @@ }, { "id": "3652903b-9f7a-4e91-9b41-11dc4ac0bd8d", - "clientId": "thesis-track-service-client", + "clientId": "thesis-management-service-client", "name": "", "description": "", "rootUrl": "", diff --git a/package-lock.json b/package-lock.json index 0bfe50a2..1fd40895 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "thesis-track", + "name": "thesis-management", "lockfileVersion": 3, "requires": true, "packages": {} diff --git a/server.Dockerfile b/server.Dockerfile index 70bf483f..43c3281f 100644 --- a/server.Dockerfile +++ b/server.Dockerfile @@ -1,7 +1,7 @@ FROM gradle:8.11.1-jdk21 AS build -COPY --chown=gradle:gradle . /home/gradle/thesis-track -WORKDIR /home/gradle/thesis-track/server +COPY --chown=gradle:gradle . /home/gradle/thesis-management +WORKDIR /home/gradle/thesis-management/server RUN gradle build -x test --no-daemon @@ -11,6 +11,6 @@ EXPOSE 8080 RUN mkdir /app -COPY --from=build /home/gradle/thesis-track/server/build/libs/*.jar /app/server.jar +COPY --from=build /home/gradle/thesis-management/server/build/libs/*.jar /app/server.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom","-jar","/app/server.jar"] diff --git a/server/build.gradle b/server/build.gradle index 99590714..5ffce82f 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -8,9 +8,9 @@ plugins { id "com.github.ben-manes.versions" version "0.51.0" } -group = "thesis-track.ls1" +group = "thesis.aet" version = "3.0.4" -description = "Thesis Track" +description = "Thesis Management" java { sourceCompatibility = JavaVersion.VERSION_21 diff --git a/server/gradle.properties b/server/gradle.properties index 5696975e..e3d4b096 100644 --- a/server/gradle.properties +++ b/server/gradle.properties @@ -1,4 +1,4 @@ -rootProject.name=Thesis Track +rootProject.name=Thesis Management spring_boot_version=3.4.1 netty_version=4.1.115.Final test_container_version=1.20.4 diff --git a/server/settings.gradle b/server/settings.gradle index d937d21a..0205f2fb 100644 --- a/server/settings.gradle +++ b/server/settings.gradle @@ -1 +1 @@ -rootProject.name = 'thesis-track' +rootProject.name = 'thesis-management' diff --git a/server/src/main/java/thesistrack/ls1/ThesisTrackApplication.java b/server/src/main/java/thesis/aet/ThesisManagementApplication.java similarity index 75% rename from server/src/main/java/thesistrack/ls1/ThesisTrackApplication.java rename to server/src/main/java/thesis/aet/ThesisManagementApplication.java index 132b9cfa..18f04afe 100644 --- a/server/src/main/java/thesistrack/ls1/ThesisTrackApplication.java +++ b/server/src/main/java/thesis/aet/ThesisManagementApplication.java @@ -1,4 +1,4 @@ -package thesistrack.ls1; +package de.tum.cit.aet.thesis; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -10,11 +10,11 @@ @SpringBootApplication @EnableScheduling -public class ThesisTrackApplication implements ApplicationRunner { - private static final Logger logger = LoggerFactory.getLogger(ThesisTrackApplication.class); +public class ThesisManagementApplication implements ApplicationRunner { + private static final Logger logger = LoggerFactory.getLogger(ThesisManagementApplication.class); public static void main(String[] args) { - SpringApplication.run(ThesisTrackApplication.class, args); + SpringApplication.run(ThesisManagementApplication.class, args); } @Override diff --git a/server/src/main/java/thesistrack/ls1/config/WebConfig.java b/server/src/main/java/thesis/aet/config/WebConfig.java similarity index 87% rename from server/src/main/java/thesistrack/ls1/config/WebConfig.java rename to server/src/main/java/thesis/aet/config/WebConfig.java index c5b79dcf..623c1d2f 100644 --- a/server/src/main/java/thesistrack/ls1/config/WebConfig.java +++ b/server/src/main/java/thesis/aet/config/WebConfig.java @@ -1,10 +1,10 @@ -package thesistrack.ls1.config; +package de.tum.cit.aet.thesis.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.format.FormatterRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import thesistrack.ls1.utility.StringToArrayConverter; +import de.tum.cit.aet.thesis.utility.StringToArrayConverter; @Configuration public class WebConfig implements WebMvcConfigurer { diff --git a/server/src/main/java/thesistrack/ls1/constants/ApplicationRejectReason.java b/server/src/main/java/thesis/aet/constants/ApplicationRejectReason.java similarity index 96% rename from server/src/main/java/thesistrack/ls1/constants/ApplicationRejectReason.java rename to server/src/main/java/thesis/aet/constants/ApplicationRejectReason.java index 81c1ffaa..cd121b21 100644 --- a/server/src/main/java/thesistrack/ls1/constants/ApplicationRejectReason.java +++ b/server/src/main/java/thesis/aet/constants/ApplicationRejectReason.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.constants; +package de.tum.cit.aet.thesis.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/server/src/main/java/thesistrack/ls1/constants/ApplicationReviewReason.java b/server/src/main/java/thesis/aet/constants/ApplicationReviewReason.java similarity index 86% rename from server/src/main/java/thesistrack/ls1/constants/ApplicationReviewReason.java rename to server/src/main/java/thesis/aet/constants/ApplicationReviewReason.java index b4778c00..e85b593c 100644 --- a/server/src/main/java/thesistrack/ls1/constants/ApplicationReviewReason.java +++ b/server/src/main/java/thesis/aet/constants/ApplicationReviewReason.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.constants; +package de.tum.cit.aet.thesis.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/server/src/main/java/thesistrack/ls1/constants/ApplicationState.java b/server/src/main/java/thesis/aet/constants/ApplicationState.java similarity index 85% rename from server/src/main/java/thesistrack/ls1/constants/ApplicationState.java rename to server/src/main/java/thesis/aet/constants/ApplicationState.java index 5debe9be..e3acdea7 100644 --- a/server/src/main/java/thesistrack/ls1/constants/ApplicationState.java +++ b/server/src/main/java/thesis/aet/constants/ApplicationState.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.constants; +package de.tum.cit.aet.thesis.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/server/src/main/java/thesistrack/ls1/constants/StringLimits.java b/server/src/main/java/thesis/aet/constants/StringLimits.java similarity index 86% rename from server/src/main/java/thesistrack/ls1/constants/StringLimits.java rename to server/src/main/java/thesis/aet/constants/StringLimits.java index b7c660d7..0055f25b 100644 --- a/server/src/main/java/thesistrack/ls1/constants/StringLimits.java +++ b/server/src/main/java/thesis/aet/constants/StringLimits.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.constants; +package de.tum.cit.aet.thesis.constants; import lombok.Getter; diff --git a/server/src/main/java/thesistrack/ls1/constants/ThesisCommentType.java b/server/src/main/java/thesis/aet/constants/ThesisCommentType.java similarity index 82% rename from server/src/main/java/thesistrack/ls1/constants/ThesisCommentType.java rename to server/src/main/java/thesis/aet/constants/ThesisCommentType.java index 2b28fb01..d4c99503 100644 --- a/server/src/main/java/thesistrack/ls1/constants/ThesisCommentType.java +++ b/server/src/main/java/thesis/aet/constants/ThesisCommentType.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.constants; +package de.tum.cit.aet.thesis.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/server/src/main/java/thesistrack/ls1/constants/ThesisFeedbackType.java b/server/src/main/java/thesis/aet/constants/ThesisFeedbackType.java similarity index 85% rename from server/src/main/java/thesistrack/ls1/constants/ThesisFeedbackType.java rename to server/src/main/java/thesis/aet/constants/ThesisFeedbackType.java index db4d91dc..f28daf38 100644 --- a/server/src/main/java/thesistrack/ls1/constants/ThesisFeedbackType.java +++ b/server/src/main/java/thesis/aet/constants/ThesisFeedbackType.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.constants; +package de.tum.cit.aet.thesis.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/server/src/main/java/thesistrack/ls1/constants/ThesisPresentationState.java b/server/src/main/java/thesis/aet/constants/ThesisPresentationState.java similarity index 83% rename from server/src/main/java/thesistrack/ls1/constants/ThesisPresentationState.java rename to server/src/main/java/thesis/aet/constants/ThesisPresentationState.java index 9f1a275d..77344819 100644 --- a/server/src/main/java/thesistrack/ls1/constants/ThesisPresentationState.java +++ b/server/src/main/java/thesis/aet/constants/ThesisPresentationState.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.constants; +package de.tum.cit.aet.thesis.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/server/src/main/java/thesistrack/ls1/constants/ThesisPresentationType.java b/server/src/main/java/thesis/aet/constants/ThesisPresentationType.java similarity index 83% rename from server/src/main/java/thesistrack/ls1/constants/ThesisPresentationType.java rename to server/src/main/java/thesis/aet/constants/ThesisPresentationType.java index 22118b81..5a7af713 100644 --- a/server/src/main/java/thesistrack/ls1/constants/ThesisPresentationType.java +++ b/server/src/main/java/thesis/aet/constants/ThesisPresentationType.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.constants; +package de.tum.cit.aet.thesis.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/server/src/main/java/thesistrack/ls1/constants/ThesisPresentationVisibility.java b/server/src/main/java/thesis/aet/constants/ThesisPresentationVisibility.java similarity index 83% rename from server/src/main/java/thesistrack/ls1/constants/ThesisPresentationVisibility.java rename to server/src/main/java/thesis/aet/constants/ThesisPresentationVisibility.java index 530abadb..8f92c1ac 100644 --- a/server/src/main/java/thesistrack/ls1/constants/ThesisPresentationVisibility.java +++ b/server/src/main/java/thesis/aet/constants/ThesisPresentationVisibility.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.constants; +package de.tum.cit.aet.thesis.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/server/src/main/java/thesistrack/ls1/constants/ThesisRoleName.java b/server/src/main/java/thesis/aet/constants/ThesisRoleName.java similarity index 84% rename from server/src/main/java/thesistrack/ls1/constants/ThesisRoleName.java rename to server/src/main/java/thesis/aet/constants/ThesisRoleName.java index 5745c0e1..3dc76d6e 100644 --- a/server/src/main/java/thesistrack/ls1/constants/ThesisRoleName.java +++ b/server/src/main/java/thesis/aet/constants/ThesisRoleName.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.constants; +package de.tum.cit.aet.thesis.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/server/src/main/java/thesistrack/ls1/constants/ThesisState.java b/server/src/main/java/thesis/aet/constants/ThesisState.java similarity index 88% rename from server/src/main/java/thesistrack/ls1/constants/ThesisState.java rename to server/src/main/java/thesis/aet/constants/ThesisState.java index 00859b89..7583fc1f 100644 --- a/server/src/main/java/thesistrack/ls1/constants/ThesisState.java +++ b/server/src/main/java/thesis/aet/constants/ThesisState.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.constants; +package de.tum.cit.aet.thesis.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/server/src/main/java/thesistrack/ls1/constants/ThesisVisibility.java b/server/src/main/java/thesis/aet/constants/ThesisVisibility.java similarity index 85% rename from server/src/main/java/thesistrack/ls1/constants/ThesisVisibility.java rename to server/src/main/java/thesis/aet/constants/ThesisVisibility.java index 6e39b9be..b2d69bad 100644 --- a/server/src/main/java/thesistrack/ls1/constants/ThesisVisibility.java +++ b/server/src/main/java/thesis/aet/constants/ThesisVisibility.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.constants; +package de.tum.cit.aet.thesis.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/server/src/main/java/thesistrack/ls1/constants/UploadFileType.java b/server/src/main/java/thesis/aet/constants/UploadFileType.java similarity index 83% rename from server/src/main/java/thesistrack/ls1/constants/UploadFileType.java rename to server/src/main/java/thesis/aet/constants/UploadFileType.java index 0097043b..e7833d11 100644 --- a/server/src/main/java/thesistrack/ls1/constants/UploadFileType.java +++ b/server/src/main/java/thesis/aet/constants/UploadFileType.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.constants; +package de.tum.cit.aet.thesis.constants; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java b/server/src/main/java/thesis/aet/controller/ApplicationController.java similarity index 93% rename from server/src/main/java/thesistrack/ls1/controller/ApplicationController.java rename to server/src/main/java/thesis/aet/controller/ApplicationController.java index 46e07d22..d6056fcc 100644 --- a/server/src/main/java/thesistrack/ls1/controller/ApplicationController.java +++ b/server/src/main/java/thesis/aet/controller/ApplicationController.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller; +package de.tum.cit.aet.thesis.controller; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -10,19 +10,19 @@ import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken; import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; -import thesistrack.ls1.constants.ApplicationRejectReason; -import thesistrack.ls1.constants.ApplicationState; -import thesistrack.ls1.constants.StringLimits; -import thesistrack.ls1.controller.payload.*; -import thesistrack.ls1.dto.ApplicationDto; -import thesistrack.ls1.dto.PaginationDto; -import thesistrack.ls1.entity.Application; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.exception.request.ResourceAlreadyExistsException; -import thesistrack.ls1.exception.request.ResourceInvalidParametersException; -import thesistrack.ls1.service.ApplicationService; -import thesistrack.ls1.service.AuthenticationService; -import thesistrack.ls1.utility.RequestValidator; +import de.tum.cit.aet.thesis.constants.ApplicationRejectReason; +import de.tum.cit.aet.thesis.constants.ApplicationState; +import de.tum.cit.aet.thesis.constants.StringLimits; +import de.tum.cit.aet.thesis.controller.payload.*; +import de.tum.cit.aet.thesis.dto.ApplicationDto; +import de.tum.cit.aet.thesis.dto.PaginationDto; +import de.tum.cit.aet.thesis.entity.Application; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.exception.request.ResourceAlreadyExistsException; +import de.tum.cit.aet.thesis.exception.request.ResourceInvalidParametersException; +import de.tum.cit.aet.thesis.service.ApplicationService; +import de.tum.cit.aet.thesis.service.AuthenticationService; +import de.tum.cit.aet.thesis.utility.RequestValidator; import java.util.List; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/controller/AvatarController.java b/server/src/main/java/thesis/aet/controller/AvatarController.java similarity index 74% rename from server/src/main/java/thesistrack/ls1/controller/AvatarController.java rename to server/src/main/java/thesis/aet/controller/AvatarController.java index eb78d617..c24ee5cc 100644 --- a/server/src/main/java/thesistrack/ls1/controller/AvatarController.java +++ b/server/src/main/java/thesis/aet/controller/AvatarController.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller; +package de.tum.cit.aet.thesis.controller; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -11,16 +11,16 @@ import org.springframework.security.access.AccessDeniedException; import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken; import org.springframework.web.bind.annotation.*; -import thesistrack.ls1.constants.ThesisState; -import thesistrack.ls1.constants.ThesisVisibility; -import thesistrack.ls1.dto.PaginationDto; -import thesistrack.ls1.dto.PublishedThesisDto; -import thesistrack.ls1.entity.Thesis; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.service.AuthenticationService; -import thesistrack.ls1.service.ThesisService; -import thesistrack.ls1.service.UploadService; -import thesistrack.ls1.service.UserService; +import de.tum.cit.aet.thesis.constants.ThesisState; +import de.tum.cit.aet.thesis.constants.ThesisVisibility; +import de.tum.cit.aet.thesis.dto.PaginationDto; +import de.tum.cit.aet.thesis.dto.PublishedThesisDto; +import de.tum.cit.aet.thesis.entity.Thesis; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.service.AuthenticationService; +import de.tum.cit.aet.thesis.service.ThesisService; +import de.tum.cit.aet.thesis.service.UploadService; +import de.tum.cit.aet.thesis.service.UserService; import java.util.Set; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/controller/CalendarController.java b/server/src/main/java/thesis/aet/controller/CalendarController.java similarity index 92% rename from server/src/main/java/thesistrack/ls1/controller/CalendarController.java rename to server/src/main/java/thesis/aet/controller/CalendarController.java index 34f780e5..8c3a558e 100644 --- a/server/src/main/java/thesistrack/ls1/controller/CalendarController.java +++ b/server/src/main/java/thesis/aet/controller/CalendarController.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller; +package de.tum.cit.aet.thesis.controller; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -6,7 +6,7 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import thesistrack.ls1.service.*; +import de.tum.cit.aet.thesis.service.*; @Slf4j @RestController diff --git a/server/src/main/java/thesistrack/ls1/controller/DashboardController.java b/server/src/main/java/thesis/aet/controller/DashboardController.java similarity index 83% rename from server/src/main/java/thesistrack/ls1/controller/DashboardController.java rename to server/src/main/java/thesis/aet/controller/DashboardController.java index c8c6e22c..d14dd859 100644 --- a/server/src/main/java/thesistrack/ls1/controller/DashboardController.java +++ b/server/src/main/java/thesis/aet/controller/DashboardController.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller; +package de.tum.cit.aet.thesis.controller; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -7,10 +7,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import thesistrack.ls1.dto.TaskDto; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.service.AuthenticationService; -import thesistrack.ls1.service.DashboardService; +import de.tum.cit.aet.thesis.dto.TaskDto; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.service.AuthenticationService; +import de.tum.cit.aet.thesis.service.DashboardService; import java.util.List; diff --git a/server/src/main/java/thesistrack/ls1/controller/PublishedPresentationController.java b/server/src/main/java/thesis/aet/controller/PublishedPresentationController.java similarity index 80% rename from server/src/main/java/thesistrack/ls1/controller/PublishedPresentationController.java rename to server/src/main/java/thesis/aet/controller/PublishedPresentationController.java index f3f8f17a..36e9372d 100644 --- a/server/src/main/java/thesistrack/ls1/controller/PublishedPresentationController.java +++ b/server/src/main/java/thesis/aet/controller/PublishedPresentationController.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller; +package de.tum.cit.aet.thesis.controller; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -9,15 +9,15 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.access.AccessDeniedException; import org.springframework.web.bind.annotation.*; -import thesistrack.ls1.constants.ThesisState; -import thesistrack.ls1.constants.ThesisVisibility; -import thesistrack.ls1.dto.PaginationDto; -import thesistrack.ls1.dto.PublishedPresentationDto; -import thesistrack.ls1.dto.PublishedThesisDto; -import thesistrack.ls1.entity.Thesis; -import thesistrack.ls1.entity.ThesisPresentation; -import thesistrack.ls1.service.ThesisPresentationService; -import thesistrack.ls1.service.ThesisService; +import de.tum.cit.aet.thesis.constants.ThesisState; +import de.tum.cit.aet.thesis.constants.ThesisVisibility; +import de.tum.cit.aet.thesis.dto.PaginationDto; +import de.tum.cit.aet.thesis.dto.PublishedPresentationDto; +import de.tum.cit.aet.thesis.dto.PublishedThesisDto; +import de.tum.cit.aet.thesis.entity.Thesis; +import de.tum.cit.aet.thesis.entity.ThesisPresentation; +import de.tum.cit.aet.thesis.service.ThesisPresentationService; +import de.tum.cit.aet.thesis.service.ThesisService; import java.util.Set; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java b/server/src/main/java/thesis/aet/controller/PublishedThesisController.java similarity index 86% rename from server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java rename to server/src/main/java/thesis/aet/controller/PublishedThesisController.java index fc2d6fc4..2f02323f 100644 --- a/server/src/main/java/thesistrack/ls1/controller/PublishedThesisController.java +++ b/server/src/main/java/thesis/aet/controller/PublishedThesisController.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller; +package de.tum.cit.aet.thesis.controller; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -9,12 +9,12 @@ import org.springframework.http.ResponseEntity; import org.springframework.security.access.AccessDeniedException; import org.springframework.web.bind.annotation.*; -import thesistrack.ls1.constants.ThesisState; -import thesistrack.ls1.constants.ThesisVisibility; -import thesistrack.ls1.dto.PaginationDto; -import thesistrack.ls1.dto.PublishedThesisDto; -import thesistrack.ls1.entity.Thesis; -import thesistrack.ls1.service.ThesisService; +import de.tum.cit.aet.thesis.constants.ThesisState; +import de.tum.cit.aet.thesis.constants.ThesisVisibility; +import de.tum.cit.aet.thesis.dto.PaginationDto; +import de.tum.cit.aet.thesis.dto.PublishedThesisDto; +import de.tum.cit.aet.thesis.entity.Thesis; +import de.tum.cit.aet.thesis.service.ThesisService; import java.util.Set; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/controller/ThesisController.java b/server/src/main/java/thesis/aet/controller/ThesisController.java similarity index 98% rename from server/src/main/java/thesistrack/ls1/controller/ThesisController.java rename to server/src/main/java/thesis/aet/controller/ThesisController.java index a54120ad..49d27359 100644 --- a/server/src/main/java/thesistrack/ls1/controller/ThesisController.java +++ b/server/src/main/java/thesis/aet/controller/ThesisController.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller; +package de.tum.cit.aet.thesis.controller; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -13,17 +13,17 @@ import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import thesistrack.ls1.constants.*; -import thesistrack.ls1.controller.payload.*; -import thesistrack.ls1.dto.PaginationDto; -import thesistrack.ls1.dto.ThesisCommentDto; -import thesistrack.ls1.dto.ThesisDto; -import thesistrack.ls1.entity.*; -import thesistrack.ls1.service.AuthenticationService; -import thesistrack.ls1.service.ThesisCommentService; -import thesistrack.ls1.service.ThesisPresentationService; -import thesistrack.ls1.service.ThesisService; -import thesistrack.ls1.utility.RequestValidator; +import de.tum.cit.aet.thesis.constants.*; +import de.tum.cit.aet.thesis.controller.payload.*; +import de.tum.cit.aet.thesis.dto.PaginationDto; +import de.tum.cit.aet.thesis.dto.ThesisCommentDto; +import de.tum.cit.aet.thesis.dto.ThesisDto; +import de.tum.cit.aet.thesis.entity.*; +import de.tum.cit.aet.thesis.service.AuthenticationService; +import de.tum.cit.aet.thesis.service.ThesisCommentService; +import de.tum.cit.aet.thesis.service.ThesisPresentationService; +import de.tum.cit.aet.thesis.service.ThesisService; +import de.tum.cit.aet.thesis.utility.RequestValidator; import java.util.Set; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/controller/TopicController.java b/server/src/main/java/thesis/aet/controller/TopicController.java similarity index 90% rename from server/src/main/java/thesistrack/ls1/controller/TopicController.java rename to server/src/main/java/thesis/aet/controller/TopicController.java index 4fca02af..2ec09aa9 100644 --- a/server/src/main/java/thesistrack/ls1/controller/TopicController.java +++ b/server/src/main/java/thesis/aet/controller/TopicController.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller; +package de.tum.cit.aet.thesis.controller; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -7,17 +7,17 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken; import org.springframework.web.bind.annotation.*; -import thesistrack.ls1.constants.StringLimits; -import thesistrack.ls1.controller.payload.CloseTopicPayload; -import thesistrack.ls1.controller.payload.ReplaceTopicPayload; -import thesistrack.ls1.dto.PaginationDto; -import thesistrack.ls1.dto.TopicDto; -import thesistrack.ls1.entity.Topic; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.service.ApplicationService; -import thesistrack.ls1.service.AuthenticationService; -import thesistrack.ls1.service.TopicService; -import thesistrack.ls1.utility.RequestValidator; +import de.tum.cit.aet.thesis.constants.StringLimits; +import de.tum.cit.aet.thesis.controller.payload.CloseTopicPayload; +import de.tum.cit.aet.thesis.controller.payload.ReplaceTopicPayload; +import de.tum.cit.aet.thesis.dto.PaginationDto; +import de.tum.cit.aet.thesis.dto.TopicDto; +import de.tum.cit.aet.thesis.entity.Topic; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.service.ApplicationService; +import de.tum.cit.aet.thesis.service.AuthenticationService; +import de.tum.cit.aet.thesis.service.TopicService; +import de.tum.cit.aet.thesis.utility.RequestValidator; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/controller/UserController.java b/server/src/main/java/thesis/aet/controller/UserController.java similarity index 93% rename from server/src/main/java/thesistrack/ls1/controller/UserController.java rename to server/src/main/java/thesis/aet/controller/UserController.java index 264270c0..5e0f1da2 100644 --- a/server/src/main/java/thesistrack/ls1/controller/UserController.java +++ b/server/src/main/java/thesis/aet/controller/UserController.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller; +package de.tum.cit.aet.thesis.controller; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -11,11 +11,11 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken; import org.springframework.web.bind.annotation.*; -import thesistrack.ls1.dto.LightUserDto; -import thesistrack.ls1.dto.PaginationDto; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.service.AuthenticationService; -import thesistrack.ls1.service.UserService; +import de.tum.cit.aet.thesis.dto.LightUserDto; +import de.tum.cit.aet.thesis.dto.PaginationDto; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.service.AuthenticationService; +import de.tum.cit.aet.thesis.service.UserService; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/controller/UserInfoController.java b/server/src/main/java/thesis/aet/controller/UserInfoController.java similarity index 89% rename from server/src/main/java/thesistrack/ls1/controller/UserInfoController.java rename to server/src/main/java/thesis/aet/controller/UserInfoController.java index e62fb00e..62aa4f77 100644 --- a/server/src/main/java/thesistrack/ls1/controller/UserInfoController.java +++ b/server/src/main/java/thesis/aet/controller/UserInfoController.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller; +package de.tum.cit.aet.thesis.controller; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -7,15 +7,15 @@ import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import thesistrack.ls1.constants.StringLimits; -import thesistrack.ls1.controller.payload.UpdateNotificationSettingPayload; -import thesistrack.ls1.controller.payload.UpdateUserInformationPayload; -import thesistrack.ls1.dto.NotificationSettingDto; -import thesistrack.ls1.dto.UserDto; -import thesistrack.ls1.entity.NotificationSetting; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.service.AuthenticationService; -import thesistrack.ls1.utility.RequestValidator; +import de.tum.cit.aet.thesis.constants.StringLimits; +import de.tum.cit.aet.thesis.controller.payload.UpdateNotificationSettingPayload; +import de.tum.cit.aet.thesis.controller.payload.UpdateUserInformationPayload; +import de.tum.cit.aet.thesis.dto.NotificationSettingDto; +import de.tum.cit.aet.thesis.dto.UserDto; +import de.tum.cit.aet.thesis.entity.NotificationSetting; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.service.AuthenticationService; +import de.tum.cit.aet.thesis.utility.RequestValidator; import java.util.List; diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/AcceptApplicationPayload.java b/server/src/main/java/thesis/aet/controller/payload/AcceptApplicationPayload.java similarity index 85% rename from server/src/main/java/thesistrack/ls1/controller/payload/AcceptApplicationPayload.java rename to server/src/main/java/thesis/aet/controller/payload/AcceptApplicationPayload.java index b6419005..8c008677 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/AcceptApplicationPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/AcceptApplicationPayload.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; import java.util.List; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/AddThesisGradePayload.java b/server/src/main/java/thesis/aet/controller/payload/AddThesisGradePayload.java similarity index 56% rename from server/src/main/java/thesistrack/ls1/controller/payload/AddThesisGradePayload.java rename to server/src/main/java/thesis/aet/controller/payload/AddThesisGradePayload.java index de4f9ac4..b828fb46 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/AddThesisGradePayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/AddThesisGradePayload.java @@ -1,6 +1,6 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; -import thesistrack.ls1.constants.ThesisVisibility; +import de.tum.cit.aet.thesis.constants.ThesisVisibility; public record AddThesisGradePayload( String finalGrade, diff --git a/server/src/main/java/thesis/aet/controller/payload/CloseTopicPayload.java b/server/src/main/java/thesis/aet/controller/payload/CloseTopicPayload.java new file mode 100644 index 00000000..7828d7ff --- /dev/null +++ b/server/src/main/java/thesis/aet/controller/payload/CloseTopicPayload.java @@ -0,0 +1,9 @@ +package de.tum.cit.aet.thesis.controller.payload; + +import de.tum.cit.aet.thesis.constants.ApplicationRejectReason; + +public record CloseTopicPayload( + ApplicationRejectReason reason, + Boolean notifyUser +) { +} diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/CreateApplicationPayload.java b/server/src/main/java/thesis/aet/controller/payload/CreateApplicationPayload.java similarity index 82% rename from server/src/main/java/thesistrack/ls1/controller/payload/CreateApplicationPayload.java rename to server/src/main/java/thesis/aet/controller/payload/CreateApplicationPayload.java index 08db452d..fdfd4ee6 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/CreateApplicationPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/CreateApplicationPayload.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; import java.time.Instant; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/CreateAssessmentPayload.java b/server/src/main/java/thesis/aet/controller/payload/CreateAssessmentPayload.java similarity index 75% rename from server/src/main/java/thesistrack/ls1/controller/payload/CreateAssessmentPayload.java rename to server/src/main/java/thesis/aet/controller/payload/CreateAssessmentPayload.java index 6995db7e..35642201 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/CreateAssessmentPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/CreateAssessmentPayload.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; public record CreateAssessmentPayload( String summary, diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/CreateThesisPayload.java b/server/src/main/java/thesis/aet/controller/payload/CreateThesisPayload.java similarity index 84% rename from server/src/main/java/thesistrack/ls1/controller/payload/CreateThesisPayload.java rename to server/src/main/java/thesis/aet/controller/payload/CreateThesisPayload.java index 9f3df973..2a4645c0 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/CreateThesisPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/CreateThesisPayload.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; import java.util.List; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/PostThesisCommentPayload.java b/server/src/main/java/thesis/aet/controller/payload/PostThesisCommentPayload.java similarity index 50% rename from server/src/main/java/thesistrack/ls1/controller/payload/PostThesisCommentPayload.java rename to server/src/main/java/thesis/aet/controller/payload/PostThesisCommentPayload.java index 95f0d060..8a28b39b 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/PostThesisCommentPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/PostThesisCommentPayload.java @@ -1,6 +1,6 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; -import thesistrack.ls1.constants.ThesisCommentType; +import de.tum.cit.aet.thesis.constants.ThesisCommentType; public record PostThesisCommentPayload( String message, diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/RejectApplicationPayload.java b/server/src/main/java/thesis/aet/controller/payload/RejectApplicationPayload.java similarity index 50% rename from server/src/main/java/thesistrack/ls1/controller/payload/RejectApplicationPayload.java rename to server/src/main/java/thesis/aet/controller/payload/RejectApplicationPayload.java index 7f92819b..2da89afb 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/RejectApplicationPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/RejectApplicationPayload.java @@ -1,6 +1,6 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; -import thesistrack.ls1.constants.ApplicationRejectReason; +import de.tum.cit.aet.thesis.constants.ApplicationRejectReason; public record RejectApplicationPayload ( ApplicationRejectReason reason, diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/ReplacePresentationPayload.java b/server/src/main/java/thesis/aet/controller/payload/ReplacePresentationPayload.java similarity index 58% rename from server/src/main/java/thesistrack/ls1/controller/payload/ReplacePresentationPayload.java rename to server/src/main/java/thesis/aet/controller/payload/ReplacePresentationPayload.java index 071735e2..157176c5 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/ReplacePresentationPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/ReplacePresentationPayload.java @@ -1,7 +1,7 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; -import thesistrack.ls1.constants.ThesisPresentationType; -import thesistrack.ls1.constants.ThesisPresentationVisibility; +import de.tum.cit.aet.thesis.constants.ThesisPresentationType; +import de.tum.cit.aet.thesis.constants.ThesisPresentationVisibility; import java.time.Instant; diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java b/server/src/main/java/thesis/aet/controller/payload/ReplaceTopicPayload.java similarity index 87% rename from server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java rename to server/src/main/java/thesis/aet/controller/payload/ReplaceTopicPayload.java index 799887a2..abd65694 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/ReplaceTopicPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/ReplaceTopicPayload.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; import java.util.List; import java.util.Set; diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/RequestChangesPayload.java b/server/src/main/java/thesis/aet/controller/payload/RequestChangesPayload.java similarity index 69% rename from server/src/main/java/thesistrack/ls1/controller/payload/RequestChangesPayload.java rename to server/src/main/java/thesis/aet/controller/payload/RequestChangesPayload.java index 5bc7af0d..bc910f45 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/RequestChangesPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/RequestChangesPayload.java @@ -1,6 +1,6 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; -import thesistrack.ls1.constants.ThesisFeedbackType; +import de.tum.cit.aet.thesis.constants.ThesisFeedbackType; import java.util.List; diff --git a/server/src/main/java/thesis/aet/controller/payload/ReviewApplicationPayload.java b/server/src/main/java/thesis/aet/controller/payload/ReviewApplicationPayload.java new file mode 100644 index 00000000..c957b956 --- /dev/null +++ b/server/src/main/java/thesis/aet/controller/payload/ReviewApplicationPayload.java @@ -0,0 +1,8 @@ +package de.tum.cit.aet.thesis.controller.payload; + +import de.tum.cit.aet.thesis.constants.ApplicationReviewReason; + +public record ReviewApplicationPayload( + ApplicationReviewReason reason +) { +} diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/SchedulePresentationPayload.java b/server/src/main/java/thesis/aet/controller/payload/SchedulePresentationPayload.java similarity index 82% rename from server/src/main/java/thesistrack/ls1/controller/payload/SchedulePresentationPayload.java rename to server/src/main/java/thesis/aet/controller/payload/SchedulePresentationPayload.java index d0ad949a..c1b5831b 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/SchedulePresentationPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/SchedulePresentationPayload.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; import jakarta.mail.internet.InternetAddress; diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/ThesisStatePayload.java b/server/src/main/java/thesis/aet/controller/payload/ThesisStatePayload.java similarity index 54% rename from server/src/main/java/thesistrack/ls1/controller/payload/ThesisStatePayload.java rename to server/src/main/java/thesis/aet/controller/payload/ThesisStatePayload.java index bc1b9109..df8ee7f7 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/ThesisStatePayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/ThesisStatePayload.java @@ -1,6 +1,6 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; -import thesistrack.ls1.constants.ThesisState; +import de.tum.cit.aet.thesis.constants.ThesisState; import java.time.Instant; diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateApplicationCommentPayload.java b/server/src/main/java/thesis/aet/controller/payload/UpdateApplicationCommentPayload.java similarity index 60% rename from server/src/main/java/thesistrack/ls1/controller/payload/UpdateApplicationCommentPayload.java rename to server/src/main/java/thesis/aet/controller/payload/UpdateApplicationCommentPayload.java index e64d3587..90117444 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateApplicationCommentPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/UpdateApplicationCommentPayload.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; public record UpdateApplicationCommentPayload ( String comment diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateNotificationSettingPayload.java b/server/src/main/java/thesis/aet/controller/payload/UpdateNotificationSettingPayload.java similarity index 66% rename from server/src/main/java/thesistrack/ls1/controller/payload/UpdateNotificationSettingPayload.java rename to server/src/main/java/thesis/aet/controller/payload/UpdateNotificationSettingPayload.java index f12a3a82..b84d6b6b 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateNotificationSettingPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/UpdateNotificationSettingPayload.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; public record UpdateNotificationSettingPayload ( String name, diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateThesisCreditsPayload.java b/server/src/main/java/thesis/aet/controller/payload/UpdateThesisCreditsPayload.java similarity index 72% rename from server/src/main/java/thesistrack/ls1/controller/payload/UpdateThesisCreditsPayload.java rename to server/src/main/java/thesis/aet/controller/payload/UpdateThesisCreditsPayload.java index 006abe02..a57007c6 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateThesisCreditsPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/UpdateThesisCreditsPayload.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; import java.util.Map; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateThesisInfoPayload.java b/server/src/main/java/thesis/aet/controller/payload/UpdateThesisInfoPayload.java similarity index 79% rename from server/src/main/java/thesistrack/ls1/controller/payload/UpdateThesisInfoPayload.java rename to server/src/main/java/thesis/aet/controller/payload/UpdateThesisInfoPayload.java index a9f1449f..65db41dc 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateThesisInfoPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/UpdateThesisInfoPayload.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; import java.util.Map; diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateThesisPayload.java b/server/src/main/java/thesis/aet/controller/payload/UpdateThesisPayload.java similarity index 81% rename from server/src/main/java/thesistrack/ls1/controller/payload/UpdateThesisPayload.java rename to server/src/main/java/thesis/aet/controller/payload/UpdateThesisPayload.java index 46778849..70da899d 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateThesisPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/UpdateThesisPayload.java @@ -1,6 +1,6 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; -import thesistrack.ls1.constants.ThesisVisibility; +import de.tum.cit.aet.thesis.constants.ThesisVisibility; import java.time.Instant; import java.util.List; diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateUserInformationPayload.java b/server/src/main/java/thesis/aet/controller/payload/UpdateUserInformationPayload.java similarity index 90% rename from server/src/main/java/thesistrack/ls1/controller/payload/UpdateUserInformationPayload.java rename to server/src/main/java/thesis/aet/controller/payload/UpdateUserInformationPayload.java index 01e235e2..d12be9a2 100644 --- a/server/src/main/java/thesistrack/ls1/controller/payload/UpdateUserInformationPayload.java +++ b/server/src/main/java/thesis/aet/controller/payload/UpdateUserInformationPayload.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller.payload; +package de.tum.cit.aet.thesis.controller.payload; import java.time.Instant; import java.util.Map; diff --git a/server/src/main/java/thesistrack/ls1/cron/ApplicationReminder.java b/server/src/main/java/thesis/aet/cron/ApplicationReminder.java similarity index 84% rename from server/src/main/java/thesistrack/ls1/cron/ApplicationReminder.java rename to server/src/main/java/thesis/aet/cron/ApplicationReminder.java index e13147aa..7347cf45 100644 --- a/server/src/main/java/thesistrack/ls1/cron/ApplicationReminder.java +++ b/server/src/main/java/thesis/aet/cron/ApplicationReminder.java @@ -1,13 +1,13 @@ -package thesistrack.ls1.cron; +package de.tum.cit.aet.thesis.cron; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.repository.ApplicationRepository; -import thesistrack.ls1.repository.UserRepository; -import thesistrack.ls1.service.MailingService; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.repository.ApplicationRepository; +import de.tum.cit.aet.thesis.repository.UserRepository; +import de.tum.cit.aet.thesis.service.MailingService; import java.time.Instant; import java.util.Set; diff --git a/server/src/main/java/thesistrack/ls1/dto/ApplicationDto.java b/server/src/main/java/thesis/aet/dto/ApplicationDto.java similarity index 86% rename from server/src/main/java/thesistrack/ls1/dto/ApplicationDto.java rename to server/src/main/java/thesis/aet/dto/ApplicationDto.java index c626abc8..0a290ddc 100644 --- a/server/src/main/java/thesistrack/ls1/dto/ApplicationDto.java +++ b/server/src/main/java/thesis/aet/dto/ApplicationDto.java @@ -1,10 +1,10 @@ -package thesistrack.ls1.dto; +package de.tum.cit.aet.thesis.dto; -import thesistrack.ls1.constants.ApplicationRejectReason; -import thesistrack.ls1.constants.ApplicationReviewReason; -import thesistrack.ls1.constants.ApplicationState; -import thesistrack.ls1.entity.Application; -import thesistrack.ls1.entity.ApplicationReviewer; +import de.tum.cit.aet.thesis.constants.ApplicationRejectReason; +import de.tum.cit.aet.thesis.constants.ApplicationReviewReason; +import de.tum.cit.aet.thesis.constants.ApplicationState; +import de.tum.cit.aet.thesis.entity.Application; +import de.tum.cit.aet.thesis.entity.ApplicationReviewer; import java.time.Instant; import java.util.List; diff --git a/server/src/main/java/thesistrack/ls1/dto/ErrorDto.java b/server/src/main/java/thesis/aet/dto/ErrorDto.java similarity index 90% rename from server/src/main/java/thesistrack/ls1/dto/ErrorDto.java rename to server/src/main/java/thesis/aet/dto/ErrorDto.java index 4ac74d90..916ab615 100644 --- a/server/src/main/java/thesistrack/ls1/dto/ErrorDto.java +++ b/server/src/main/java/thesis/aet/dto/ErrorDto.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.dto; +package de.tum.cit.aet.thesis.dto; import java.time.Instant; diff --git a/server/src/main/java/thesistrack/ls1/dto/LightUserDto.java b/server/src/main/java/thesis/aet/dto/LightUserDto.java similarity index 92% rename from server/src/main/java/thesistrack/ls1/dto/LightUserDto.java rename to server/src/main/java/thesis/aet/dto/LightUserDto.java index d482bd29..b2f09bf1 100644 --- a/server/src/main/java/thesistrack/ls1/dto/LightUserDto.java +++ b/server/src/main/java/thesis/aet/dto/LightUserDto.java @@ -1,6 +1,6 @@ -package thesistrack.ls1.dto; +package de.tum.cit.aet.thesis.dto; -import thesistrack.ls1.entity.User; +import de.tum.cit.aet.thesis.entity.User; import java.time.Instant; import java.util.List; diff --git a/server/src/main/java/thesistrack/ls1/dto/NotificationSettingDto.java b/server/src/main/java/thesis/aet/dto/NotificationSettingDto.java similarity index 81% rename from server/src/main/java/thesistrack/ls1/dto/NotificationSettingDto.java rename to server/src/main/java/thesis/aet/dto/NotificationSettingDto.java index baf5c4f3..f1425a79 100644 --- a/server/src/main/java/thesistrack/ls1/dto/NotificationSettingDto.java +++ b/server/src/main/java/thesis/aet/dto/NotificationSettingDto.java @@ -1,6 +1,6 @@ -package thesistrack.ls1.dto; +package de.tum.cit.aet.thesis.dto; -import thesistrack.ls1.entity.NotificationSetting; +import de.tum.cit.aet.thesis.entity.NotificationSetting; public record NotificationSettingDto( String name, diff --git a/server/src/main/java/thesistrack/ls1/dto/PaginationDto.java b/server/src/main/java/thesis/aet/dto/PaginationDto.java similarity index 94% rename from server/src/main/java/thesistrack/ls1/dto/PaginationDto.java rename to server/src/main/java/thesis/aet/dto/PaginationDto.java index b238e6ad..4afd2c46 100644 --- a/server/src/main/java/thesistrack/ls1/dto/PaginationDto.java +++ b/server/src/main/java/thesis/aet/dto/PaginationDto.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.dto; +package de.tum.cit.aet.thesis.dto; import org.springframework.data.domain.Page; diff --git a/server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java b/server/src/main/java/thesis/aet/dto/PublishedPresentationDto.java similarity index 79% rename from server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java rename to server/src/main/java/thesis/aet/dto/PublishedPresentationDto.java index d63e89a9..c3500e65 100644 --- a/server/src/main/java/thesistrack/ls1/dto/PublishedPresentationDto.java +++ b/server/src/main/java/thesis/aet/dto/PublishedPresentationDto.java @@ -1,9 +1,9 @@ -package thesistrack.ls1.dto; +package de.tum.cit.aet.thesis.dto; -import thesistrack.ls1.constants.ThesisPresentationState; -import thesistrack.ls1.constants.ThesisPresentationType; -import thesistrack.ls1.constants.ThesisPresentationVisibility; -import thesistrack.ls1.entity.ThesisPresentation; +import de.tum.cit.aet.thesis.constants.ThesisPresentationState; +import de.tum.cit.aet.thesis.constants.ThesisPresentationType; +import de.tum.cit.aet.thesis.constants.ThesisPresentationVisibility; +import de.tum.cit.aet.thesis.entity.ThesisPresentation; import java.time.Instant; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/dto/PublishedThesisDto.java b/server/src/main/java/thesis/aet/dto/PublishedThesisDto.java similarity index 89% rename from server/src/main/java/thesistrack/ls1/dto/PublishedThesisDto.java rename to server/src/main/java/thesis/aet/dto/PublishedThesisDto.java index 8200b75b..a8252d7b 100644 --- a/server/src/main/java/thesistrack/ls1/dto/PublishedThesisDto.java +++ b/server/src/main/java/thesis/aet/dto/PublishedThesisDto.java @@ -1,7 +1,7 @@ -package thesistrack.ls1.dto; +package de.tum.cit.aet.thesis.dto; -import thesistrack.ls1.constants.ThesisState; -import thesistrack.ls1.entity.Thesis; +import de.tum.cit.aet.thesis.constants.ThesisState; +import de.tum.cit.aet.thesis.entity.Thesis; import java.time.Instant; import java.util.List; diff --git a/server/src/main/java/thesistrack/ls1/dto/TaskDto.java b/server/src/main/java/thesis/aet/dto/TaskDto.java similarity index 73% rename from server/src/main/java/thesistrack/ls1/dto/TaskDto.java rename to server/src/main/java/thesis/aet/dto/TaskDto.java index 1aeaad50..9d6c026c 100644 --- a/server/src/main/java/thesistrack/ls1/dto/TaskDto.java +++ b/server/src/main/java/thesis/aet/dto/TaskDto.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.dto; +package de.tum.cit.aet.thesis.dto; public record TaskDto( String message, diff --git a/server/src/main/java/thesistrack/ls1/dto/ThesisCommentDto.java b/server/src/main/java/thesis/aet/dto/ThesisCommentDto.java similarity index 89% rename from server/src/main/java/thesistrack/ls1/dto/ThesisCommentDto.java rename to server/src/main/java/thesis/aet/dto/ThesisCommentDto.java index 55f23e4e..767b2e72 100644 --- a/server/src/main/java/thesistrack/ls1/dto/ThesisCommentDto.java +++ b/server/src/main/java/thesis/aet/dto/ThesisCommentDto.java @@ -1,6 +1,6 @@ -package thesistrack.ls1.dto; +package de.tum.cit.aet.thesis.dto; -import thesistrack.ls1.entity.ThesisComment; +import de.tum.cit.aet.thesis.entity.ThesisComment; import java.time.Instant; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/dto/ThesisDto.java b/server/src/main/java/thesis/aet/dto/ThesisDto.java similarity index 98% rename from server/src/main/java/thesistrack/ls1/dto/ThesisDto.java rename to server/src/main/java/thesis/aet/dto/ThesisDto.java index ee6739c3..9dc9f2bd 100644 --- a/server/src/main/java/thesistrack/ls1/dto/ThesisDto.java +++ b/server/src/main/java/thesis/aet/dto/ThesisDto.java @@ -1,8 +1,8 @@ -package thesistrack.ls1.dto; +package de.tum.cit.aet.thesis.dto; -import thesistrack.ls1.constants.*; -import thesistrack.ls1.entity.*; -import thesistrack.ls1.entity.jsonb.ThesisMetadata; +import de.tum.cit.aet.thesis.constants.*; +import de.tum.cit.aet.thesis.entity.*; +import de.tum.cit.aet.thesis.entity.jsonb.ThesisMetadata; import java.time.Instant; import java.util.*; diff --git a/server/src/main/java/thesistrack/ls1/dto/TopicDto.java b/server/src/main/java/thesis/aet/dto/TopicDto.java similarity index 90% rename from server/src/main/java/thesistrack/ls1/dto/TopicDto.java rename to server/src/main/java/thesis/aet/dto/TopicDto.java index 88bb832d..2d20c203 100644 --- a/server/src/main/java/thesistrack/ls1/dto/TopicDto.java +++ b/server/src/main/java/thesis/aet/dto/TopicDto.java @@ -1,8 +1,8 @@ -package thesistrack.ls1.dto; +package de.tum.cit.aet.thesis.dto; -import thesistrack.ls1.constants.ThesisRoleName; -import thesistrack.ls1.entity.Topic; -import thesistrack.ls1.entity.TopicRole; +import de.tum.cit.aet.thesis.constants.ThesisRoleName; +import de.tum.cit.aet.thesis.entity.Topic; +import de.tum.cit.aet.thesis.entity.TopicRole; import java.time.Instant; import java.util.ArrayList; diff --git a/server/src/main/java/thesistrack/ls1/dto/UserDto.java b/server/src/main/java/thesis/aet/dto/UserDto.java similarity index 95% rename from server/src/main/java/thesistrack/ls1/dto/UserDto.java rename to server/src/main/java/thesis/aet/dto/UserDto.java index 5b1455e5..4a4dac83 100644 --- a/server/src/main/java/thesistrack/ls1/dto/UserDto.java +++ b/server/src/main/java/thesis/aet/dto/UserDto.java @@ -1,7 +1,7 @@ -package thesistrack.ls1.dto; +package de.tum.cit.aet.thesis.dto; import jakarta.mail.internet.InternetAddress; -import thesistrack.ls1.entity.User; +import de.tum.cit.aet.thesis.entity.User; import java.time.Instant; import java.util.*; diff --git a/server/src/main/java/thesistrack/ls1/entity/Application.java b/server/src/main/java/thesis/aet/entity/Application.java similarity index 94% rename from server/src/main/java/thesistrack/ls1/entity/Application.java rename to server/src/main/java/thesis/aet/entity/Application.java index 2fdf0dff..dfad1e45 100644 --- a/server/src/main/java/thesistrack/ls1/entity/Application.java +++ b/server/src/main/java/thesis/aet/entity/Application.java @@ -1,12 +1,12 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.CreationTimestamp; -import thesistrack.ls1.constants.ApplicationRejectReason; -import thesistrack.ls1.constants.ApplicationState; +import de.tum.cit.aet.thesis.constants.ApplicationRejectReason; +import de.tum.cit.aet.thesis.constants.ApplicationState; import java.time.Instant; import java.util.ArrayList; diff --git a/server/src/main/java/thesistrack/ls1/entity/ApplicationReviewer.java b/server/src/main/java/thesis/aet/entity/ApplicationReviewer.java similarity index 84% rename from server/src/main/java/thesistrack/ls1/entity/ApplicationReviewer.java rename to server/src/main/java/thesis/aet/entity/ApplicationReviewer.java index 5d3c484e..9ba68907 100644 --- a/server/src/main/java/thesistrack/ls1/entity/ApplicationReviewer.java +++ b/server/src/main/java/thesis/aet/entity/ApplicationReviewer.java @@ -1,11 +1,11 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import thesistrack.ls1.constants.ApplicationReviewReason; -import thesistrack.ls1.entity.key.ApplicationReviewerId; +import de.tum.cit.aet.thesis.constants.ApplicationReviewReason; +import de.tum.cit.aet.thesis.entity.key.ApplicationReviewerId; import java.time.Instant; diff --git a/server/src/main/java/thesistrack/ls1/entity/NotificationSetting.java b/server/src/main/java/thesis/aet/entity/NotificationSetting.java similarity index 87% rename from server/src/main/java/thesistrack/ls1/entity/NotificationSetting.java rename to server/src/main/java/thesis/aet/entity/NotificationSetting.java index c3c520cf..2d9e1c33 100644 --- a/server/src/main/java/thesistrack/ls1/entity/NotificationSetting.java +++ b/server/src/main/java/thesis/aet/entity/NotificationSetting.java @@ -1,11 +1,11 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.UpdateTimestamp; -import thesistrack.ls1.entity.key.NotificationSettingId; +import de.tum.cit.aet.thesis.entity.key.NotificationSettingId; import java.time.Instant; diff --git a/server/src/main/java/thesistrack/ls1/entity/Thesis.java b/server/src/main/java/thesis/aet/entity/Thesis.java similarity index 95% rename from server/src/main/java/thesistrack/ls1/entity/Thesis.java rename to server/src/main/java/thesis/aet/entity/Thesis.java index 0bafffe9..1b2195c8 100644 --- a/server/src/main/java/thesistrack/ls1/entity/Thesis.java +++ b/server/src/main/java/thesis/aet/entity/Thesis.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; @@ -7,12 +7,12 @@ import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.type.SqlTypes; -import thesistrack.ls1.constants.ThesisFeedbackType; -import thesistrack.ls1.constants.ThesisRoleName; -import thesistrack.ls1.constants.ThesisState; -import thesistrack.ls1.constants.ThesisVisibility; -import thesistrack.ls1.dto.LightUserDto; -import thesistrack.ls1.entity.jsonb.ThesisMetadata; +import de.tum.cit.aet.thesis.constants.ThesisFeedbackType; +import de.tum.cit.aet.thesis.constants.ThesisRoleName; +import de.tum.cit.aet.thesis.constants.ThesisState; +import de.tum.cit.aet.thesis.constants.ThesisVisibility; +import de.tum.cit.aet.thesis.dto.LightUserDto; +import de.tum.cit.aet.thesis.entity.jsonb.ThesisMetadata; import java.time.Instant; import java.util.*; diff --git a/server/src/main/java/thesistrack/ls1/entity/ThesisAssessment.java b/server/src/main/java/thesis/aet/entity/ThesisAssessment.java similarity index 97% rename from server/src/main/java/thesistrack/ls1/entity/ThesisAssessment.java rename to server/src/main/java/thesis/aet/entity/ThesisAssessment.java index 7fce98b7..a93dc1b5 100644 --- a/server/src/main/java/thesistrack/ls1/entity/ThesisAssessment.java +++ b/server/src/main/java/thesis/aet/entity/ThesisAssessment.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; diff --git a/server/src/main/java/thesistrack/ls1/entity/ThesisComment.java b/server/src/main/java/thesis/aet/entity/ThesisComment.java similarity index 93% rename from server/src/main/java/thesistrack/ls1/entity/ThesisComment.java rename to server/src/main/java/thesis/aet/entity/ThesisComment.java index 9dfccb3a..55934e96 100644 --- a/server/src/main/java/thesistrack/ls1/entity/ThesisComment.java +++ b/server/src/main/java/thesis/aet/entity/ThesisComment.java @@ -1,11 +1,11 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.CreationTimestamp; -import thesistrack.ls1.constants.ThesisCommentType; +import de.tum.cit.aet.thesis.constants.ThesisCommentType; import java.time.Instant; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/entity/ThesisFeedback.java b/server/src/main/java/thesis/aet/entity/ThesisFeedback.java similarity index 91% rename from server/src/main/java/thesistrack/ls1/entity/ThesisFeedback.java rename to server/src/main/java/thesis/aet/entity/ThesisFeedback.java index cd326960..30995c41 100644 --- a/server/src/main/java/thesistrack/ls1/entity/ThesisFeedback.java +++ b/server/src/main/java/thesis/aet/entity/ThesisFeedback.java @@ -1,10 +1,10 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import thesistrack.ls1.constants.ThesisFeedbackType; +import de.tum.cit.aet.thesis.constants.ThesisFeedbackType; import java.time.Instant; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/entity/ThesisFile.java b/server/src/main/java/thesis/aet/entity/ThesisFile.java similarity index 96% rename from server/src/main/java/thesistrack/ls1/entity/ThesisFile.java rename to server/src/main/java/thesis/aet/entity/ThesisFile.java index 8be4444a..7c452646 100644 --- a/server/src/main/java/thesistrack/ls1/entity/ThesisFile.java +++ b/server/src/main/java/thesis/aet/entity/ThesisFile.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; diff --git a/server/src/main/java/thesistrack/ls1/entity/ThesisPresentation.java b/server/src/main/java/thesis/aet/entity/ThesisPresentation.java similarity index 89% rename from server/src/main/java/thesistrack/ls1/entity/ThesisPresentation.java rename to server/src/main/java/thesis/aet/entity/ThesisPresentation.java index eae74d3c..fa116ba7 100644 --- a/server/src/main/java/thesistrack/ls1/entity/ThesisPresentation.java +++ b/server/src/main/java/thesis/aet/entity/ThesisPresentation.java @@ -1,13 +1,13 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.CreationTimestamp; -import thesistrack.ls1.constants.ThesisPresentationState; -import thesistrack.ls1.constants.ThesisPresentationType; -import thesistrack.ls1.constants.ThesisPresentationVisibility; +import de.tum.cit.aet.thesis.constants.ThesisPresentationState; +import de.tum.cit.aet.thesis.constants.ThesisPresentationType; +import de.tum.cit.aet.thesis.constants.ThesisPresentationVisibility; import java.time.Instant; import java.util.ArrayList; diff --git a/server/src/main/java/thesistrack/ls1/entity/ThesisPresentationInvite.java b/server/src/main/java/thesis/aet/entity/ThesisPresentationInvite.java similarity index 89% rename from server/src/main/java/thesistrack/ls1/entity/ThesisPresentationInvite.java rename to server/src/main/java/thesis/aet/entity/ThesisPresentationInvite.java index c267825b..27c0852f 100644 --- a/server/src/main/java/thesistrack/ls1/entity/ThesisPresentationInvite.java +++ b/server/src/main/java/thesis/aet/entity/ThesisPresentationInvite.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.mail.internet.AddressException; import jakarta.mail.internet.InternetAddress; @@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import thesistrack.ls1.entity.key.ThesisPresentationInviteId; +import de.tum.cit.aet.thesis.entity.key.ThesisPresentationInviteId; import java.time.Instant; diff --git a/server/src/main/java/thesistrack/ls1/entity/ThesisProposal.java b/server/src/main/java/thesis/aet/entity/ThesisProposal.java similarity index 96% rename from server/src/main/java/thesistrack/ls1/entity/ThesisProposal.java rename to server/src/main/java/thesis/aet/entity/ThesisProposal.java index 43f3a255..5b9e42c0 100644 --- a/server/src/main/java/thesistrack/ls1/entity/ThesisProposal.java +++ b/server/src/main/java/thesis/aet/entity/ThesisProposal.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; diff --git a/server/src/main/java/thesistrack/ls1/entity/ThesisRole.java b/server/src/main/java/thesis/aet/entity/ThesisRole.java similarity index 87% rename from server/src/main/java/thesistrack/ls1/entity/ThesisRole.java rename to server/src/main/java/thesis/aet/entity/ThesisRole.java index 114b007d..083c4570 100644 --- a/server/src/main/java/thesistrack/ls1/entity/ThesisRole.java +++ b/server/src/main/java/thesis/aet/entity/ThesisRole.java @@ -1,12 +1,12 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.CreationTimestamp; -import thesistrack.ls1.constants.ThesisRoleName; -import thesistrack.ls1.entity.key.ThesisRoleId; +import de.tum.cit.aet.thesis.constants.ThesisRoleName; +import de.tum.cit.aet.thesis.entity.key.ThesisRoleId; import java.time.Instant; diff --git a/server/src/main/java/thesistrack/ls1/entity/ThesisStateChange.java b/server/src/main/java/thesis/aet/entity/ThesisStateChange.java similarity index 84% rename from server/src/main/java/thesistrack/ls1/entity/ThesisStateChange.java rename to server/src/main/java/thesis/aet/entity/ThesisStateChange.java index f026ec33..d380e265 100644 --- a/server/src/main/java/thesistrack/ls1/entity/ThesisStateChange.java +++ b/server/src/main/java/thesis/aet/entity/ThesisStateChange.java @@ -1,10 +1,10 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import thesistrack.ls1.entity.key.ThesisStateChangeId; +import de.tum.cit.aet.thesis.entity.key.ThesisStateChangeId; import java.time.Instant; diff --git a/server/src/main/java/thesistrack/ls1/entity/Topic.java b/server/src/main/java/thesis/aet/entity/Topic.java similarity index 97% rename from server/src/main/java/thesistrack/ls1/entity/Topic.java rename to server/src/main/java/thesis/aet/entity/Topic.java index 9d418aaa..5f9fd690 100644 --- a/server/src/main/java/thesistrack/ls1/entity/Topic.java +++ b/server/src/main/java/thesis/aet/entity/Topic.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; diff --git a/server/src/main/java/thesistrack/ls1/entity/TopicRole.java b/server/src/main/java/thesis/aet/entity/TopicRole.java similarity index 91% rename from server/src/main/java/thesistrack/ls1/entity/TopicRole.java rename to server/src/main/java/thesis/aet/entity/TopicRole.java index 4d975f1f..d848560d 100644 --- a/server/src/main/java/thesistrack/ls1/entity/TopicRole.java +++ b/server/src/main/java/thesis/aet/entity/TopicRole.java @@ -1,10 +1,10 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import thesistrack.ls1.entity.key.TopicRoleId; +import de.tum.cit.aet.thesis.entity.key.TopicRoleId; import java.time.Instant; diff --git a/server/src/main/java/thesistrack/ls1/entity/User.java b/server/src/main/java/thesis/aet/entity/User.java similarity index 99% rename from server/src/main/java/thesistrack/ls1/entity/User.java rename to server/src/main/java/thesis/aet/entity/User.java index bf6a3127..3f085dcd 100644 --- a/server/src/main/java/thesistrack/ls1/entity/User.java +++ b/server/src/main/java/thesis/aet/entity/User.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.mail.internet.InternetAddress; import jakarta.persistence.*; diff --git a/server/src/main/java/thesistrack/ls1/entity/UserGroup.java b/server/src/main/java/thesis/aet/entity/UserGroup.java similarity index 79% rename from server/src/main/java/thesistrack/ls1/entity/UserGroup.java rename to server/src/main/java/thesis/aet/entity/UserGroup.java index 08f6eaa9..dd968809 100644 --- a/server/src/main/java/thesistrack/ls1/entity/UserGroup.java +++ b/server/src/main/java/thesis/aet/entity/UserGroup.java @@ -1,9 +1,9 @@ -package thesistrack.ls1.entity; +package de.tum.cit.aet.thesis.entity; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; -import thesistrack.ls1.entity.key.UserGroupId; +import de.tum.cit.aet.thesis.entity.key.UserGroupId; @Getter @Setter diff --git a/server/src/main/java/thesistrack/ls1/entity/jsonb/ThesisMetadata.java b/server/src/main/java/thesis/aet/entity/jsonb/ThesisMetadata.java similarity index 93% rename from server/src/main/java/thesistrack/ls1/entity/jsonb/ThesisMetadata.java rename to server/src/main/java/thesis/aet/entity/jsonb/ThesisMetadata.java index eb214429..0c089466 100644 --- a/server/src/main/java/thesistrack/ls1/entity/jsonb/ThesisMetadata.java +++ b/server/src/main/java/thesis/aet/entity/jsonb/ThesisMetadata.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity.jsonb; +package de.tum.cit.aet.thesis.entity.jsonb; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/thesistrack/ls1/entity/key/ApplicationReviewerId.java b/server/src/main/java/thesis/aet/entity/key/ApplicationReviewerId.java similarity index 96% rename from server/src/main/java/thesistrack/ls1/entity/key/ApplicationReviewerId.java rename to server/src/main/java/thesis/aet/entity/key/ApplicationReviewerId.java index 5393c074..1bc86b5f 100644 --- a/server/src/main/java/thesistrack/ls1/entity/key/ApplicationReviewerId.java +++ b/server/src/main/java/thesis/aet/entity/key/ApplicationReviewerId.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity.key; +package de.tum.cit.aet.thesis.entity.key; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/server/src/main/java/thesistrack/ls1/entity/key/NotificationSettingId.java b/server/src/main/java/thesis/aet/entity/key/NotificationSettingId.java similarity index 95% rename from server/src/main/java/thesistrack/ls1/entity/key/NotificationSettingId.java rename to server/src/main/java/thesis/aet/entity/key/NotificationSettingId.java index 10841eee..bd33fdfc 100644 --- a/server/src/main/java/thesistrack/ls1/entity/key/NotificationSettingId.java +++ b/server/src/main/java/thesis/aet/entity/key/NotificationSettingId.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity.key; +package de.tum.cit.aet.thesis.entity.key; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/server/src/main/java/thesistrack/ls1/entity/key/ThesisPresentationInviteId.java b/server/src/main/java/thesis/aet/entity/key/ThesisPresentationInviteId.java similarity index 96% rename from server/src/main/java/thesistrack/ls1/entity/key/ThesisPresentationInviteId.java rename to server/src/main/java/thesis/aet/entity/key/ThesisPresentationInviteId.java index 193927d9..8faf6265 100644 --- a/server/src/main/java/thesistrack/ls1/entity/key/ThesisPresentationInviteId.java +++ b/server/src/main/java/thesis/aet/entity/key/ThesisPresentationInviteId.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity.key; +package de.tum.cit.aet.thesis.entity.key; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/server/src/main/java/thesistrack/ls1/entity/key/ThesisRoleId.java b/server/src/main/java/thesis/aet/entity/key/ThesisRoleId.java similarity index 92% rename from server/src/main/java/thesistrack/ls1/entity/key/ThesisRoleId.java rename to server/src/main/java/thesis/aet/entity/key/ThesisRoleId.java index acadff61..17bbe48f 100644 --- a/server/src/main/java/thesistrack/ls1/entity/key/ThesisRoleId.java +++ b/server/src/main/java/thesis/aet/entity/key/ThesisRoleId.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity.key; +package de.tum.cit.aet.thesis.entity.key; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; @@ -8,7 +8,7 @@ import lombok.Getter; import lombok.Setter; import org.hibernate.Hibernate; -import thesistrack.ls1.constants.ThesisRoleName; +import de.tum.cit.aet.thesis.constants.ThesisRoleName; import java.io.Serializable; import java.util.Objects; diff --git a/server/src/main/java/thesistrack/ls1/entity/key/ThesisStateChangeId.java b/server/src/main/java/thesis/aet/entity/key/ThesisStateChangeId.java similarity index 92% rename from server/src/main/java/thesistrack/ls1/entity/key/ThesisStateChangeId.java rename to server/src/main/java/thesis/aet/entity/key/ThesisStateChangeId.java index 964561fe..6e5ddde2 100644 --- a/server/src/main/java/thesistrack/ls1/entity/key/ThesisStateChangeId.java +++ b/server/src/main/java/thesis/aet/entity/key/ThesisStateChangeId.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity.key; +package de.tum.cit.aet.thesis.entity.key; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; @@ -8,7 +8,7 @@ import lombok.Getter; import lombok.Setter; import org.hibernate.Hibernate; -import thesistrack.ls1.constants.ThesisState; +import de.tum.cit.aet.thesis.constants.ThesisState; import java.io.Serial; import java.io.Serializable; diff --git a/server/src/main/java/thesistrack/ls1/entity/key/TopicRoleId.java b/server/src/main/java/thesis/aet/entity/key/TopicRoleId.java similarity index 92% rename from server/src/main/java/thesistrack/ls1/entity/key/TopicRoleId.java rename to server/src/main/java/thesis/aet/entity/key/TopicRoleId.java index b47e7d12..94baafc6 100644 --- a/server/src/main/java/thesistrack/ls1/entity/key/TopicRoleId.java +++ b/server/src/main/java/thesis/aet/entity/key/TopicRoleId.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity.key; +package de.tum.cit.aet.thesis.entity.key; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; @@ -8,7 +8,7 @@ import lombok.Getter; import lombok.Setter; import org.hibernate.Hibernate; -import thesistrack.ls1.constants.ThesisRoleName; +import de.tum.cit.aet.thesis.constants.ThesisRoleName; import java.util.Objects; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/entity/key/UserGroupId.java b/server/src/main/java/thesis/aet/entity/key/UserGroupId.java similarity index 95% rename from server/src/main/java/thesistrack/ls1/entity/key/UserGroupId.java rename to server/src/main/java/thesis/aet/entity/key/UserGroupId.java index 600d5bfa..52d95ed7 100644 --- a/server/src/main/java/thesistrack/ls1/entity/key/UserGroupId.java +++ b/server/src/main/java/thesis/aet/entity/key/UserGroupId.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.entity.key; +package de.tum.cit.aet.thesis.entity.key; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/server/src/main/java/thesistrack/ls1/exception/CalendarException.java b/server/src/main/java/thesis/aet/exception/CalendarException.java similarity index 84% rename from server/src/main/java/thesistrack/ls1/exception/CalendarException.java rename to server/src/main/java/thesis/aet/exception/CalendarException.java index f371b8a0..7c2ca238 100644 --- a/server/src/main/java/thesistrack/ls1/exception/CalendarException.java +++ b/server/src/main/java/thesis/aet/exception/CalendarException.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.exception; +package de.tum.cit.aet.thesis.exception; public class CalendarException extends RuntimeException { public CalendarException(String message) { diff --git a/server/src/main/java/thesistrack/ls1/exception/MailingException.java b/server/src/main/java/thesis/aet/exception/MailingException.java similarity index 84% rename from server/src/main/java/thesistrack/ls1/exception/MailingException.java rename to server/src/main/java/thesis/aet/exception/MailingException.java index ede81f51..209ece05 100644 --- a/server/src/main/java/thesistrack/ls1/exception/MailingException.java +++ b/server/src/main/java/thesis/aet/exception/MailingException.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.exception; +package de.tum.cit.aet.thesis.exception; public class MailingException extends RuntimeException{ public MailingException(String message) { diff --git a/server/src/main/java/thesistrack/ls1/exception/ResponseExceptionHandler.java b/server/src/main/java/thesis/aet/exception/ResponseExceptionHandler.java similarity index 85% rename from server/src/main/java/thesistrack/ls1/exception/ResponseExceptionHandler.java rename to server/src/main/java/thesis/aet/exception/ResponseExceptionHandler.java index fa0d1385..d7b77c97 100644 --- a/server/src/main/java/thesistrack/ls1/exception/ResponseExceptionHandler.java +++ b/server/src/main/java/thesis/aet/exception/ResponseExceptionHandler.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.exception; +package de.tum.cit.aet.thesis.exception; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonProcessingException; @@ -9,11 +9,11 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.context.request.WebRequest; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; -import thesistrack.ls1.dto.ErrorDto; -import thesistrack.ls1.exception.request.AccessDeniedException; -import thesistrack.ls1.exception.request.ResourceAlreadyExistsException; -import thesistrack.ls1.exception.request.ResourceInvalidParametersException; -import thesistrack.ls1.exception.request.ResourceNotFoundException; +import de.tum.cit.aet.thesis.dto.ErrorDto; +import de.tum.cit.aet.thesis.exception.request.AccessDeniedException; +import de.tum.cit.aet.thesis.exception.request.ResourceAlreadyExistsException; +import de.tum.cit.aet.thesis.exception.request.ResourceInvalidParametersException; +import de.tum.cit.aet.thesis.exception.request.ResourceNotFoundException; import java.text.ParseException; diff --git a/server/src/main/java/thesistrack/ls1/exception/UploadException.java b/server/src/main/java/thesis/aet/exception/UploadException.java similarity index 85% rename from server/src/main/java/thesistrack/ls1/exception/UploadException.java rename to server/src/main/java/thesis/aet/exception/UploadException.java index 2f54c3db..514564fd 100644 --- a/server/src/main/java/thesistrack/ls1/exception/UploadException.java +++ b/server/src/main/java/thesis/aet/exception/UploadException.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.exception; +package de.tum.cit.aet.thesis.exception; public class UploadException extends RuntimeException { public UploadException(String message) { diff --git a/server/src/main/java/thesistrack/ls1/exception/request/AccessDeniedException.java b/server/src/main/java/thesis/aet/exception/request/AccessDeniedException.java similarity index 74% rename from server/src/main/java/thesistrack/ls1/exception/request/AccessDeniedException.java rename to server/src/main/java/thesis/aet/exception/request/AccessDeniedException.java index d04d7a20..adea3d84 100644 --- a/server/src/main/java/thesistrack/ls1/exception/request/AccessDeniedException.java +++ b/server/src/main/java/thesis/aet/exception/request/AccessDeniedException.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.exception.request; +package de.tum.cit.aet.thesis.exception.request; public class AccessDeniedException extends RuntimeException{ diff --git a/server/src/main/java/thesistrack/ls1/exception/request/ResourceAlreadyExistsException.java b/server/src/main/java/thesis/aet/exception/request/ResourceAlreadyExistsException.java similarity index 76% rename from server/src/main/java/thesistrack/ls1/exception/request/ResourceAlreadyExistsException.java rename to server/src/main/java/thesis/aet/exception/request/ResourceAlreadyExistsException.java index fcd264e5..1bfbd1da 100644 --- a/server/src/main/java/thesistrack/ls1/exception/request/ResourceAlreadyExistsException.java +++ b/server/src/main/java/thesis/aet/exception/request/ResourceAlreadyExistsException.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.exception.request; +package de.tum.cit.aet.thesis.exception.request; public class ResourceAlreadyExistsException extends RuntimeException { public ResourceAlreadyExistsException(String message) { diff --git a/server/src/main/java/thesistrack/ls1/exception/request/ResourceInvalidParametersException.java b/server/src/main/java/thesis/aet/exception/request/ResourceInvalidParametersException.java similarity index 77% rename from server/src/main/java/thesistrack/ls1/exception/request/ResourceInvalidParametersException.java rename to server/src/main/java/thesis/aet/exception/request/ResourceInvalidParametersException.java index 1a943269..5487dc80 100644 --- a/server/src/main/java/thesistrack/ls1/exception/request/ResourceInvalidParametersException.java +++ b/server/src/main/java/thesis/aet/exception/request/ResourceInvalidParametersException.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.exception.request; +package de.tum.cit.aet.thesis.exception.request; public class ResourceInvalidParametersException extends RuntimeException { public ResourceInvalidParametersException(String message) { diff --git a/server/src/main/java/thesistrack/ls1/exception/request/ResourceNotFoundException.java b/server/src/main/java/thesis/aet/exception/request/ResourceNotFoundException.java similarity index 75% rename from server/src/main/java/thesistrack/ls1/exception/request/ResourceNotFoundException.java rename to server/src/main/java/thesis/aet/exception/request/ResourceNotFoundException.java index e15f2033..8c0d1c25 100644 --- a/server/src/main/java/thesistrack/ls1/exception/request/ResourceNotFoundException.java +++ b/server/src/main/java/thesis/aet/exception/request/ResourceNotFoundException.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.exception.request; +package de.tum.cit.aet.thesis.exception.request; public class ResourceNotFoundException extends RuntimeException { public ResourceNotFoundException(String message) { diff --git a/server/src/main/java/thesistrack/ls1/repository/ApplicationRepository.java b/server/src/main/java/thesis/aet/repository/ApplicationRepository.java similarity index 93% rename from server/src/main/java/thesistrack/ls1/repository/ApplicationRepository.java rename to server/src/main/java/thesis/aet/repository/ApplicationRepository.java index 2c78ef83..f56eac48 100644 --- a/server/src/main/java/thesistrack/ls1/repository/ApplicationRepository.java +++ b/server/src/main/java/thesis/aet/repository/ApplicationRepository.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -6,10 +6,10 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import thesistrack.ls1.constants.ApplicationState; -import thesistrack.ls1.entity.Application; -import thesistrack.ls1.entity.Topic; -import thesistrack.ls1.entity.User; +import de.tum.cit.aet.thesis.constants.ApplicationState; +import de.tum.cit.aet.thesis.entity.Application; +import de.tum.cit.aet.thesis.entity.Topic; +import de.tum.cit.aet.thesis.entity.User; import java.util.List; import java.util.Set; diff --git a/server/src/main/java/thesis/aet/repository/ApplicationReviewerRepository.java b/server/src/main/java/thesis/aet/repository/ApplicationReviewerRepository.java new file mode 100644 index 00000000..9219b697 --- /dev/null +++ b/server/src/main/java/thesis/aet/repository/ApplicationReviewerRepository.java @@ -0,0 +1,13 @@ +package de.tum.cit.aet.thesis.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import de.tum.cit.aet.thesis.entity.ApplicationReviewer; +import de.tum.cit.aet.thesis.entity.ThesisStateChange; +import de.tum.cit.aet.thesis.entity.key.ApplicationReviewerId; +import de.tum.cit.aet.thesis.entity.key.ThesisStateChangeId; + + +@Repository +public interface ApplicationReviewerRepository extends JpaRepository { +} diff --git a/server/src/main/java/thesistrack/ls1/repository/NotificationSettingRepository.java b/server/src/main/java/thesis/aet/repository/NotificationSettingRepository.java similarity index 53% rename from server/src/main/java/thesistrack/ls1/repository/NotificationSettingRepository.java rename to server/src/main/java/thesis/aet/repository/NotificationSettingRepository.java index d3eabd95..b67d2a5a 100644 --- a/server/src/main/java/thesistrack/ls1/repository/NotificationSettingRepository.java +++ b/server/src/main/java/thesis/aet/repository/NotificationSettingRepository.java @@ -1,11 +1,11 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import thesistrack.ls1.entity.ApplicationReviewer; -import thesistrack.ls1.entity.NotificationSetting; -import thesistrack.ls1.entity.key.ApplicationReviewerId; -import thesistrack.ls1.entity.key.NotificationSettingId; +import de.tum.cit.aet.thesis.entity.ApplicationReviewer; +import de.tum.cit.aet.thesis.entity.NotificationSetting; +import de.tum.cit.aet.thesis.entity.key.ApplicationReviewerId; +import de.tum.cit.aet.thesis.entity.key.NotificationSettingId; import java.util.List; import java.util.Optional; diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisAssessmentRepository.java b/server/src/main/java/thesis/aet/repository/ThesisAssessmentRepository.java similarity index 71% rename from server/src/main/java/thesistrack/ls1/repository/ThesisAssessmentRepository.java rename to server/src/main/java/thesis/aet/repository/ThesisAssessmentRepository.java index e29dbb2d..5d4b7b49 100644 --- a/server/src/main/java/thesistrack/ls1/repository/ThesisAssessmentRepository.java +++ b/server/src/main/java/thesis/aet/repository/ThesisAssessmentRepository.java @@ -1,8 +1,8 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import thesistrack.ls1.entity.ThesisAssessment; +import de.tum.cit.aet.thesis.entity.ThesisAssessment; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisCommentRepository.java b/server/src/main/java/thesis/aet/repository/ThesisCommentRepository.java similarity index 73% rename from server/src/main/java/thesistrack/ls1/repository/ThesisCommentRepository.java rename to server/src/main/java/thesis/aet/repository/ThesisCommentRepository.java index 3c021e6f..dfba0f2e 100644 --- a/server/src/main/java/thesistrack/ls1/repository/ThesisCommentRepository.java +++ b/server/src/main/java/thesis/aet/repository/ThesisCommentRepository.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -6,11 +6,11 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import thesistrack.ls1.constants.ThesisCommentType; -import thesistrack.ls1.constants.ThesisState; -import thesistrack.ls1.constants.ThesisVisibility; -import thesistrack.ls1.entity.Thesis; -import thesistrack.ls1.entity.ThesisComment; +import de.tum.cit.aet.thesis.constants.ThesisCommentType; +import de.tum.cit.aet.thesis.constants.ThesisState; +import de.tum.cit.aet.thesis.constants.ThesisVisibility; +import de.tum.cit.aet.thesis.entity.Thesis; +import de.tum.cit.aet.thesis.entity.ThesisComment; import java.util.Set; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisFeedbackRepository.java b/server/src/main/java/thesis/aet/repository/ThesisFeedbackRepository.java similarity index 71% rename from server/src/main/java/thesistrack/ls1/repository/ThesisFeedbackRepository.java rename to server/src/main/java/thesis/aet/repository/ThesisFeedbackRepository.java index 3716a485..6649fd23 100644 --- a/server/src/main/java/thesistrack/ls1/repository/ThesisFeedbackRepository.java +++ b/server/src/main/java/thesis/aet/repository/ThesisFeedbackRepository.java @@ -1,8 +1,8 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import thesistrack.ls1.entity.ThesisFeedback; +import de.tum.cit.aet.thesis.entity.ThesisFeedback; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisFileRepository.java b/server/src/main/java/thesis/aet/repository/ThesisFileRepository.java similarity index 62% rename from server/src/main/java/thesistrack/ls1/repository/ThesisFileRepository.java rename to server/src/main/java/thesis/aet/repository/ThesisFileRepository.java index 80d6a30d..236b6878 100644 --- a/server/src/main/java/thesistrack/ls1/repository/ThesisFileRepository.java +++ b/server/src/main/java/thesis/aet/repository/ThesisFileRepository.java @@ -1,9 +1,9 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import thesistrack.ls1.entity.ThesisFeedback; -import thesistrack.ls1.entity.ThesisFile; +import de.tum.cit.aet.thesis.entity.ThesisFeedback; +import de.tum.cit.aet.thesis.entity.ThesisFile; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationInviteRepository.java b/server/src/main/java/thesis/aet/repository/ThesisPresentationInviteRepository.java similarity index 59% rename from server/src/main/java/thesistrack/ls1/repository/ThesisPresentationInviteRepository.java rename to server/src/main/java/thesis/aet/repository/ThesisPresentationInviteRepository.java index cdcab84f..5aba85e8 100644 --- a/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationInviteRepository.java +++ b/server/src/main/java/thesis/aet/repository/ThesisPresentationInviteRepository.java @@ -1,10 +1,10 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import thesistrack.ls1.entity.ThesisFeedback; -import thesistrack.ls1.entity.ThesisPresentationInvite; -import thesistrack.ls1.entity.key.ThesisPresentationInviteId; +import de.tum.cit.aet.thesis.entity.ThesisFeedback; +import de.tum.cit.aet.thesis.entity.ThesisPresentationInvite; +import de.tum.cit.aet.thesis.entity.key.ThesisPresentationInviteId; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java b/server/src/main/java/thesis/aet/repository/ThesisPresentationRepository.java similarity index 85% rename from server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java rename to server/src/main/java/thesis/aet/repository/ThesisPresentationRepository.java index e872e271..5d9fa58e 100644 --- a/server/src/main/java/thesistrack/ls1/repository/ThesisPresentationRepository.java +++ b/server/src/main/java/thesis/aet/repository/ThesisPresentationRepository.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -6,9 +6,9 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import thesistrack.ls1.constants.ThesisPresentationState; -import thesistrack.ls1.constants.ThesisPresentationVisibility; -import thesistrack.ls1.entity.ThesisPresentation; +import de.tum.cit.aet.thesis.constants.ThesisPresentationState; +import de.tum.cit.aet.thesis.constants.ThesisPresentationVisibility; +import de.tum.cit.aet.thesis.entity.ThesisPresentation; import java.time.Instant; import java.util.List; diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisProposalRepository.java b/server/src/main/java/thesis/aet/repository/ThesisProposalRepository.java similarity index 71% rename from server/src/main/java/thesistrack/ls1/repository/ThesisProposalRepository.java rename to server/src/main/java/thesis/aet/repository/ThesisProposalRepository.java index 3ca428d0..40e4d8bb 100644 --- a/server/src/main/java/thesistrack/ls1/repository/ThesisProposalRepository.java +++ b/server/src/main/java/thesis/aet/repository/ThesisProposalRepository.java @@ -1,8 +1,8 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import thesistrack.ls1.entity.ThesisProposal; +import de.tum.cit.aet.thesis.entity.ThesisProposal; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisRepository.java b/server/src/main/java/thesis/aet/repository/ThesisRepository.java similarity index 89% rename from server/src/main/java/thesistrack/ls1/repository/ThesisRepository.java rename to server/src/main/java/thesis/aet/repository/ThesisRepository.java index c17edb9a..1ad85dc6 100644 --- a/server/src/main/java/thesistrack/ls1/repository/ThesisRepository.java +++ b/server/src/main/java/thesis/aet/repository/ThesisRepository.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -6,10 +6,10 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import thesistrack.ls1.constants.ThesisRoleName; -import thesistrack.ls1.constants.ThesisState; -import thesistrack.ls1.constants.ThesisVisibility; -import thesistrack.ls1.entity.Thesis; +import de.tum.cit.aet.thesis.constants.ThesisRoleName; +import de.tum.cit.aet.thesis.constants.ThesisState; +import de.tum.cit.aet.thesis.constants.ThesisVisibility; +import de.tum.cit.aet.thesis.entity.Thesis; import java.util.List; import java.util.Set; diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisRoleRepository.java b/server/src/main/java/thesis/aet/repository/ThesisRoleRepository.java similarity index 68% rename from server/src/main/java/thesistrack/ls1/repository/ThesisRoleRepository.java rename to server/src/main/java/thesis/aet/repository/ThesisRoleRepository.java index 530dfa9f..0ce3cf8e 100644 --- a/server/src/main/java/thesistrack/ls1/repository/ThesisRoleRepository.java +++ b/server/src/main/java/thesis/aet/repository/ThesisRoleRepository.java @@ -1,9 +1,9 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import thesistrack.ls1.entity.ThesisRole; -import thesistrack.ls1.entity.key.ThesisRoleId; +import de.tum.cit.aet.thesis.entity.ThesisRole; +import de.tum.cit.aet.thesis.entity.key.ThesisRoleId; import java.util.List; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/repository/ThesisStateChangeRepository.java b/server/src/main/java/thesis/aet/repository/ThesisStateChangeRepository.java similarity index 60% rename from server/src/main/java/thesistrack/ls1/repository/ThesisStateChangeRepository.java rename to server/src/main/java/thesis/aet/repository/ThesisStateChangeRepository.java index 05853e0c..e0f27d73 100644 --- a/server/src/main/java/thesistrack/ls1/repository/ThesisStateChangeRepository.java +++ b/server/src/main/java/thesis/aet/repository/ThesisStateChangeRepository.java @@ -1,9 +1,9 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import thesistrack.ls1.entity.ThesisStateChange; -import thesistrack.ls1.entity.key.ThesisStateChangeId; +import de.tum.cit.aet.thesis.entity.ThesisStateChange; +import de.tum.cit.aet.thesis.entity.key.ThesisStateChangeId; @Repository diff --git a/server/src/main/java/thesistrack/ls1/repository/TopicRepository.java b/server/src/main/java/thesis/aet/repository/TopicRepository.java similarity index 83% rename from server/src/main/java/thesistrack/ls1/repository/TopicRepository.java rename to server/src/main/java/thesis/aet/repository/TopicRepository.java index 5da95d52..419db278 100644 --- a/server/src/main/java/thesistrack/ls1/repository/TopicRepository.java +++ b/server/src/main/java/thesis/aet/repository/TopicRepository.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -6,10 +6,10 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import thesistrack.ls1.constants.ThesisState; -import thesistrack.ls1.constants.ThesisVisibility; -import thesistrack.ls1.entity.Thesis; -import thesistrack.ls1.entity.Topic; +import de.tum.cit.aet.thesis.constants.ThesisState; +import de.tum.cit.aet.thesis.constants.ThesisVisibility; +import de.tum.cit.aet.thesis.entity.Thesis; +import de.tum.cit.aet.thesis.entity.Topic; import java.util.List; import java.util.Set; diff --git a/server/src/main/java/thesistrack/ls1/repository/TopicRoleRepository.java b/server/src/main/java/thesis/aet/repository/TopicRoleRepository.java similarity index 68% rename from server/src/main/java/thesistrack/ls1/repository/TopicRoleRepository.java rename to server/src/main/java/thesis/aet/repository/TopicRoleRepository.java index 54dca0cf..e984837a 100644 --- a/server/src/main/java/thesistrack/ls1/repository/TopicRoleRepository.java +++ b/server/src/main/java/thesis/aet/repository/TopicRoleRepository.java @@ -1,9 +1,9 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import thesistrack.ls1.entity.TopicRole; -import thesistrack.ls1.entity.key.TopicRoleId; +import de.tum.cit.aet.thesis.entity.TopicRole; +import de.tum.cit.aet.thesis.entity.key.TopicRoleId; import java.util.List; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/repository/UserGroupRepository.java b/server/src/main/java/thesis/aet/repository/UserGroupRepository.java similarity index 67% rename from server/src/main/java/thesistrack/ls1/repository/UserGroupRepository.java rename to server/src/main/java/thesis/aet/repository/UserGroupRepository.java index 512f4ce1..5e91cf01 100644 --- a/server/src/main/java/thesistrack/ls1/repository/UserGroupRepository.java +++ b/server/src/main/java/thesis/aet/repository/UserGroupRepository.java @@ -1,9 +1,9 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; -import thesistrack.ls1.entity.UserGroup; -import thesistrack.ls1.entity.key.UserGroupId; +import de.tum.cit.aet.thesis.entity.UserGroup; +import de.tum.cit.aet.thesis.entity.key.UserGroupId; import java.util.List; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/repository/UserRepository.java b/server/src/main/java/thesis/aet/repository/UserRepository.java similarity index 94% rename from server/src/main/java/thesistrack/ls1/repository/UserRepository.java rename to server/src/main/java/thesis/aet/repository/UserRepository.java index 50b07988..c091bd88 100644 --- a/server/src/main/java/thesistrack/ls1/repository/UserRepository.java +++ b/server/src/main/java/thesis/aet/repository/UserRepository.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.repository; +package de.tum.cit.aet.thesis.repository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import thesistrack.ls1.entity.User; +import de.tum.cit.aet.thesis.entity.User; import java.util.List; import java.util.Optional; diff --git a/server/src/main/java/thesistrack/ls1/security/CorsConfig.java b/server/src/main/java/thesis/aet/security/CorsConfig.java similarity index 90% rename from server/src/main/java/thesistrack/ls1/security/CorsConfig.java rename to server/src/main/java/thesis/aet/security/CorsConfig.java index dec95ac5..893d169e 100644 --- a/server/src/main/java/thesistrack/ls1/security/CorsConfig.java +++ b/server/src/main/java/thesis/aet/security/CorsConfig.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.security; +package de.tum.cit.aet.thesis.security; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -10,7 +10,7 @@ @Configuration public class CorsConfig { @Bean - public CorsConfigurationSource corsConfigurationSource(@Value("${thesis-track.client.host}") String clientHost) { + public CorsConfigurationSource corsConfigurationSource(@Value("${thesis-management.client.host}") String clientHost) { CorsConfiguration configuration = new CorsConfiguration(); configuration.addAllowedOrigin(clientHost); configuration.addAllowedMethod("*"); diff --git a/server/src/main/java/thesistrack/ls1/security/JwtAuthConfig.java b/server/src/main/java/thesis/aet/security/JwtAuthConfig.java similarity index 78% rename from server/src/main/java/thesistrack/ls1/security/JwtAuthConfig.java rename to server/src/main/java/thesis/aet/security/JwtAuthConfig.java index c682d0d8..9077e6ed 100644 --- a/server/src/main/java/thesistrack/ls1/security/JwtAuthConfig.java +++ b/server/src/main/java/thesis/aet/security/JwtAuthConfig.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.security; +package de.tum.cit.aet.thesis.security; import jakarta.validation.constraints.NotBlank; import lombok.Data; @@ -9,7 +9,7 @@ @Data @Validated @Configuration -@ConfigurationProperties(prefix = "thesis-track.keycloak") +@ConfigurationProperties(prefix = "thesis-management.keycloak") public class JwtAuthConfig { @NotBlank private String clientId; diff --git a/server/src/main/java/thesistrack/ls1/security/JwtAuthConverter.java b/server/src/main/java/thesis/aet/security/JwtAuthConverter.java similarity index 98% rename from server/src/main/java/thesistrack/ls1/security/JwtAuthConverter.java rename to server/src/main/java/thesis/aet/security/JwtAuthConverter.java index 0111ec8b..99edde21 100644 --- a/server/src/main/java/thesistrack/ls1/security/JwtAuthConverter.java +++ b/server/src/main/java/thesis/aet/security/JwtAuthConverter.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.security; +package de.tum.cit.aet.thesis.security; import org.springframework.core.convert.converter.Converter; import org.springframework.lang.NonNull; diff --git a/server/src/main/java/thesistrack/ls1/security/WebSecurityConfig.java b/server/src/main/java/thesis/aet/security/WebSecurityConfig.java similarity index 97% rename from server/src/main/java/thesistrack/ls1/security/WebSecurityConfig.java rename to server/src/main/java/thesis/aet/security/WebSecurityConfig.java index c498c597..e0074dc8 100644 --- a/server/src/main/java/thesistrack/ls1/security/WebSecurityConfig.java +++ b/server/src/main/java/thesis/aet/security/WebSecurityConfig.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.security; +package de.tum.cit.aet.thesis.security; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; @@ -28,7 +28,7 @@ public class WebSecurityConfig { private final JwtAuthConverter jwtAuthConverter; - @Value("${thesis-track.client.host}") + @Value("${thesis-management.client.host}") private String clientHost; @Bean diff --git a/server/src/main/java/thesistrack/ls1/service/AccessManagementService.java b/server/src/main/java/thesis/aet/service/AccessManagementService.java similarity index 92% rename from server/src/main/java/thesistrack/ls1/service/AccessManagementService.java rename to server/src/main/java/thesis/aet/service/AccessManagementService.java index 8b2d9f57..968560ba 100644 --- a/server/src/main/java/thesistrack/ls1/service/AccessManagementService.java +++ b/server/src/main/java/thesis/aet/service/AccessManagementService.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.BodyInserters; import org.springframework.web.reactive.function.client.WebClient; -import thesistrack.ls1.entity.User; +import de.tum.cit.aet.thesis.entity.User; import org.springframework.http.HttpHeaders; @@ -33,11 +33,11 @@ public class AccessManagementService { @Autowired public AccessManagementService( - @Value("${thesis-track.keycloak.host}") String keycloakHost, - @Value("${thesis-track.keycloak.realm-name}") String keycloakRealmName, - @Value("${thesis-track.keycloak.service-client.id}") String serviceClientId, - @Value("${thesis-track.keycloak.service-client.secret}") String serviceClientSecret, - @Value("${thesis-track.keycloak.service-client.student-group-name}") String studentGroupName + @Value("${thesis-management.keycloak.host}") String keycloakHost, + @Value("${thesis-management.keycloak.realm-name}") String keycloakRealmName, + @Value("${thesis-management.keycloak.service-client.id}") String serviceClientId, + @Value("${thesis-management.keycloak.service-client.secret}") String serviceClientSecret, + @Value("${thesis-management.keycloak.service-client.student-group-name}") String studentGroupName ) { this.keycloakRealmName = keycloakRealmName; this.serviceClientId = serviceClientId; diff --git a/server/src/main/java/thesistrack/ls1/service/ApplicationService.java b/server/src/main/java/thesis/aet/service/ApplicationService.java similarity index 93% rename from server/src/main/java/thesistrack/ls1/service/ApplicationService.java rename to server/src/main/java/thesis/aet/service/ApplicationService.java index 6554f164..bda8126a 100644 --- a/server/src/main/java/thesistrack/ls1/service/ApplicationService.java +++ b/server/src/main/java/thesis/aet/service/ApplicationService.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; @@ -6,16 +6,16 @@ import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import thesistrack.ls1.constants.ApplicationRejectReason; -import thesistrack.ls1.constants.ApplicationReviewReason; -import thesistrack.ls1.entity.*; -import thesistrack.ls1.constants.ApplicationState; -import thesistrack.ls1.entity.key.ApplicationReviewerId; -import thesistrack.ls1.exception.request.ResourceInvalidParametersException; -import thesistrack.ls1.exception.request.ResourceNotFoundException; -import thesistrack.ls1.repository.ApplicationRepository; -import thesistrack.ls1.repository.ApplicationReviewerRepository; -import thesistrack.ls1.repository.TopicRepository; +import de.tum.cit.aet.thesis.constants.ApplicationRejectReason; +import de.tum.cit.aet.thesis.constants.ApplicationReviewReason; +import de.tum.cit.aet.thesis.entity.*; +import de.tum.cit.aet.thesis.constants.ApplicationState; +import de.tum.cit.aet.thesis.entity.key.ApplicationReviewerId; +import de.tum.cit.aet.thesis.exception.request.ResourceInvalidParametersException; +import de.tum.cit.aet.thesis.exception.request.ResourceNotFoundException; +import de.tum.cit.aet.thesis.repository.ApplicationRepository; +import de.tum.cit.aet.thesis.repository.ApplicationReviewerRepository; +import de.tum.cit.aet.thesis.repository.TopicRepository; import java.time.Instant; import java.util.*; diff --git a/server/src/main/java/thesistrack/ls1/service/AuthenticationService.java b/server/src/main/java/thesis/aet/service/AuthenticationService.java similarity index 91% rename from server/src/main/java/thesistrack/ls1/service/AuthenticationService.java rename to server/src/main/java/thesis/aet/service/AuthenticationService.java index fcbb1afe..70bb7811 100644 --- a/server/src/main/java/thesistrack/ls1/service/AuthenticationService.java +++ b/server/src/main/java/thesis/aet/service/AuthenticationService.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import jakarta.mail.internet.AddressException; import jakarta.mail.internet.InternetAddress; @@ -7,16 +7,16 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import thesistrack.ls1.constants.UploadFileType; -import thesistrack.ls1.entity.NotificationSetting; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.entity.UserGroup; -import thesistrack.ls1.entity.key.NotificationSettingId; -import thesistrack.ls1.entity.key.UserGroupId; -import thesistrack.ls1.exception.request.ResourceNotFoundException; -import thesistrack.ls1.repository.NotificationSettingRepository; -import thesistrack.ls1.repository.UserGroupRepository; -import thesistrack.ls1.repository.UserRepository; +import de.tum.cit.aet.thesis.constants.UploadFileType; +import de.tum.cit.aet.thesis.entity.NotificationSetting; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.entity.UserGroup; +import de.tum.cit.aet.thesis.entity.key.NotificationSettingId; +import de.tum.cit.aet.thesis.entity.key.UserGroupId; +import de.tum.cit.aet.thesis.exception.request.ResourceNotFoundException; +import de.tum.cit.aet.thesis.repository.NotificationSettingRepository; +import de.tum.cit.aet.thesis.repository.UserGroupRepository; +import de.tum.cit.aet.thesis.repository.UserRepository; import java.time.Instant; import java.util.*; diff --git a/server/src/main/java/thesistrack/ls1/service/CalendarService.java b/server/src/main/java/thesis/aet/service/CalendarService.java similarity index 94% rename from server/src/main/java/thesistrack/ls1/service/CalendarService.java rename to server/src/main/java/thesis/aet/service/CalendarService.java index 8731266b..6f7962aa 100644 --- a/server/src/main/java/thesistrack/ls1/service/CalendarService.java +++ b/server/src/main/java/thesis/aet/service/CalendarService.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import jakarta.mail.internet.InternetAddress; import net.fortuna.ical4j.data.CalendarBuilder; @@ -34,10 +34,10 @@ public class CalendarService { private final boolean enabled; public CalendarService( - @Value("${thesis-track.calendar.enabled}") Boolean enabled, - @Value("${thesis-track.calendar.url}") String caldavUrl, - @Value("${thesis-track.calendar.username}") String caldavUsername, - @Value("${thesis-track.calendar.password}") String caldavPassword + @Value("${thesis-management.calendar.enabled}") Boolean enabled, + @Value("${thesis-management.calendar.url}") String caldavUrl, + @Value("${thesis-management.calendar.username}") String caldavUsername, + @Value("${thesis-management.calendar.password}") String caldavPassword ) { this.enabled = enabled; diff --git a/server/src/main/java/thesistrack/ls1/service/DashboardService.java b/server/src/main/java/thesis/aet/service/DashboardService.java similarity index 90% rename from server/src/main/java/thesistrack/ls1/service/DashboardService.java rename to server/src/main/java/thesis/aet/service/DashboardService.java index f098bc2d..26e037c1 100644 --- a/server/src/main/java/thesistrack/ls1/service/DashboardService.java +++ b/server/src/main/java/thesis/aet/service/DashboardService.java @@ -1,22 +1,22 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; -import thesistrack.ls1.constants.ThesisPresentationState; -import thesistrack.ls1.constants.ThesisPresentationVisibility; -import thesistrack.ls1.constants.ThesisRoleName; -import thesistrack.ls1.constants.ThesisState; -import thesistrack.ls1.dto.TaskDto; -import thesistrack.ls1.entity.Thesis; -import thesistrack.ls1.entity.ThesisPresentation; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.repository.ApplicationRepository; -import thesistrack.ls1.repository.ThesisPresentationRepository; -import thesistrack.ls1.repository.ThesisRepository; -import thesistrack.ls1.repository.TopicRepository; +import de.tum.cit.aet.thesis.constants.ThesisPresentationState; +import de.tum.cit.aet.thesis.constants.ThesisPresentationVisibility; +import de.tum.cit.aet.thesis.constants.ThesisRoleName; +import de.tum.cit.aet.thesis.constants.ThesisState; +import de.tum.cit.aet.thesis.dto.TaskDto; +import de.tum.cit.aet.thesis.entity.Thesis; +import de.tum.cit.aet.thesis.entity.ThesisPresentation; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.repository.ApplicationRepository; +import de.tum.cit.aet.thesis.repository.ThesisPresentationRepository; +import de.tum.cit.aet.thesis.repository.ThesisRepository; +import de.tum.cit.aet.thesis.repository.TopicRepository; import java.time.Instant; import java.time.temporal.ChronoUnit; @@ -36,7 +36,7 @@ public DashboardService( ThesisRepository thesisRepository, ApplicationRepository applicationRepository, TopicRepository topicRepository, - @Value("${thesis-track.scientific-writing-guide}") String scientificWritingGuide + @Value("${thesis-management.scientific-writing-guide}") String scientificWritingGuide ) { this.thesisRepository = thesisRepository; this.applicationRepository = applicationRepository; diff --git a/server/src/main/java/thesistrack/ls1/service/MailingService.java b/server/src/main/java/thesis/aet/service/MailingService.java similarity index 96% rename from server/src/main/java/thesistrack/ls1/service/MailingService.java rename to server/src/main/java/thesis/aet/service/MailingService.java index 4371306d..0fe95869 100644 --- a/server/src/main/java/thesistrack/ls1/service/MailingService.java +++ b/server/src/main/java/thesis/aet/service/MailingService.java @@ -1,18 +1,18 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import jakarta.mail.util.ByteArrayDataSource; import org.apache.commons.io.FilenameUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.stereotype.Service; -import thesistrack.ls1.constants.ThesisCommentType; -import thesistrack.ls1.constants.ApplicationRejectReason; -import thesistrack.ls1.constants.ThesisFeedbackType; -import thesistrack.ls1.constants.ThesisPresentationVisibility; -import thesistrack.ls1.entity.*; -import thesistrack.ls1.utility.DataFormatter; -import thesistrack.ls1.utility.MailBuilder; -import thesistrack.ls1.utility.MailConfig; +import de.tum.cit.aet.thesis.constants.ThesisCommentType; +import de.tum.cit.aet.thesis.constants.ApplicationRejectReason; +import de.tum.cit.aet.thesis.constants.ThesisFeedbackType; +import de.tum.cit.aet.thesis.constants.ThesisPresentationVisibility; +import de.tum.cit.aet.thesis.entity.*; +import de.tum.cit.aet.thesis.utility.DataFormatter; +import de.tum.cit.aet.thesis.utility.MailBuilder; +import de.tum.cit.aet.thesis.utility.MailConfig; import java.nio.charset.StandardCharsets; import java.time.Instant; diff --git a/server/src/main/java/thesistrack/ls1/service/ThesisCommentService.java b/server/src/main/java/thesis/aet/service/ThesisCommentService.java similarity index 86% rename from server/src/main/java/thesistrack/ls1/service/ThesisCommentService.java rename to server/src/main/java/thesis/aet/service/ThesisCommentService.java index 9f6c28af..fd39f3de 100644 --- a/server/src/main/java/thesistrack/ls1/service/ThesisCommentService.java +++ b/server/src/main/java/thesis/aet/service/ThesisCommentService.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import org.springframework.core.io.Resource; import org.springframework.data.domain.Page; @@ -7,13 +7,13 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import thesistrack.ls1.constants.ThesisCommentType; -import thesistrack.ls1.constants.UploadFileType; -import thesistrack.ls1.entity.Thesis; -import thesistrack.ls1.entity.ThesisComment; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.exception.request.ResourceNotFoundException; -import thesistrack.ls1.repository.ThesisCommentRepository; +import de.tum.cit.aet.thesis.constants.ThesisCommentType; +import de.tum.cit.aet.thesis.constants.UploadFileType; +import de.tum.cit.aet.thesis.entity.Thesis; +import de.tum.cit.aet.thesis.entity.ThesisComment; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.exception.request.ResourceNotFoundException; +import de.tum.cit.aet.thesis.repository.ThesisCommentRepository; import java.time.Instant; import java.util.UUID; diff --git a/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java b/server/src/main/java/thesis/aet/service/ThesisPresentationService.java similarity index 92% rename from server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java rename to server/src/main/java/thesis/aet/service/ThesisPresentationService.java index aa806953..070d034d 100644 --- a/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java +++ b/server/src/main/java/thesis/aet/service/ThesisPresentationService.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import jakarta.mail.internet.InternetAddress; import net.fortuna.ical4j.model.Calendar; @@ -13,18 +13,18 @@ import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import thesistrack.ls1.constants.ThesisPresentationState; -import thesistrack.ls1.constants.ThesisPresentationType; -import thesistrack.ls1.constants.ThesisPresentationVisibility; -import thesistrack.ls1.entity.*; -import thesistrack.ls1.entity.key.ThesisPresentationInviteId; -import thesistrack.ls1.exception.request.AccessDeniedException; -import thesistrack.ls1.exception.request.ResourceInvalidParametersException; -import thesistrack.ls1.exception.request.ResourceNotFoundException; -import thesistrack.ls1.repository.ThesisPresentationInviteRepository; -import thesistrack.ls1.repository.ThesisPresentationRepository; -import thesistrack.ls1.repository.ThesisRepository; -import thesistrack.ls1.repository.UserRepository; +import de.tum.cit.aet.thesis.constants.ThesisPresentationState; +import de.tum.cit.aet.thesis.constants.ThesisPresentationType; +import de.tum.cit.aet.thesis.constants.ThesisPresentationVisibility; +import de.tum.cit.aet.thesis.entity.*; +import de.tum.cit.aet.thesis.entity.key.ThesisPresentationInviteId; +import de.tum.cit.aet.thesis.exception.request.AccessDeniedException; +import de.tum.cit.aet.thesis.exception.request.ResourceInvalidParametersException; +import de.tum.cit.aet.thesis.exception.request.ResourceNotFoundException; +import de.tum.cit.aet.thesis.repository.ThesisPresentationInviteRepository; +import de.tum.cit.aet.thesis.repository.ThesisPresentationRepository; +import de.tum.cit.aet.thesis.repository.ThesisRepository; +import de.tum.cit.aet.thesis.repository.UserRepository; import java.time.Instant; import java.time.temporal.ChronoUnit; @@ -48,8 +48,8 @@ public ThesisPresentationService( ThesisRepository thesisRepository, MailingService mailingService, ThesisPresentationRepository thesisPresentationRepository, - @Value("${thesis-track.client.host}") String clientHost, - @Value("${thesis-track.mail.sender}") InternetAddress applicationMail, + @Value("${thesis-management.client.host}") String clientHost, + @Value("${thesis-management.mail.sender}") InternetAddress applicationMail, UserRepository userRepository, ThesisPresentationInviteRepository thesisPresentationInviteRepository) { this.calendarService = calendarService; this.thesisRepository = thesisRepository; @@ -298,7 +298,7 @@ public ThesisPresentation findById(UUID thesisId, UUID presentationId) { private Calendar createEmptyCalendar() { Calendar calendar = new Calendar(); - calendar.add(new ProdId("-//Thesis Track//Thesis Presentations//EN")); + calendar.add(new ProdId("-//Thesis Management//Thesis Presentations//EN")); calendar.add(ImmutableVersion.VERSION_2_0); calendar.add(ImmutableCalScale.GREGORIAN); diff --git a/server/src/main/java/thesistrack/ls1/service/ThesisService.java b/server/src/main/java/thesis/aet/service/ThesisService.java similarity index 96% rename from server/src/main/java/thesistrack/ls1/service/ThesisService.java rename to server/src/main/java/thesis/aet/service/ThesisService.java index b50c98dd..9d900b1f 100644 --- a/server/src/main/java/thesistrack/ls1/service/ThesisService.java +++ b/server/src/main/java/thesis/aet/service/ThesisService.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; @@ -9,19 +9,19 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import thesistrack.ls1.constants.*; -import thesistrack.ls1.controller.payload.RequestChangesPayload; -import thesistrack.ls1.controller.payload.ThesisStatePayload; -import thesistrack.ls1.entity.*; -import thesistrack.ls1.entity.jsonb.ThesisMetadata; -import thesistrack.ls1.entity.key.ThesisRoleId; -import thesistrack.ls1.entity.key.ThesisStateChangeId; -import thesistrack.ls1.exception.request.ResourceInvalidParametersException; -import thesistrack.ls1.exception.request.ResourceNotFoundException; -import thesistrack.ls1.repository.*; -import thesistrack.ls1.utility.DataFormatter; -import thesistrack.ls1.utility.PDFBuilder; -import thesistrack.ls1.utility.RequestValidator; +import de.tum.cit.aet.thesis.constants.*; +import de.tum.cit.aet.thesis.controller.payload.RequestChangesPayload; +import de.tum.cit.aet.thesis.controller.payload.ThesisStatePayload; +import de.tum.cit.aet.thesis.entity.*; +import de.tum.cit.aet.thesis.entity.jsonb.ThesisMetadata; +import de.tum.cit.aet.thesis.entity.key.ThesisRoleId; +import de.tum.cit.aet.thesis.entity.key.ThesisStateChangeId; +import de.tum.cit.aet.thesis.exception.request.ResourceInvalidParametersException; +import de.tum.cit.aet.thesis.exception.request.ResourceNotFoundException; +import de.tum.cit.aet.thesis.repository.*; +import de.tum.cit.aet.thesis.utility.DataFormatter; +import de.tum.cit.aet.thesis.utility.PDFBuilder; +import de.tum.cit.aet.thesis.utility.RequestValidator; import java.time.Instant; import java.util.*; diff --git a/server/src/main/java/thesistrack/ls1/service/TopicService.java b/server/src/main/java/thesis/aet/service/TopicService.java similarity index 90% rename from server/src/main/java/thesistrack/ls1/service/TopicService.java rename to server/src/main/java/thesis/aet/service/TopicService.java index 7ac53a33..704f4a35 100644 --- a/server/src/main/java/thesistrack/ls1/service/TopicService.java +++ b/server/src/main/java/thesis/aet/service/TopicService.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import org.hibernate.SessionFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -7,17 +7,17 @@ import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import thesistrack.ls1.constants.ThesisRoleName; -import thesistrack.ls1.entity.Topic; -import thesistrack.ls1.entity.TopicRole; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.entity.key.TopicRoleId; -import thesistrack.ls1.exception.request.ResourceInvalidParametersException; -import thesistrack.ls1.exception.request.ResourceNotFoundException; -import thesistrack.ls1.repository.TopicRepository; -import thesistrack.ls1.repository.TopicRoleRepository; -import thesistrack.ls1.repository.UserRepository; -import thesistrack.ls1.utility.HibernateHelper; +import de.tum.cit.aet.thesis.constants.ThesisRoleName; +import de.tum.cit.aet.thesis.entity.Topic; +import de.tum.cit.aet.thesis.entity.TopicRole; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.entity.key.TopicRoleId; +import de.tum.cit.aet.thesis.exception.request.ResourceInvalidParametersException; +import de.tum.cit.aet.thesis.exception.request.ResourceNotFoundException; +import de.tum.cit.aet.thesis.repository.TopicRepository; +import de.tum.cit.aet.thesis.repository.TopicRoleRepository; +import de.tum.cit.aet.thesis.repository.UserRepository; +import de.tum.cit.aet.thesis.utility.HibernateHelper; import java.time.Instant; import java.util.*; diff --git a/server/src/main/java/thesistrack/ls1/service/UploadService.java b/server/src/main/java/thesis/aet/service/UploadService.java similarity index 93% rename from server/src/main/java/thesistrack/ls1/service/UploadService.java rename to server/src/main/java/thesis/aet/service/UploadService.java index 7a486f24..2061a582 100644 --- a/server/src/main/java/thesistrack/ls1/service/UploadService.java +++ b/server/src/main/java/thesis/aet/service/UploadService.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; @@ -8,8 +8,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; -import thesistrack.ls1.constants.UploadFileType; -import thesistrack.ls1.exception.UploadException; +import de.tum.cit.aet.thesis.constants.UploadFileType; +import de.tum.cit.aet.thesis.exception.UploadException; import java.io.File; import java.io.FileNotFoundException; @@ -29,7 +29,7 @@ public class UploadService { private final Path rootLocation; @Autowired - public UploadService(@Value("${thesis-track.storage.upload-location}") String uploadLocation) { + public UploadService(@Value("${thesis-management.storage.upload-location}") String uploadLocation) { this.rootLocation = Paths.get(uploadLocation); File uploadDirectory = rootLocation.toFile(); diff --git a/server/src/main/java/thesistrack/ls1/service/UserService.java b/server/src/main/java/thesis/aet/service/UserService.java similarity index 90% rename from server/src/main/java/thesistrack/ls1/service/UserService.java rename to server/src/main/java/thesis/aet/service/UserService.java index 131d4d06..0e549b37 100644 --- a/server/src/main/java/thesistrack/ls1/service/UserService.java +++ b/server/src/main/java/thesis/aet/service/UserService.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; @@ -6,9 +6,9 @@ import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.exception.request.ResourceNotFoundException; -import thesistrack.ls1.repository.UserRepository; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.exception.request.ResourceNotFoundException; +import de.tum.cit.aet.thesis.repository.UserRepository; import java.util.Arrays; import java.util.HashSet; diff --git a/server/src/main/java/thesistrack/ls1/utility/DataFormatter.java b/server/src/main/java/thesis/aet/utility/DataFormatter.java similarity index 95% rename from server/src/main/java/thesistrack/ls1/utility/DataFormatter.java rename to server/src/main/java/thesis/aet/utility/DataFormatter.java index 41dc20e4..b5da658d 100644 --- a/server/src/main/java/thesistrack/ls1/utility/DataFormatter.java +++ b/server/src/main/java/thesis/aet/utility/DataFormatter.java @@ -1,7 +1,7 @@ -package thesistrack.ls1.utility; +package de.tum.cit.aet.thesis.utility; -import thesistrack.ls1.dto.LightUserDto; -import thesistrack.ls1.entity.User; +import de.tum.cit.aet.thesis.dto.LightUserDto; +import de.tum.cit.aet.thesis.entity.User; import java.time.Instant; import java.time.ZoneId; diff --git a/server/src/main/java/thesistrack/ls1/utility/HibernateHelper.java b/server/src/main/java/thesis/aet/utility/HibernateHelper.java similarity index 94% rename from server/src/main/java/thesistrack/ls1/utility/HibernateHelper.java rename to server/src/main/java/thesis/aet/utility/HibernateHelper.java index 4e91b706..04184d7a 100644 --- a/server/src/main/java/thesistrack/ls1/utility/HibernateHelper.java +++ b/server/src/main/java/thesis/aet/utility/HibernateHelper.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.utility; +package de.tum.cit.aet.thesis.utility; import jakarta.persistence.Column; diff --git a/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java b/server/src/main/java/thesis/aet/utility/MailBuilder.java similarity index 95% rename from server/src/main/java/thesistrack/ls1/utility/MailBuilder.java rename to server/src/main/java/thesis/aet/utility/MailBuilder.java index 429193f9..aa7df559 100644 --- a/server/src/main/java/thesistrack/ls1/utility/MailBuilder.java +++ b/server/src/main/java/thesis/aet/utility/MailBuilder.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.utility; +package de.tum.cit.aet.thesis.utility; import jakarta.activation.DataHandler; import jakarta.activation.FileDataSource; @@ -14,13 +14,13 @@ import org.springframework.mail.javamail.JavaMailSender; import org.thymeleaf.context.Context; import org.thymeleaf.spring6.SpringTemplateEngine; -import thesistrack.ls1.constants.ThesisRoleName; -import thesistrack.ls1.dto.ApplicationDto; -import thesistrack.ls1.dto.ThesisCommentDto; -import thesistrack.ls1.dto.ThesisDto; -import thesistrack.ls1.dto.UserDto; -import thesistrack.ls1.entity.*; -import thesistrack.ls1.service.UploadService; +import de.tum.cit.aet.thesis.constants.ThesisRoleName; +import de.tum.cit.aet.thesis.dto.ApplicationDto; +import de.tum.cit.aet.thesis.dto.ThesisCommentDto; +import de.tum.cit.aet.thesis.dto.ThesisDto; +import de.tum.cit.aet.thesis.dto.UserDto; +import de.tum.cit.aet.thesis.entity.*; +import de.tum.cit.aet.thesis.service.UploadService; import java.util.*; @@ -289,7 +289,7 @@ public void send(JavaMailSender mailSender, UploadService uploadService) { try { MimeMessage message = mailSender.createMimeMessage(); - message.setFrom("ThesisTrack <" + config.getSender().getAddress() + ">"); + message.setFrom("ThesisManagement <" + config.getSender().getAddress() + ">"); message.setSender(config.getSender()); message.addRecipient(Message.RecipientType.TO, recipient.getEmail()); diff --git a/server/src/main/java/thesistrack/ls1/utility/MailConfig.java b/server/src/main/java/thesis/aet/utility/MailConfig.java similarity index 80% rename from server/src/main/java/thesistrack/ls1/utility/MailConfig.java rename to server/src/main/java/thesis/aet/utility/MailConfig.java index 6d585c30..ed95e6b2 100644 --- a/server/src/main/java/thesistrack/ls1/utility/MailConfig.java +++ b/server/src/main/java/thesis/aet/utility/MailConfig.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.utility; +package de.tum.cit.aet.thesis.utility; import jakarta.mail.internet.AddressException; import jakarta.mail.internet.InternetAddress; @@ -8,8 +8,8 @@ import org.springframework.stereotype.Component; import org.thymeleaf.ITemplateEngine; import org.thymeleaf.TemplateEngine; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.repository.UserRepository; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.repository.UserRepository; import java.util.*; @@ -39,12 +39,12 @@ public class MailConfig { @Autowired public MailConfig( - @Value("${thesis-track.mail.enabled}") boolean enabled, - @Value("${thesis-track.mail.sender}") InternetAddress sender, - @Value("${thesis-track.mail.bcc-recipients}") String bccRecipientsList, - @Value("${thesis-track.mail.signature}") String mailSignature, - @Value("${thesis-track.mail.workspace-url}") String workspaceUrl, - @Value("${thesis-track.client.host}") String clientHost, + @Value("${thesis-management.mail.enabled}") boolean enabled, + @Value("${thesis-management.mail.sender}") InternetAddress sender, + @Value("${thesis-management.mail.bcc-recipients}") String bccRecipientsList, + @Value("${thesis-management.mail.signature}") String mailSignature, + @Value("${thesis-management.mail.workspace-url}") String workspaceUrl, + @Value("${thesis-management.client.host}") String clientHost, TemplateEngine templateEngine, UserRepository userRepository ) { diff --git a/server/src/main/java/thesistrack/ls1/utility/MailLogger.java b/server/src/main/java/thesis/aet/utility/MailLogger.java similarity index 98% rename from server/src/main/java/thesistrack/ls1/utility/MailLogger.java rename to server/src/main/java/thesis/aet/utility/MailLogger.java index c4f1c105..9ede30bd 100644 --- a/server/src/main/java/thesistrack/ls1/utility/MailLogger.java +++ b/server/src/main/java/thesis/aet/utility/MailLogger.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.utility; +package de.tum.cit.aet.thesis.utility; import jakarta.mail.Address; import jakarta.mail.Message; diff --git a/server/src/main/java/thesistrack/ls1/utility/PDFBuilder.java b/server/src/main/java/thesis/aet/utility/PDFBuilder.java similarity index 98% rename from server/src/main/java/thesistrack/ls1/utility/PDFBuilder.java rename to server/src/main/java/thesis/aet/utility/PDFBuilder.java index fe8765db..d5e4fd61 100644 --- a/server/src/main/java/thesistrack/ls1/utility/PDFBuilder.java +++ b/server/src/main/java/thesis/aet/utility/PDFBuilder.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.utility; +package de.tum.cit.aet.thesis.utility; import com.itextpdf.html2pdf.ConverterProperties; import com.itextpdf.html2pdf.resolver.font.DefaultFontProvider; diff --git a/server/src/main/java/thesistrack/ls1/utility/RequestValidator.java b/server/src/main/java/thesis/aet/utility/RequestValidator.java similarity index 95% rename from server/src/main/java/thesistrack/ls1/utility/RequestValidator.java rename to server/src/main/java/thesis/aet/utility/RequestValidator.java index 514ab3b6..37f5dbb2 100644 --- a/server/src/main/java/thesistrack/ls1/utility/RequestValidator.java +++ b/server/src/main/java/thesis/aet/utility/RequestValidator.java @@ -1,8 +1,8 @@ -package thesistrack.ls1.utility; +package de.tum.cit.aet.thesis.utility; import jakarta.mail.internet.AddressException; import jakarta.mail.internet.InternetAddress; -import thesistrack.ls1.exception.request.ResourceInvalidParametersException; +import de.tum.cit.aet.thesis.exception.request.ResourceInvalidParametersException; import java.util.Set; diff --git a/server/src/main/java/thesistrack/ls1/utility/StringToArrayConverter.java b/server/src/main/java/thesis/aet/utility/StringToArrayConverter.java similarity index 94% rename from server/src/main/java/thesistrack/ls1/utility/StringToArrayConverter.java rename to server/src/main/java/thesis/aet/utility/StringToArrayConverter.java index 547a0046..5bb6a9bb 100644 --- a/server/src/main/java/thesistrack/ls1/utility/StringToArrayConverter.java +++ b/server/src/main/java/thesis/aet/utility/StringToArrayConverter.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.utility; +package de.tum.cit.aet.thesis.utility; import org.springframework.core.convert.converter.Converter; import org.springframework.stereotype.Component; diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/CloseTopicPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/CloseTopicPayload.java deleted file mode 100644 index dc9b37e8..00000000 --- a/server/src/main/java/thesistrack/ls1/controller/payload/CloseTopicPayload.java +++ /dev/null @@ -1,9 +0,0 @@ -package thesistrack.ls1.controller.payload; - -import thesistrack.ls1.constants.ApplicationRejectReason; - -public record CloseTopicPayload( - ApplicationRejectReason reason, - Boolean notifyUser -) { -} diff --git a/server/src/main/java/thesistrack/ls1/controller/payload/ReviewApplicationPayload.java b/server/src/main/java/thesistrack/ls1/controller/payload/ReviewApplicationPayload.java deleted file mode 100644 index 1bfa1a92..00000000 --- a/server/src/main/java/thesistrack/ls1/controller/payload/ReviewApplicationPayload.java +++ /dev/null @@ -1,8 +0,0 @@ -package thesistrack.ls1.controller.payload; - -import thesistrack.ls1.constants.ApplicationReviewReason; - -public record ReviewApplicationPayload( - ApplicationReviewReason reason -) { -} diff --git a/server/src/main/java/thesistrack/ls1/repository/ApplicationReviewerRepository.java b/server/src/main/java/thesistrack/ls1/repository/ApplicationReviewerRepository.java deleted file mode 100644 index 64bbe61c..00000000 --- a/server/src/main/java/thesistrack/ls1/repository/ApplicationReviewerRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package thesistrack.ls1.repository; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -import thesistrack.ls1.entity.ApplicationReviewer; -import thesistrack.ls1.entity.ThesisStateChange; -import thesistrack.ls1.entity.key.ApplicationReviewerId; -import thesistrack.ls1.entity.key.ThesisStateChangeId; - - -@Repository -public interface ApplicationReviewerRepository extends JpaRepository { -} diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml index ff3a8ac1..d6cd542e 100644 --- a/server/src/main/resources/application.yml +++ b/server/src/main/resources/application.yml @@ -5,9 +5,9 @@ logging: spring: datasource: - url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5144/thesis-track} - username: ${SPRING_DATASOURCE_USERNAME:thesis-track-postgres} - password: ${SPRING_DATASOURCE_PASSWORD:thesis-track-postgres} + url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5144/thesis-management} + username: ${SPRING_DATASOURCE_USERNAME:thesis-management-postgres} + password: ${SPRING_DATASOURCE_PASSWORD:thesis-management-postgres} driver-class-name: org.postgresql.Driver liquibase: enabled: true @@ -32,16 +32,16 @@ spring: client: registration: keycloak: - client-id: ${KEYCLOAK_CLIENT_ID:thesis-track-app} + client-id: ${KEYCLOAK_CLIENT_ID:thesis-management-app} scope: openid provider: keycloak: - issuer-uri: ${KEYCLOAK_HOST:http://localhost:8081}/realms/${KEYCLOAK_REALM_NAME:thesis-track} + issuer-uri: ${KEYCLOAK_HOST:http://localhost:8081}/realms/${KEYCLOAK_REALM_NAME:thesis-management} user-name-attribute: preferred_username resourceserver: jwt: - jwk-set-uri: ${KEYCLOAK_HOST:http://localhost:8081}/realms/${KEYCLOAK_REALM_NAME:thesis-track}/protocol/openid-connect/certs - issuer-uri: ${KEYCLOAK_HOST:http://localhost:8081}/realms/${KEYCLOAK_REALM_NAME:thesis-track} + jwk-set-uri: ${KEYCLOAK_HOST:http://localhost:8081}/realms/${KEYCLOAK_REALM_NAME:thesis-management}/protocol/openid-connect/certs + issuer-uri: ${KEYCLOAK_HOST:http://localhost:8081}/realms/${KEYCLOAK_REALM_NAME:thesis-management} mail: host: ${POSTFIX_HOST:localhost} port: ${POSTFIX_PORT:25} @@ -73,13 +73,13 @@ server: servlet: context-path: /api -thesis-track: +thesis-management: keycloak: host: ${KEYCLOAK_HOST:http://localhost:8081} - realm-name: ${KEYCLOAK_REALM_NAME:thesis-track} - client-id: ${KEYCLOAK_CLIENT_ID:thesis-track-app} + realm-name: ${KEYCLOAK_REALM_NAME:thesis-management} + client-id: ${KEYCLOAK_CLIENT_ID:thesis-management-app} service-client: - id: ${KEYCLOAK_SERVICE_CLIENT_ID:thesis-track-service-client} + id: ${KEYCLOAK_SERVICE_CLIENT_ID:thesis-management-service-client} secret: ${KEYCLOAK_SERVICE_CLIENT_SECRET:} student-group-name: ${KEYCLOAK_SERVICE_STUDENT_GROUP_NAME:thesis-students} calendar: diff --git a/server/src/test/java/thesistrack/ls1/controller/ApplicationControllerTest.java b/server/src/test/java/thesis/aet/controller/ApplicationControllerTest.java similarity index 92% rename from server/src/test/java/thesistrack/ls1/controller/ApplicationControllerTest.java rename to server/src/test/java/thesis/aet/controller/ApplicationControllerTest.java index 0e3965e8..71faf217 100644 --- a/server/src/test/java/thesistrack/ls1/controller/ApplicationControllerTest.java +++ b/server/src/test/java/thesis/aet/controller/ApplicationControllerTest.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller; +package de.tum.cit.aet.thesis.controller; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -9,11 +9,11 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.testcontainers.junit.jupiter.Testcontainers; -import thesistrack.ls1.constants.ApplicationState; -import thesistrack.ls1.controller.payload.AcceptApplicationPayload; -import thesistrack.ls1.controller.payload.CreateApplicationPayload; -import thesistrack.ls1.controller.payload.UpdateApplicationCommentPayload; -import thesistrack.ls1.mock.BaseIntegrationTest; +import de.tum.cit.aet.thesis.constants.ApplicationState; +import de.tum.cit.aet.thesis.controller.payload.AcceptApplicationPayload; +import de.tum.cit.aet.thesis.controller.payload.CreateApplicationPayload; +import de.tum.cit.aet.thesis.controller.payload.UpdateApplicationCommentPayload; +import de.tum.cit.aet.thesis.mock.BaseIntegrationTest; import java.time.Instant; import java.util.List; diff --git a/server/src/test/java/thesistrack/ls1/controller/ThesisControllerTest.java b/server/src/test/java/thesis/aet/controller/ThesisControllerTest.java similarity index 98% rename from server/src/test/java/thesistrack/ls1/controller/ThesisControllerTest.java rename to server/src/test/java/thesis/aet/controller/ThesisControllerTest.java index a1b7898c..8cfe38c9 100644 --- a/server/src/test/java/thesistrack/ls1/controller/ThesisControllerTest.java +++ b/server/src/test/java/thesis/aet/controller/ThesisControllerTest.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller; +package de.tum.cit.aet.thesis.controller; import org.junit.jupiter.api.*; import org.springframework.http.MediaType; @@ -7,9 +7,9 @@ import org.springframework.test.context.DynamicPropertySource; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.testcontainers.junit.jupiter.Testcontainers; -import thesistrack.ls1.constants.*; -import thesistrack.ls1.controller.payload.*; -import thesistrack.ls1.mock.BaseIntegrationTest; +import de.tum.cit.aet.thesis.constants.*; +import de.tum.cit.aet.thesis.controller.payload.*; +import de.tum.cit.aet.thesis.mock.BaseIntegrationTest; import java.time.Instant; import java.util.*; diff --git a/server/src/test/java/thesistrack/ls1/controller/TopicControllerTest.java b/server/src/test/java/thesis/aet/controller/TopicControllerTest.java similarity index 95% rename from server/src/test/java/thesistrack/ls1/controller/TopicControllerTest.java rename to server/src/test/java/thesis/aet/controller/TopicControllerTest.java index bc13fbba..3c1ac34a 100644 --- a/server/src/test/java/thesistrack/ls1/controller/TopicControllerTest.java +++ b/server/src/test/java/thesis/aet/controller/TopicControllerTest.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller; +package de.tum.cit.aet.thesis.controller; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -8,10 +8,10 @@ import org.springframework.test.context.DynamicPropertySource; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.testcontainers.junit.jupiter.Testcontainers; -import thesistrack.ls1.constants.ApplicationRejectReason; -import thesistrack.ls1.controller.payload.CloseTopicPayload; -import thesistrack.ls1.controller.payload.ReplaceTopicPayload; -import thesistrack.ls1.mock.BaseIntegrationTest; +import de.tum.cit.aet.thesis.constants.ApplicationRejectReason; +import de.tum.cit.aet.thesis.controller.payload.CloseTopicPayload; +import de.tum.cit.aet.thesis.controller.payload.ReplaceTopicPayload; +import de.tum.cit.aet.thesis.mock.BaseIntegrationTest; import java.util.List; import java.util.Set; diff --git a/server/src/test/java/thesistrack/ls1/controller/UserControllerTest.java b/server/src/test/java/thesis/aet/controller/UserControllerTest.java similarity index 94% rename from server/src/test/java/thesistrack/ls1/controller/UserControllerTest.java rename to server/src/test/java/thesis/aet/controller/UserControllerTest.java index 9a6f6f20..4d64fd60 100644 --- a/server/src/test/java/thesistrack/ls1/controller/UserControllerTest.java +++ b/server/src/test/java/thesis/aet/controller/UserControllerTest.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.controller; +package de.tum.cit.aet.thesis.controller; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -7,7 +7,7 @@ import org.springframework.test.context.DynamicPropertySource; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.testcontainers.junit.jupiter.Testcontainers; -import thesistrack.ls1.mock.BaseIntegrationTest; +import de.tum.cit.aet.thesis.mock.BaseIntegrationTest; import java.util.List; diff --git a/server/src/test/java/thesistrack/ls1/mock/BaseIntegrationTest.java b/server/src/test/java/thesis/aet/mock/BaseIntegrationTest.java similarity index 96% rename from server/src/test/java/thesistrack/ls1/mock/BaseIntegrationTest.java rename to server/src/test/java/thesis/aet/mock/BaseIntegrationTest.java index cb5b6ffb..091cd0b6 100644 --- a/server/src/test/java/thesistrack/ls1/mock/BaseIntegrationTest.java +++ b/server/src/test/java/thesis/aet/mock/BaseIntegrationTest.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.mock; +package de.tum.cit.aet.thesis.mock; import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; @@ -21,10 +21,10 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; -import thesistrack.ls1.controller.payload.CreateApplicationPayload; -import thesistrack.ls1.controller.payload.CreateThesisPayload; -import thesistrack.ls1.controller.payload.ReplaceTopicPayload; -import thesistrack.ls1.repository.*; +import de.tum.cit.aet.thesis.controller.payload.CreateApplicationPayload; +import de.tum.cit.aet.thesis.controller.payload.CreateThesisPayload; +import de.tum.cit.aet.thesis.controller.payload.ReplaceTopicPayload; +import de.tum.cit.aet.thesis.repository.*; import java.time.Instant; import java.util.*; diff --git a/server/src/test/java/thesistrack/ls1/mock/EntityMockFactory.java b/server/src/test/java/thesis/aet/mock/EntityMockFactory.java similarity index 86% rename from server/src/test/java/thesistrack/ls1/mock/EntityMockFactory.java rename to server/src/test/java/thesis/aet/mock/EntityMockFactory.java index 84d1da6c..63fcd572 100644 --- a/server/src/test/java/thesistrack/ls1/mock/EntityMockFactory.java +++ b/server/src/test/java/thesis/aet/mock/EntityMockFactory.java @@ -1,11 +1,11 @@ -package thesistrack.ls1.mock; - -import thesistrack.ls1.constants.ApplicationState; -import thesistrack.ls1.constants.ThesisRoleName; -import thesistrack.ls1.constants.ThesisState; -import thesistrack.ls1.entity.*; -import thesistrack.ls1.entity.key.ThesisRoleId; -import thesistrack.ls1.entity.key.UserGroupId; +package de.tum.cit.aet.thesis.mock; + +import de.tum.cit.aet.thesis.constants.ApplicationState; +import de.tum.cit.aet.thesis.constants.ThesisRoleName; +import de.tum.cit.aet.thesis.constants.ThesisState; +import de.tum.cit.aet.thesis.entity.*; +import de.tum.cit.aet.thesis.entity.key.ThesisRoleId; +import de.tum.cit.aet.thesis.entity.key.UserGroupId; import java.util.*; diff --git a/server/src/test/java/thesistrack/ls1/mock/TestSecurityConfig.java b/server/src/test/java/thesis/aet/mock/TestSecurityConfig.java similarity index 98% rename from server/src/test/java/thesistrack/ls1/mock/TestSecurityConfig.java rename to server/src/test/java/thesis/aet/mock/TestSecurityConfig.java index 301ffdf5..2db68527 100644 --- a/server/src/test/java/thesistrack/ls1/mock/TestSecurityConfig.java +++ b/server/src/test/java/thesis/aet/mock/TestSecurityConfig.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.mock; +package de.tum.cit.aet.thesis.mock; import com.auth0.jwt.JWT; import org.springframework.boot.test.context.TestConfiguration; diff --git a/server/src/test/java/thesistrack/ls1/service/ApplicationServiceTest.java b/server/src/test/java/thesis/aet/service/ApplicationServiceTest.java similarity index 92% rename from server/src/test/java/thesistrack/ls1/service/ApplicationServiceTest.java rename to server/src/test/java/thesis/aet/service/ApplicationServiceTest.java index 283ab5ab..11a5a0ad 100644 --- a/server/src/test/java/thesistrack/ls1/service/ApplicationServiceTest.java +++ b/server/src/test/java/thesis/aet/service/ApplicationServiceTest.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -8,17 +8,17 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; -import thesistrack.ls1.constants.ApplicationRejectReason; -import thesistrack.ls1.constants.ApplicationReviewReason; -import thesistrack.ls1.constants.ApplicationState; -import thesistrack.ls1.entity.*; -import thesistrack.ls1.entity.key.ApplicationReviewerId; -import thesistrack.ls1.exception.request.ResourceInvalidParametersException; -import thesistrack.ls1.exception.request.ResourceNotFoundException; -import thesistrack.ls1.mock.EntityMockFactory; -import thesistrack.ls1.repository.ApplicationRepository; -import thesistrack.ls1.repository.ApplicationReviewerRepository; -import thesistrack.ls1.repository.TopicRepository; +import de.tum.cit.aet.thesis.constants.ApplicationRejectReason; +import de.tum.cit.aet.thesis.constants.ApplicationReviewReason; +import de.tum.cit.aet.thesis.constants.ApplicationState; +import de.tum.cit.aet.thesis.entity.*; +import de.tum.cit.aet.thesis.entity.key.ApplicationReviewerId; +import de.tum.cit.aet.thesis.exception.request.ResourceInvalidParametersException; +import de.tum.cit.aet.thesis.exception.request.ResourceNotFoundException; +import de.tum.cit.aet.thesis.mock.EntityMockFactory; +import de.tum.cit.aet.thesis.repository.ApplicationRepository; +import de.tum.cit.aet.thesis.repository.ApplicationReviewerRepository; +import de.tum.cit.aet.thesis.repository.TopicRepository; import java.time.Instant; import java.util.*; diff --git a/server/src/test/java/thesistrack/ls1/service/AuthenticationServiceTest.java b/server/src/test/java/thesis/aet/service/AuthenticationServiceTest.java similarity index 89% rename from server/src/test/java/thesistrack/ls1/service/AuthenticationServiceTest.java rename to server/src/test/java/thesis/aet/service/AuthenticationServiceTest.java index 45d0aebb..4ef86cac 100644 --- a/server/src/test/java/thesistrack/ls1/service/AuthenticationServiceTest.java +++ b/server/src/test/java/thesis/aet/service/AuthenticationServiceTest.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -7,14 +7,14 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.mock.web.MockMultipartFile; import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken; -import thesistrack.ls1.constants.UploadFileType; -import thesistrack.ls1.entity.NotificationSetting; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.entity.key.NotificationSettingId; -import thesistrack.ls1.mock.EntityMockFactory; -import thesistrack.ls1.repository.NotificationSettingRepository; -import thesistrack.ls1.repository.UserGroupRepository; -import thesistrack.ls1.repository.UserRepository; +import de.tum.cit.aet.thesis.constants.UploadFileType; +import de.tum.cit.aet.thesis.entity.NotificationSetting; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.entity.key.NotificationSettingId; +import de.tum.cit.aet.thesis.mock.EntityMockFactory; +import de.tum.cit.aet.thesis.repository.NotificationSettingRepository; +import de.tum.cit.aet.thesis.repository.UserGroupRepository; +import de.tum.cit.aet.thesis.repository.UserRepository; import java.time.Instant; import java.util.*; @@ -81,7 +81,7 @@ void updateUserInformation_WithAllFields_UpdatesUser() { Instant.now(), "Java", "AI", - "Thesis Track", + "Thesis Management", Map.of("key", "value"), avatar, null, diff --git a/server/src/test/java/thesistrack/ls1/service/ThesisCommentServiceTest.java b/server/src/test/java/thesis/aet/service/ThesisCommentServiceTest.java similarity index 93% rename from server/src/test/java/thesistrack/ls1/service/ThesisCommentServiceTest.java rename to server/src/test/java/thesis/aet/service/ThesisCommentServiceTest.java index 274d37b7..96697d47 100644 --- a/server/src/test/java/thesistrack/ls1/service/ThesisCommentServiceTest.java +++ b/server/src/test/java/thesis/aet/service/ThesisCommentServiceTest.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -12,14 +12,14 @@ import org.springframework.data.domain.PageRequest; import org.springframework.mock.web.MockMultipartFile; import org.springframework.web.multipart.MultipartFile; -import thesistrack.ls1.constants.ThesisCommentType; -import thesistrack.ls1.constants.UploadFileType; -import thesistrack.ls1.entity.Thesis; -import thesistrack.ls1.entity.ThesisComment; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.exception.request.ResourceNotFoundException; -import thesistrack.ls1.mock.EntityMockFactory; -import thesistrack.ls1.repository.ThesisCommentRepository; +import de.tum.cit.aet.thesis.constants.ThesisCommentType; +import de.tum.cit.aet.thesis.constants.UploadFileType; +import de.tum.cit.aet.thesis.entity.Thesis; +import de.tum.cit.aet.thesis.entity.ThesisComment; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.exception.request.ResourceNotFoundException; +import de.tum.cit.aet.thesis.mock.EntityMockFactory; +import de.tum.cit.aet.thesis.repository.ThesisCommentRepository; import java.time.Instant; import java.util.List; diff --git a/server/src/test/java/thesistrack/ls1/service/ThesisPresentationServiceTest.java b/server/src/test/java/thesis/aet/service/ThesisPresentationServiceTest.java similarity index 91% rename from server/src/test/java/thesistrack/ls1/service/ThesisPresentationServiceTest.java rename to server/src/test/java/thesis/aet/service/ThesisPresentationServiceTest.java index a1581dfb..d8133129 100644 --- a/server/src/test/java/thesistrack/ls1/service/ThesisPresentationServiceTest.java +++ b/server/src/test/java/thesis/aet/service/ThesisPresentationServiceTest.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import jakarta.mail.internet.InternetAddress; import net.fortuna.ical4j.model.Calendar; @@ -10,18 +10,18 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; -import thesistrack.ls1.constants.ThesisPresentationState; -import thesistrack.ls1.constants.ThesisPresentationType; -import thesistrack.ls1.constants.ThesisPresentationVisibility; -import thesistrack.ls1.entity.*; -import thesistrack.ls1.exception.request.AccessDeniedException; -import thesistrack.ls1.exception.request.ResourceInvalidParametersException; -import thesistrack.ls1.exception.request.ResourceNotFoundException; -import thesistrack.ls1.mock.EntityMockFactory; -import thesistrack.ls1.repository.ThesisPresentationInviteRepository; -import thesistrack.ls1.repository.ThesisPresentationRepository; -import thesistrack.ls1.repository.ThesisRepository; -import thesistrack.ls1.repository.UserRepository; +import de.tum.cit.aet.thesis.constants.ThesisPresentationState; +import de.tum.cit.aet.thesis.constants.ThesisPresentationType; +import de.tum.cit.aet.thesis.constants.ThesisPresentationVisibility; +import de.tum.cit.aet.thesis.entity.*; +import de.tum.cit.aet.thesis.exception.request.AccessDeniedException; +import de.tum.cit.aet.thesis.exception.request.ResourceInvalidParametersException; +import de.tum.cit.aet.thesis.exception.request.ResourceNotFoundException; +import de.tum.cit.aet.thesis.mock.EntityMockFactory; +import de.tum.cit.aet.thesis.repository.ThesisPresentationInviteRepository; +import de.tum.cit.aet.thesis.repository.ThesisPresentationRepository; +import de.tum.cit.aet.thesis.repository.ThesisRepository; +import de.tum.cit.aet.thesis.repository.UserRepository; import java.time.Instant; import java.util.*; diff --git a/server/src/test/java/thesistrack/ls1/service/ThesisServiceTest.java b/server/src/test/java/thesis/aet/service/ThesisServiceTest.java similarity index 95% rename from server/src/test/java/thesistrack/ls1/service/ThesisServiceTest.java rename to server/src/test/java/thesis/aet/service/ThesisServiceTest.java index 89c26fc5..6617f24f 100644 --- a/server/src/test/java/thesistrack/ls1/service/ThesisServiceTest.java +++ b/server/src/test/java/thesis/aet/service/ThesisServiceTest.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -8,12 +8,12 @@ import org.springframework.data.domain.PageImpl; import org.springframework.mock.web.MockMultipartFile; import org.springframework.web.multipart.MultipartFile; -import thesistrack.ls1.constants.*; -import thesistrack.ls1.entity.*; -import thesistrack.ls1.exception.request.ResourceInvalidParametersException; -import thesistrack.ls1.exception.request.ResourceNotFoundException; -import thesistrack.ls1.mock.EntityMockFactory; -import thesistrack.ls1.repository.*; +import de.tum.cit.aet.thesis.constants.*; +import de.tum.cit.aet.thesis.entity.*; +import de.tum.cit.aet.thesis.exception.request.ResourceInvalidParametersException; +import de.tum.cit.aet.thesis.exception.request.ResourceNotFoundException; +import de.tum.cit.aet.thesis.mock.EntityMockFactory; +import de.tum.cit.aet.thesis.repository.*; import java.util.*; diff --git a/server/src/test/java/thesistrack/ls1/service/TopicServiceTest.java b/server/src/test/java/thesis/aet/service/TopicServiceTest.java similarity index 92% rename from server/src/test/java/thesistrack/ls1/service/TopicServiceTest.java rename to server/src/test/java/thesis/aet/service/TopicServiceTest.java index c0e3bfa4..5646f8b2 100644 --- a/server/src/test/java/thesistrack/ls1/service/TopicServiceTest.java +++ b/server/src/test/java/thesis/aet/service/TopicServiceTest.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import org.hibernate.SessionFactory; import org.junit.jupiter.api.BeforeEach; @@ -10,15 +10,15 @@ import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; -import thesistrack.ls1.entity.Topic; -import thesistrack.ls1.entity.TopicRole; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.exception.request.ResourceInvalidParametersException; -import thesistrack.ls1.exception.request.ResourceNotFoundException; -import thesistrack.ls1.mock.EntityMockFactory; -import thesistrack.ls1.repository.TopicRepository; -import thesistrack.ls1.repository.TopicRoleRepository; -import thesistrack.ls1.repository.UserRepository; +import de.tum.cit.aet.thesis.entity.Topic; +import de.tum.cit.aet.thesis.entity.TopicRole; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.exception.request.ResourceInvalidParametersException; +import de.tum.cit.aet.thesis.exception.request.ResourceNotFoundException; +import de.tum.cit.aet.thesis.mock.EntityMockFactory; +import de.tum.cit.aet.thesis.repository.TopicRepository; +import de.tum.cit.aet.thesis.repository.TopicRoleRepository; +import de.tum.cit.aet.thesis.repository.UserRepository; import java.util.*; diff --git a/server/src/test/java/thesistrack/ls1/service/UserServiceTest.java b/server/src/test/java/thesis/aet/service/UserServiceTest.java similarity index 91% rename from server/src/test/java/thesistrack/ls1/service/UserServiceTest.java rename to server/src/test/java/thesis/aet/service/UserServiceTest.java index 3fe08700..497ca589 100644 --- a/server/src/test/java/thesistrack/ls1/service/UserServiceTest.java +++ b/server/src/test/java/thesis/aet/service/UserServiceTest.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.service; +package de.tum.cit.aet.thesis.service; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -10,10 +10,10 @@ import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; -import thesistrack.ls1.entity.User; -import thesistrack.ls1.exception.request.ResourceNotFoundException; -import thesistrack.ls1.mock.EntityMockFactory; -import thesistrack.ls1.repository.UserRepository; +import de.tum.cit.aet.thesis.entity.User; +import de.tum.cit.aet.thesis.exception.request.ResourceNotFoundException; +import de.tum.cit.aet.thesis.mock.EntityMockFactory; +import de.tum.cit.aet.thesis.repository.UserRepository; import java.util.*; diff --git a/server/src/test/java/thesistrack/ls1/utility/DataFormatterTest.java b/server/src/test/java/thesis/aet/utility/DataFormatterTest.java similarity index 98% rename from server/src/test/java/thesistrack/ls1/utility/DataFormatterTest.java rename to server/src/test/java/thesis/aet/utility/DataFormatterTest.java index 4956d921..5b979322 100644 --- a/server/src/test/java/thesistrack/ls1/utility/DataFormatterTest.java +++ b/server/src/test/java/thesis/aet/utility/DataFormatterTest.java @@ -1,10 +1,10 @@ -package thesistrack.ls1.utility; +package de.tum.cit.aet.thesis.utility; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import thesistrack.ls1.dto.LightUserDto; +import de.tum.cit.aet.thesis.dto.LightUserDto; import java.time.Instant; import java.time.ZoneId; diff --git a/server/src/test/java/thesistrack/ls1/utility/RequestValidatorTest.java b/server/src/test/java/thesis/aet/utility/RequestValidatorTest.java similarity index 97% rename from server/src/test/java/thesistrack/ls1/utility/RequestValidatorTest.java rename to server/src/test/java/thesis/aet/utility/RequestValidatorTest.java index 28379f52..495a4649 100644 --- a/server/src/test/java/thesistrack/ls1/utility/RequestValidatorTest.java +++ b/server/src/test/java/thesis/aet/utility/RequestValidatorTest.java @@ -1,4 +1,4 @@ -package thesistrack.ls1.utility; +package de.tum.cit.aet.thesis.utility; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -6,7 +6,7 @@ import org.junit.jupiter.params.provider.NullAndEmptySource; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import thesistrack.ls1.exception.request.ResourceInvalidParametersException; +import de.tum.cit.aet.thesis.exception.request.ResourceInvalidParametersException; import java.util.HashSet; import java.util.Set; diff --git a/server/src/test/resources/application.yml b/server/src/test/resources/application.yml index ea779730..94f4e41b 100644 --- a/server/src/test/resources/application.yml +++ b/server/src/test/resources/application.yml @@ -5,7 +5,7 @@ logging: spring: datasource: - url: jdbc:postgresql://unreachable:5432/thesis-track + url: jdbc:postgresql://unreachable:5432/thesis-management username: "" password: "" driver-class-name: org.postgresql.Driver @@ -42,13 +42,13 @@ server: servlet: context-path: /api -thesis-track: +thesis-management: keycloak: host: http://unreachable:8081 - realm-name: thesis-track - client-id: thesis-track-app + realm-name: thesis-management + client-id: thesis-management-app service-client: - id: thesis-track-service-client + id: thesis-management-service-client secret: "" student-group-name: thesis-students calendar: diff --git a/thesis-track-backup.sh b/thesis-management-backup.sh similarity index 96% rename from thesis-track-backup.sh rename to thesis-management-backup.sh index 64a4bf6a..44d76d57 100644 --- a/thesis-track-backup.sh +++ b/thesis-management-backup.sh @@ -2,7 +2,7 @@ # Configuration BACKUP_DIR="./backups" # Directory to store backups -DB_CONTAINER="thesis-track-db" # PostgreSQL container name +DB_CONTAINER="thesis-management-db" # PostgreSQL container name UPLOADS_DIR="./thesis_uploads" # Path to thesis_uploads folder DB_USER=$(grep SPRING_DATASOURCE_USERNAME .env.prod | cut -d '=' -f 2) # Extract DB user from .env.prod DB_NAME=$(grep SPRING_DATASOURCE_DATABASE .env.prod | cut -d '=' -f 2) # Extract DB name from .env.prod