Skip to content

Refactor habit to-do list and custom to-do list #7832

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
ToriForH wants to merge 35 commits into
base: dev
Choose a base branch
from
Open

Refactor habit to-do list and custom to-do list #7832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
5d02dea
update entities
ToriForH Nov 13, 2024
0951f6d
update habit controller, service and related dtos
ToriForH Nov 18, 2024
351d414
update habit assign controller, service and related reposotories and …
ToriForH Nov 18, 2024
47ede66
update to-do and custom to-do controllers, service and related reposo…
ToriForH Nov 19, 2024
b9b391c
update style
ToriForH Nov 20, 2024
57d912f
update style
ToriForH Nov 20, 2024
ab87d9d
fix tests compiler errors
ToriForH Nov 20, 2024
30a8bc9
update style
ToriForH Nov 20, 2024
13d553e
remove unused endpoints and related service methods, refactor to-do l…
ToriForH Nov 23, 2024
7d22271
update controllers and services
ToriForH Nov 23, 2024
fdc362b
implement UserToDoListItemController and UserToDoListItemService
ToriForH Nov 23, 2024
87e69c8
update style
ToriForH Nov 23, 2024
d428bf5
fix errors
ToriForH Nov 23, 2024
32bc4b9
update controllers tests
ToriForH Nov 23, 2024
c1cb2ca
update mappers
ToriForH Nov 24, 2024
c898789
update service tests
ToriForH Nov 24, 2024
896e93b
add ToDoListItemService tests
ToriForH Nov 25, 2024
9c3baf5
add tests UserToDoListItemService
ToriForH Nov 27, 2024
2144d7d
update security config, update habit service method to disable custom…
ToriForH Nov 27, 2024
169ba62
resolve conflicts
ToriForH Nov 27, 2024
fa12602
update style
ToriForH Nov 27, 2024
d41def2
update tests
ToriForH Nov 27, 2024
347c8fc
update style
ToriForH Nov 27, 2024
204d997
resolve sonar issues, delete unused endpoint and related methods
ToriForH Nov 27, 2024
21d208e
update style
ToriForH Nov 27, 2024
7186f9c
resolve sonar issues
ToriForH Nov 27, 2024
d3fdb4b
remove duplicates
ToriForH Nov 27, 2024
c90bd0a
update style
ToriForH Nov 27, 2024
015fc88
fix bugs
ToriForH Dec 6, 2024
c7a668c
delete unused dtos
ToriForH Dec 6, 2024
261cf3b
update tests, update style
ToriForH Dec 6, 2024
ab38077
remove unused imports and variables
ToriForH Dec 6, 2024
d9b1bee
remove unused import
ToriForH Dec 6, 2024
d8ec548
update documentation
ToriForH Jan 12, 2025
3d4390c
resolve conflicts
ToriForH Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 22 additions & 41 deletions core/src/main/java/greencity/config/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,10 @@ public class SecurityConfig {
private static final String RANDOM = "/random";
private static final String SUBSCRIPTIONS = "/subscriptions";
private static final String ACTIVE = "/active";
private static final String USER_CUSTOM_TO_DO_LIST_ITEMS = "/user/{userId}/custom-to-do-list-items";
private static final String CUSTOM_TO_DO_LIST = "/custom/to-do-list-items/{userId}";
private static final String CUSTOM_TO_DO_LIST_URL = CUSTOM_TO_DO_LIST + "/custom-to-do-list-items";
private static final String CUSTOM_TO_DO_LIST_ITEMS = "/{userId}/custom-to-do-list-items";
private static final String HABIT_ASSIGN_ID = "/habit/assign/{habitId}";
private static final String USER_TO_DO_LIST = "/user/to-do-list-items";
private static final String CUSTOM_TO_DO_LIST = "/habits/custom-to-do-list-items";
private static final String TO_DO_LIST = "/habits/to-do-list-items";
private static final String USER_TO_DO_LIST = "/habits/assign/user-to-do-list-items/{habitAssignId}";
private static final String HABIT_ASSIGN_WITH_HABIT_ID = "/habit/assign/{habitId}";
private static final String ACHIEVEMENTS = "/achievements";
private static final String NOTIFICATIONS = "/notifications";
private static final String NOTIFICATION_ID = "/{notificationId}";
Expand Down Expand Up @@ -151,7 +149,6 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
"/place/all",
"/habit",
"/habit/{id}",
"/habit/{id}/to-do-list",
"/tags/search",
"/tags/v2/search",
"/habit/tags/all",
Expand Down Expand Up @@ -225,35 +222,32 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
ACHIEVEMENTS,
ACHIEVEMENTS + COUNT,
ACHIEVEMENTS + CATEGORIES,
CUSTOM_TO_DO_LIST_ITEMS,
CUSTOM_TO_DO_LIST,
CUSTOM_TO_DO_LIST_URL,
"/custom/to-do-list-items/{userId}/{habitId}",
CUSTOM_TO_DO_LIST + "/{habitId}",
CUSTOM_TO_DO_LIST + "/assign/{habitAssignId}",
TO_DO_LIST + "/{habitId}",
TO_DO_LIST + "/assign/{habitAssignId}",
USER_TO_DO_LIST,
ECO_NEWS + COUNT,
ECO_NEWS + ECO_NEWS_ID + "/summary",
ECO_NEWS + ECO_NEWS_ID + LIKES + "/{userId}",
"/favorite_place/",
"/to-do-list-items",
"/habit/assign/allForCurrentUser",
"/habit/assign/allMutualHabits/{userId}",
"/habit/assign/allUser/{userId}",
"/habit/assign/myHabits/{userId}",
"/habit/assign/active/{date}",
"/habit/assign/{habitAssignId}/more",
"/habit/assign/activity/{from}/to/{to}",
HABIT_ASSIGN_ID + ACTIVE,
HABIT_ASSIGN_ID,
HABIT_ASSIGN_ID + "/all",
HABIT_ASSIGN_WITH_HABIT_ID + ACTIVE,
HABIT_ASSIGN_WITH_HABIT_ID,
HABIT_ASSIGN_WITH_HABIT_ID + "/all",
"/habit/statistic/acquired/count",
"/habit/statistic/in-progress/count",
FACT_OF_THE_DAY + RANDOM + "/by-tags",
"/place/{status}",
"/place/v2/filteredPlacesCategories",
"/social-networks/image",
"/user",
"/user/to-do-list-items/habits/{habitId}/to-do-list",
USER_CUSTOM_TO_DO_LIST_ITEMS,
"/user/{userId}/custom-to-do-list-items/available",
"/user/{userId}/sixUserFriends/",
"/user/{userId}/profile/",
"/user/isOnline/{userId}/",
Expand All @@ -269,9 +263,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
EVENTS + EVENT_ID + LIKES,
EVENTS + EVENT_ID + LIKES + COUNT,
EVENTS + EVENT_ID + DISLIKES + COUNT,
"/user/to-do-list-items/{userId}/get-all-inprogress",
"/habit/assign/{habitAssignId}/allUserAndCustomList",
"/habit/assign/allUserAndCustomToDoListsInprogress",
"/habit/assign/{habitAssignId}/allUserToDoList",
"/habit/assign/allUserToDoListsInprogress",
"/habit/assign/{habitAssignId}",
"/habit/tags/search",
"/habit/search",
Expand All @@ -288,7 +281,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
FRIENDS + "/user-data-as-friend/{friendId}",
FRIENDS,
NOTIFICATIONS,
HABIT_ASSIGN_ID + "/friends/habit-duration-info",
HABIT_ASSIGN_WITH_HABIT_ID + "/friends/habit-duration-info",
"/ai/**")
.hasAnyRole(USER, ADMIN, MODERATOR, UBS_EMPLOYEE)
.requestMatchers(HttpMethod.POST,
Expand All @@ -313,10 +306,9 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
EVENTS + EVENT_ID + DISLIKE,
NOTIFICATIONS + NOTIFICATION_ID + "/viewNotification",
NOTIFICATIONS + NOTIFICATION_ID + "/unreadNotification",
CUSTOM_TO_DO_LIST_ITEMS,
"/files",
HABIT_ASSIGN_ID,
HABIT_ASSIGN_ID + "/custom",
HABIT_ASSIGN_WITH_HABIT_ID,
HABIT_ASSIGN_WITH_HABIT_ID + "/custom",
"/habit/assign/{habitAssignId}/enroll/**",
"/habit/assign/{habitAssignId}/unenroll/{date}",
"/habit/statistic/{habitId}",
Expand All @@ -328,14 +320,12 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
"/place/{placeId}/comments",
"/place/propose",
"/place/save/favorite/",
USER_CUSTOM_TO_DO_LIST_ITEMS,
USER_TO_DO_LIST,
"/user/{userId}/habit",
"/user/{userId}/userFriend/{friendId}",
"/user/{userId}/declineFriend/{friendId}",
"/user/{userId}/acceptFriend/{friendId}",
"/habit/custom",
"/custom/to-do-list-items/{userId}/{habitId}/custom-to-do-list-items",
FRIENDS + "/{friendId}",
ECO_NEWS + "/{ecoNewsId}/favorites",
"/habit/assign/{habitId}/invite",
Expand All @@ -350,24 +340,19 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
EVENTS_COMMENTS + COMMENT_ID,
EVENTS + EVENT_ID,
"/habit/update/{habitId}",
HABIT_ASSIGN_ID + "/update-habit-duration",
HABIT_ASSIGN_WITH_HABIT_ID + "/update-habit-duration",
"/habit/assign/{habitAssignId}/updateProgressNotificationHasDisplayed",
HABIT_ASSIGN_ID + "/allUserAndCustomList",
HABIT_ASSIGN_WITH_HABIT_ID + "/userToDoList",
"/habit/assign/{habitAssignId}/update-status-and-duration")
.hasAnyRole(USER, ADMIN, MODERATOR, UBS_EMPLOYEE)
.requestMatchers(HttpMethod.PATCH,
HABITS + COMMENTS,
ECO_NEWS + COMMENTS,
EVENTS_COMMENTS + COMMENT_ID,
ECO_NEWS + COMMENTS,
CUSTOM_TO_DO_LIST_ITEMS,
CUSTOM_TO_DO_LIST_URL,
HABIT_ASSIGN_ID,
"/to-do-list-items/toDoList/{userId}",
HABIT_ASSIGN_ID,
USER_CUSTOM_TO_DO_LIST_ITEMS,
USER_TO_DO_LIST + "/{toDoListItemId}/status/{status}",
USER_TO_DO_LIST + "/{userToDoListItemId}",
HABIT_ASSIGN_WITH_HABIT_ID,
USER_TO_DO_LIST,
HABIT_ASSIGN_WITH_HABIT_ID,
"/user/profilePicture",
"/user/deleteProfilePicture",
FRIENDS + "/{friendId}/acceptFriend",
Expand All @@ -380,12 +365,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
ECO_NEWS_ID_COMMENTS + COMMENT_ID,
HABITS + "/comments/{id}",
"/habit/{habitId}/favorites",
CUSTOM_TO_DO_LIST_ITEMS,
CUSTOM_TO_DO_LIST_URL,
"/favorite_place/{placeId}",
"/social-networks",
USER_CUSTOM_TO_DO_LIST_ITEMS,
USER_TO_DO_LIST + "/user-to-do-list-items",
USER_TO_DO_LIST,
EVENTS_COMMENTS + COMMENT_ID,
EVENTS + EVENT_ID,
Expand Down
Loading
Loading