Skip to content

Commit 4e705cf

Browse files
authored
Deactivate open-in-view (spring jpa) property (#130)
Signed-off-by: Slimane AMAR <[email protected]>
1 parent 7803bf8 commit 4e705cf

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</developers>
4343

4444
<properties>
45-
<gridsuite-dependencies.version>37.0.0</gridsuite-dependencies.version>
45+
<gridsuite-dependencies.version>38.0.0</gridsuite-dependencies.version>
4646
<liquibase-hibernate-package>org.gridsuite.shortcircuit.server</liquibase-hibernate-package>
4747
<db-util.version>1.0.5</db-util.version>
4848
</properties>

src/main/java/org/gridsuite/shortcircuit/server/ShortCircuitController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public ResponseEntity<byte[]> getZippedCsvExportFaultResult(
8181
@Parameter(description = "Csv headers and translations payload") @RequestBody CsvTranslation csvTranslation) {
8282
return ResponseEntity.ok()
8383
.contentType(MediaType.parseMediaType(APPLICATION_OCTET_STREAM_VALUE))
84-
.body(shortCircuitService.getZippedCsvExportResult(resultUuid, csvTranslation));
84+
.body(shortCircuitService.getZippedCsvExportResult(resultUuid, shortCircuitService.getResult(resultUuid, FaultResultsMode.FULL), csvTranslation));
8585
}
8686

8787
@GetMapping(value = "/results/{resultUuid}/fault_results/paged", produces = APPLICATION_JSON_VALUE)

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public ShortCircuitService(final NotificationService notificationService, final
7070
this.parametersRepository = parametersRepository;
7171
}
7272

73+
@Transactional
7374
public UUID runAndSaveResult(UUID networkUuid, String variantId, String receiver, UUID reportUuid, String reporterId, String reportType,
7475
String userId, String busId, final Optional<UUID> parametersUuid) {
7576
ShortCircuitParameters parameters = fromEntity(parametersUuid.flatMap(parametersRepository::findById).orElseGet(ShortCircuitParametersEntity::new)).parameters();
@@ -263,8 +264,7 @@ public byte[] exportToCsv(ShortCircuitAnalysisResult result, List<String> header
263264
}
264265
}
265266

266-
public byte[] getZippedCsvExportResult(UUID resultUuid, CsvTranslation csvTranslation) {
267-
ShortCircuitAnalysisResult result = getResult(resultUuid, FaultResultsMode.FULL);
267+
public byte[] getZippedCsvExportResult(UUID resultUuid, ShortCircuitAnalysisResult result, CsvTranslation csvTranslation) {
268268
if (result == null) {
269269
throw new ShortCircuitException(RESULT_NOT_FOUND, "The short circuit analysis result '" + resultUuid + "' does not exist");
270270
}
@@ -276,6 +276,7 @@ public byte[] getZippedCsvExportResult(UUID resultUuid, CsvTranslation csvTransl
276276
return exportToCsv(result, headersList, enumValueTranslations);
277277
}
278278

279+
@Transactional(readOnly = true)
279280
public ShortCircuitAnalysisResult getResult(UUID resultUuid, FaultResultsMode mode) {
280281
AtomicReference<Long> startTime = new AtomicReference<>();
281282
startTime.set(System.nanoTime());

0 commit comments

Comments
 (0)