Skip to content

FINERACT-2529: pass externalId instead of null resolvedClientId in Cl… #5632

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
mansi75 wants to merge 2 commits into
base: develop
Choose a base branch
from
+4 −4
Open

FINERACT-2529: pass externalId instead of null resolvedClientId in Cl… #5632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bf0eb6
FINERACT-2529: pass externalId instead of null resolvedClientId in Cl…
mansi75 Mar 16, 2026
eb9542e
FINERACT-2529: improve ClientNotFoundException message and BatchApi r…
mansi75 Mar 18, 2026
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
2 changes: 1 addition & 1 deletion ...src/main/java/org/apache/fineract/portfolio/client/exception/ClientNotFoundException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public ClientNotFoundException(final Long id) {
}

public ClientNotFoundException(final ExternalId externalId) {
super("error.msg.client.id.invalid", "Client with identifier " + externalId + " does not exist", externalId);
super("error.msg.client.id.invalid", "Client with identifier " + externalId.getValue() + " does not exist", externalId.getValue());
}

public ClientNotFoundException() {
Expand Down
4 changes: 2 additions & 2 deletions ...e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/common/BatchApiStepDef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public class BatchApiStepDef extends AbstractStepDef {
private static final Long CHARGE_ID_NFS_FEE = ChargeProductType.LOAN_NSF_FEE.value;
private static final String ERROR_DEVELOPER_MESSAGE = "The requested resource is not available.";
private static final Integer ERROR_HTTP_404 = 404;
private static final String ERROR_DEVELOPER_MESSAGE_CLIENT = "Client with identifier null does not exist";
private static final String ERROR_DEVELOPER_MESSAGE_CLIENT = "Client with identifier {externalId} does not exist";
private static final String ERROR_DEVELOPER_MESSAGE_LOAN_EXTERNAL = "Loan with external identifier {externalId} does not exist";
private static final String PWD_USER_WITH_ROLE = "1234567890Aa!";

Expand Down Expand Up @@ -921,7 +921,7 @@ public void clientNotCreated(int nr) throws IOException {

String developerMessageExpected = ERROR_DEVELOPER_MESSAGE;
Integer httpStatusCodeExpected = ERROR_HTTP_404;
String errorsDeveloperMessageExpected = ERROR_DEVELOPER_MESSAGE_CLIENT;
String errorsDeveloperMessageExpected = ERROR_DEVELOPER_MESSAGE_CLIENT.replace("{externalId}", clientExternalId);

assertThat(developerMessageActual).as(ErrorMessageHelper.wrongErrorMessage(developerMessageActual, developerMessageExpected))
.isEqualTo(developerMessageExpected);
Expand Down
2 changes: 1 addition & 1 deletion ...t-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ private Long getResolvedClientId(final Long clientId, final ExternalId clientExt
clientExternalId.throwExceptionIfEmpty();
resolvedClientId = clientReadPlatformService.retrieveClientIdByExternalId(clientExternalId);
if (resolvedClientId == null) {
throw new ClientNotFoundException(resolvedClientId);
throw new ClientNotFoundException(clientExternalId);
}
}
return resolvedClientId;
Expand Down
Loading