✨ : delete state related to stack

gaia-app · Aug 5, 2022 · 4f9462e · 4f9462e
1 parent dc9f931
commit 4f9462e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/io/gaia_app/stacks/controller/StackRestController.java b/src/main/java/io/gaia_app/stacks/controller/StackRestController.java
@@ -6,6 +6,7 @@
 import io.gaia_app.stacks.bo.Stack;
 import io.gaia_app.stacks.repository.JobRepository;
 import io.gaia_app.stacks.repository.StackRepository;
+import io.gaia_app.stacks.repository.TerraformStateRepository;
 import io.gaia_app.stacks.service.StackCostCalculator;
 import io.gaia_app.organizations.Organization;
 import io.gaia_app.organizations.User;
@@ -31,16 +32,20 @@ public class StackRestController {
 
     private CredentialsRepository credentialsRepository;
 
+    private TerraformStateRepository stateRepository;
+
     @Autowired
     public StackRestController(
         StackRepository stackRepository,
         StackCostCalculator stackCostCalculator,
         JobRepository jobRepository,
-        CredentialsRepository credentialsRepository) {
+        CredentialsRepository credentialsRepository,
+        TerraformStateRepository stateRepository) {
         this.stackRepository = stackRepository;
         this.stackCostCalculator = stackCostCalculator;
         this.jobRepository = jobRepository;
         this.credentialsRepository = credentialsRepository;
+        this.stateRepository = stateRepository;
     }
 
     @GetMapping
@@ -93,6 +98,7 @@ public void delete(@PathVariable String id, User user){
         // delete stack if it was found
         stackRepository.delete(stack);
         jobRepository.deleteByStackId(id);
+        stateRepository.deleteById(id);
     }
 
     @PostMapping("/{id}/{jobType}")

diff --git a/src/test/java/io/gaia_app/stacks/controller/StackRestControllerTest.java b/src/test/java/io/gaia_app/stacks/controller/StackRestControllerTest.java
@@ -5,6 +5,7 @@
 import io.gaia_app.stacks.bo.*;
 import io.gaia_app.stacks.repository.JobRepository;
 import io.gaia_app.stacks.repository.StackRepository;
+import io.gaia_app.stacks.repository.TerraformStateRepository;
 import io.gaia_app.stacks.service.StackCostCalculator;
 import io.gaia_app.organizations.Organization;
 import io.gaia_app.organizations.User;
@@ -55,6 +56,9 @@ class StackRestControllerTest {
     @Mock
     private CredentialsRepository credentialsRepository;
 
+    @Mock
+    private TerraformStateRepository terraformStateRepository;
+
     @BeforeEach
     void setUp() {
         adminUser.setAdmin(true);
@@ -183,6 +187,7 @@ void delete_shouldRemoveStack_forAdmin(){
         // then
         verify(stackRepository).delete(stack);
         verify(jobRepository).deleteByStackId("42");
+        verify(terraformStateRepository).deleteById("42");
     }
 
     @Test
@@ -197,6 +202,7 @@ void delete_shouldRemoveStack_forStandardUser() {
         // then
         verify(stackRepository).delete(stack);
         verify(jobRepository).deleteByStackId("42");
+        verify(terraformStateRepository).deleteById("42");
     }
 
     @Test
@@ -211,6 +217,7 @@ void delete_shouldRemoveStack_forUserWithoutOrganization() {
         // then
         verify(stackRepository).delete(stack);
         verify(jobRepository).deleteByStackId("42");
+        verify(terraformStateRepository).deleteById("42");
     }
 
     @Test