Deleting containers

Author: TobyNartowski

src/main/java/pl/simplemethod/codebin/repository/ContainersRepository.java

@@ -28,6 +28,4 @@ public interface ContainersRepository extends JpaRepository<Containers, Long> {
     List<Containers> getByHostPorts(Integer ports);
 
     List<Containers> getByIdDocker(String dockerId);
-
-
 }

src/main/java/pl/simplemethod/codebin/repository/ImagesRepository.java

@@ -12,17 +12,15 @@
 @Transactional
 public interface ImagesRepository extends JpaRepository<Images, Long> {
 
-Images getFirstById(Integer id);
+    Images getFirstById(Integer id);
 
-Images getFirstByType(String type);
+    Images getFirstByType(String type);
 
-List<Images> getById(Integer id);
+    List<Images> getById(Integer id);
 
-List<Images> getByName(String name);
-
-Images getFirstByName(String name);
-
-List<Images> getByType(String type);
+    List<Images> getByName(String name);
 
+    Images getFirstByName(String name);
 
+    List<Images> getByType(String type);
 }

src/main/java/pl/simplemethod/codebin/repository/UsersRepository.java

@@ -9,11 +9,13 @@
 @Repository
 @Transactional
 public interface UsersRepository  extends JpaRepository<Users, Long> {
-Users getFirstByGithub(Integer github);
+    Users getFirstByGithub(Integer github);
 
-Users getFirstById(Integer id);
+    Users getFirstById(Integer id);
 
-Users getFirstByToken(String token);
+    Users getFirstByToken(String token);
 
-Users getFirstBySubscription(String  subscription);
+    Users getFirstBySubscription(String  subscription);
+
+    Users findByContainersidDocker(String id);
 }

src/main/java/pl/simplemethod/codebin/srv/SrvRestController.java

@@ -267,6 +267,12 @@ ResponseEntity infoDocker() {
     ResponseEntity deleteContainer(@PathVariable(value = "ID") String containerId) {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
+
+        Users users = usersRepository.findByContainersidDocker(containerId);
+        Containers containerToDelete = containersRepository.getFirstByIdDocker(containerId);
+        users.getContainers().remove(containerToDelete);
+        usersRepository.save(users);
+
         org.json.JSONObject response = srvClient.deleteContainer(containerId);
         containersRepository.removeByIdDocker(containerId);
         return new ResponseEntity<>(response.toString(), headers, HttpStatus.valueOf(response.getInt("status")));