Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rhopman wants to merge 1 commit into
base: develop
Choose a base branch
from
+32 −0
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...ava/org/apache/fineract/portfolio/client/domain/search/SearchingClientRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public Page<SearchedClient> searchByText(String searchText, Pageable pageable, S
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);

Expand Down
31 changes: 31 additions & 0 deletions ...ion-tests/src/test/java/org/apache/fineract/integrationtests/client/ClientSearchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
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;

Expand Down Expand Up @@ -271,6 +272,36 @@ public void testClientSearchWorks_ByClientIdentifier() {
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
Expand Down