Skip to content

Commit 7622afb

Browse files
SebastienDechandIrwin-SOLIMANEmmanuelle BONOLIpeacepilouEmmanuelleBonoli
authored
Staging (#100)
* :sparkles: add route to get Thmes * change dates of creation messages * add save geolocalisation for registration & fix size activity images * :construction: temp * :hammer: minor change to works with front reusable button and ez display of theme icon * Feature/issue-25/create-login-modal - Trigger user informations to frontend - Rename geolocalisation to geolocation - Add login DTO for geolocation, association, activity, association follower and voluntary * review Pilou in progress for staging * feature/issue-25/create-login-modal: add validators on register and login routes (#23) * feature: add new asso, activities and images to display more cards * feat: add themes to new activities * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * Development (#37) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) --------- Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Development (#45) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 2/docker (#43) * Development (#37) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) --------- Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> --------- Co-authored-by: Pierre-Louis <[email protected]> Co-authored-by: Emmanuelle B <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> Co-authored-by: sebastienDOC <[email protected]> * Feature/issue 2/docker (#44) * Development (#37) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) --------- Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> * :sparkles: added the cd yml conf to deploy on VPS --------- Co-authored-by: Pierre-Louis <[email protected]> Co-authored-by: Emmanuelle B <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> Co-authored-by: sebastienDOC <[email protected]> * Update ci.yml (#46) * :sparkles: added the cd yml conf to deploy on VPS (#47) --------- Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Emmanuelle B <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> Co-authored-by: sebastienDOC <[email protected]> Co-authored-by: Pierre-Louis <[email protected]> * Development (#50) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 2/docker (#43) * Development (#37) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) --------- Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> --------- Co-authored-by: Pierre-Louis <[email protected]> Co-authored-by: Emmanuelle B <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> Co-authored-by: sebastienDOC <[email protected]> * Feature/issue 2/docker (#44) * Development (#37) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) --------- Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> * :sparkles: added the cd yml conf to deploy on VPS --------- Co-authored-by: Pierre-Louis <[email protected]> Co-authored-by: Emmanuelle B <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> Co-authored-by: sebastienDOC <[email protected]> * Update ci.yml (#46) * :sparkles: added the cd yml conf to deploy on VPS (#47) * Irwin soliman patch 2 (#49) * Development (#45) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 2/docker (#43) * Development (#37) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) --------- Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> --------- Co-authored-by: Pierre-Louis <[email protected]> Co-authored-by: Emmanuelle B <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> Co-authored-by: sebastienDOC <[email protected]> * Feature/issue 2/docker (#44) * Development (#37) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) --------- Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> * :sparkles: added the cd yml conf to deploy on VPS --------- Co-authored-by: Pierre-Louis <[email protected]> Co-authored-by: Emmanuelle B <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> Co-authored-by: sebastienDOC <[email protected]> * Update ci.yml (#46) * :sparkles: added the cd yml conf to deploy on VPS (#47) --------- Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Emmanuelle B <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> Co-authored-by: sebastienDOC <[email protected]> Co-authored-by: Pierre-Louis <[email protected]> * Update cd.yml --------- Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Emmanuelle B <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> Co-authored-by: sebastienDOC <[email protected]> Co-authored-by: Pierre-Louis <[email protected]> --------- Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Emmanuelle B <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> Co-authored-by: sebastienDOC <[email protected]> Co-authored-by: Pierre-Louis <[email protected]> * Development (#52) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 2/docker (#43) * Development (#37) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) --------- Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> --------- Co-authored-by: Pierre-Louis <[email protected]> Co-authored-by: Emmanuelle B <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> Co-authored-by: sebastienDOC <[email protected]> * Feature/issue 2/docker (#44) * Development (#37) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) --------- Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> * :sparkles: added the cd yml conf to deploy on VPS --------- Co-authored-by: Pierre-Louis <[email protected]> Co-authored-by: Emmanuelle B <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> Co-authored-by: sebastienDOC <[email protected]> * Update ci.yml (#46) * :sparkles: added the cd yml conf to deploy on VPS (#47) * Irwin soliman patch 2 (#49) * Development (#45) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 2/docker (#43) * Development (#37) * delete old way to handle interactions user * handle unread messages activities for users (#27) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 34/create activity page (#29) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * Feature/issue 45/admin report (#31) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 83/display previous association activity images (#33) * :construction: WIP * :sparkles: backend fully operational for adding an new activity to DB * :sparkles: adress is now complete with lat and lon comming from front * :hammer: back can now provide both image with URL and Blob * :sparkles: asso can now select from previous activity photo when creating new activity * feat(issue-38): implement association profile (#34) - implement password change - implement account delete - implement add / remove stats - implement update info and description * start tests backend: UT and IT (#35) Co-authored-by: Emmanuelle BONOLI <[email protected]> * Feature/issue 45/admin report (#36) * Hotfix/issue 9998/review staging (#26) * add default Avatar image for association and also a type to identify user and voluntary * :hammer: theme are now sorted by backend * :hammer: add route for activityById and fix cors and fix isIS * create admin report page --------- Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Emmanuelle BONOLI <[email protected]> * :hammer: fix PR comments (#38) --------- Co-authored-by: Emmanuelle BONOLI <[email protected]> Co-authored-by: Irwin SOLIMAN <[email protected]> Co-authored-by: Sébastien DECHAND <[email protected]> * Feature/issue 85/add draft to activity creation (#39) * :hammer: add activity draft is now complete # Conflicts: # src/main/java/com/back_alasso/Activity/Activity.java # src/main/java/com/back_alasso/Activity/ActivityController.java # src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java # src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java # src/main/java/com/back_alasso/Address/Address.java # src/main/java/com/back_alasso/Association/AssociationService.java # src/main/java/com/back_alasso/User/UserService.java * :sparkles: association : add draft to activity creation � Conflicts: � src/main/java/com/back_alasso/Activity/Activity.java � src/main/java/com/back_alasso/Activity/ActivityController.java � src/main/java/com/back_alasso/Activity/ActivityResponseMapper.java � src/main/java/com/back_alasso/Activity/DTO/ActivityResponseDTO.java � src/main/java/com/back_alasso/Association/AssociationService.java � src/main/java/com/back_alasso/User/UserService.java * :hammer: refacto activity Service and added validator to DTO --------- Co-authored-by: sebastienDOC <[email protected]> * feat(issue-50): implement profile update, email change, password change, account deletion, and avatar upload (#40) - Implement voluntary profile update endpoint with DTO validation - Allow voluntary users to change their email with token regeneration - Implement password change functionality for all users - Add account deletion endpoint for voluntary users - Implement avatar upload for voluntary users with filename and extension storage - Refactor DTO structure: move to dedicated Authentication/DTO and Voluntary/DTO packages - Add missing ActivityDTO, AssociationCardDTO, and related association DTOs * CI-CD ready for local work (#41) Co-authored-by: Emmanuelle BONOLI <[email protected]> --------- Co-authored-by: Pierre-Louis <61482009+peacepilou@us…
1 parent 89edbbb commit 7622afb

File tree

18 files changed

+46
-27
lines changed

18 files changed

+46
-27
lines changed

‎src/main/java/com/back_alasso/config/DatabaseInitializer.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,11 @@ CommandLineRunner init() {
252252
new Image("/images/Association/logoSPA.png", ImageEnumType.LOGO),
253253
new Image("/images/Association/spaProfile.jpg", ImageEnumType.PROFILE_ASSOCIATION),
254254
new Image("/images/Association/logoUrbanNature.png", ImageEnumType.LOGO),
255-
new Image("/images/Association/plage_1.jpg", ImageEnumType.PROFILE_ASSOCIATION),
255+
new Image("/images/Association/plage_1.png", ImageEnumType.PROFILE_ASSOCIATION),
256256
new Image("/images/Association/logoJeunesseSolidaire.png", ImageEnumType.LOGO),
257-
new Image("/images/Association/ecriture_3.jpg", ImageEnumType.PROFILE_ASSOCIATION),
257+
new Image("/images/Association/ecriture_3.png", ImageEnumType.PROFILE_ASSOCIATION),
258258
new Image("/images/Association/logoCulturArt.png", ImageEnumType.LOGO),
259-
new Image("/images/Association/spectacle_2.jpg", ImageEnumType.PROFILE_ASSOCIATION)
259+
new Image("/images/Association/spectacle_2.png", ImageEnumType.PROFILE_ASSOCIATION)
260260
);
261261

262262
List<Association> associations = Arrays.asList(
@@ -387,16 +387,16 @@ CommandLineRunner init() {
387387
new Image("/images/Activity/maraude1.png", ImageEnumType.ACTIVITY),
388388
new Image("/images/Activity/maraude2.jpg", ImageEnumType.ACTIVITY),
389389
new Image("/images/Activity/spaActivity.jpg", ImageEnumType.ACTIVITY),
390-
new Image("/images/Activity/jardin_2.jpg", ImageEnumType.ACTIVITY),
391-
new Image("/images/Activity/jardin_3.jpg", ImageEnumType.ACTIVITY),
392-
new Image("/images/Activity/ecriture_1.jpg", ImageEnumType.ACTIVITY),
393-
new Image("/images/Activity/ecriture_2.jpg", ImageEnumType.ACTIVITY),
394-
new Image("/images/Activity/plage_2.jpg", ImageEnumType.ACTIVITY),
395-
new Image("/images/Activity/spectacle_1.jpg", ImageEnumType.ACTIVITY),
396-
new Image("/images/Activity/spectacle_3.jpg", ImageEnumType.ACTIVITY),
397-
new Image("/images/Activity/cuisine_1.jpg", ImageEnumType.ACTIVITY),
398-
new Image("/images/Activity/cuisine_2.jpg", ImageEnumType.ACTIVITY),
399-
new Image("/images/Activity/cuisine_3.jpg", ImageEnumType.ACTIVITY),
390+
new Image("/images/Activity/jardin_2.png", ImageEnumType.ACTIVITY),
391+
new Image("/images/Activity/jardin_3.png", ImageEnumType.ACTIVITY),
392+
new Image("/images/Activity/ecriture_1.png", ImageEnumType.ACTIVITY),
393+
new Image("/images/Activity/ecriture_2.png", ImageEnumType.ACTIVITY),
394+
new Image("/images/Activity/plage_2.png", ImageEnumType.ACTIVITY),
395+
new Image("/images/Activity/spectacle_1.png", ImageEnumType.ACTIVITY),
396+
new Image("/images/Activity/spectacle_3.png", ImageEnumType.ACTIVITY),
397+
new Image("/images/Activity/cuisine_1.png", ImageEnumType.ACTIVITY),
398+
new Image("/images/Activity/cuisine_2.png", ImageEnumType.ACTIVITY),
399+
new Image("/images/Activity/cuisine_3.png", ImageEnumType.ACTIVITY),
400400
new Image("/images/Activity/defaultActivityImage.jpg", ImageEnumType.ACTIVITY)
401401
);
402402

‎src/main/java/com/back_alasso/features/Authentication/AuthController.java‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
import com.back_alasso.features.User.UserService;
1111
import com.back_alasso.features.Voluntary.Voluntary;
1212
import com.back_alasso.features.Voluntary.VoluntaryLoginResponseMapper;
13+
import com.back_alasso.security.LoginRateLimitFilter;
14+
import jakarta.servlet.http.HttpServletRequest;
15+
import jakarta.servlet.http.HttpServletResponse;
1316
import jakarta.validation.Valid;
1417
import jakarta.validation.Validator;
1518
import java.util.HashMap;
@@ -34,6 +37,7 @@ public class AuthController {
3437
private final AuthService authService;
3538
private final VoluntaryLoginResponseMapper voluntaryLoginResponseMapper;
3639
private final AssociationLoginResponseMapper associationLoginResponseMapper;
40+
private final LoginRateLimitFilter loginRateLimitFilter;
3741

3842
@PostMapping("/register/voluntary")
3943
public ResponseEntity<Boolean> register(@Valid @RequestBody VoluntaryRegistrationDTO voluntaryRegistrationDTO) {
@@ -54,21 +58,30 @@ public ResponseEntity<Boolean> register(@RequestBody AssociationRegistrationDTO
5458
}
5559

5660
@PostMapping("/login")
57-
public ResponseEntity<Map<String, Object>> authenticate(@Valid @RequestBody UserLoginDTO userLoginDTO) {
58-
String token = authService.authenticate(userLoginDTO.email(), userLoginDTO.password());
59-
User user = userService.findByEmail(userLoginDTO.email());
60-
61-
if (user.getAccount_status().equals(AccountEnumType.BANNED)) {
62-
return ResponseEntity.status(HttpStatus.FORBIDDEN).body(null);
63-
}
61+
public ResponseEntity<Map<String, Object>> authenticate(
62+
@Valid @RequestBody UserLoginDTO userLoginDTO,
63+
HttpServletRequest request,
64+
HttpServletResponse res
65+
) {
66+
String key = "ip:" + (request.getHeader("X-Forwarded-For") != null ? request.getHeader("X-Forwarded-For") : request.getRemoteAddr());
6467

65-
Map<String, Object> response = new HashMap<>();
66-
response.put("token", token);
6768
try {
69+
String token = authService.authenticate(userLoginDTO.email(), userLoginDTO.password());
70+
User user = userService.findByEmail(userLoginDTO.email());
71+
72+
if (user.getAccount_status().equals(AccountEnumType.BANNED)) {
73+
return ResponseEntity.status(HttpStatus.FORBIDDEN).build();
74+
}
75+
76+
loginRateLimitFilter.resetBucket(key);
77+
res.setHeader("X-Rate-Limit-Remaining", String.valueOf(loginRateLimitFilter.getRemainingAttempt(key)));
78+
79+
Map<String, Object> response = new HashMap<>();
80+
response.put("token", token);
6881
authService.addUserToResponse(user, response);
69-
return ResponseEntity.status(HttpStatus.OK).body(response);
70-
} catch (IllegalArgumentException e) {
71-
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
82+
return ResponseEntity.ok(response);
83+
} catch (Exception e) {
84+
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(Map.of("message", "Invalid credentials"));
7285
}
7386
}
7487

‎src/main/java/com/back_alasso/security/LoginRateLimitFilter.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,15 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
5555
}
5656
}
5757

58+
public long getRemainingAttempt(String key) {
59+
return cache.get(key).getAvailableTokens();
60+
}
61+
62+
public void resetBucket(String key) {
63+
cache.put(key, newBucket(key));
64+
}
65+
5866
private String extractKey(HttpServletRequest request) {
59-
String username = request.getParameter("username");
60-
if (username != null && !username.isBlank()) return "usr:" + username.toLowerCase();
6167
String ip = request.getHeader("X-Forwarded-For");
6268
if (ip == null) ip = request.getRemoteAddr();
6369
return "ip:" + ip;

‎src/main/resources/static/images/Activity/cuisine_1.png‎

187 KB
Loading

‎src/main/resources/static/images/Activity/cuisine_2.png‎

377 KB
Loading

‎src/main/resources/static/images/Activity/cuisine_3.png‎

367 KB
Loading

‎src/main/resources/static/images/Activity/ecriture_1.png‎

155 KB
Loading

‎src/main/resources/static/images/Activity/ecriture_2.png‎

451 KB
Loading

‎src/main/resources/static/images/Activity/jardin_1.png‎

410 KB
Loading

‎src/main/resources/static/images/Activity/jardin_2.png‎

463 KB
Loading

0 commit comments

Comments
 (0)