Fix for LF params reset made by a user with no profile (#555)

Signed-off-by: David BRAQUART <[email protected]>

Author: dbraquart

src/main/java/org/gridsuite/study/server/service/ConsumerService.java

@@ -229,7 +229,7 @@ public Consumer<Message<String>> consumeCaseImportSucceeded() {
 
     private UserProfileInfos getUserProfile(String userId) {
         try {
-            return userAdminService.getUserProfile(userId);
+            return userAdminService.getUserProfile(userId).orElse(null);
         } catch (Exception e) {
             LOGGER.error(String.format("Could not access to profile for user '%s'", userId), e);
         }

src/main/java/org/gridsuite/study/server/service/StudyService.java

@@ -1054,7 +1054,7 @@ public boolean createOrUpdateLoadFlowParameters(StudyEntity studyEntity, String
         boolean userProfileIssue = false;
         UUID existingLoadFlowParametersUuid = studyEntity.getLoadFlowParametersUuid();
 
-        UserProfileInfos userProfileInfos = parameters == null ? userAdminService.getUserProfile(userId) : null;
+        UserProfileInfos userProfileInfos = parameters == null ? userAdminService.getUserProfile(userId).orElse(null) : null;
         if (parameters == null && userProfileInfos != null && userProfileInfos.getLoadFlowParameterId() != null) {
             // reset case, with existing profile, having default LF params
             try {

src/main/java/org/gridsuite/study/server/service/UserAdminService.java

@@ -15,6 +15,8 @@
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
+import java.util.Optional;
+
 import static org.gridsuite.study.server.StudyConstants.*;
 import static org.gridsuite.study.server.StudyException.Type.GET_USER_PROFILE_FAILED;
 import static org.gridsuite.study.server.utils.StudyUtils.handleHttpError;
@@ -38,12 +40,15 @@ public void setUserAdminServerBaseUri(String serverBaseUri) {
         this.userAdminServerBaseUri = serverBaseUri;
     }
 
-    public UserProfileInfos getUserProfile(String sub) {
+    public Optional<UserProfileInfos> getUserProfile(String sub) {
         String path = UriComponentsBuilder.fromPath(DELIMITER + USER_ADMIN_API_VERSION + USERS_PROFILE_URI)
             .buildAndExpand(sub).toUriString();
         try {
-            return restTemplate.getForObject(userAdminServerBaseUri + path, UserProfileInfos.class);
+            return Optional.of(restTemplate.getForObject(userAdminServerBaseUri + path, UserProfileInfos.class));
         } catch (HttpStatusCodeException e) {
+            if (e.getStatusCode().value() == 404) {
+                return Optional.empty(); // a user may not have a profile
+            }
             throw handleHttpError(e, GET_USER_PROFILE_FAILED);
         }
     }

src/test/java/org/gridsuite/study/server/LoadFlowTest.java

@@ -293,8 +293,7 @@ public MockResponse dispatch(RecordedRequest request) {
                     return new MockResponse().setResponseCode(200).setBody(objectMapper.writeValueAsString(LOADFLOW_PARAMETERS_UUID_STRING))
                             .addHeader("Content-Type", "application/json; charset=utf-8");
                 } else if (path.matches("/v1/users/" + NO_PROFILE_USER_ID + "/profile")) {
-                    return new MockResponse().setResponseCode(200)
-                            .addHeader("Content-Type", "application/json; charset=utf-8");
+                    return new MockResponse().setResponseCode(404);
                 } else if (path.matches("/v1/users/" + NO_PARAMS_IN_PROFILE_USER_ID + "/profile")) {
                     return new MockResponse().setResponseCode(200).setBody(USER_PROFILE_NO_PARAMS_JSON)
                             .addHeader("Content-Type", "application/json; charset=utf-8");