fix: remove scenario in ScenarioUploader (#485)

* fix: remove scenario in ScenarioUploader * chore: upgrade version for api and chart candidate * chore: fix sonar bug
Decathlon · Aug 19, 2021 · d4eca51 · d4eca51
1 parent c832ab9
commit d4eca51
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 10 deletions.
diff --git a/charts/candidate/Chart.yaml b/charts/candidate/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: ara
-version: 9.2.1-rc.1
+version: 9.2.1-rc.2
 home: https://github.com/Decathlon/ara
 description: |
     ARA helps you to fight against regressions by letting it preanalyze your non-regression tests runs,

diff --git a/charts/candidate/values.yaml b/charts/candidate/values.yaml
@@ -8,7 +8,7 @@ api:
     image:
         registry: docker.io
         repository: decathlon/ara-api
-        tag: 10.0.1
+        tag: 10.0.2
         imagePullPolicy: IfNotPresent
     replicas: 1
     annotations: {}

diff --git a/code/api/api/pom.xml b/code/api/api/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>com.decathlon.ara</groupId>
     <artifactId>ara-api</artifactId>
-    <version>10.0.1</version>
+    <version>10.0.2</version>
 
     <name>ARA API</name>
     <description>

diff --git a/code/api/api/src/main/java/com/decathlon/ara/scenario/common/upload/ScenarioUploader.java b/code/api/api/src/main/java/com/decathlon/ara/scenario/common/upload/ScenarioUploader.java
@@ -58,7 +58,10 @@ public void processUploadedContent(long projectId, String sourceCode, Technology
         }
 
         // Remove the previous scenarios from the same source => the database will remove the associations between functionalities and these scenarios
-        scenarioRepository.deleteAll(scenarioRepository.findAllBySourceId(source.getId()));
+        var allScenarios = scenarioRepository.findAllBySourceId(source.getId());
+        allScenarios.forEach(this::removeScenarioAssociationSafely);
+        scenarioRepository.deleteAll(allScenarios);
+
         // Let Hibernate make the DELETE SQL statements now, because we will add the same scenarios below: don't mess with old and new instances
         entityManager.flush();
         entityManager.clear();
@@ -81,6 +84,21 @@ public void processUploadedContent(long projectId, String sourceCode, Technology
         functionalityRepository.saveAll(functionalities);
     }
 
+    public void removeScenarioAssociationSafely(Scenario scenario) {
+        var scenarioFunctionalities = scenario.getFunctionalities();
+        while (!scenarioFunctionalities.isEmpty()) {
+            var initialSize = scenarioFunctionalities.size();
+            scenarioFunctionalities.stream()
+                    .findFirst()
+                    .ifPresent(scenario::removeFunctionality);
+            if (scenarioFunctionalities.size() >= initialSize) {
+                // Check implementation of removeFunctionality decrease the size of functionalities set
+                throw new IllegalStateException(
+                        "Error during scenario-functionality link deletion: prevent infinite loop");
+            }
+        }
+    }
+
     @FunctionalInterface
     public interface ScenarioListSupplier {
         List<Scenario> get(Source source) throws BadRequestException;

diff --git a/code/api/database/pom.xml b/code/api/database/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>com.decathlon.ara</groupId>
     <artifactId>ara-database</artifactId>
-    <version>10.0.1</version>
+    <version>10.0.2</version>
 
     <name>ARA Database</name>
     <description>

diff --git a/code/api/database/src/main/java/com/decathlon/ara/domain/Scenario.java b/code/api/database/src/main/java/com/decathlon/ara/domain/Scenario.java
@@ -97,6 +97,16 @@ public class Scenario implements Comparable<Scenario> {
     @ManyToMany(fetch = FetchType.LAZY, mappedBy = "scenarios")
     private Set<Functionality> functionalities = new HashSet<>();
 
+    public void addFunctionality(Functionality functionality) {
+        this.functionalities.add(functionality);
+        functionality.getScenarios().add(this);
+    }
+
+    public void removeFunctionality(Functionality functionality) {
+        this.functionalities.remove(functionality);
+        functionality.getScenarios().remove(this);
+    }
+
     @Override
     public int compareTo(Scenario other) {
         // Keep business key in sync with @EqualsAndHashCode

diff --git a/code/api/generated-cucumber-report/pom.xml b/code/api/generated-cucumber-report/pom.xml
@@ -27,7 +27,7 @@
 
     <groupId>com.decathlon.ara</groupId>
     <artifactId>ara-generated-cucumber-report</artifactId>
-    <version>10.0.1</version>
+    <version>10.0.2</version>
 
     <name>ARA Cucumber</name>
     <description>

diff --git a/code/api/jacoco-aggregation/pom.xml b/code/api/jacoco-aggregation/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>ara-parent</artifactId>
         <groupId>com.decathlon.ara</groupId>
-        <version>10.0.1</version>
+        <version>10.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.decathlon.ara</groupId>
     <artifactId>jacoco-aggregation</artifactId>
     <packaging>pom</packaging>
-    <version>10.0.1</version>
+    <version>10.0.2</version>
 
     <name>Jacoco Report Aggregation</name>
 

diff --git a/code/api/lib/pom.xml b/code/api/lib/pom.xml
@@ -27,7 +27,7 @@
 
     <groupId>com.decathlon.ara</groupId>
     <artifactId>ara-lib</artifactId>
-    <version>10.0.1</version>
+    <version>10.0.2</version>
 
     <properties>
         <java.version>16</java.version>

diff --git a/code/api/pom.xml b/code/api/pom.xml
@@ -28,7 +28,7 @@
     <groupId>com.decathlon.ara</groupId>
     <artifactId>ara-parent</artifactId>
     <packaging>pom</packaging>
-    <version>10.0.1</version>
+    <version>10.0.2</version>
 
     <name>ARA Parent</name>
     <description>