fix wrongly deletion on update runTemplate

fix deletion of other runTemplates when using updateSolutionrunTemplate
add tests to check correct functionnement

Author: Leopold-Cramer

doc/licenses/index.html

@@ -123,7 +123,7 @@
 <div class='header'>
 <h1>cosmotech-api-parent 2.3.12-SNAPSHOT</h1>
 <h2>Dependency License Report</h2>
-<h2 class='timestamp'><em>2023-08-29 12:02:56 CEST</em>.</h2></div>
+<h2 class='timestamp'><em>2023-09-07 15:51:29 CEST</em>.</h2></div>
 <h3>cosmotech-api-parent</h3>
 <ul>
 <li><a class='license' href='#cosmotech-api-parent_Apache_License,_Version_2.0'><span class='name'>Apache License, Version 2.0</span> <span class='badge'>373</span></a></li>

doc/licenses/jna-5.12.1.jar/META-INF/LICENSE

@@ -0,0 +1,26 @@
+SPDX-License-Identifier: Apache-2.0 OR LGPL-2.1
+
+Java Native Access (JNA) is licensed under the LGPL, version 2.1
+or later, or (from version 4.0 onward) the Apache License,
+version 2.0.
+
+You can freely decide which license you want to apply to the project.
+
+You may obtain a copy of the LGPL License at:
+
+http://www.gnu.org/licenses/licenses.html
+
+A copy is also included in the downloadable source code package
+containing JNA, in file "LGPL2.1", under the same directory
+as this file.
+
+You may obtain a copy of the Apache License at:
+
+http://www.apache.org/licenses/
+
+A copy is also included in the downloadable source code package
+containing JNA, in file "AL2.0", under the same directory
+as this file.
+
+Commercial support may be available, please e-mail
+twall[at]users[dot]sf[dot]net.

solution/src/integrationTest/kotlin/com/cosmotech/solution/service/SolutionServiceIntegrationTest.kt

@@ -87,6 +87,38 @@ class SolutionServiceIntegrationTest : CsmRedisTestBase() {
     solutionRegistered = solutionApiService.createSolution(organizationRegistered.id!!, solution)
   }
 
+  @Test
+  fun `test verify updateRunTemplate works as intended`() {
+
+    val solution =
+        Solution(
+            "id",
+            organizationRegistered.id!!,
+            "key",
+            "name",
+            runTemplates = mutableListOf(RunTemplate(id = "one"), RunTemplate(id = "two")))
+    solutionRegistered = solutionApiService.createSolution(organizationRegistered.id!!, solution)
+
+    val endTemplates =
+        solutionApiService.updateSolutionRunTemplate(
+            organizationRegistered.id!!,
+            solutionRegistered.id!!,
+            "one",
+            RunTemplate(id = "one", name = "name_one"))
+
+    val expectedSolution =
+        Solution(
+            "id",
+            organizationRegistered.id!!,
+            "key",
+            "name",
+            runTemplates =
+                mutableListOf(RunTemplate(id = "one", name = "name_one"), RunTemplate(id = "two")))
+    // Assert that no runTemplate were deleted
+    assertEquals(expectedSolution.runTemplates!!.size, endTemplates.size)
+    assertEquals(expectedSolution.runTemplates!!, endTemplates)
+  }
+
   @Test
   fun `test CRUD operations on Solution`() {
 

solution/src/main/kotlin/com/cosmotech/solution/service/SolutionServiceImpl.kt

@@ -213,23 +213,16 @@ internal class SolutionServiceImpl(
       runTemplateId: String,
       runTemplate: RunTemplate
   ): List<RunTemplate> {
+
     val existingSolution = findSolutionById(organizationId, solutionId)
-    val runTemplates =
-        existingSolution.runTemplates?.filter { it.id == runTemplateId }?.toMutableList()
-    if (runTemplates == null || runTemplates.isEmpty()) {
-      throw CsmResourceNotFoundException("Run Template '$runTemplateId' *not* found")
-    }
-    var hasChanged = false
-    for (existingRunTemplate in runTemplates) {
-      hasChanged =
-          hasChanged || existingRunTemplate.compareToAndMutateIfNeeded(runTemplate).isNotEmpty()
-    }
+    val runTemplateToChange =
+        existingSolution.runTemplates?.first { it.id == runTemplateId }
+            ?: throw CsmResourceNotFoundException("Run Template '$runTemplateId' *not* found")
 
-    if (hasChanged) {
-      existingSolution.runTemplates = runTemplates
-      solutionRepository.save(existingSolution)
-    }
-    return runTemplates
+    runTemplateToChange.compareToAndMutateIfNeeded(runTemplate).isNotEmpty()
+    solutionRepository.save(existingSolution)
+
+    return existingSolution.runTemplates!!.toList()
   }
 
   @EventListener(OrganizationUnregistered::class)