diff --git a/service/src/main/java/com/myhome/services/springdatajpa/AmenitySDJpaService.java b/service/src/main/java/com/myhome/services/springdatajpa/AmenitySDJpaService.java index 709fc514..e89bd5b4 100644 --- a/service/src/main/java/com/myhome/services/springdatajpa/AmenitySDJpaService.java +++ b/service/src/main/java/com/myhome/services/springdatajpa/AmenitySDJpaService.java @@ -20,16 +20,18 @@ import com.myhome.domain.Amenity; import com.myhome.domain.Community; import com.myhome.model.AmenityDto; -import com.myhome.repositories.AmenityBookingItemRepository; import com.myhome.repositories.AmenityRepository; import com.myhome.repositories.CommunityRepository; +import com.myhome.services.AmenityBookingService; import com.myhome.services.AmenityService; import com.myhome.services.CommunityService; -import java.util.HashSet; + import java.util.List; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; + +import com.myhome.services.HouseService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -41,7 +43,8 @@ public class AmenitySDJpaService implements AmenityService { private final CommunityRepository communityRepository; private final CommunityService communityService; private final AmenityApiMapper amenityApiMapper; - private final AmenityBookingItemRepository bookingRepository; + private final AmenityBookingService amenityBookingService; + private final HouseService houseService; @Override public Optional> createAmenities(Set amenities, String communityId) { @@ -94,8 +97,7 @@ public Set listAllAmenities(String communityId) { public boolean updateAmenity(AmenityDto updatedAmenity) { String amenityId = updatedAmenity.getAmenityId(); return amenityRepository.findByAmenityId(amenityId) - .map(amenity -> communityRepository.findByCommunityId(updatedAmenity.getCommunityId()) - .map(community -> { + .map(amenity -> { Amenity updated = new Amenity(); updated.setName(updatedAmenity.getName()); updated.setPrice(updatedAmenity.getPrice()); @@ -104,7 +106,6 @@ public boolean updateAmenity(AmenityDto updatedAmenity) { updated.setDescription(updatedAmenity.getDescription()); return updated; }) - .orElse(null)) .map(amenityRepository::save).isPresent(); }