CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

FINERACT-2488: Fix duplicate results in /api/v2/clients/search (#5485)

Browse Source
This commit is contained in:
Ralph Hopman
2026-02-14 13:05:13 -06:00
committed by GitHub
parent 176d510384
commit 4bb5c02b19
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-core/src/main/java/org/apache/fineract/portfolio/client/domain/search/SearchingClientRepositoryImpl.java
+1
View File
@@ -67,6 +67,7 @@ public class SearchingClientRepositoryImpl implements SearchingClientRepository
Path<Office> office = root.get("office");
Specification<Client> spec = (r, q, builder) -> {
q.distinct(true);
Path<Office> o = r.get("office");
Join<Client, ClientIdentifier> identity = r.join("identifiers", JoinType.LEFT);
integration-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientSearchTest.java
+31
View File
@@ -36,6 +36,7 @@ import org.apache.fineract.client.models.PostOfficesResponse;
import org.apache.fineract.client.models.SortOrder;
import org.apache.fineract.integrationtests.common.ClientHelper;
import org.apache.fineract.integrationtests.common.Utils;
import org.apache.fineract.integrationtests.common.system.CodeHelper;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -271,6 +272,36 @@ public class ClientSearchTest extends IntegrationTest {
assertThat(result.getContent().get(0).getMobileNo()).isEqualTo(request1.getMobileNo());
}
@Test
public void testClientSearchDoesNotDuplicateResults_WhenIdentifierHasMultipleMatches() {
// given
PostClientsRequest request = ClientHelper.defaultClientCreationRequest();
PostClientsResponse clientResponse = clientHelper.createClient(request);
Integer codeId = (Integer) CodeHelper.createCode(requestSpec, responseSpec, Utils.randomStringGenerator("ClientIdentifierTest_", 6),
CodeHelper.RESPONSE_ID_ATTRIBUTE_NAME);
Integer documentTypeIdOne = CodeHelper.createCodeValue(requestSpec, responseSpec, codeId,
Utils.randomStringGenerator("DocType_", 6), 1);
Integer documentTypeIdTwo = CodeHelper.createCodeValue(requestSpec, responseSpec, codeId,
Utils.randomStringGenerator("DocType_", 6), 2);
String documentKeyToken = Utils.randomStringGenerator("DUP_ID_", 6);
PostClientsClientIdIdentifiersRequest identifierOne = new PostClientsClientIdIdentifiersRequest()
.documentTypeId(documentTypeIdOne.longValue()).documentKey(documentKeyToken + "_A").description("Test").status("Active");
PostClientsClientIdIdentifiersRequest identifierTwo = new PostClientsClientIdIdentifiersRequest()
.documentTypeId(documentTypeIdTwo.longValue()).documentKey(documentKeyToken + "_B").description("Test").status("Active");
clientHelper.createClientIdentifer(clientResponse.getClientId(), identifierOne);
clientHelper.createClientIdentifer(clientResponse.getClientId(), identifierTwo);
// when
PageClientSearchData result = clientHelper.searchClients(documentKeyToken);
// then
assertThat(result.getTotalElements()).isEqualTo(1);
assertThat(result.getContent().size()).isEqualTo(1);
assertThat(result.getContent().get(0).getExternalId().getValue()).isEqualTo(request.getExternalId());
}
@Test
public void testClientSearchByLegalForm() {
// given