FINERACT-2169: Business date api refactor;
This commit is contained in:
committed by
Adam Saghy
parent
99f313e02c
commit
35aa6e1f4f
+2
-2
@@ -41,7 +41,7 @@ import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
import org.apache.fineract.client.models.BusinessDateResponse;
|
||||
import org.apache.fineract.client.models.BusinessDateData;
|
||||
import org.apache.fineract.client.models.DeleteDelinquencyBucketResponse;
|
||||
import org.apache.fineract.client.models.DeleteDelinquencyRangeResponse;
|
||||
import org.apache.fineract.client.models.GetDelinquencyBucketsResponse;
|
||||
@@ -321,7 +321,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
|
||||
final LocalDate bussinesLocalDate = Utils.getDateAsLocalDate("01 March 2012");
|
||||
log.info("Current date {}", bussinesLocalDate);
|
||||
BusinessDateHelper.updateBusinessDate(requestSpec, responseSpec, BusinessDateType.BUSINESS_DATE, bussinesLocalDate);
|
||||
final BusinessDateResponse businessDateResponse = this.businessDateHelper.getBusinessDateByType(requestSpec, responseSpec,
|
||||
final BusinessDateData businessDateResponse = this.businessDateHelper.getBusinessDateByType(requestSpec, responseSpec,
|
||||
BusinessDateType.BUSINESS_DATE);
|
||||
|
||||
ArrayList<Integer> rangeIds = new ArrayList<>();
|
||||
|
||||
+5
-4
@@ -25,6 +25,7 @@ import java.time.LocalDate;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.fineract.client.models.BusinessDateData;
|
||||
import org.apache.fineract.client.models.BusinessDateRequest;
|
||||
import org.apache.fineract.client.models.BusinessDateResponse;
|
||||
import org.apache.fineract.client.util.Calls;
|
||||
@@ -60,19 +61,19 @@ public final class BusinessDateHelper {
|
||||
// Example: org.apache.fineract.integrationtests.common.loans.LoanTransactionHelper.disburseLoan(java.lang.Long,
|
||||
// org.apache.fineract.client.models.PostLoansLoanIdRequest)
|
||||
@Deprecated(forRemoval = true)
|
||||
public BusinessDateResponse getBusinessDateByType(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
|
||||
public BusinessDateData getBusinessDateByType(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
|
||||
final BusinessDateType type) {
|
||||
final String BUSINESS_DATE_API = "/fineract-provider/api/v1/businessdate/" + type.name() + "?" + Utils.TENANT_IDENTIFIER;
|
||||
final String response = Utils.performServerGet(requestSpec, responseSpec, BUSINESS_DATE_API);
|
||||
log.info("{}", response);
|
||||
return GSON.fromJson(response, BusinessDateResponse.class);
|
||||
return GSON.fromJson(response, BusinessDateData.class);
|
||||
}
|
||||
|
||||
public BusinessDateResponse getBusinessDate(final String type) {
|
||||
public BusinessDateData getBusinessDate(final String type) {
|
||||
return Calls.ok(FineractClientHelper.getFineractClient().businessDateManagement.getBusinessDate(type));
|
||||
}
|
||||
|
||||
public List<BusinessDateResponse> getBusinessDates() {
|
||||
public List<BusinessDateData> getBusinessDates() {
|
||||
return Calls.ok(FineractClientHelper.getFineractClient().businessDateManagement.getBusinessDates());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user