Skip to content

FINERACT-2454: Migrate LoanWithdrawnByApplicantIntegrationTest from RestAssured to feign client #5668

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
Dpk376 wants to merge 3 commits into
base: develop
Choose a base branch
from
+134 −229
Open

FINERACT-2454: Migrate LoanWithdrawnByApplicantIntegrationTest from RestAssured to feign client #5668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f84a76
FINERACT-2454: Migrate ClientExternalIdTest from RestAssured to finer…
Dpk376 Mar 20, 2026
e0867d2
FINERACT-2454: Fix getObligeeData to handle JSON array response
Dpk376 Mar 20, 2026
d99bb19
FINERACT-2454: Migrate LoanWithdrawnByApplicantIntegrationTest from R…
Dpk376 Mar 21, 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
89 changes: 39 additions & 50 deletions ...ration-tests/src/test/java/org/apache/fineract/integrationtests/ClientExternalIdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
import java.util.UUID;
import lombok.extern.slf4j.Slf4j;
import org.apache.fineract.client.models.DeleteClientsClientIdResponse;
import org.apache.fineract.client.models.GetClientTransferProposalDateResponse;
import org.apache.fineract.client.models.GetClientsClientIdAccountsResponse;
import org.apache.fineract.client.models.GetClientsClientIdResponse;
import org.apache.fineract.client.models.GetObligeeData;
import org.apache.fineract.client.models.PostClientsClientIdResponse;
import org.apache.fineract.client.models.PostClientsResponse;
import org.apache.fineract.client.models.PutClientsClientIdRequest;
import org.apache.fineract.client.models.PutClientsClientIdResponse;
import org.apache.fineract.infrastructure.configuration.api.GlobalConfigurationConstants;
import org.apache.fineract.integrationtests.common.ClientHelper;
Expand Down Expand Up @@ -66,10 +66,9 @@ public void setup() {
public void whenAutoExternalIdConfigIsOffCreateClient() {
// given
globalConfigurationHelper.manageConfigurations(GlobalConfigurationConstants.ENABLE_AUTO_GENERATED_EXTERNAL_ID, false);
final String jsonPayload = ClientHelper.getBasicClientAsJSON(ClientHelper.DEFAULT_OFFICE_ID, ClientHelper.LEGALFORM_ID_PERSON,
null);
// when
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(requestSpec, responseSpec, jsonPayload);
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(ClientHelper.DEFAULT_OFFICE_ID,
ClientHelper.LEGALFORM_ID_PERSON, null);
// then
assertNotNull(clientResponse);
assertNull(clientResponse.getResourceExternalId());
Expand All @@ -79,10 +78,9 @@ public void whenAutoExternalIdConfigIsOffCreateClient() {
public void whenAutoExternalIdConfigIsOffCreateClientWithValue() {
// given
final String externalId = UUID.randomUUID().toString();
final String jsonPayload = ClientHelper.getBasicClientAsJSON(ClientHelper.DEFAULT_OFFICE_ID, ClientHelper.LEGALFORM_ID_PERSON,
externalId);
// when
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(requestSpec, responseSpec, jsonPayload);
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(ClientHelper.DEFAULT_OFFICE_ID,
ClientHelper.LEGALFORM_ID_PERSON, externalId);
// then
assertNotNull(clientResponse);
assertNotNull(clientResponse.getResourceExternalId());
Expand All @@ -95,10 +93,9 @@ public void whenAutoExternalIdConfigIsOffCreateClientWithValue() {
public void whenAutoExternalIdConfigIsOnCreateClient() {
// given
globalConfigurationHelper.manageConfigurations(GlobalConfigurationConstants.ENABLE_AUTO_GENERATED_EXTERNAL_ID, true);
final String jsonPayload = ClientHelper.getBasicClientAsJSON(ClientHelper.DEFAULT_OFFICE_ID, ClientHelper.LEGALFORM_ID_PERSON,
null);
// when
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(requestSpec, responseSpec, jsonPayload);
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(ClientHelper.DEFAULT_OFFICE_ID,
ClientHelper.LEGALFORM_ID_PERSON, null);
// then
assertNotNull(clientResponse);
assertNotNull(clientResponse.getResourceExternalId());
Expand All @@ -114,10 +111,9 @@ public void whenAutoExternalIdConfigIsOnCreateClientWithValue() {
// given
globalConfigurationHelper.manageConfigurations(GlobalConfigurationConstants.ENABLE_AUTO_GENERATED_EXTERNAL_ID, true);
final String externalId = UUID.randomUUID().toString();
final String jsonPayload = ClientHelper.getBasicClientAsJSON(ClientHelper.DEFAULT_OFFICE_ID, ClientHelper.LEGALFORM_ID_PERSON,
externalId);
// when
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(requestSpec, responseSpec, jsonPayload);
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(ClientHelper.DEFAULT_OFFICE_ID,
ClientHelper.LEGALFORM_ID_PERSON, externalId);
// then
assertNotNull(clientResponse);
assertNotNull(clientResponse.getResourceExternalId());
Expand All @@ -132,19 +128,19 @@ public void whenAutoExternalIdConfigIsOnCreateClientWithValue() {
public void testClientStatusUsingExternalId() {
ClientHelper clientHelper = new ClientHelper(requestSpec, responseSpec);
globalConfigurationHelper.manageConfigurations(GlobalConfigurationConstants.ENABLE_AUTO_GENERATED_EXTERNAL_ID, true);
String jsonPayload = ClientHelper.getBasicClientAsJSON(ClientHelper.DEFAULT_OFFICE_ID, ClientHelper.LEGALFORM_ID_PERSON, null);
final PostClientsResponse addClientResponse = ClientHelper.addClientAsPerson(requestSpec, responseSpec, jsonPayload);
final PostClientsResponse addClientResponse = ClientHelper.addClientAsPerson(ClientHelper.DEFAULT_OFFICE_ID,
ClientHelper.LEGALFORM_ID_PERSON, null);
final String clientExternalId = addClientResponse.getResourceExternalId();
final Long clientId = addClientResponse.getClientId();
assertNotNull(clientExternalId);
log.info("Client data id {} and external Id {}", clientId, clientExternalId);

GetClientsClientIdResponse clientResponse = ClientHelper.getClientByExternalId(requestSpec, responseSpec, clientExternalId);
GetClientsClientIdResponse clientResponse = ClientHelper.getClientByExternalId(clientExternalId);
ClientStatusChecker.verifyClientStatus(ClientStatus.ACTIVE, clientResponse);
log.info("Client data id {} and status {}", clientExternalId, clientResponse.getStatus().getCode());

// Close Client action
jsonPayload = clientHelper.getCloseClientAsJSON();
String jsonPayload = clientHelper.getCloseClientAsJSON();
PostClientsClientIdResponse commandResponse = ClientHelper.performClientActionUsingExternalId(requestSpec, responseSpec,
clientExternalId, ClientHelper.CLOSE_CLIENT_COMMAND, jsonPayload);
assertNotNull(commandResponse);
Expand All @@ -153,7 +149,7 @@ public void testClientStatusUsingExternalId() {
log.info("Client data id {} and external Id {}", commandResponse.getResourceId(), clientExternalId);
assertEquals(clientId.intValue(), commandResponse.getResourceId());

clientResponse = ClientHelper.getClientByExternalId(requestSpec, responseSpec, clientExternalId);
clientResponse = ClientHelper.getClientByExternalId(clientExternalId);
ClientStatusChecker.verifyClientStatus(ClientStatus.CLOSED, clientResponse);
log.info("Client data id {} and status {}", clientExternalId, clientResponse.getStatus().getCode());

Expand All @@ -167,7 +163,7 @@ public void testClientStatusUsingExternalId() {
log.info("Client data id {} and external Id {}", commandResponse.getResourceId(), clientExternalId);
assertEquals(clientId.intValue(), commandResponse.getResourceId());

clientResponse = ClientHelper.getClientByExternalId(requestSpec, responseSpec, clientExternalId);
clientResponse = ClientHelper.getClientByExternalId(clientExternalId);
ClientStatusChecker.verifyClientStatus(ClientStatus.PENDING, clientResponse);
log.info("Client data id {} and status {}", clientExternalId, clientResponse.getStatus().getCode());

Expand All @@ -181,7 +177,7 @@ public void testClientStatusUsingExternalId() {
log.info("Client data id {} and external Id {}", commandResponse.getResourceId(), clientExternalId);
assertEquals(clientId.intValue(), commandResponse.getResourceId());

clientResponse = ClientHelper.getClientByExternalId(requestSpec, responseSpec, clientExternalId);
clientResponse = ClientHelper.getClientByExternalId(clientExternalId);
ClientStatusChecker.verifyClientStatus(ClientStatus.REJECTED, clientResponse);
log.info("Client data id {} and status {}", clientExternalId, clientResponse.getStatus().getCode());

Expand All @@ -195,7 +191,7 @@ public void testClientStatusUsingExternalId() {
log.info("Client data id {} and external Id {}", commandResponse.getResourceId(), clientExternalId);
assertEquals(clientId.intValue(), commandResponse.getResourceId());

clientResponse = ClientHelper.getClientByExternalId(requestSpec, responseSpec, clientExternalId);
clientResponse = ClientHelper.getClientByExternalId(clientExternalId);
ClientStatusChecker.verifyClientStatus(ClientStatus.ACTIVE, clientResponse);
log.info("Client data id {} and status {}", clientExternalId, clientResponse.getStatus().getCode());

Expand All @@ -206,13 +202,12 @@ public void testClientStatusUsingExternalId() {
public void testUpdateClientUsingExternalId() {
// given
globalConfigurationHelper.manageConfigurations(GlobalConfigurationConstants.ENABLE_AUTO_GENERATED_EXTERNAL_ID, true);
String jsonPayload = ClientHelper.getBasicClientAsJSON(ClientHelper.DEFAULT_OFFICE_ID, ClientHelper.LEGALFORM_ID_PERSON, null);
// when
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(requestSpec, responseSpec, jsonPayload);
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(ClientHelper.DEFAULT_OFFICE_ID,
ClientHelper.LEGALFORM_ID_PERSON, null);
final String clientExternalId = clientResponse.getResourceExternalId();
jsonPayload = ClientHelper.getBasicClientAsJSON(null, ClientHelper.LEGALFORM_ID_PERSON, clientExternalId);
final PutClientsClientIdResponse clientUpdateResponse = ClientHelper.updateClient(requestSpec, responseSpec, clientExternalId,
jsonPayload);
PutClientsClientIdRequest updateRequest = new PutClientsClientIdRequest().externalId(clientExternalId);
final PutClientsClientIdResponse clientUpdateResponse = ClientHelper.updateClientByExternalId(clientExternalId, updateRequest);
// then
assertNotNull(clientUpdateResponse);
assertNotNull(clientUpdateResponse.getResourceExternalId());
Expand All @@ -226,19 +221,19 @@ public void testDeleteClientUsingExternalId() {
// given
ClientHelper clientHelper = new ClientHelper(requestSpec, responseSpec);
globalConfigurationHelper.manageConfigurations(GlobalConfigurationConstants.ENABLE_AUTO_GENERATED_EXTERNAL_ID, true);
String jsonPayload = ClientHelper.getBasicClientAsJSON(ClientHelper.DEFAULT_OFFICE_ID, ClientHelper.LEGALFORM_ID_PERSON, null);
// when
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(requestSpec, responseSpec, jsonPayload);
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(ClientHelper.DEFAULT_OFFICE_ID,
ClientHelper.LEGALFORM_ID_PERSON, null);
final String clientExternalId = clientResponse.getResourceExternalId();
jsonPayload = clientHelper.getCloseClientAsJSON();
PostClientsClientIdResponse commandResponse = ClientHelper.performClientActionUsingExternalId(requestSpec, responseSpec,
clientExternalId, ClientHelper.CLOSE_CLIENT_COMMAND, jsonPayload);
String jsonPayload = clientHelper.getCloseClientAsJSON();
ClientHelper.performClientActionUsingExternalId(requestSpec, responseSpec, clientExternalId, ClientHelper.CLOSE_CLIENT_COMMAND,
jsonPayload);
jsonPayload = clientHelper.getReactivateClientAsJSON();
commandResponse = ClientHelper.performClientActionUsingExternalId(requestSpec, responseSpec, clientExternalId,
ClientHelper.REACTIVATE_CLIENT_COMMAND, jsonPayload);
ClientHelper.performClientActionUsingExternalId(requestSpec, responseSpec, clientExternalId, ClientHelper.REACTIVATE_CLIENT_COMMAND,
jsonPayload);

// then
final DeleteClientsClientIdResponse clientDeleteResponse = ClientHelper.deleteClient(requestSpec, responseSpec, clientExternalId);
final DeleteClientsClientIdResponse clientDeleteResponse = ClientHelper.deleteClientByExternalId(clientExternalId);
assertNotNull(clientDeleteResponse);
assertNotNull(clientDeleteResponse.getResourceExternalId());
assertEquals(clientExternalId, clientDeleteResponse.getResourceExternalId());
Expand All @@ -250,14 +245,12 @@ public void testDeleteClientUsingExternalId() {
public void testGetClientAccountsUsingExternalId() {
// given
globalConfigurationHelper.manageConfigurations(GlobalConfigurationConstants.ENABLE_AUTO_GENERATED_EXTERNAL_ID, true);
final String jsonPayload = ClientHelper.getBasicClientAsJSON(ClientHelper.DEFAULT_OFFICE_ID, ClientHelper.LEGALFORM_ID_PERSON,
null);
// when
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(requestSpec, responseSpec, jsonPayload);
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(ClientHelper.DEFAULT_OFFICE_ID,
ClientHelper.LEGALFORM_ID_PERSON, null);
final String clientExternalId = clientResponse.getResourceExternalId();

GetClientsClientIdAccountsResponse clientAccountsResponse = ClientHelper.getClientAccounts(requestSpec, responseSpec,
clientExternalId);
GetClientsClientIdAccountsResponse clientAccountsResponse = ClientHelper.getClientAccounts(clientExternalId);

// then
assertNotNull(clientAccountsResponse);
Expand All @@ -269,15 +262,12 @@ public void testGetClientAccountsUsingExternalId() {
public void testGetClientTransferProposalDate() {
// given
globalConfigurationHelper.manageConfigurations(GlobalConfigurationConstants.ENABLE_AUTO_GENERATED_EXTERNAL_ID, true);
final String jsonPayload = ClientHelper.getBasicClientAsJSON(ClientHelper.DEFAULT_OFFICE_ID, ClientHelper.LEGALFORM_ID_PERSON,
null);
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(requestSpec, responseSpec, jsonPayload);
ResponseSpecification response204Spec = new ResponseSpecBuilder().expectStatusCode(204).build();
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(ClientHelper.DEFAULT_OFFICE_ID,
ClientHelper.LEGALFORM_ID_PERSON, null);

// when
final String clientExternalId = clientResponse.getResourceExternalId();
final GetClientTransferProposalDateResponse transferProposalDateResponse = ClientHelper.getProposedTransferDate(requestSpec,
response204Spec, clientExternalId);
ClientHelper.getProposedTransferDate(clientExternalId);

fetchClientByExternalId(clientResponse.getResourceExternalId());

Expand All @@ -288,12 +278,11 @@ public void testGetClientTransferProposalDate() {
public void testGetClientObligeeData() {
// given
globalConfigurationHelper.manageConfigurations(GlobalConfigurationConstants.ENABLE_AUTO_GENERATED_EXTERNAL_ID, true);
final String jsonPayload = ClientHelper.getBasicClientAsJSON(ClientHelper.DEFAULT_OFFICE_ID, ClientHelper.LEGALFORM_ID_PERSON,
null);
// when
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(requestSpec, responseSpec, jsonPayload);
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(ClientHelper.DEFAULT_OFFICE_ID,
ClientHelper.LEGALFORM_ID_PERSON, null);
final String clientExternalId = clientResponse.getResourceExternalId();
final List<GetObligeeData> obligeeDataResponse = ClientHelper.getObligeeData(requestSpec, responseSpec, clientExternalId);
final List<GetObligeeData> obligeeDataResponse = ClientHelper.getObligeeData(clientExternalId);

// then
assertNotNull(obligeeDataResponse);
Expand All @@ -304,7 +293,7 @@ public void testGetClientObligeeData() {
}

private void fetchClientByExternalId(final String externalId) {
GetClientsClientIdResponse clientResponse = ClientHelper.getClientByExternalId(requestSpec, responseSpec, externalId);
GetClientsClientIdResponse clientResponse = ClientHelper.getClientByExternalId(externalId);
assertNotNull(clientResponse);
assertEquals(externalId, clientResponse.getExternalId());
}
Expand Down
8 changes: 3 additions & 5 deletions ...test/java/org/apache/fineract/integrationtests/LoanAccountsContainsCurrencyFieldTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,9 @@ public void testGetClientLoanAccountsUsingExternalIdContainsCurrency() {

// given
globalConfigurationHelper.manageConfigurations(GlobalConfigurationConstants.ENABLE_AUTO_GENERATED_EXTERNAL_ID, true);
final String jsonPayload = ClientHelper.getBasicClientAsJSON(ClientHelper.DEFAULT_OFFICE_ID, ClientHelper.LEGALFORM_ID_PERSON,
null);
// when
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(requestSpec, responseSpec, jsonPayload);
final PostClientsResponse clientResponse = ClientHelper.addClientAsPerson(ClientHelper.DEFAULT_OFFICE_ID,
ClientHelper.LEGALFORM_ID_PERSON, null);
final String clientExternalId = clientResponse.getResourceExternalId();
final long clientId = clientResponse.getClientId();

Expand All @@ -81,8 +80,7 @@ public void testGetClientLoanAccountsUsingExternalIdContainsCurrency() {
final Integer loanId = createLoanAccount(loanTransactionHelper, String.valueOf(clientId), String.valueOf(loanProductId),
formattedDate);

GetClientsClientIdAccountsResponse clientAccountsResponse = ClientHelper.getClientAccounts(requestSpec, responseSpec,
clientExternalId);
GetClientsClientIdAccountsResponse clientAccountsResponse = ClientHelper.getClientAccounts(clientExternalId);

if (clientAccountsResponse.getLoanAccounts() == null) {
// Handle the case where getClientAccounts returned null
Expand Down
Loading