From 13319316a22451e0084fe3d28eea8e6665e5d7b0 Mon Sep 17 00:00:00 2001
From: Slimane AMAR <amarsli@gm0winl104.bureau.si.interne>
Date: Mon, 17 Feb 2025 10:12:53 +0100
Subject: [PATCH 1/3] Deactivate open-in-view (spring jpa) property

---
 .../server/service/SecurityAnalysisParametersService.java       | 1 +
 .../server/service/SecurityAnalysisService.java                 | 2 ++
 .../server/service/SecurityAnalysisWorkerService.java           | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisParametersService.java b/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisParametersService.java
index 6c446699..42fdecdb 100644
--- a/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisParametersService.java
+++ b/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisParametersService.java
@@ -136,6 +136,7 @@ public SecurityAnalysisParametersValues getDefaultSecurityAnalysisParametersValu
                 .build();
     }
 
+    @Transactional(readOnly = true)
     public Optional<SecurityAnalysisParametersValues> getParameters(UUID parametersUuid) {
         return securityAnalysisParametersRepository.findById(parametersUuid)
                 .map(this::toSecurityAnalysisParametersValues);
diff --git a/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisService.java b/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisService.java
index d5352d0b..515035c0 100644
--- a/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisService.java
+++ b/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisService.java
@@ -16,6 +16,7 @@
 import org.gridsuite.securityanalysis.server.dto.SecurityAnalysisStatus;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Objects;
@@ -38,6 +39,7 @@ public SecurityAnalysisService(SecurityAnalysisResultService securityAnalysisRes
     }
 
     @Override
+    @Transactional
     public UUID runAndSaveResult(SecurityAnalysisRunContext runContext) {
         Objects.requireNonNull(runContext);
         var resultUuid = uuidGeneratorService.generate();
diff --git a/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java b/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java
index de75750c..f99854ad 100644
--- a/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java
+++ b/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java
@@ -41,6 +41,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.messaging.Message;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.io.*;
@@ -98,6 +99,7 @@ public void setSecurityAnalysisFactorySupplier(Function<String, SecurityAnalysis
         this.securityAnalysisFactorySupplier = Objects.requireNonNull(securityAnalysisFactorySupplier);
     }
 
+    @Transactional(readOnly = true)
     public SecurityAnalysisResult run(SecurityAnalysisRunContext runContext) {
         try {
             Network network = getNetwork(runContext.getNetworkUuid(),

From a0cd09db36877eafd31df861ac55dcd65fe61061 Mon Sep 17 00:00:00 2001
From: Slimane AMAR <amarsli@gm0winl104.bureau.si.interne>
Date: Mon, 17 Feb 2025 10:58:56 +0100
Subject: [PATCH 2/3] Remove transaction for run

---
 .../server/service/SecurityAnalysisWorkerService.java           | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java b/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java
index f99854ad..de75750c 100644
--- a/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java
+++ b/src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java
@@ -41,7 +41,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.messaging.Message;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.io.*;
@@ -99,7 +98,6 @@ public void setSecurityAnalysisFactorySupplier(Function<String, SecurityAnalysis
         this.securityAnalysisFactorySupplier = Objects.requireNonNull(securityAnalysisFactorySupplier);
     }
 
-    @Transactional(readOnly = true)
     public SecurityAnalysisResult run(SecurityAnalysisRunContext runContext) {
         try {
             Network network = getNetwork(runContext.getNetworkUuid(),

From db78b8c083e7cf72793e5f9af852b2c103173091 Mon Sep 17 00:00:00 2001
From: Slimane AMAR <amarsli@gm0winl104.bureau.si.interne>
Date: Thu, 20 Feb 2025 13:55:07 +0100
Subject: [PATCH 3/3] Upgrade to gridsuite dependencies 38

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2ace1e90..16345360 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
 
     <properties>
         <jib.from.image>powsybl/java-dynawo:3.0.0</jib.from.image>
-        <gridsuite-dependencies.version>37.0.0</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>38.0.0</gridsuite-dependencies.version>
         <liquibase-hibernate-package>org.gridsuite.securityanalysis.server</liquibase-hibernate-package>
         <db-util.version>1.0.5</db-util.version>
         <mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>