From d9911bd7714adbb382cd87aefecde5c339136af0 Mon Sep 17 00:00:00 2001 From: kiran-vsm Date: Thu, 25 Jun 2020 12:08:55 +0530 Subject: [PATCH] FINERACT-1043: Unable to create client due to invalid error message about required address field --- .../client/domain/ClientAddressRepository.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientAddressRepository.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientAddressRepository.java index a17074deb..478d8ed92 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientAddressRepository.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientAddressRepository.java @@ -21,14 +21,15 @@ package org.apache.fineract.portfolio.client.domain; import org.apache.fineract.infrastructure.codes.domain.CodeValue; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface ClientAddressRepository extends JpaRepository, JpaSpecificationExecutor { - ClientAddress findByClientId(String clientId); + @Query("SELECT clientAddress FROM ClientAddress clientAddress WHERE clientAddress.client.id = :clientId AND clientAddress.addressType = :addressType AND clientAddress.isActive = :isActive ") + ClientAddress findByClientIdAndAddressTypeAndIsActive(@Param("clientId") final long clientId, final CodeValue addressType, + @Param("isActive") final boolean isActive); - // ClientAddress findByAddressId(long addressId); - - ClientAddress findByClientIdAndAddressTypeAndIsActive(final long clientId, final CodeValue addressTypeId, final boolean isActive); - - ClientAddress findByClientIdAndAddressId(final long clientId, final long addressId); + @Query("SELECT clientAddress FROM ClientAddress clientAddress WHERE clientAddress.client.id = :clientId AND clientAddress.address.id = :addressId ") + ClientAddress findByClientIdAndAddressId(@Param("clientId") final long clientId, @Param("addressId") final long addressId); }