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

FINERACT-2181: modified id and id related fields in api objects to long datatype

Browse Source
This commit is contained in:
mark.vituska
2025-04-10 11:01:25 +02:00
committed by Adam Saghy
parent 3260f76ca7
commit 09879800e0
31 changed files with 271 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyBucketsIntegrationTest.java
+69 -64
View File
@@ -136,11 +136,11 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
// when
final PutDelinquencyRangeResponse delinquencyRangeResponse02 = DelinquencyRangesHelper.updateDelinquencyRange(requestSpec,
responseSpec, delinquencyRangeResponse01.getResourceId(), jsonRange);
responseSpec, Math.toIntExact(delinquencyRangeResponse01.getResourceId()), jsonRange);
final DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
delinquencyRangeResponse01.getResourceId());
Math.toIntExact(delinquencyRangeResponse01.getResourceId()));
final DeleteDelinquencyRangeResponse deleteDelinquencyRangeResponse = DelinquencyRangesHelper.deleteDelinquencyRange(requestSpec,
responseSpec, delinquencyRangeResponse01.getResourceId());
responseSpec, Math.toIntExact(delinquencyRangeResponse01.getResourceId()));
// then
assertNotNull(delinquencyRangeResponse02);
@@ -158,25 +158,25 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(1, 3);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec,
jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
jsonRange = DelinquencyRangesHelper.getAsJSON(4, 30);
// Create
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds);
PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec,
responseSpec, jsonBucket);
// Update
jsonRange = DelinquencyRangesHelper.getAsJSON(31, 60);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds);
PutDelinquencyBucketResponse updateDelinquencyBucketResponse = DelinquencyBucketsHelper.updateDelinquencyBucket(requestSpec,
responseSpec, delinquencyBucketResponse.getResourceId(), jsonBucket);
responseSpec, Math.toIntExact(Math.toIntExact(delinquencyBucketResponse.getResourceId())), jsonBucket);
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
// Read
final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
delinquencyBucketResponse.getResourceId());
Math.toIntExact(Math.toIntExact(delinquencyBucketResponse.getResourceId())));
// when
final ArrayList<DelinquencyBucketData> bucketList = DelinquencyBucketsHelper.getDelinquencyBuckets(requestSpec, responseSpec);
@@ -196,17 +196,17 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(1, 3);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec,
jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
jsonRange = DelinquencyRangesHelper.getAsJSON(4, 30);
// Create
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds);
PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec,
responseSpec, jsonBucket);
// Delete
DeleteDelinquencyBucketResponse deleteDelinquencyBucketResponse = DelinquencyBucketsHelper.deleteDelinquencyBucket(requestSpec,
responseSpec, delinquencyBucketResponse.getResourceId());
responseSpec, Math.toIntExact(Math.toIntExact(delinquencyBucketResponse.getResourceId())));
// when
final ArrayList<DelinquencyBucketData> bucketList = DelinquencyBucketsHelper.getDelinquencyBuckets(requestSpec, responseSpec);
@@ -224,11 +224,11 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(1, 3);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec,
jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
jsonRange = DelinquencyRangesHelper.getAsJSON(3, 30);
// Create
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds);
final ResponseSpecification response403Spec = new ResponseSpecBuilder().expectStatusCode(403).build();
@@ -243,11 +243,11 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(1, 3);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec,
jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
jsonRange = DelinquencyRangesHelper.getAsJSON(4, 30);
// Create
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds);
final ResponseSpecification response403Spec = new ResponseSpecBuilder().expectStatusCode(403).build();
@@ -268,17 +268,18 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(1, 3);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec,
jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60);
DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
delinquencyRangeResponse.getResourceId());
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
// Second Range
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId());
range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final String classificationExpected = range.getClassification();
log.info("Expected Delinquency Range classification after Disbursement {}", classificationExpected);
@@ -287,7 +288,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
responseSpec, jsonBucket);
assertNotNull(delinquencyBucketResponse);
final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
delinquencyBucketResponse.getResourceId());
Math.toIntExact(Math.toIntExact(delinquencyBucketResponse.getResourceId())));
// Loan product creation without Delinquency bucket
GetLoanProductsProductIdResponse getLoanProductResponse = createLoanProduct(loanTransactionHelper, null, null);
@@ -327,17 +328,18 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(1, 3);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec,
responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60);
DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
delinquencyRangeResponse.getResourceId());
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
// Second Range
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId());
range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final String classificationExpected = range.getClassification();
log.info("Expected Delinquency Range classification after Disbursement {}", classificationExpected);
@@ -346,7 +348,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
responseSpec, jsonBucket);
assertNotNull(delinquencyBucketResponse);
final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
delinquencyBucketResponse.getResourceId());
Math.toIntExact(Math.toIntExact(delinquencyBucketResponse.getResourceId())));
// Client and Loan account creation
final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
@@ -425,17 +427,18 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(1, 3);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec,
responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60);
DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
delinquencyRangeResponse.getResourceId());
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
// Second Range
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId());
range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final String classificationExpected = range.getClassification();
log.info("Expected Delinquency Range classification after Disbursement {}", classificationExpected);
@@ -444,7 +447,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
responseSpec, jsonBucket);
assertNotNull(delinquencyBucketResponse);
final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
delinquencyBucketResponse.getResourceId());
Math.toIntExact(Math.toIntExact(delinquencyBucketResponse.getResourceId())));
// Client and Loan account creation
final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
@@ -515,34 +518,36 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(4, 30);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec,
jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
delinquencyRangeResponse.getResourceId());
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final String classificationExpected02 = range.getClassification();
log.info("Expected Delinquency Range classification after first repayment {}", classificationExpected02);
// Second Range
jsonRange = DelinquencyRangesHelper.getAsJSON(31, 60);
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId());
range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final String classificationExpected01 = range.getClassification();
log.info("Expected Delinquency Range classification after Disbursement {}", classificationExpected01);
// Third Range
jsonRange = DelinquencyRangesHelper.getAsJSON(61, 90);
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId());
range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds);
PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec,
responseSpec, jsonBucket);
assertNotNull(delinquencyBucketResponse);
final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
delinquencyBucketResponse.getResourceId());
Math.toIntExact(delinquencyBucketResponse.getResourceId()));
// Client and Loan account creation
final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
@@ -624,9 +629,9 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(4, 30);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec,
jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
delinquencyRangeResponse.getResourceId());
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final String classificationExpected = range.getClassification();
log.info("Expected Delinquency Range classification after first repayment {}", classificationExpected);
@@ -635,7 +640,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
responseSpec, jsonBucket);
assertNotNull(delinquencyBucketResponse);
final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
delinquencyBucketResponse.getResourceId());
Math.toIntExact(delinquencyBucketResponse.getResourceId()));
// Client and Loan account creation
final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
@@ -729,14 +734,14 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(1, 3);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec,
responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60);
// Create
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
delinquencyRangeResponse.getResourceId());
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final String classificationExpected = range.getClassification();
log.info("Expected Delinquency Range classification {}", classificationExpected);
@@ -744,7 +749,7 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec,
responseSpec, jsonBucket);
final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
delinquencyBucketResponse.getResourceId());
Math.toIntExact(delinquencyBucketResponse.getResourceId()));
// Client and Loan account creation
final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
@@ -821,21 +826,21 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(1, 3);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec,
responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
delinquencyRangeResponse.getResourceId());
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final String classificationExpected = range.getClassification();
log.info("Expected Delinquency Range classification {}", classificationExpected);
jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60);
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds);
PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec,
responseSpec, jsonBucket);
final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
delinquencyBucketResponse.getResourceId());
Math.toIntExact(delinquencyBucketResponse.getResourceId()));
// Client and Loan account creation
final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
@@ -925,21 +930,21 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(1, 3);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec,
responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
delinquencyRangeResponse.getResourceId());
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final String classificationExpected = range.getClassification();
log.info("Expected Delinquency Range classification {}", classificationExpected);
jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60);
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds);
PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec,
responseSpec, jsonBucket);
final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
delinquencyBucketResponse.getResourceId());
Math.toIntExact(delinquencyBucketResponse.getResourceId()));
// Client and Loan account creation
final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
@@ -1006,21 +1011,21 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(1, 3);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec,
responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
delinquencyRangeResponse.getResourceId());
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final String classificationExpected = range.getClassification();
log.info("Expected Delinquency Range classification {}", classificationExpected);
jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60);
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds);
PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec,
responseSpec, jsonBucket);
final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
delinquencyBucketResponse.getResourceId());
Math.toIntExact(delinquencyBucketResponse.getResourceId()));
// Client and Loan account creation
final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
@@ -1361,14 +1366,14 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(4, 30);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec,
jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds);
PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec,
responseSpec, jsonBucket);
assertNotNull(delinquencyBucketResponse);
final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
delinquencyBucketResponse.getResourceId());
Math.toIntExact(delinquencyBucketResponse.getResourceId()));
// Client and Loan account creation
final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, "01 January 2012");
@@ -1422,14 +1427,14 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(4, 30);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec,
responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds);
PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec,
responseSpec, jsonBucket);
assertNotNull(delinquencyBucketResponse);
final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
delinquencyBucketResponse.getResourceId());
Math.toIntExact(delinquencyBucketResponse.getResourceId()));
// Client creation
final Integer clientId = ClientHelper.createClient(this.requestSpec, this.responseSpec, operationDate);
@@ -1472,16 +1477,16 @@ public class DelinquencyBucketsIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(4, 30);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec,
jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
delinquencyRangeResponse.getResourceId());
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds);
PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec,
responseSpec, jsonBucket);
assertNotNull(delinquencyBucketResponse);
final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
delinquencyBucketResponse.getResourceId());
Math.toIntExact(delinquencyBucketResponse.getResourceId()));
// Client and Loan account creation
final Long clientId = clientHelper.createClient(ClientHelper.defaultClientCreationRequest()).getClientId();
integration-tests/src/test/java/org/apache/fineract/integrationtests/ExternalIdSupportIntegrationTest.java
+5 -5
View File
@@ -840,15 +840,15 @@ public class ExternalIdSupportIntegrationTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(1, 3);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec,
responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60);
DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
delinquencyRangeResponse.getResourceId());
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
// Second Range
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds);
PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec,
@@ -859,7 +859,7 @@ public class ExternalIdSupportIntegrationTest extends BaseLoanIntegrationTest {
.withInterestRateFrequencyTypeAsMonths().withAmortizationTypeAsEqualPrincipalPayment()
.withInterestTypeAsDecliningBalance().withAccountingRuleAsNone()
.withInterestCalculationPeriodTypeAsRepaymentPeriod(true).withDaysInMonth("30").withDaysInYear("365")
.withMoratorium("0", "0").withDelinquencyBucket(delinquencyBucketResponse.getResourceId())
.withMoratorium("0", "0").withDelinquencyBucket(Math.toIntExact(delinquencyBucketResponse.getResourceId()))
.withInArrearsTolerance("1001").withMultiDisburse().withDisallowExpectedDisbursements(true).build(null);
final Integer loanProductID = this.loanTransactionHelper.getLoanProductId(loanProductJSON);
@@ -1006,7 +1006,7 @@ public class ExternalIdSupportIntegrationTest extends BaseLoanIntegrationTest {
String loanExternalIdStr10 = UUID.randomUUID().toString();
applyForLoanApplication(client.getClientId().intValue(), loanProductID, loanExternalIdStr10);
result = this.loanTransactionHelper.assignLoanOfficerLoan(loanExternalIdStr10, new PostLoansLoanIdRequest()
.assignmentDate("2 September 2022").locale("en").dateFormat("dd MMMM yyyy").toLoanOfficerId(loanOfficerId));
.assignmentDate("2 September 2022").locale("en").dateFormat("dd MMMM yyyy").toLoanOfficerId(loanOfficerId.longValue()));
assertEquals(loanExternalIdStr10, result.getResourceExternalId());
result = this.loanTransactionHelper.unassignLoanOfficerLoan(loanExternalIdStr10,
new PostLoansLoanIdRequest().unassignedDate("2 September 2022").locale("en").dateFormat("dd MMMM yyyy"));
integration-tests/src/test/java/org/apache/fineract/integrationtests/NotesTest.java
+2 -1
View File
@@ -222,7 +222,8 @@ public class NotesTest {
Assertions.assertNotNull(postNoteResponse);
Assertions.assertNotNull(postNoteResponse.getResourceId());
NoteData getNoteResponse = NotesHelper.retrieveSavingsNote(requestSpec, responseSpec, savingsId, postNoteResponse.getResourceId());
NoteData getNoteResponse = NotesHelper.retrieveSavingsNote(requestSpec, responseSpec, savingsId,
Math.toIntExact(postNoteResponse.getResourceId()));
Assertions.assertNotNull(getNoteResponse);
Assertions.assertEquals(noteText, getNoteResponse.getNote());
}
integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsAccountsExternalIdTest.java
+2 -2
View File
@@ -51,8 +51,8 @@ public class SavingsAccountsExternalIdTest extends IntegrationTest {
void submitSavingsAccountsApplication() {
LOG.info("------------------------------ CREATING NEW SAVINGS ACCOUNT APPLICATION ---------------------------------------");
PostSavingsAccountsRequest request = new PostSavingsAccountsRequest();
request.setClientId(1);
request.setProductId(1);
request.setClientId(1L);
request.setProductId(1L);
request.setLocale(locale);
request.setDateFormat(dateFormat);
request.submittedOnDate(formattedDate);
integration-tests/src/test/java/org/apache/fineract/integrationtests/SavingsAccountsTest.java
+3 -3
View File
@@ -51,8 +51,8 @@ public class SavingsAccountsTest extends IntegrationTest {
void submitSavingsAccountsApplication() {
LOG.info("------------------------------ CREATING NEW SAVINGS ACCOUNT APPLICATION ---------------------------------------");
PostSavingsAccountsRequest request = new PostSavingsAccountsRequest();
request.setClientId(1);
request.setProductId(1);
request.setClientId(1L);
request.setProductId(1L);
request.setLocale(locale);
request.setDateFormat(dateFormat);
request.submittedOnDate(formattedDate);
@@ -61,7 +61,7 @@ public class SavingsAccountsTest extends IntegrationTest {
assertThat(response.isSuccessful()).isTrue();
assertThat(response.body()).isNotNull();
savingId = response.body().getSavingsId();
savingId = Math.toIntExact(response.body().getSavingsId());
}
@Test
integration-tests/src/test/java/org/apache/fineract/integrationtests/common/products/DelinquencyBucketsHelper.java
+8 -7
View File
@@ -131,7 +131,7 @@ public class DelinquencyBucketsHelper {
PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec,
responseSpec, jsonBucket);
assertNotNull(delinquencyBucketResponse);
return delinquencyBucketResponse.getResourceId();
return Math.toIntExact(delinquencyBucketResponse.getResourceId());
}
// TODO: Rewrite to use fineract-client instead!
@@ -143,7 +143,7 @@ public class DelinquencyBucketsHelper {
String jsonRange = DelinquencyRangesHelper.getAsJSON(range.getLeft(), range.getRight());
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec,
jsonRange);
return delinquencyRangeResponse.getResourceId();
return Math.toIntExact(delinquencyRangeResponse.getResourceId());
}
// TODO: Rewrite to use fineract-client instead!
@@ -157,22 +157,23 @@ public class DelinquencyBucketsHelper {
String jsonRange = DelinquencyRangesHelper.getAsJSON(1, 3);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec,
jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60);
DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
delinquencyRangeResponse.getResourceId());
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
// Second Range
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
String jsonBucket = DelinquencyBucketsHelper.getAsJSON(rangeIds);
PostDelinquencyBucketResponse delinquencyBucketResponse = DelinquencyBucketsHelper.createDelinquencyBucket(requestSpec,
responseSpec, jsonBucket);
assertNotNull(delinquencyBucketResponse);
return delinquencyBucketResponse.getResourceId();
return Math.toIntExact(delinquencyBucketResponse.getResourceId());
}
public static void evaluateLoanCollectionData(GetLoansLoanIdResponse getLoansLoanIdResponse, Integer pastDueDays,
integration-tests/src/test/java/org/apache/fineract/integrationtests/inlinecob/InlineLoanCOBTest.java
+6 -5
View File
@@ -167,17 +167,18 @@ public class InlineLoanCOBTest extends BaseLoanIntegrationTest {
String jsonRange = DelinquencyRangesHelper.getAsJSON(1, 3);
PostDelinquencyRangeResponse delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec,
responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
jsonRange = DelinquencyRangesHelper.getAsJSON(4, 60);
DelinquencyRangeData range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
delinquencyRangeResponse.getResourceId());
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
// Second Range
delinquencyRangeResponse = DelinquencyRangesHelper.createDelinquencyRange(requestSpec, responseSpec, jsonRange);
rangeIds.add(delinquencyRangeResponse.getResourceId());
rangeIds.add(Math.toIntExact(delinquencyRangeResponse.getResourceId()));
range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec, delinquencyRangeResponse.getResourceId());
range = DelinquencyRangesHelper.getDelinquencyRange(requestSpec, responseSpec,
Math.toIntExact(delinquencyRangeResponse.getResourceId()));
final String classificationExpected = range.getClassification();
log.info("Expected Delinquency Range classification after Disbursement {}", classificationExpected);
@@ -186,7 +187,7 @@ public class InlineLoanCOBTest extends BaseLoanIntegrationTest {
responseSpec, jsonBucket);
assertNotNull(delinquencyBucketResponse);
final DelinquencyBucketData delinquencyBucket = DelinquencyBucketsHelper.getDelinquencyBucket(requestSpec, responseSpec,
delinquencyBucketResponse.getResourceId());
Math.toIntExact(delinquencyBucketResponse.getResourceId()));
final Integer loanProductID = createLoanProduct(loanTransactionHelper, Math.toIntExact(delinquencyBucket.getId()));