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

FINERACT-1926: Fineract Asset Externalization - GET Pagination

Browse Source 
- [x] Added Pagination to response
- [x] Added limit and offset to the request
This commit is contained in:
Janos Haber
2023-05-31 17:15:59 +02:00
committed by Adam Saghy
parent d76e6aef3d
commit f43e13a0ee
8 changed files with 72 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/src/test/java/org/apache/fineract/integrationtests/investor/externalassetowner/ExternalAssetOwnerHelper.java
+7 -4
View File
@@ -20,6 +20,7 @@ package org.apache.fineract.integrationtests.investor.externalassetowner;
import io.restassured.specification.RequestSpecification;
import io.restassured.specification.ResponseSpecification;
import org.apache.fineract.client.models.PageExternalTransferData;
import org.apache.fineract.integrationtests.client.IntegrationTest;
import org.apache.fineract.integrationtests.common.Utils;
@@ -45,9 +46,11 @@ public class ExternalAssetOwnerHelper extends IntegrationTest {
return Utils.performServerGet(requestSpec, responseSpec, RETRIEVE_TRANSFER_URL);
}
public String retrieveTransferByLoanId(Long loanId) {
final String RETRIEVE_TRANSFER_URL = "/fineract-provider/api/v1/external-asset-owners/transfers?" + Utils.TENANT_IDENTIFIER
+ "&loanId=" + loanId;
return Utils.performServerGet(requestSpec, responseSpec, RETRIEVE_TRANSFER_URL);
public PageExternalTransferData retrieveTransferByLoanId(Long loanId) {
return ok(fineract().externalAssetOwners.getTransfer1(null, loanId, null, 0, 100));
}
public PageExternalTransferData retrieveTransferByLoanId(Long loanId, int offset, int limit) {
return ok(fineract().externalAssetOwners.getTransfer1(null, loanId, null, offset, limit));
}
}
integration-tests/src/test/java/org/apache/fineract/integrationtests/investor/externalassetowner/InitiateExternalAssetOwnerTransferTest.java
+22 -16
View File
@@ -35,6 +35,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.fineract.client.models.ExternalTransferData;
import org.apache.fineract.client.models.PageExternalTransferData;
import org.apache.fineract.infrastructure.businessdate.domain.BusinessDateType;
import org.apache.fineract.integrationtests.common.BusinessDateHelper;
import org.apache.fineract.integrationtests.common.ClientHelper;
@@ -113,18 +115,16 @@ public class InitiateExternalAssetOwnerTransferTest {
Map<String, Object> responseMap = new Gson().fromJson(saleResponse, type);
assertEquals(responseMap.get("resourceExternalId"), transferExternalId);
String retrieveResponse = externalAssetOwnerHelper.retrieveTransferByLoanId(loanID.longValue());
Type retrieveType = new TypeToken<List<Map<String, Object>>>() {}.getType();
List<Map<String, Object>> retrieveResponseMap = new Gson().fromJson(retrieveResponse, retrieveType);
assertEquals(1, retrieveResponseMap.size());
assertEquals(retrieveResponseMap.get(0).get("transferExternalId"), transferExternalId);
assertEquals(retrieveResponseMap.get(0).get("status"), "PENDING");
PageExternalTransferData retrieveResponse = externalAssetOwnerHelper.retrieveTransferByLoanId(loanID.longValue());
List<ExternalTransferData> retrieveResponseMap = retrieveResponse.getContent();
assertEquals(1, retrieveResponse.getTotalElements());
assertEquals(retrieveResponseMap.get(0).getTransferExternalId(), transferExternalId);
assertEquals(retrieveResponseMap.get(0).getStatus(), ExternalTransferData.StatusEnum.PENDING);
} finally {
requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
requestSpec.header("Fineract-Platform-TenantId", "default");
responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.BUSINESS_DATE, todaysDate);
GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE);
}
}
@@ -288,20 +288,26 @@ public class InitiateExternalAssetOwnerTransferTest {
Map<String, Object> buybackResponseMap = new Gson().fromJson(buybackResponse, type);
assertEquals(buybackResponseMap.get("resourceExternalId"), buybackTransferExternalId);
String retrieveResponse = externalAssetOwnerHelper.retrieveTransferByLoanId(loanID.longValue());
Type retrieveType = new TypeToken<List<Map<String, Object>>>() {}.getType();
List<Map<String, Object>> retrieveResponseMap = new Gson().fromJson(retrieveResponse, retrieveType);
assertEquals(2, retrieveResponseMap.size());
assertEquals(retrieveResponseMap.get(0).get("transferExternalId"), transferExternalId);
assertEquals(retrieveResponseMap.get(0).get("status"), "PENDING");
assertEquals(retrieveResponseMap.get(1).get("transferExternalId"), buybackTransferExternalId);
assertEquals(retrieveResponseMap.get(1).get("status"), "BUYBACK");
PageExternalTransferData retrieveResponse = externalAssetOwnerHelper.retrieveTransferByLoanId(loanID.longValue(), 0, 1);
List<ExternalTransferData> retrieveResponseMap = retrieveResponse.getContent();
assertEquals(2, retrieveResponse.getTotalElements());
assertEquals(1, retrieveResponse.getNumberOfElements());
assertEquals(retrieveResponseMap.get(0).getTransferExternalId(), transferExternalId);
assertEquals(retrieveResponseMap.get(0).getStatus(), ExternalTransferData.StatusEnum.PENDING);
retrieveResponse = externalAssetOwnerHelper.retrieveTransferByLoanId(loanID.longValue(), 1, 1);
retrieveResponseMap = retrieveResponse.getContent();
assertEquals(2, retrieveResponse.getTotalElements());
assertEquals(1, retrieveResponse.getNumberOfElements());
assertEquals(retrieveResponseMap.get(0).getTransferExternalId(), buybackTransferExternalId);
assertEquals(retrieveResponseMap.get(0).getStatus(), ExternalTransferData.StatusEnum.BUYBACK);
} finally {
requestSpec = new RequestSpecBuilder().setContentType(ContentType.JSON).build();
requestSpec.header("Authorization", "Basic " + Utils.loginIntoServerAndGetBase64EncodedAuthenticationKey());
requestSpec.header("Fineract-Platform-TenantId", "default");
responseSpec = new ResponseSpecBuilder().expectStatusCode(200).build();
BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.BUSINESS_DATE, todaysDate);
GlobalConfigurationHelper.updateIsBusinessDateEnabled(requestSpec, responseSpec, Boolean.FALSE);
}
}