Feature/9272/automatic secret refresh from azure (#9286)

* 9272/added properties classes and refresh-interval

* 9272/change jwt tool

* 9272/change RestClient

* 9272/change UserRemoteClientConfig

* 9272/change ManagmentEventController

* 9272/change ManagmentController

* 9272/change NotificationServiceImpl

* 9272/change OpenAIServiceImpl

* 9272/change GoogleApiConfiguration

* 9272/change CommentServiceImpl

* 9272/change HabbitAssignController

* 9272/change EcoNewsController

* 9272/change DatabaseBackupServiceImpl

* 9272/formatting

* 9272/added tests to properties class

* 9272/fix CodeRabbit and Sonar issues

Author: SashaPog

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

@@ -27,6 +27,7 @@
 import greencity.dto.user.UserVO;
 import greencity.exception.exceptions.NotFoundException;
 import greencity.exception.exceptions.WrongIdException;
+import greencity.properties.OpenAiProperties;
 import greencity.service.EcoNewsRelevanceService;
 import greencity.service.EcoNewsService;
 import greencity.service.TagsService;
@@ -42,7 +43,6 @@
 import java.util.List;
 import java.util.Locale;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -67,9 +67,7 @@ public class EcoNewsController {
     private final EcoNewsService ecoNewsService;
     private final TagsService tagService;
     private final EcoNewsRelevanceService ecoNewsRelevanceService;
-
-    @Value("${greencity.relevance.enabled}")
-    private String relevanceServiceStatus;
+    private final OpenAiProperties openAiProperties;
 
     /**
      * Method for creating {@link EcoNewsVO}.
@@ -225,7 +223,7 @@ public ResponseEntity<PageableAdvancedDto<EcoNewsGenericDto>> findAll(
     })
     @GetMapping("/relevance-enabled")
     public ResponseEntity<Boolean> isRelevanceEnabled() {
-        boolean isRelevanceEnabled = relevanceServiceStatus.equals("enabled");
+        boolean isRelevanceEnabled = openAiProperties.getRelevance().equals("enabled");
         return ResponseEntity.status(HttpStatus.OK).body(isRelevanceEnabled);
     }
 

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

@@ -21,6 +21,7 @@
 import greencity.dto.habit.HabitWorkingDaysDto;
 import greencity.dto.habitstatuscalendar.HabitStatusCalendarDto;
 import greencity.dto.user.UserVO;
+import greencity.properties.RemoteWebClientProperties;
 import greencity.service.HabitAssignService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -38,7 +39,6 @@
 import java.util.List;
 import java.util.Locale;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Pageable;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.HttpStatus;
@@ -63,8 +63,7 @@
 public class HabitAssignController {
     private final HabitAssignService habitAssignService;
 
-    @Value("${client.address}")
-    private String redirectUrl;
+    private final RemoteWebClientProperties remoteWebClientProperties;
 
     /**
      * Method which assigns habit for {@link UserVO} with default props.
@@ -747,7 +746,7 @@ public ResponseEntity<ResponseEntity.BodyBuilder> inviteFriendRequest(@PathVaria
     public ResponseEntity<Void> confirmInvitation(@PathVariable Long habitAssignId) {
         habitAssignService.confirmHabitInvitation(habitAssignId);
         return ResponseEntity.status(HttpStatus.FOUND)
-            .location(URI.create(redirectUrl + "/#/profile"))
+            .location(URI.create(remoteWebClientProperties.getClientAddress() + "/#/profile"))
             .build();
     }
 

core/src/main/java/greencity/webcontroller/ManagementController.java

@@ -1,8 +1,8 @@
 package greencity.webcontroller;
 
+import greencity.properties.RemoteWebClientProperties;
 import greencity.security.utils.SecurityUtils;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,8 +12,7 @@
 @RequiredArgsConstructor
 @RequestMapping
 public class ManagementController {
-    @Value("${greencityuser.server.address}")
-    private String greenCityUserServerAddress;
+    private final RemoteWebClientProperties remoteWebClientProperties;
 
     /**
      * Returns index page.
@@ -48,10 +47,11 @@ public String redirectLogin() {
     @GetMapping("/management/login")
     public String login() {
         if (!SecurityUtils.isAuthenticated()) {
-            String managementLoginUrl = UriComponentsBuilder.fromHttpUrl(greenCityUserServerAddress)
-                .path("/management/login")
-                .build()
-                .toUriString();
+            String managementLoginUrl =
+                UriComponentsBuilder.fromHttpUrl(remoteWebClientProperties.getGreencityUserServerAddress())
+                    .path("/management/login")
+                    .build()
+                    .toUriString();
             return "redirect:" + managementLoginUrl;
         } else {
             return "redirect:/management";

core/src/main/java/greencity/webcontroller/ManagementEventController.java

@@ -14,6 +14,8 @@
 import greencity.dto.filter.FilterEventDto;
 import greencity.dto.user.UserProfilePictureDto;
 import greencity.enums.TagType;
+import greencity.properties.GoogleProperties;
+import greencity.properties.RemoteWebClientProperties;
 import greencity.service.EventService;
 import greencity.service.TagsService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -26,7 +28,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.modelmapper.ModelMapper;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -87,12 +88,8 @@ public class ManagementEventController {
     private final TagsService tagsService;
     private final RestClient restClient;
     private final ModelMapper getModelMapper;
-
-    @Value("${google.maps.api.key}")
-    private String googleMapApiKey;
-
-    @Value("${address}")
-    private String backendAddress;
+    private final RemoteWebClientProperties remoteWebClientProperties;
+    private final GoogleProperties googleProperties;
 
     /**
      * Method that returns management page with all {@link EventDto}.
@@ -129,7 +126,7 @@ public String getAllEvents(@RequestParam(required = false, name = "query") Strin
         model.addAttribute(SORT_MODEL, orderUrl.toString());
         model.addAttribute(EVENT_TAGS, tagsService.findByTypeAndLanguageCode(TagType.EVENT, locale.getLanguage()));
         model.addAttribute(PAGE_SIZE, pageable.getPageSize());
-        model.addAttribute(BACKEND_ADDRESS_ATTRIBUTE, backendAddress);
+        model.addAttribute(BACKEND_ADDRESS_ATTRIBUTE, remoteWebClientProperties.getGreencityServerAddress());
         model.addAttribute(CITIES,
             eventService.getAllEventsAddresses().stream()
                 .map(e -> "en".equals(locale.getLanguage()) ? e.getCityEn() : e.getCityUk())
@@ -193,9 +190,9 @@ public String getUsersDislikedEvent(@PathVariable("eventId") Long eventId,
     public String getEventCreatePage(Model model, Principal principal) {
         model.addAttribute(ADD_EVENT_DTO_REQUEST, new AddEventDtoRequest());
         model.addAttribute(IMAGES, new MultipartFile[] {});
-        model.addAttribute(BACKEND_ADDRESS_ATTRIBUTE, backendAddress);
+        model.addAttribute(BACKEND_ADDRESS_ATTRIBUTE, remoteWebClientProperties.getGreencityServerAddress());
         model.addAttribute(AUTHOR, restClient.findByEmail(principal.getName()).getName());
-        model.addAttribute(GOOGLE_MAP_API_KEY, googleMapApiKey);
+        model.addAttribute(GOOGLE_MAP_API_KEY, googleProperties.getGoogleMapApiKey());
         return "core/management_create_event";
     }
 
@@ -245,10 +242,10 @@ public ResponseEntity<EventDto> update(
 
     @GetMapping("/edit/{id}")
     public String editEvent(@PathVariable("id") Long id, Model model, Principal principal) {
-        model.addAttribute(BACKEND_ADDRESS_ATTRIBUTE, backendAddress);
+        model.addAttribute(BACKEND_ADDRESS_ATTRIBUTE, remoteWebClientProperties.getGreencityServerAddress());
         model.addAttribute(AUTHOR, restClient.findByEmail(principal.getName()).getName());
         model.addAttribute(EVENT_DTO, eventService.getEvent(id, principal));
-        model.addAttribute(GOOGLE_MAP_API_KEY, googleMapApiKey);
+        model.addAttribute(GOOGLE_MAP_API_KEY, googleProperties.getGoogleMapApiKey());
         return "core/management_edit_event";
     }
 

core/src/main/resources/application.properties

@@ -1,4 +1,5 @@
 spring.cloud.azure.keyvault.secret.property-sources[0].endpoint=${KEY_VAULT_ENDPOINT}
+spring.cloud.azure.keyvault.secret.property-sources[0].refresh-interval=15m
 
 #Azure Connection
 spring.cloud.azure.credential.client-id=${AZURE_CLIENT_ID}

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

@@ -19,6 +19,7 @@
 import greencity.dto.user.UserVO;
 import greencity.exception.exceptions.NotFoundException;
 import greencity.exception.handler.CustomExceptionHandler;
+import greencity.properties.OpenAiProperties;
 import greencity.security.jwt.JwtTool;
 import greencity.service.EcoNewsRelevanceService;
 import greencity.service.EcoNewsService;
@@ -85,6 +86,8 @@ class EcoNewsControllerTest {
     @Mock
     private ModelMapper modelMapper;
     @Mock
+    private OpenAiProperties openAiProperties;
+    @Mock
     JwtTool jwtTool;
 
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
@@ -99,7 +102,7 @@ static void setup() {
     }
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         this.mockMvc = MockMvcBuilders
             .standaloneSetup(ecoNewsController)
             .setCustomArgumentResolvers(
@@ -114,6 +117,8 @@ public void setUp() {
             .thenReturn(jwt);
         when(jwtTool.extractUserId(jwt))
             .thenReturn(TestConst.USER_ID);
+        when(openAiProperties.getRelevance())
+            .thenReturn("enabled");
     }
 
     @Test

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

@@ -10,6 +10,7 @@
 import greencity.dto.habit.UserToDoAndCustomToDoListsDto;
 import greencity.dto.user.UserVO;
 import greencity.enums.HabitAssignStatus;
+import greencity.properties.RemoteWebClientProperties;
 import greencity.security.jwt.JwtTool;
 import greencity.service.HabitAssignService;
 import greencity.service.UserService;
@@ -54,6 +55,9 @@ class HabitAssignControllerTest {
     @Mock
     private UserService userService;
 
+    @Mock
+    private RemoteWebClientProperties remoteWebClientProperties;
+
     @Mock
     JwtTool jwtTool;
 
@@ -79,6 +83,8 @@ void setUp() {
             .thenReturn(jwt);
         lenient().when(jwtTool.extractUserId(jwt))
             .thenReturn(TestConst.USER_ID);
+        lenient().when(remoteWebClientProperties.getClientAddress())
+            .thenReturn("http://localhost:4200/");
     }
 
     @Test

core/src/test/java/greencity/webcontroller/ManagementControllerTest.java

@@ -1,22 +1,24 @@
 package greencity.webcontroller;
 
 import greencity.TestConst;
+import greencity.properties.RemoteWebClientProperties;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
 import org.springframework.data.web.PageableHandlerMethodArgumentResolver;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.util.UriComponentsBuilder;
 
+import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
@@ -25,6 +27,9 @@
 class ManagementControllerTest {
     private MockMvc mockMvc;
 
+    @Mock
+    private RemoteWebClientProperties remoteWebClientProperties;
+
     private static final String link = "/management";
     private static final String loginLink = "/login";
 
@@ -54,8 +59,8 @@ void redirectLoginTest() throws Exception {
 
     @Test
     void loginTest() throws Exception {
-        ReflectionTestUtils.setField(managementController,
-            "greenCityUserServerAddress", TestConst.GREENCITY_USER_SERVER_ADDRESS);
+        when(remoteWebClientProperties.getGreencityUserServerAddress())
+            .thenReturn(TestConst.GREENCITY_USER_SERVER_ADDRESS);
 
         SecurityContextHolder.getContext()
             .setAuthentication(new AnonymousAuthenticationToken("GUEST", "anonymousUser", AuthorityUtils

core/src/test/java/greencity/webcontroller/ManagementEventControllerTest.java

@@ -13,6 +13,8 @@
 import greencity.dto.user.UserVO;
 import greencity.entity.event.Event;
 import greencity.enums.TagType;
+import greencity.properties.GoogleProperties;
+import greencity.properties.RemoteWebClientProperties;
 import greencity.repository.EventRepo;
 import greencity.service.EventService;
 import greencity.service.TagsService;
@@ -78,11 +80,19 @@ class ManagementEventControllerTest {
     private Validator mockValidator;
     @Mock
     private Locale defaultLocale;
+    @Mock
+    private RemoteWebClientProperties remoteWebClientProperties;
+    @Mock
+    private GoogleProperties googleProperties;
 
     @BeforeEach
     void setUp() {
         defaultLocale = Locale.getDefault();
         Locale.setDefault(Locale.ENGLISH);
+        when(remoteWebClientProperties.getGreencityUserServerAddress())
+            .thenReturn("http://localhost:8060/");
+        when(googleProperties.getGoogleApiKey())
+            .thenReturn("mock-api-key");
         this.mockMvc = MockMvcBuilders.standaloneSetup(managementEventController)
             .setCustomArgumentResolvers(new PageableHandlerMethodArgumentResolver())
             .setValidator(mockValidator)

service-api/pom.xml

@@ -137,5 +137,11 @@
             <artifactId>reactor-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.github.hakky54</groupId>
+            <artifactId>logcaptor</artifactId>
+            <version>2.12.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>