From 1809259c566bc85b0b175376258f7f51b53d5576 Mon Sep 17 00:00:00 2001 From: VasylyshynDmytro Date: Fri, 13 Dec 2024 17:06:26 +0200 Subject: [PATCH] Fprmatter --- .../controller/PlaceControllerTest.java | 10 +++---- .../main/resources/notification.properties | 26 +++++++++---------- .../main/resources/notification_ua.properties | 20 +++++++------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/core/src/test/java/greencity/controller/PlaceControllerTest.java b/core/src/test/java/greencity/controller/PlaceControllerTest.java index 2143bc5e4..e559e9c9c 100644 --- a/core/src/test/java/greencity/controller/PlaceControllerTest.java +++ b/core/src/test/java/greencity/controller/PlaceControllerTest.java @@ -696,12 +696,12 @@ void updateStatusDoesNotSendNotificationButSavesDataWhenStatusIsDELETED() throws """; mockMvc.perform(patch(placeLink + "/status") - .contentType(MediaType.APPLICATION_JSON) - .content(json)) - .andExpect(status().isOk()) - .andExpect(content().string("Status updated successfully for place: testPlace")); + .contentType(MediaType.APPLICATION_JSON) + .content(json)) + .andExpect(status().isOk()) + .andExpect(content().string("Status updated successfully for place: testPlace")); verify(placeService, times(1)).updatePlaceStatus(any(UpdatePlaceStatusWithUserEmailDto.class)); verify(restClient, times(0)) - .sendEmailNotificationChangesPlaceStatus(any(UpdatePlaceStatusWithUserEmailDto.class)); + .sendEmailNotificationChangesPlaceStatus(any(UpdatePlaceStatusWithUserEmailDto.class)); } } diff --git a/service/src/main/resources/notification.properties b/service/src/main/resources/notification.properties index 5ff3ce434..3be2ed791 100644 --- a/service/src/main/resources/notification.properties +++ b/service/src/main/resources/notification.properties @@ -7,27 +7,27 @@ TWO_USERS={user1} and {user2} THREE_OR_MORE_USERS={user1}, {user2} and other users ECONEWS_COMMENT_LIKE_TITLE=You received a like. -ECONEWS_COMMENT_LIKE={user} liked your comment «{message}» to EcoNews «{secondMessage}». +ECONEWS_COMMENT_LIKE={user} liked your comment «{message}» to EcoNews «{secondMessage}». ECONEWS_COMMENT_REPLY_TITLE=You received a comment reply -ECONEWS_COMMENT_REPLY={user} commented your comment «{message}» to EcoNews «{secondMessage}». +ECONEWS_COMMENT_REPLY={user} commented your comment «{message}» to EcoNews «{secondMessage}». EVENT_COMMENT_LIKE_TITLE=You received a like. -EVENT_COMMENT_LIKE={user} liked your comment «{message}» to event «{secondMessage}». +EVENT_COMMENT_LIKE={user} liked your comment «{message}» to event «{secondMessage}». EVENT_COMMENT_REPLY_TITLE=You received a comment reply -EVENT_COMMENT_REPLY={user} commented your comment «{message}» in the event «{secondMessage}». +EVENT_COMMENT_REPLY={user} commented your comment «{message}» in the event «{secondMessage}». EVENT_COMMENT_USER_TAG_TITLE=You have been tagged in the comment. -EVENT_COMMENT_USER_TAG={user} tagged you {times} in the event «{secondMessage}». +EVENT_COMMENT_USER_TAG={user} tagged you {times} in the event «{secondMessage}». ECONEWS_COMMENT_TITLE=You received a comment -ECONEWS_COMMENT=You received {message} from {user} on your news «{secondMessage}». +ECONEWS_COMMENT=You received {message} from {user} on your news «{secondMessage}». ECONEWS_CREATED_TITLE=You have created eco news ECONEWS_CREATED=You successfully created eco news {message}. ECONEWS_LIKE_TITLE=Your news received a like ECONEWS_LIKE=News {message} received a like from {user}. ECONEWS_COMMENT_USER_TAG_TITLE=You have been tagged in the comment. -ECONEWS_COMMENT_USER_TAG={user} tagged you {times} in the eco news «{secondMessage}». +ECONEWS_COMMENT_USER_TAG={user} tagged you {times} in the eco news «{secondMessage}». EVENT_COMMENT_TITLE=You received a comment -EVENT_COMMENT=You received {message} from {user} on your event «{secondMessage}». +EVENT_COMMENT=You received {message} from {user} on your event «{secondMessage}». EVENT_CANCELED_TITLE=Event was canceled EVENT_CANCELED=Unfortunately, event {message} was canceled. EVENT_CREATED_TITLE=You have created event @@ -39,7 +39,7 @@ EVENT_NAME_UPDATED=Event {message} was updated. New name is {secondMessage}. EVENT_UPDATED_TITLE=Event was updated EVENT_UPDATED=Event {message} was updated. EVENT_LIKE_TITLE=Your event received a like. -EVENT_LIKE=Event «{secondMessage}» received a like from {user}. +EVENT_LIKE=Event «{secondMessage}» received a like from {user}. FRIEND_REQUEST_ACCEPTED_TITLE=Your friend request was accepted FRIEND_REQUEST_ACCEPTED={user} accepted your friend request. @@ -49,15 +49,15 @@ FRIEND_REQUEST_RECEIVED={user} sent you a friend request. HABIT_LIKE=Habit {message} received a like from {user}. HABIT_LIKE_TITLE=Your habit received a like HABIT_INVITE_TITLE=Habit invitation. -HABIT_INVITE={user} invite you to add new habit «{secondMessage}». +HABIT_INVITE={user} invite you to add new habit «{secondMessage}». HABIT_COMMENT_TITLE=You received a comment HABIT_COMMENT={user} commented on your habit {message}. HABIT_COMMENT_LIKE_TITLE=You received a like. -HABIT_COMMENT_LIKE={user} liked your comment «{message}» to habit «{secondMessage}». +HABIT_COMMENT_LIKE={user} liked your comment «{message}» to habit «{secondMessage}». HABIT_COMMENT_REPLY_TITLE=You received a comment reply -HABIT_COMMENT_REPLY={user} commented your comment «{message}» to Habit «{secondMessage}». +HABIT_COMMENT_REPLY={user} commented your comment «{message}» to Habit «{secondMessage}». HABIT_COMMENT_USER_TAG_TITLE=You have been tagged in the comment. -HABIT_COMMENT_USER_TAG={user} tagged you {times} in the habit «{secondMessage}». +HABIT_COMMENT_USER_TAG={user} tagged you {times} in the habit «{secondMessage}». HABIT_LAST_DAY_OF_PRIMARY_DURATION_TITLE=Today is last day of your habit primary duration HABIT_LAST_DAY_OF_PRIMARY_DURATION=Today the duration of your habit {message} is run out. To get more information go to Habit's page diff --git a/service/src/main/resources/notification_ua.properties b/service/src/main/resources/notification_ua.properties index cb159a53e..d514bd322 100644 --- a/service/src/main/resources/notification_ua.properties +++ b/service/src/main/resources/notification_ua.properties @@ -7,17 +7,17 @@ TWO_USERS=\u007b\u0075\u0073\u0065\u0072\u0031\u007d\u0020\u0442\u0430\u0020\u00 THREE_OR_MORE_USERS=\u007b\u0075\u0073\u0065\u0072\u0031\u007d\u002c\u0020\u007b\u0075\u0073\u0065\u0072\u0032\u007d\u0020\u0442\u0430\u0020\u0456\u043d\u0448\u0456\u0020\u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0447\u0456 ECONEWS_COMMENT_LIKE_TITLE=\u0412\u0438 \u043e\u0442\u0440\u0438\u043c\u0430\u043b\u0438 \u043b\u0430\u0439\u043a -ECONEWS_COMMENT_LIKE=\u0412\u0456\u0434 {user} \u043e\u0442\u0440\u0438\u043c\u0430\u043d\u043e \u043b\u0430\u0439\u043a \u043d\u0430 \u0432\u0430\u0448 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 «{message}» \u0434\u043e \u0435\u043a\u043e \u043d\u043e\u0432\u0438\u043d\u0438 «{secondMessage}». +ECONEWS_COMMENT_LIKE=\u0412\u0456\u0434 {user} \u043e\u0442\u0440\u0438\u043c\u0430\u043d\u043e \u043b\u0430\u0439\u043a \u043d\u0430 \u0432\u0430\u0448 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 «{message}» \u0434\u043e \u0435\u043a\u043e \u043d\u043e\u0432\u0438\u043d\u0438 «{secondMessage}». ECONEWS_COMMENT_REPLY_TITLE=\u0412\u0438 \u043e\u0442\u0440\u0438\u043c\u0430\u043b\u0438 \u0432\u0456\u0434\u043f\u043e\u0432\u0456\u0434\u044c \u043d\u0430 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 -ECONEWS_COMMENT_REPLY={user} \u043f\u0440\u043e\u043a\u043e\u043c\u0435\u043d\u0442\u0443\u0432\u0430\u0432 \u0432\u0430\u0448 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 «{message}» \u0434\u043e \u0435\u043a\u043e \u043d\u043e\u0432\u0438\u043d\u0438 «{secondMessage}». +ECONEWS_COMMENT_REPLY={user} \u043f\u0440\u043e\u043a\u043e\u043c\u0435\u043d\u0442\u0443\u0432\u0430\u0432 \u0432\u0430\u0448 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 «{message}» \u0434\u043e \u0435\u043a\u043e \u043d\u043e\u0432\u0438\u043d\u0438 «{secondMessage}». ECONEWS_COMMENT_USER_TAG_TITLE=\u0412\u0430\u0441\u0020\u0442\u0435\u0433\u043d\u0443\u043b\u0438\u0020\u0432\u0020\u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440\u0456 -ECONEWS_COMMENT_USER_TAG={user} \u043f\u043e\u0437\u043d\u0430\u0447\u0438\u0432\u0020\u0432\u0430\u0441 {times} \u0432\u0020\u0435\u043a\u043e\u043b\u043e\u0433\u0456\u0447\u043d\u0438\u0445\u0020\u043d\u043e\u0432\u0438\u043d\u0430\u0445 «{secondMessage}». +ECONEWS_COMMENT_USER_TAG={user} \u043f\u043e\u0437\u043d\u0430\u0447\u0438\u0432\u0020\u0432\u0430\u0441 {times} \u0432\u0020\u0435\u043a\u043e\u043b\u043e\u0433\u0456\u0447\u043d\u0438\u0445\u0020\u043d\u043e\u0432\u0438\u043d\u0430\u0445 «{secondMessage}». EVENT_COMMENT_LIKE_TITLE=\u0412\u0438 \u043e\u0442\u0440\u0438\u043c\u0430\u043b\u0438 \u043b\u0430\u0439\u043a -EVENT_COMMENT_LIKE=\u0412\u0456\u0434 {user} \u043e\u0442\u0440\u0438\u043c\u0430\u043d\u043e \u043b\u0430\u0439\u043a \u043d\u0430 \u0432\u0430\u0448 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 «{message}» \u0434\u043e \u043f\u043e\u0434\u0456\u0457 «{secondMessage}». +EVENT_COMMENT_LIKE=\u0412\u0456\u0434 {user} \u043e\u0442\u0440\u0438\u043c\u0430\u043d\u043e \u043b\u0430\u0439\u043a \u043d\u0430 \u0432\u0430\u0448 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 «{message}» \u0434\u043e \u043f\u043e\u0434\u0456\u0457 «{secondMessage}». EVENT_COMMENT_REPLY_TITLE=\u0412\u0438 \u043e\u0442\u0440\u0438\u043c\u0430\u043b\u0438 \u0432\u0456\u0434\u043f\u043e\u0432\u0456\u0434\u044c \u043d\u0430 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 -EVENT_COMMENT_REPLY={user} \u043f\u0440\u043e\u043a\u043e\u043c\u0435\u043d\u0442\u0443\u0432\u0430\u0432 \u0432\u0430\u0448 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 «{message}» \u0434\u043e \u043f\u043e\u0434\u0456\u0457 «{secondMessage}». +EVENT_COMMENT_REPLY={user} \u043f\u0440\u043e\u043a\u043e\u043c\u0435\u043d\u0442\u0443\u0432\u0430\u0432 \u0432\u0430\u0448 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 «{message}» \u0434\u043e \u043f\u043e\u0434\u0456\u0457 «{secondMessage}». EVENT_COMMENT_USER_TAG_TITLE=\u0412\u0430\u0441\u0020\u0442\u0435\u0433\u043d\u0443\u043b\u0438\u0020\u0432\u0020\u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440\u0456 -EVENT_COMMENT_USER_TAG={user} \u043f\u043e\u0437\u043d\u0430\u0447\u0438\u0432\u0020\u0432\u0430\u0441 {times} \u0443\u0020\u043f\u043e\u0434\u0456\u0457 «{secondMessage}». +EVENT_COMMENT_USER_TAG={user} \u043f\u043e\u0437\u043d\u0430\u0447\u0438\u0432\u0020\u0432\u0430\u0441 {times} \u0443\u0020\u043f\u043e\u0434\u0456\u0457 «{secondMessage}». ECONEWS_COMMENT_TITLE=\u0412\u0438 \u043e\u0442\u0440\u0438\u043c\u0430\u043b\u0438 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 ECONEWS_COMMENT=\u0414\u043E \u0432\u0430\u0448\u043e\u0457 \u043D\u043E\u0432\u0438\u043D\u0438 \u00AB{secondMessage}\u00BB {user} \u0437\u0430\u043B\u0438\u0448\u0438\u0432(\u043B\u0438) {message}. @@ -49,15 +49,15 @@ FRIEND_REQUEST_RECEIVED={user} \u043D\u0430\u0434\u0456\u0441\u043B\u0430\u0432 HABIT_LIKE=\u0417\u0432\u0438\u0447\u043a\u0430 {message} \u043e\u0442\u0440\u0438\u043c\u0430\u043b\u0430 \u043b\u0430\u0439\u043a \u0432\u0456\u0434 {user}. HABIT_LIKE_TITLE=\u0412\u0430\u0448\u0430\u0020\u0437\u0432\u0438\u0447\u043a\u0430\u0020\u043e\u0442\u0440\u0438\u043c\u0430\u043b\u0430\u0020\u043b\u0430\u0439\u043a HABIT_INVITE_TITLE=\u0417\u0430\u043f\u0440\u043e\u0448\u0435\u043d\u043d\u044f\u0020\u0434\u043e\u0020\u0437\u0432\u0438\u0447\u043a\u0438 -HABIT_INVITE={user} \u0437\u0430\u043F\u0440\u043E\u0448\u0443\u0454 \u0432\u0430\u0441 \u0434\u043E\u0434\u0430\u0442\u0438 \u043D\u043E\u0432\u0443 \u0437\u0432\u0438\u0447\u043A\u0443 «{message}». +HABIT_INVITE={user} \u0437\u0430\u043F\u0440\u043E\u0448\u0443\u0454 \u0432\u0430\u0441 \u0434\u043E\u0434\u0430\u0442\u0438 \u043D\u043E\u0432\u0443 \u0437\u0432\u0438\u0447\u043A\u0443 «{message}». HABIT_COMMENT_TITLE=\u0412\u0438 \u043e\u0442\u0440\u0438\u043c\u0430\u043b\u0438 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 HABIT_COMMENT=\u0414\u043e\u0020\u0432\u0430\u0448\u043e\u0457\u0020\u0437\u0432\u0438\u0447\u043a\u0438 \u00AB{secondMessage}\u00BB {user} \u0437\u0430\u043B\u0438\u0448\u0438\u0432(\u043B\u0438) {message}. HABIT_COMMENT_LIKE_TITLE=\u0412\u0438 \u043e\u0442\u0440\u0438\u043c\u0430\u043b\u0438 \u043b\u0430\u0439\u043a -HABIT_COMMENT_LIKE=\u0412\u0456\u0434 {user} \u043e\u0442\u0440\u0438\u043c\u0430\u043d\u043e \u043b\u0430\u0439\u043a \u043d\u0430 \u0432\u0430\u0448 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 «{message}» \u0434\u043e\u0020\u0437\u0432\u0438\u0447\u043a\u0438 «{secondMessage}». +HABIT_COMMENT_LIKE=\u0412\u0456\u0434 {user} \u043e\u0442\u0440\u0438\u043c\u0430\u043d\u043e \u043b\u0430\u0439\u043a \u043d\u0430 \u0432\u0430\u0448 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 «{message}» \u0434\u043e\u0020\u0437\u0432\u0438\u0447\u043a\u0438 «{secondMessage}». HABIT_COMMENT_REPLY_TITLE=\u0412\u0438 \u043e\u0442\u0440\u0438\u043c\u0430\u043b\u0438 \u0432\u0456\u0434\u043f\u043e\u0432\u0456\u0434\u044c \u043d\u0430 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 -HABIT_COMMENT_REPLY={user} \u043f\u0440\u043e\u043a\u043e\u043c\u0435\u043d\u0442\u0443\u0432\u0430\u0432 \u0432\u0430\u0448 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 «{message}» \u0434\u043e\u0020\u0437\u0432\u0438\u0447\u043a\u0438 «{secondMessage}». +HABIT_COMMENT_REPLY={user} \u043f\u0440\u043e\u043a\u043e\u043c\u0435\u043d\u0442\u0443\u0432\u0430\u0432 \u0432\u0430\u0448 \u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440 «{message}» \u0434\u043e\u0020\u0437\u0432\u0438\u0447\u043a\u0438 «{secondMessage}». HABIT_COMMENT_USER_TAG_TITLE=\u0412\u0430\u0441\u0020\u0442\u0435\u0433\u043d\u0443\u043b\u0438\u0020\u0432\u0020\u043a\u043e\u043c\u0435\u043d\u0442\u0430\u0440\u0456 -HABIT_COMMENT_USER_TAG={user} \u043f\u043e\u0437\u043d\u0430\u0447\u0438\u0432\u0020\u0432\u0430\u0441 {times} \u0443\u0020\u0437\u0432\u0438\u0447\u0446\u0456 «{secondMessage}». +HABIT_COMMENT_USER_TAG={user} \u043f\u043e\u0437\u043d\u0430\u0447\u0438\u0432\u0020\u0432\u0430\u0441 {times} \u0443\u0020\u0437\u0432\u0438\u0447\u0446\u0456 «{secondMessage}». HABIT_LAST_DAY_OF_PRIMARY_DURATION_TITLE=\u0421\u044c\u043e\u0433\u043e\u0434\u043d\u0456\u0020\u043e\u0441\u0442\u0430\u043d\u043d\u0456\u0439\u0020\u0434\u0435\u043d\u044c\u0020\u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0457\u0020\u0442\u0440\u0438\u0432\u0430\u043b\u043e\u0441\u0442\u0456\u0020\u0432\u0430\u0448\u043e\u0457\u0020\u0437\u0432\u0438\u0447\u043a\u0438 HABIT_LAST_DAY_OF_PRIMARY_DURATION=\u0421\u044c\u043e\u0433\u043e\u0434\u043d\u0456\u0020\u0442\u0435\u0440\u043c\u0456\u043d\u0020\u0432\u0430\u0448\u043e\u0457\u0020\u0437\u0432\u0438\u0447\u043a\u0438\u0020{message}\u0020\u0437\u0430\u043a\u0456\u043d\u0447\u0438\u0432\u0441\u044f\u002e\u0020\u0414\u043b\u044f\u0020\u043e\u0442\u0440\u0438\u043c\u0430\u043d\u043d\u044f\u0020\u0434\u043e\u0434\u0430\u0442\u043a\u043e\u0432\u043e\u0457\u0020\u0456\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0456\u0457\u0020\u043f\u0435\u0440\u0435\u0439\u0434\u0456\u0442\u044c\u0020\u043d\u0430\u0020\u0441\u0442\u043e\u0440\u0456\u043d\u043a\u0443\u0020\u0048\u0061\u0062\u0069\u0074