fix²

Author: Tristan-WorkGH

src/main/java/org/gridsuite/study/server/StudyController.java

@@ -628,9 +628,10 @@ public ResponseEntity<Void> stopLoadFlow(@Parameter(description = "Study uuid")
     public ResponseEntity<Void> runShortCircuit(
             @PathVariable("studyUuid") UUID studyUuid,
             @PathVariable("nodeUuid") UUID nodeUuid,
-            @RequestParam(value = "busId", required = false) Optional<String> busId) throws IOException {
+            @RequestParam(value = "busId", required = false) Optional<String> busId,
+            @RequestHeader(HEADER_USER_ID) String userId) throws IOException {
         studyService.assertIsNodeNotReadOnly(nodeUuid);
-        studyService.runShortCircuit(studyUuid, nodeUuid, busId.map(StringUtils::stripToNull));
+        studyService.runShortCircuit(studyUuid, nodeUuid, busId.map(StringUtils::stripToNull), userId);
         return ResponseEntity.ok().build();
     }
 
@@ -1765,7 +1766,7 @@ public ResponseEntity<Void> invalidateShortCircuitStatus(@Parameter(description
         return ResponseEntity.ok().build();
     }
 
-    @PostMapping(value = "/studies/{studyUuid}/nodes/{nodeUuid}/non-evacuated-energy/run")
+    @PostMapping(value = "/studies/{studyUuid}/nodes/{nodeUuid}/non-evacuated-energy/run", produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "run sensitivity analysis non evacuated energy on study")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The sensitivity analysis non evacuated energy has started")})
     public ResponseEntity<UUID> runNonEvacuatedEnergy(@Parameter(description = "studyUuid") @PathVariable("studyUuid") UUID studyUuid,

src/main/java/org/gridsuite/study/server/StudyWebConfig.java

@@ -7,19 +7,14 @@
 package org.gridsuite.study.server;
 
 import lombok.AllArgsConstructor;
-import org.gridsuite.study.server.converter.UuidHttpConverter;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.format.FormatterRegistry;
-import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import java.util.List;
-
 @AllArgsConstructor
 @Configuration
 public class StudyWebConfig implements WebMvcConfigurer {
     private final InsensitiveStringToEnumConverterFactory insensitiveEnumConverterFactory;
-    private final UuidHttpConverter uuidConverter;
 
     /**
      * {@inheritDoc}
@@ -28,12 +23,4 @@ public class StudyWebConfig implements WebMvcConfigurer {
     public void addFormatters(final FormatterRegistry registry) {
         registry.addConverterFactory(insensitiveEnumConverterFactory);
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void extendMessageConverters(final List<HttpMessageConverter<?>> converters) {
-        converters.add(uuidConverter);
-    }
 }

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

@@ -1717,11 +1717,11 @@ public UUID runSensitivityAnalysis(UUID studyUuid, UUID nodeUuid, String userId)
         return result;
     }
 
-    public UUID runShortCircuit(UUID studyUuid, UUID nodeUuid, Optional<String> busId) throws JsonProcessingException {
+    public UUID runShortCircuit(UUID studyUuid, UUID nodeUuid, Optional<String> busId, String userId) throws JsonProcessingException {
         networkModificationTreeService.getComputationResultUuid(nodeUuid, busId.isEmpty() ? SHORT_CIRCUIT : SHORT_CIRCUIT_ONE_BUS)
                                       .ifPresent(shortCircuitService::deleteShortCircuitAnalysisResult);
         final Optional<UUID> parametersUuid = studyRepository.findById(studyUuid).map(StudyEntity::getShortCircuitParametersUuid);
-        final UUID result = shortCircuitService.runShortCircuit(studyUuid, nodeUuid, busId, parametersUuid);
+        final UUID result = shortCircuitService.runShortCircuit(studyUuid, nodeUuid, busId, parametersUuid, userId);
         updateComputationResultUuid(nodeUuid, result, busId.isEmpty() ? SHORT_CIRCUIT : SHORT_CIRCUIT_ONE_BUS);
         notificationService.emitStudyChanged(studyUuid, nodeUuid,
                 busId.isEmpty() ? NotificationService.UPDATE_TYPE_SHORT_CIRCUIT_STATUS : NotificationService.UPDATE_TYPE_ONE_BUS_SHORT_CIRCUIT_STATUS);

src/main/java/org/gridsuite/study/server/service/shortcircuit/ShortCircuitService.java

@@ -73,7 +73,7 @@ public ShortCircuitService(RemoteServicesProperties remoteServicesProperties,
         this.objectMapper = objectMapper;
     }
 
-    public UUID runShortCircuit(UUID studyUuid, UUID nodeUuid, Optional<String> busId, Optional<UUID> parametersUuid) throws JsonProcessingException {
+    public UUID runShortCircuit(UUID studyUuid, UUID nodeUuid, Optional<String> busId, Optional<UUID> parametersUuid, String userId) throws JsonProcessingException {
         final Optional<String> variantId = Optional.ofNullable(getVariantId(nodeUuid)).map(StringUtils::stripToNull);
         final URI path = UriComponentsBuilder.fromUriString(shortCircuitServerBaseUri)
             .pathSegment(SHORT_CIRCUIT_API_VERSION, "networks", "{networkUuid}", "run-and-save")
@@ -87,6 +87,7 @@ public UUID runShortCircuit(UUID studyUuid, UUID nodeUuid, Optional<String> busI
             .buildAndExpand(networkStoreService.getNetworkUuid(studyUuid))
             .toUri();
         HttpHeaders headers = new HttpHeaders();
+        headers.set(HEADER_USER_ID, userId);
         headers.setAccept(List.of(MediaType.TEXT_PLAIN));
         return UUID.fromString(restTemplate.postForObject(path, new HttpEntity<>(headers), String.class));
     }

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

@@ -249,6 +249,8 @@ public MockResponse dispatch(RecordedRequest request) {
                     return new MockResponse().setResponseCode(200).setHeader(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN_VALUE).setBody(SHORT_CIRCUIT_ANALYSIS_PARAMETERS_UUID);
                 } else if ("GET".equalsIgnoreCase(request.getMethod()) && path.equals("/v1/parameters/" + SHORT_CIRCUIT_ANALYSIS_PARAMETERS_UUID)) {
                     return new MockResponse().setResponseCode(200).setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_UTF8_VALUE).setBody(TestUtils.resourceToString("/short-circuit-parameters.json"));
+                } else if ("PUT".equalsIgnoreCase(request.getMethod()) && path.equals("/v1/parameters/" + SHORT_CIRCUIT_ANALYSIS_PARAMETERS_UUID)) {
+                    return new MockResponse().setResponseCode(200);
                 } else {
                     LOGGER.error("Unhandled method+path: {} {}", request.getMethod(), request.getPath());
                     return new MockResponse().setResponseCode(418)
@@ -275,7 +277,7 @@ public void testShortCircuitAnalysisParameters() throws Exception {
                         .header(HEADER_USER_ID, "testUserId")
                         .content("{\"dumb\": \"json\"}").contentType(MediaType.APPLICATION_JSON))
                 .andExpect(status().isOk());
-        assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.equals("/v1/parameters")));
+        assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.equals("/v1/parameters/" + SHORT_CIRCUIT_ANALYSIS_PARAMETERS_UUID)));
     }
 
     @Test
@@ -599,8 +601,8 @@ public void testResetUuidResultWhenSCFailed() throws Exception {
         doAnswer(invocation -> {
             input.send(MessageBuilder.withPayload("").setHeader(HEADER_RECEIVER, resultUuidJson).build(), shortCircuitAnalysisFailedDestination);
             return resultUuid;
-        }).when(studyService).runShortCircuit(any(), any(), any());
-        studyService.runShortCircuit(studyEntity.getId(), modificationNode.getId(), null);
+        }).when(studyService).runShortCircuit(any(), any(), any(), any());
+        studyService.runShortCircuit(studyEntity.getId(), modificationNode.getId(), null, "user_1");
 
         // Test reset uuid result in the database
         assertTrue(networkModificationTreeService.getComputationResultUuid(modificationNode.getId(), ComputationType.SHORT_CIRCUIT).isEmpty());