Merge pull request #136 from ccims/bugfix/invalid_deletes

Bugfix/invalid deletes
ccims · Sep 25, 2024 · 5bdda5b · 5bdda5b
2 parents 788bc17 + 4edf0ba
commit 5bdda5b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.../main/kotlin/gropius/service/architecture/IntraComponentDependencySpecificationService.kt b/.../main/kotlin/gropius/service/architecture/IntraComponentDependencySpecificationService.kt
@@ -143,7 +143,7 @@ class IntraComponentDependencySpecificationService(
                 )
             }
         }
-        intraComponentDependencyParticipantRepository.deleteAll(participantsToRemove)
+        intraComponentDependencyParticipantRepository.deleteAll(participantsToRemove).awaitSingleOrNull()
         if (participants.isEmpty()) {
             throw IllegalArgumentException("$propertyName must not be empty")
         }
@@ -194,7 +194,7 @@ class IntraComponentDependencySpecificationService(
         val allParticipants = intraComponentDependencySpecification.let {
             it.outgoingParticipants() + it.incomingParticipants()
         }
-        intraComponentDependencyParticipantRepository.deleteAll(allParticipants)
+        intraComponentDependencyParticipantRepository.deleteAll(allParticipants).awaitSingleOrNull()
         repository.delete(intraComponentDependencySpecification).awaitSingleOrNull()
     }
 

diff --git a/core/src/main/kotlin/gropius/service/architecture/ProjectService.kt b/core/src/main/kotlin/gropius/service/architecture/ProjectService.kt
@@ -107,7 +107,7 @@ class ProjectService(
             project, Permission(NodePermission.ADMIN, authorizationContext), "delete the Project"
         )
         beforeDeleteTrackable(project)
-        nodeRepository.deleteAll(project.relationLayouts() + project.relationLayouts()).awaitSingle()
+        nodeRepository.deleteAll(project.relationLayouts() + project.relationLayouts()).awaitSingleOrNull()
         repository.delete(project).awaitSingleOrNull()
     }
 

diff --git a/core/src/main/kotlin/gropius/service/architecture/TrackableService.kt b/core/src/main/kotlin/gropius/service/architecture/TrackableService.kt
@@ -83,7 +83,7 @@ abstract class TrackableService<T : Trackable, R : GropiusRepository<T, String>>
         node.syncsTo().forEach {
             imsProjectService.deleteIMSProject(it)
         }
-        nodeRepository.deleteAll(labelsToDelete + imsProjectsToDelete + issuesToDelete + node.artefacts() + node)
+        nodeRepository.deleteAll(labelsToDelete + imsProjectsToDelete + issuesToDelete + node.artefacts())
             .awaitSingleOrNull()
     }