Add places to notifications (#416)

* Done.

* Remove change place status email.

* Change name.

* Fix tests.

core/src/main/java/greencity/config/SecurityConfig.java

@@ -200,13 +200,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                     "/ownSecurity/register",
                     "/email/sendReport",
                     "/email/sendHabitNotification",
-                    "/email/sendInterestingEcoNews",
-                    "/email/changePlaceStatus",
-                    "/email/general/notification",
-                    "/email/sendHabitAssignNotification",
-                    "/email/taggedUserInComment/notification",
-                    "/email/userReceivedComment/notification",
-                    "/email/userReceivedCommentReply/notification")
+                    "/email/sendInterestingEcoNews")
                 .hasAnyRole(ADMIN)
                 .requestMatchers(HttpMethod.PATCH,
                     "/user/status",

core/src/main/java/greencity/controller/EmailController.java

@@ -45,21 +45,6 @@ public ResponseEntity<Object> sendReport(@RequestBody SendReportEmailMessage mes
         return ResponseEntity.ok().build();
     }
 
-    /**
-     * Method for sending simple notification to {@code User} about status change.
-     *
-     * @param message - object with all necessary data for sending email
-     */
-    @ApiResponses(value = {
-        @ApiResponse(responseCode = "200", description = HttpStatuses.OK),
-        @ApiResponse(responseCode = "400", description = HttpStatuses.BAD_REQUEST),
-    })
-    @PostMapping("/changePlaceStatus")
-    public ResponseEntity<Object> changePlaceStatus(@RequestBody @Valid ChangePlaceStatusDto message) {
-        emailService.sendChangePlaceStatusEmail(message);
-        return ResponseEntity.ok().build();
-    }
-
     /**
      * Sends email notification about not marked habits during 3 last days.
      *

core/src/test/java/greencity/controller/EmailControllerTest.java

@@ -5,7 +5,6 @@
 import greencity.dto.econews.InterestingEcoNewsDto;
 import greencity.dto.violation.UserViolationMailDto;
 import greencity.message.ScheduledEmailMessage;
-import greencity.message.ChangePlaceStatusDto;
 import greencity.message.SendHabitNotification;
 import greencity.message.SendReportEmailMessage;
 import greencity.service.EmailService;
@@ -100,7 +99,7 @@ void sendReport() throws Exception {
                         }
                     ]
                 },
-                "emailNotification": "WEEKLY",
+                "periodicity": "WEEKLY",
                 "subscribers": [
                     {
                         "email": "string",
@@ -118,42 +117,6 @@ void sendReport() throws Exception {
         verify(emailService).sendAddedNewPlacesReportEmail(message);
     }
 
-    @Test
-    void changePlaceStatus() throws Exception {
-        String content = """
-            {\
-            "authorEmail":"string",\
-            "authorFirstName":"string",\
-            "placeName":"string",\
-            "placeStatus":"APPROVED",\
-            "authorLanguage":"en"\
-            }\
-            """;
-
-        mockPerform(content, "/changePlaceStatus");
-
-        ChangePlaceStatusDto message = new ObjectMapper().readValue(content, ChangePlaceStatusDto.class);
-
-        verify(emailService).sendChangePlaceStatusEmail(message);
-    }
-
-    @Test
-    void changePlaceStatusInvalidPlaceStatus() throws Exception {
-        String content = """
-            {\
-            "authorEmail":"string",\
-            "authorFirstName":"string",\
-            "placeName":"string",\
-            "placeStatus":"ggggggg"\
-            }\
-            """;
-
-        mockMvc.perform(post(LINK + "/changePlaceStatus")
-            .content(content)
-            .contentType(MediaType.APPLICATION_JSON))
-            .andExpect(status().isBadRequest());
-    }
-
     @Test
     void sendHabitNotification() throws Exception {
         String content = """

dao/src/main/java/greencity/enums/EmailPreference.java

@@ -4,5 +4,6 @@ public enum EmailPreference {
     SYSTEM,
     LIKES,
     COMMENTS,
-    INVITES
+    INVITES,
+    PLACES
 }

service-api/src/main/java/greencity/constant/EmailConstants.java

@@ -5,7 +5,6 @@
 @UtilityClass
 public class EmailConstants {
     // subjects
-    public static final String CHANGE_PLACE_STATUS = "change.place.status.subject";
     public static final String NEW_PLACES = "New places";
     public static final String INTERESTING_ECO_NEWS = "interesting.news.subject";
     public static final String VERIFY_EMAIL = "verify.email";
@@ -23,8 +22,6 @@ public class EmailConstants {
     public static final String VERIFY_ADDRESS = "verifyAddress";
     public static final String RESTORE_PASS = "restorePassword";
     public static final String APPROVE_REGISTRATION = "approveRegistration";
-    public static final String PLACE_NAME = "placeName";
-    public static final String STATUS = "status";
     public static final String RESULT = "result";
     public static final String REPORT_TYPE = "reportType";
     public static final String UNSUBSCRIBE_LINK = "unsubscribeLink";
@@ -42,7 +39,6 @@ public class EmailConstants {
     public static final String CRETE_PASSWORD_PAGE = "create-employee-password-page";
     public static final String SUCCESS_RESTORED_PASSWORD_PAGE = "success-restored-password-page";
     public static final String USER_APPROVAL_EMAIL_PAGE = "user-approval-email-page";
-    public static final String CHANGE_PLACE_STATUS_EMAIL_PAGE = "change-place-status-email-page";
     public static final String NEW_PLACES_REPORT_EMAIL_PAGE = "new-places-report-email-page";
     public static final String REASONS_OF_DEACTIVATION_PAGE = "user-reasons-of-deactivation-page";
     public static final String ACTIVATION_PAGE = "user-activation-page";

service-api/src/main/java/greencity/message/SendReportEmailMessage.java

@@ -3,7 +3,7 @@
 import greencity.dto.category.CategoryDto;
 import greencity.dto.place.PlaceNotificationDto;
 import greencity.dto.user.SubscriberDto;
-import greencity.enums.EmailNotification;
+import greencity.enums.EmailPreferencePeriodicity;
 import java.util.List;
 import java.util.Map;
 import lombok.AllArgsConstructor;
@@ -18,5 +18,5 @@
 public class SendReportEmailMessage {
     private List<SubscriberDto> subscribers;
     private Map<CategoryDto, List<PlaceNotificationDto>> categoriesDtoWithPlacesDtoMap;
-    private EmailNotification emailNotification;
+    private EmailPreferencePeriodicity periodicity;
 }