Issue jmprathab#257 fix 500 error with adding 'AmenityBookingService'

service/src/main/java/com/myhome/repositories/AmenityRepository.java

@@ -26,8 +26,8 @@
 public interface AmenityRepository extends JpaRepository<Amenity, Long> {
 
   @Query("from Amenity amenity where amenity.amenityId = :amenityId")
-  @EntityGraph(value = "Amenity.community")
-  Optional<Amenity> findByAmenityIdWithCommunity(@Param("amenityId") String amenityId);
+  @EntityGraph(value = "Amenity.community_house")
+  Optional<Amenity> findByAmenityIdWithCommunityAndHouse(@Param("amenityId") String amenityId);
 
   Optional<Amenity> findByAmenityId(String amenityId);
 }

service/src/main/java/com/myhome/services/AmenityBookingService.java

@@ -0,0 +1,14 @@
+package com.myhome.services;
+
+import com.myhome.domain.Amenity;
+import com.myhome.domain.AmenityBookingItem;
+
+import java.time.LocalDateTime;
+
+public interface AmenityBookingService {
+  AmenityBookingItem bookAmenity(Amenity amenity, LocalDateTime bookingStartDate, LocalDateTime bookingEndDate);
+
+  boolean deleteBooking(String bookingId);
+
+  boolean removeAllAmenityBookings(String amenityID);
+}

service/src/main/java/com/myhome/services/springdatajpa/AmenityBookingSDJpaService.java

@@ -0,0 +1,42 @@
+package com.myhome.services.springdatajpa;
+
+import com.myhome.domain.Amenity;
+import com.myhome.domain.AmenityBookingItem;
+import com.myhome.repositories.AmenityBookingItemRepository;
+import com.myhome.services.AmenityBookingService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.HashSet;
+
+@Service
+@RequiredArgsConstructor
+public class AmenityBookingSDJpaService implements AmenityBookingService {
+
+  private final AmenityBookingItemRepository bookingItemRepository;
+
+  @Override
+  public AmenityBookingItem bookAmenity(Amenity amenity, LocalDateTime bookingStartDate, LocalDateTime bookingEndDate) {
+    AmenityBookingItem newBooking = new AmenityBookingItem(null, amenity,
+        bookingStartDate, bookingEndDate, null);
+    return bookingItemRepository.save(newBooking);
+  }
+
+  @Override
+  public boolean deleteBooking(String bookingId) {
+    return bookingItemRepository.findByAmenityBookingItemId(bookingId)
+        .map(bookingItem -> {
+          bookingItemRepository.delete(bookingItem);
+          return true;
+        })
+        .orElse(false);
+  }
+
+  @Override
+  public boolean removeAllAmenityBookings(String amenityId) {
+    HashSet<AmenityBookingItem> bookings = bookingItemRepository.findAllByAmenity_AmenityId(amenityId);
+    bookingItemRepository.deleteAll(bookings);
+    return false;
+  }
+}

service/src/main/java/com/myhome/services/springdatajpa/AmenitySDJpaService.java

@@ -70,10 +70,13 @@ public Optional<Amenity> getAmenityDetails(String amenityId) {
 
   @Override
   public boolean deleteAmenity(String amenityId) {
-    return amenityRepository.findByAmenityIdWithCommunity(amenityId)
+    return amenityRepository.findByAmenityIdWithCommunityAndHouse(amenityId)
         .map(amenity -> {
-          Community community = amenity.getCommunity();
-          community.getAmenities().remove(amenity);
+          amenityBookingService.removeAllAmenityBookings(amenity.getAmenityId());
+          if(amenity.getCommunityHouse() != null) {
+            houseService.removeAmenityFromHouse(amenity.getCommunityHouse(),
+                amenity.getAmenityId());
+          }
           amenityRepository.delete(amenity);
           return true;
         })