Merge branch 'master' of https://github.com/jmprathab/MyHome

* 'master' of https://github.com/jmprathab/MyHome:
  Resolved as per PR Comments
  delete community api

src/main/java/com/myhome/controllers/CommunityController.java

@@ -205,5 +205,21 @@ public ResponseEntity<Void> deleteAdminFromCommunity(
       return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
     }
   }
+
+  @Operation(description = "Deletion community with given community id",
+          responses = {@ApiResponse(responseCode = "204", description = "If community was removed"),
+                  @ApiResponse(responseCode = "404", description = "If parameters are invalid")})
+  @DeleteMapping(
+          path = "/communities/{communityId}"
+  )
+  public ResponseEntity<Void> deleteCommunity(@PathVariable String communityId) {
+    log.trace("Received delete community request");
+    Integer isDeleted = communityService.deleteCommunity(communityId);
+    if (isDeleted == 1) {
+      return ResponseEntity.status(HttpStatus.NO_CONTENT).build();
+    } else {
+      return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
+    }
+  }
 }
 

src/main/java/com/myhome/repositories/CommunityRepository.java

@@ -19,9 +19,13 @@
 import com.myhome.domain.Community;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 
 @Repository
 public interface CommunityRepository extends CrudRepository<Community, Long> {
 
   Community findByCommunityId(String communityId);
+
+  @Transactional
+  Integer deleteByCommunityId(String communityId);
 }

src/main/java/com/myhome/services/CommunityService.java

@@ -33,5 +33,7 @@ public interface CommunityService {
 
   Set<String> addHousesToCommunity(String communityId, Set<CommunityHouse> houses);
 
+  Integer deleteCommunity(String communityId);
+
   Optional<Community> deleteAdminFromCommunity(String communityId, String adminId);
 }

src/main/java/com/myhome/services/springdatajpa/CommunitySDJpaService.java

@@ -116,6 +116,11 @@ public Optional<Community> deleteAdminFromCommunity(String communityId, String a
     return Optional.of(savedCommunity);
   }
 
+  @Override
+  public Integer deleteCommunity(String communityId) {
+    return communityRepository.deleteByCommunityId(communityId);
+  }
+
   private String generateUniqueId() {
     return UUID.randomUUID().toString();
   }