Merge pull request #565 from ita-social-projects/dev

Merge dev to prod

Author: SaenkoVova

az-cd-pipeline-prod.yml

@@ -12,7 +12,7 @@ pr: none
 variables:
   agentOS: ubuntu-latest
 
-  azKeyVault: greencity-app
+  azKeyVault: greencity-values
 
   artifactName: drop
   userRepoName: core

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

@@ -186,7 +186,12 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                     "/management/socialnetworkimages/get-all-remote",
                     "/management/socialnetworkimages/find",
                     "/ownSecurity/authorities/categories",
-                    "/ownSecurity/authorities/by-category")
+                    "/ownSecurity/authorities/by-category",
+                    "/user/findByUuid/external")
+                .hasAnyRole(ADMIN, UBS_EMPLOYEE, MODERATOR, EMPLOYEE)
+                .requestMatchers(HttpMethod.POST,
+                    "/email/sendReasonOfDeactivation",
+                    "/email/sendMessageOfActivation")
                 .hasAnyRole(ADMIN, UBS_EMPLOYEE, MODERATOR, EMPLOYEE)
                 .requestMatchers(HttpMethod.PATCH,
                     "/user/to-do-list-items/{userToDoListItemId}",
@@ -215,8 +220,6 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                     "/email/sendReport",
                     "/email/sendHabitNotification",
                     "/email/sendInterestingEcoNews",
-                    "/email/sendReasonOfDeactivation",
-                    "/email/sendMessageOfActivation",
                     "/management/socialnetworkimages/save-remote",
                     "/user-notification-preference/search",
                     FILES + "/single")
@@ -234,8 +237,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                     "/user/roles-distribution",
                     "/user/findByEmailAdvanced",
                     "/user/isOnline",
-                    "/user/greencity/lang",
-                    "/user/findByUuid/external")
+                    "/user/greencity/lang")
                 .hasAnyRole(ADMIN)
                 .requestMatchers(HttpMethod.DELETE,
                     "/management/socialnetworkimages/delete",

core/src/main/java/greencity/exception/handler/CustomExceptionHandler.java

@@ -495,4 +495,12 @@ public final ResponseEntity<Object> handleErrorParsingException(ErrorParsingExce
 
         return ResponseEntity.status(HttpStatus.BAD_GATEWAY).body(exceptionResponse);
     }
+
+    @ExceptionHandler({UserProfileCreationException.class})
+    public ResponseEntity<ExceptionResponse> handleUserProfileCreationException(UserProfileCreationException ex,
+        WebRequest request) {
+        log.info(ex.getMessage());
+        ExceptionResponse exceptionResponse = new ExceptionResponse(getErrorAttributes(request));
+        return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).body(exceptionResponse);
+    }
 }

core/src/main/resources/application.properties

@@ -41,13 +41,6 @@ security.jwt.verify-email.expiration-hours=${JWT_VERIFY_EMAIL_EXPIRATION_HOURS}
 security.brute-force.max-attempts=${BRUTE_FORCE_MAX_ATTEMPTS}
 security.brute-force.block-time-minutes=${BRUTE_FORCE_BLOCK_TIME_MINUTES}
 
-# Logger
-logging.level.root=${LOGGING_LEVEL_ROOT:debug}
-logging.level.greencity.exception.handler.CustomExceptionHandler=${LOGGING_LEVEL_EXCEPTION_HANDLER:ERROR}
-logging.file.path=${LOGGING_FILE_PATH:logs}
-logging.file.name=${LOGGING_FILE_NAME:logs/log.log}
-logging.pattern.file=%d{"yyyy/MM/dd HH:mm:ss,SSS"} %magenta([%thread]) %highlight(%-5level) %M\\(%F:%L\\) - %msg%n
-
 # Cache
 spring.cache.caffeine.spec=${CACHE_CAFFEINE_SPEC}
 

dao/src/main/java/greencity/dto/filter/FilterUserDto.java

@@ -92,7 +92,7 @@ public class User {
     @OneToOne(mappedBy = "user", cascade = {CascadeType.PERSIST, CascadeType.REMOVE})
     private VerifyEmail verifyEmail;
 
-    @OneToOne(mappedBy = "user", cascade = CascadeType.PERSIST)
+    @OneToOne(mappedBy = "user", cascade = {CascadeType.PERSIST, CascadeType.REMOVE})
     private RestorePasswordEmail restorePasswordEmail;
 
     @Enumerated(value = EnumType.ORDINAL)