1
0
forked from PGL/Clyde
Commit Graph

274 Commits

Author SHA1 Message Date
e6e147af26 Implements the school fees gestion for a student and a payment table containing a history of all the financial transactions of the system 2024-04-08 14:50:37 +02:00
194b14f02b Implements the backend logic for the minerval gestion 2024-04-08 10:18:28 +02:00
5f483216b9
indev 2024-04-08 10:02:03 +02:00
5a4d066c45
Forum and topic getter and creator endpoints 2024-04-07 18:16:05 +02:00
f9bcff6d4f
Avoid password leakage
The password should never be parsed to json ever so can be safely
ignored.
2024-04-07 14:46:14 +02:00
aa3e1cb868 backend Schedule 2024-04-07 14:33:51 +02:00
3c721de18b Big commit:
make some changes to profile to provide an interface for a student to manage his courses.

implements the submission of exemptions request
2024-04-06 16:12:11 +02:00
5bb7606721
signing and commenting 2024-04-05 12:54:51 +02:00
648b73b585 Fix the implementation of externalCurriculum upload 2024-04-04 16:54:11 +02:00
cb750b8505
Database creation (Tables) 2024-04-02 21:40:52 +02:00
7ca5c34afe
adding timestamp 2024-04-02 11:08:58 +02:00
2b9493422d setup grid to display courses 2024-04-01 16:51:18 +02:00
bce53305b3 Merge master into my branch 2024-04-01 10:40:36 +02:00
0e26e1a0db adding compose for launching properly everything 2024-03-30 23:23:33 +01:00
4a314449ad Add the backend logic for ExternalCurriculum class (need to do one more endpoint) 2024-03-29 15:31:02 +01:00
2bdffe6ab4
remove member of a discussion 2024-03-29 14:30:46 +01:00
a3c9d6a7c0 Fix the profilepicture url issue (it wasn't sent to the db)
add a prototype of a more generic uploadfile function in uploads.js

makes the distinction between a master cursus and a bachelor cursus in display
2024-03-29 10:55:59 +01:00
729d1ad504
adding members management 2024-03-27 23:54:59 +01:00
b4499e04c7
Managing the message with backend
Using DTO to change the way discussions and message are sent to the
client
2024-03-27 19:50:52 +01:00
94f12f0a86 Add the date and identitycard feature to inscriptionRequest 2024-03-27 16:04:55 +01:00
eafff6ec2d Ajoute le détail des étudiants (big update) 2024-03-25 09:57:35 +01:00
66e7fa24a1
Adding the discussion architectures and creating new discussions 2024-03-25 00:08:44 +01:00
ad0e7b3e35 - Ajoute un champ year dans UserCurriculum pour différencier les anciers cursus de l'actuel pour l'étudiant
- Ajoute la table ExemptionsRequest
- Ajoute la table ScholarshipRequest
- Ajoute la table UninscriptionRequest
2024-03-23 14:08:03 +01:00
73f3df0bc6 Clean le projet 2024-03-18 20:54:16 +01:00
90a7b7b70e Merge pull request 'Link back and front all get' (#115) from wal/front/listingUsers into master
Reviewed-on: PGL/Clyde#115
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
2024-03-18 20:20:35 +01:00
4f002a29e1 Merge pull request 'added delete self' (#145) from Max/Backend/UserDelete into master
Reviewed-on: PGL/Clyde#145
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2024-03-18 20:19:41 +01:00
4715441afd FINAL COMMIT 2024-03-18 18:47:00 +01:00
77ac771b8f Merge remote-tracking branch 'origin/Max/Backend/UserDelete' into wal/front/listingUsers 2024-03-18 17:36:07 +01:00
a276c24f8f added delete self 2024-03-18 17:30:04 +01:00
25c5c1b018 Nearly finish 2024-03-18 17:28:14 +01:00
c7f37b0854 Fix le truc de max et ajoute le test du delete 2024-03-18 15:55:38 +01:00
a9e5e45872 Merge branch 'master' into wal/front/listingUsers 2024-03-18 14:57:49 +01:00
0871d2971d manage Course finished 2024-03-18 14:51:27 +01:00
9744bd973f Resolve conflicts and adapt tests 2024-03-18 14:29:30 +01:00
ecaa0af24a Merge remote-tracking branch 'origin/master' into Leo/Backend/UnitTest
# Conflicts:
#	backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java
#	backend/src/main/java/ovh/herisson/Clyde/Services/UserService.java
2024-03-18 13:55:45 +01:00
ec3c912847
Merge remote-tracking branch 'origin/master' into Max/Backend/GetUserById 2024-03-18 13:45:47 +01:00
fd357ba938 GET /curriculum returns user's curriculum 2024-03-18 12:15:13 +01:00
92079c5a47 Merge remote-tracking branch 'origin/Max/Backend/UserDelete' into wal/front/listingUsers 2024-03-18 11:59:44 +01:00
753af3874e Login and register ok and starting requests 2024-03-18 11:55:51 +01:00
e03a01ec89 oups forgot somthing 2024-03-18 11:53:33 +01:00
fd18df7c3a added a InscriptionRequest to POST /mock 2024-03-18 11:33:50 +01:00
93c161be4c added every delete endpoint required 2024-03-18 11:22:21 +01:00
a80fb2b297 added DELETE user and prepared tables for cascade deletion 2024-03-18 00:14:48 +01:00
f484fb095e added protection for inscription requests 2024-03-18 00:14:26 +01:00
611e7167f9
CI -> build no test and trying to fix test 2024-03-17 22:40:22 +01:00
ee37dc79a7
Fixing the CI
Moving the dev test and build to port 5442 from 5432 to avoid
conflicting with the running postgresql
2024-03-17 22:02:12 +01:00
2fb6aef67c added GET /user/{id} 2024-03-17 22:01:48 +01:00
7e7cec2f6c Merge branch 'Max/Backend/GetUserById' into wal/front/listingUsers 2024-03-17 22:00:56 +01:00
345599888d added GET /user/{id} 2024-03-17 21:48:58 +01:00
19b4950be4 Merge branch 'master' into wal/front/listingUsers 2024-03-17 21:39:04 +01:00
d9307753c4 trop de truc 2024-03-17 21:38:10 +01:00
f2b80ba89f Resolve conflicts and resolve condition bug in isNotSecretaryOrAdmin 2024-03-17 19:17:38 +01:00
114116b97c Merge remote-tracking branch 'origin/master' into Leo/Backend/UnitTest
# Conflicts:
#	backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
2024-03-17 19:14:25 +01:00
924faca13f Add testing for file uploading and correct minors bugs in service 2024-03-17 19:06:27 +01:00
ea4a0745e0 creation of the user when request accepted 2024-03-17 17:15:33 +01:00
76f5a39a8f GET /users doesn't return Admins if the poster isn't an admin 2024-03-17 16:26:30 +01:00
37f8a3ac4e removed an unused variable 2024-03-17 16:25:00 +01:00
ea46dd664c added a todo to send an email for every state changement of request 2024-03-17 16:02:30 +01:00
b2d0be014c UserList and Student List part1 2024-03-17 15:59:12 +01:00
571d27c230 Add test for user patch 2024-03-17 15:53:50 +01:00
37a9eb46ae Add tests for UserController get and post 2024-03-17 15:42:43 +01:00
bfc4f6567b Merge remote-tracking branch 'origin/Leo/Backend/UnitTest' into Leo/Backend/UnitTest
# Conflicts:
#	backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java
2024-03-17 15:40:45 +01:00
d423a57fa0 Add tests for UserController get and post 2024-03-17 15:40:14 +01:00
210fda0401 Merge branch 'master' into wal/front/listingUsers 2024-03-17 13:33:47 +01:00
b67b25b4a4 Login Finished, add curricula and apps 2024-03-17 13:24:24 +01:00
385290d1a2 Merge branch 'master' into Max/Backend/ReturnUserPasswordIssue 2024-03-17 13:07:20 +01:00
cf2deb983d added security to assistant posting and Get courses/owned for owners 2024-03-17 12:13:03 +01:00
008af10d0e Merge branch 'master' into Leo/Backend/UnitTest 2024-03-17 10:36:00 +01:00
f7df234312 moved portective method to Static ProtectiveService 2024-03-17 03:06:19 +01:00
d855bbe911 Merge branch 'Max/Backend/CourseInCurriculum' into Max/Backend/ReturnUserPasswordIssue 2024-03-17 02:50:12 +01:00
f2507ddcdd forgot the return statement 2024-03-17 02:46:33 +01:00
a70b05a0ef protected course'owner password 2024-03-17 02:45:49 +01:00
1d793cef4e moved UserWithouPaswword to authenticatorService 2024-03-17 02:40:05 +01:00
4cf2ac1aa8 fixed an issue with the getting of curriculums 2024-03-17 02:34:00 +01:00
6e6bd285af added security to the post of course and GET /courses 2024-03-17 02:15:08 +01:00
474a8d3f31 added POST /curriculum/{id} endopoint to post courses 2024-03-17 02:00:42 +01:00
4379794dba added /students endpoint 2024-03-16 23:05:26 +01:00
c5d7ce4178 cleaned the Entities 2024-03-16 20:31:03 +01:00
382d3c203a cleaned the services 2024-03-16 20:25:35 +01:00
5a7934b2a3 Merge branch 'master' into wal/front/listingUsers 2024-03-16 19:57:53 +01:00
97b57b361d cleaned all controllers 2024-03-16 19:13:57 +01:00
069466ef5f Max/Backend/CoursesEndpoints (#129)
PLZ FIX

Reviewed-on: PGL/Clyde#129
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Co-authored-by: Bartha Maxime <231026@umons.ac.be>
Co-committed-by: Bartha Maxime <231026@umons.ac.be>
2024-03-16 17:17:07 +01:00
d5f6656e2b added the GET /teachers (#130)
had to fix the mock and the UserController isAdminOrSecretary

Reviewed-on: PGL/Clyde#130
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Co-authored-by: Bartha Maxime <231026@umons.ac.be>
Co-committed-by: Bartha Maxime <231026@umons.ac.be>
2024-03-16 17:16:46 +01:00
17ab241250
show map by role 2024-03-16 16:57:52 +01:00
36ce5a553b Profil, merge Master and corrections 2024-03-16 15:21:10 +01:00
a5807148e1 And again we continue 2024-03-16 15:06:21 +01:00
182be8ac7b
Merge branch 'master' into Max/Backend/AppsController 2024-03-16 14:48:03 +01:00
da3f8c47f9
Fix merge because i'm bad 2024-03-16 14:34:11 +01:00
1546fc6d47
Merge branch 'master' into Max/Backend/BackendClean 2024-03-16 14:13:47 +01:00
45fbef52ed
fix tokens characters 2024-03-16 12:29:51 +01:00
abff9aef3a Merge branch 'master' into Max/Backend/AppsController 2024-03-16 11:58:03 +01:00
8f2fb04112 I pressed tab by accident 2024-03-16 09:03:03 +01:00
c6198b7220 cleaned Services + added private final to all repos 2024-03-16 09:02:08 +01:00
13fd048cd2 added a inscriptionService mock user 2024-03-16 09:01:36 +01:00
b7b2eafb93 removed the GET /Apps/{id} frontend just iterates on the /apps list 2024-03-16 00:44:11 +01:00
0860567e1b fixed the GetAuthorizedApps method 2024-03-16 00:42:46 +01:00
25009ba149 Enum in CamelCase 2024-03-16 00:34:20 +01:00
208c6c63e8 moved the isSecretaryOrAdmin method 2024-03-16 00:31:03 +01:00
e2da7271af rename Cursus -> Curriculum 2024-03-15 23:53:15 +01:00
1f14890d43 added ApplicationController and Application enum 2024-03-15 18:54:53 +01:00
189e664f37 Add tests for Storage system 2024-03-15 18:49:41 +01:00
f33a421aee Merge branch 'master' into Max/Backend/Curriculum 2024-03-15 17:40:42 +01:00
017235cccf fixed inscription in the backend 2024-03-15 17:29:45 +01:00
c8b7930a8e Setup unit tests and implements test for the token limit and trivial tests for userRepository 2024-03-15 11:20:23 +01:00
20d52b2b21 Merge pull request 'Max/Backend/RegisterEndPoint' (#105) from Max/Backend/RegisterEndPoint into master
Reviewed-on: PGL/Clyde#105
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Wal <karpinskiwal@gmail.com>
2024-03-14 23:30:13 +01:00
1502cc871c Merge pull request 'UploadAPI and profilePicture' (#102) from tonitch/front/apiUpload into master
Reviewed-on: PGL/Clyde#102
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Maxime <231026@umons.ac.be>
2024-03-14 22:37:30 +01:00
826bbf5990 Create the directory if not exists 2024-03-14 22:36:48 +01:00
c26972369f Putting the right configuration for cors 2024-03-14 22:35:57 +01:00
12846ed83d added cursus/course interactions 2024-03-14 21:53:43 +01:00
bb4ee784fa Merge pull request 'Max/Backend/UserControllerUpdate' (#94) from Max/Backend/UserControllerUpdate into master
Reviewed-on: PGL/Clyde#94
Reviewed-by: LeoMoulin <leomoulin125@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2024-03-14 21:53:33 +01:00
9aa425d1c3 changed details 2024-03-14 20:04:27 +01:00
f0a411c031 added InscriptionController 2024-03-14 16:36:09 +01:00
a0285e700d
Modifying backend so it send the full entry of a file upload 2024-03-13 22:28:59 +01:00
68e55e8355
Putting the right configuration for cors 2024-03-13 20:42:06 +01:00
157e5951fc ups je change un copié collé 2024-03-13 19:14:22 +01:00
4241f15731 j'ai envie de me pendre 2024-03-13 19:12:46 +01:00
cead1188ab Merge pull request 'Leo/Backend' (#95) from Leo/Backend into master
Reviewed-on: PGL/Clyde#95
Reviewed-by: Maxime <231026@umons.ac.be>
Reviewed-by: Wal <karpinskiwal@gmail.com>
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
2024-03-13 18:06:33 +01:00
5c7147bb17 fixing the double throw before the merge
Signed-off-by: Debucquoy Anthony <d.tonitch@gmail.com>
2024-03-13 18:05:35 +01:00
2a58c335f2 Apply les trucs de l'exception 2024-03-13 15:48:28 +01:00
62f64eed60 HUUUUGE CHANGE 2024-03-13 15:36:13 +01:00
4b1db883e2 updated tonitch's reviews 2024-03-13 15:28:17 +01:00
044648674c Merge branch 'master' into Max/Backend/UserControllerUpdate 2024-03-12 23:16:35 +01:00
4b0ea8cf40 added the post /user Endpoint 2024-03-12 23:08:18 +01:00
dae59f67ce encoding the password before saving it
oups I Forgor
2024-03-12 22:35:25 +01:00
66282bce9f Create new constructor for ReinscriptionRequest so you don't have to worry about the type of the request 2024-03-12 17:53:52 +01:00
8fbfb36958 Remove the bad link between users and file. Add a delete function for storageFile entities and clean things. 2024-03-12 10:48:13 +01:00
5c728098df protected post /user and get/users and return without password 2024-03-12 00:03:32 +01:00
28d252279a added a small description 2024-03-11 22:33:53 +01:00
ab91a39a63 Create exception for file deletion.
Add user/inscriptionrequest connection to StorageFile entity.
Create a prototype of the delete for file function
2024-03-11 20:23:45 +01:00
d4c48ee9f1 Leo/Backend (#82)
Ce merge enverra dans main : le timeout des token, la limite de 5 token par user, les nouvelles tables pour les demandes d'inscriptions

Co-authored-by: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Reviewed-on: PGL/Clyde#82
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Reviewed-by: Maxime <231026@umons.ac.be>
Reviewed-by: Wal <karpinskiwal@gmail.com>
Co-authored-by: LeoMoulin <leomoulin125@gmail.com>
Co-committed-by: LeoMoulin <leomoulin125@gmail.com>
2024-03-11 19:16:19 +01:00
5325d6e3ae Storage System (#92)
First idea of the storage system

Reviewed-on: PGL/Clyde#92
Co-authored-by: Bartha Maxime <231026@umons.ac.be>
Co-committed-by: Bartha Maxime <231026@umons.ac.be>
2024-03-11 17:52:08 +01:00
ce2efb61c8 fixed some issue for the token authorization (#87)
Reviewed-on: PGL/Clyde#87
Reviewed-by: Debucquoy Anthony <d.tonitch@gmail.com>
Co-authored-by: Bartha Maxime <231026@umons.ac.be>
Co-committed-by: Bartha Maxime <231026@umons.ac.be>
2024-03-10 23:28:13 +01:00
8fdfb470cb fixing the origin requests once and for all 2024-03-09 18:54:46 +01:00
847b1ca419 Solve crossOrigin Finally 2024-03-09 16:20:55 +01:00
521c98fdc2 token is now an writable char thanks to the modulos ! 2024-03-09 00:46:40 +01:00
82a3b152f2 put the params in the body and fixed token issue 2024-03-08 20:54:23 +01:00
fba30cff9e fixed a token encoding issue 2024-03-08 18:52:10 +01:00
acfd366fc8 fixed the user constructor issue 2024-03-08 12:00:56 +01:00
3b31fa794f Merge branch 'Leo/Backend' into Max/Backend/loginApi 2024-03-07 20:53:33 +01:00
c33b73a114 - Ajout de "l'url" de l'image dans User 2024-03-07 19:12:48 +01:00
2f2a72bfa0 added the possibility to remove the mocks 2024-03-07 17:29:31 +01:00
6b58c852a2 cleaning 2024-03-07 17:02:19 +01:00
8b35b3dc01 cleaned the login process 2024-03-07 17:01:50 +01:00
e1d8e37c52 Merge branch 'master' into Max/Backend/loginApi 2024-03-07 15:15:32 +01:00
2938707f0f added mocks users with their role as password and token 2024-03-07 00:55:07 +01:00
434cc8dd2b - On objectise tout
- Ajout des relation
2024-03-06 20:05:24 +01:00
4a85a55290 added Token and User Services 2024-03-06 17:38:09 +01:00
37d24c59e7 add generic HttpResponse 2024-03-06 17:37:38 +01:00
5acca4d10d added foreign key to user 2024-03-06 17:37:06 +01:00
b050a74b75 added LoginController Post(/login) 2024-03-06 17:35:49 +01:00