CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 37 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
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/factory/SavingsAccountRequestFactory.java
+3 -3
View File
@@ -28,14 +28,14 @@ public final class SavingsAccountRequestFactory {
public static final String DATE_FORMAT = "dd MMMM yyyy";
public static final String DEFAULT_LOCALE = "en";
public static final String DEFAULT_TRANSACTION_DATE = "";
public static final Integer DEFAULT_CLIENT_ID = 1;
public static final Long DEFAULT_CLIENT_ID = 1L;
public static final String DEFAULT_SUBMITTED_ON_DATE = "";
public static final String DEFAULT_APPROVED_ON_DATE = "";
public static final String DEFAULT_ACTIVATED_ON_DATE = "";
public static final BigDecimal DEFAULT_REPAYMENT_TRANSACTION_AMOUNT = new BigDecimal(1);
public static final Integer DEFAULT_PAYMENT_TYPE_ID = 2;
public static final Integer EUR_SAVING_PRODUCT_ID = 1;
public static final Integer USD_SAVING_PRODUCT_ID = 2;
public static final Long EUR_SAVING_PRODUCT_ID = 1L;
public static final Long USD_SAVING_PRODUCT_ID = 2L;
private SavingsAccountRequestFactory() {}
fineract-e2e-tests-core/src/test/java/org/apache/fineract/test/stepdef/saving/SavingsAccountStepDef.java
+2 -2
View File
@@ -50,7 +50,7 @@ public class SavingsAccountStepDef extends AbstractStepDef {
long clientId = clientResponse.body().getClientId();
PostSavingsAccountsRequest createSavingsAccountRequest = SavingsAccountRequestFactory.defaultEURSavingsAccountRequest()
.clientId((int) clientId).submittedOnDate(submittedOnDate);
.clientId(clientId).submittedOnDate(submittedOnDate);
Response<PostSavingsAccountsResponse> createSavingsAccountResponse = savingsAccountApi
.submitApplication2(createSavingsAccountRequest).execute();
@@ -63,7 +63,7 @@ public class SavingsAccountStepDef extends AbstractStepDef {
long clientId = clientResponse.body().getClientId();
PostSavingsAccountsRequest createSavingsAccountRequest = SavingsAccountRequestFactory.defaultUSDSavingsAccountRequest()
.clientId((int) clientId).submittedOnDate(submittedOnDate);
.clientId(clientId).submittedOnDate(submittedOnDate);
Response<PostSavingsAccountsResponse> createSavingsAccountResponse = savingsAccountApi
.submitApplication2(createSavingsAccountRequest).execute();
fineract-loan/src/main/java/org/apache/fineract/portfolio/delinquency/api/DelinquencyApiResourceSwagger.java
+6 -6
View File
@@ -33,7 +33,7 @@ public final class DelinquencyApiResourceSwagger {
private PostDelinquencyRangeResponse() {}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "PutDelinquencyRangeResponse")
@@ -42,7 +42,7 @@ public final class DelinquencyApiResourceSwagger {
private PutDelinquencyRangeResponse() {}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
public DelinquencyRangeRequest changes;
}
@@ -52,7 +52,7 @@ public final class DelinquencyApiResourceSwagger {
private DeleteDelinquencyRangeResponse() {}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "PostDelinquencyBucketResponse")
@@ -61,7 +61,7 @@ public final class DelinquencyApiResourceSwagger {
private PostDelinquencyBucketResponse() {}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "PutDelinquencyBucketResponse")
@@ -70,7 +70,7 @@ public final class DelinquencyApiResourceSwagger {
private PutDelinquencyBucketResponse() {}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "DeleteDelinquencyBucketResponse")
@@ -79,7 +79,7 @@ public final class DelinquencyApiResourceSwagger {
private DeleteDelinquencyBucketResponse() {}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "GetDelinquencyTagHistoryResponse")
fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanScheduleApiResourceSwagger.java
+1 -1
View File
@@ -44,7 +44,7 @@ final class LoanScheduleApiResourceSwagger {
private PostLoanChanges() {}
@Schema(example = "[21, 22]")
public List<Integer> removedEntityIds;
public List<Long> removedEntityIds;
}
@Schema(example = "1")
fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionApiResourceSwagger.java
+1 -1
View File
@@ -538,7 +538,7 @@ final class StandingInstructionApiResourceSwagger {
}
@Schema(example = "20")
public Integer resourceId;
public Long resourceId;
public PutUpdateStandingInstructionChanges changes;
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeWritePlatformServiceJpaRepositoryImpl.java
+1 -1
View File
@@ -171,7 +171,7 @@ public class ChargeWritePlatformServiceJpaRepositoryImpl implements ChargeWriteP
final String paymentTypeIdParamName = "paymentTypeId";
if (changes.containsKey(paymentTypeIdParamName)) {
final Integer paymentTypeIdNewValue = command.integerValueOfParameterNamed(paymentTypeIdParamName);
final Long paymentTypeIdNewValue = command.longValueOfParameterNamed(paymentTypeIdParamName);
PaymentType paymentType = null;
if (paymentTypeIdNewValue != null) {
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java
+3 -3
View File
@@ -1600,7 +1600,7 @@ final class LoansApiResourceSwagger {
}
@Schema(example = "2")
public Integer toLoanOfficerId;
public Long toLoanOfficerId;
@Schema(example = "02 September 2014")
public String assignmentDate;
@@ -1611,7 +1611,7 @@ final class LoansApiResourceSwagger {
@Schema(example = "dd MMMM yyyy")
public String dateFormat;
@Schema(example = "")
public Integer fromLoanOfficerId;
public Long fromLoanOfficerId;
@Schema(example = "3e7791ce-aa10-11ec-b909-0242ac120002")
public String externalId;
@Schema(example = "5000.33")
@@ -1690,7 +1690,7 @@ final class LoansApiResourceSwagger {
}
@Schema(example = "2")
public Integer officeId;
public Long officeId;
@Schema(example = "6")
public Long clientId;
@Schema(example = "3")
fineract-provider/src/main/java/org/apache/fineract/portfolio/note/api/NotesApiResourceSwagger.java
+3 -3
View File
@@ -46,7 +46,7 @@ public final class NotesApiResourceSwagger {
@Schema(example = "1")
public Long clientId;
@Schema(example = "76")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "PutResourceTypeResourceIdNotesNoteIdResponse")
@@ -67,7 +67,7 @@ public final class NotesApiResourceSwagger {
@Schema(example = "1")
public Long clientId;
@Schema(example = "76")
public Integer resourceId;
public Long resourceId;
public PutNotesChanges changes;
}
@@ -77,6 +77,6 @@ public final class NotesApiResourceSwagger {
private DeleteResourceTypeResourceIdNotesNoteIdResponse() {}
@Schema(example = "76")
public Integer resourceId;
public Long resourceId;
}
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/repaymentwithpostdatedchecks/api/PostDatedChecksApiResourceSwagger.java
+1 -1
View File
@@ -73,7 +73,7 @@ final class PostDatedChecksApiResourceSwagger {
private UpdatePostDatedCheckResponse() {}
@Schema(example = "12")
public Integer resourceId;
public Long resourceId;
public UpdateChangesResponse changes;
static final class UpdateChangesResponse {
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositProductsApiResourceSwagger.java
+3 -3
View File
@@ -110,7 +110,7 @@ final class FixedDepositProductsApiResourceSwagger {
private PostFixedDepositProductsResponse() {}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "PutFixedDepositProductsProductIdRequest")
@@ -144,7 +144,7 @@ final class FixedDepositProductsApiResourceSwagger {
}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
public PutFixedDepositProductsChanges changes;
}
@@ -519,6 +519,6 @@ final class FixedDepositProductsApiResourceSwagger {
private DeleteFixedDepositProductsProductIdResponse() {}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositProductsApiResourceSwagger.java
+3 -3
View File
@@ -120,7 +120,7 @@ final class RecurringDepositProductsApiResourceSwagger {
private PostRecurringDepositProductsResponse() {}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "PutRecurringDepositProductsRequest")
@@ -154,7 +154,7 @@ final class RecurringDepositProductsApiResourceSwagger {
}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
public PutRecurringDepositProductsChanges changes;
}
@@ -546,6 +546,6 @@ final class RecurringDepositProductsApiResourceSwagger {
private DeleteRecurringDepositProductsProductIdResponse() {}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountsApiResourceSwagger.java
+24 -24
View File
@@ -46,7 +46,7 @@ final class SavingsAccountsApiResourceSwagger {
}
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "small business")
public String clientName;
public Set<GetSavingsProductOptions> productOptions;
@@ -190,15 +190,15 @@ final class SavingsAccountsApiResourceSwagger {
@Schema(example = "000000001")
public String accountNo;
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "small business")
public String clientName;
@Schema(example = "1")
public Integer savingsProductId;
public Long savingsProductId;
@Schema(example = "Passbook Savings")
public String savingsProductName;
@Schema(example = "0")
public Integer fieldOfficerId;
public Long fieldOfficerId;
public GetSavingsStatus status;
public GetSavingsTimeline timeline;
public GetSavingsCurrency currency;
@@ -222,9 +222,9 @@ final class SavingsAccountsApiResourceSwagger {
private PostSavingsAccountsRequest() {}
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "1")
public Integer productId;
public Long productId;
@Schema(example = "en")
public String locale;
@Schema(example = "dd MMMM yyyy")
@@ -241,13 +241,13 @@ final class SavingsAccountsApiResourceSwagger {
private PostSavingsAccountsResponse() {}
@Schema(example = "2")
public Integer officeId;
public Long officeId;
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "1")
public Integer savingsId;
public Long savingsId;
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "GetSavingsAccountsAccountIdResponse")
@@ -267,19 +267,19 @@ final class SavingsAccountsApiResourceSwagger {
}
@Schema(example = "1")
public Integer id;
public Long id;
@Schema(example = "000000001")
public String accountNo;
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "small business")
public String clientName;
@Schema(example = "1")
public Integer savingsProductId;
public Long savingsProductId;
@Schema(example = "Passbook Savings")
public String savingsProductName;
@Schema(example = "0")
public Integer fieldOfficerId;
public Long fieldOfficerId;
public GetSavingsAccountsResponse.GetSavingsPageItems.GetSavingsStatus status;
public GetSavingsAccountsResponse.GetSavingsPageItems.GetSavingsTimeline timeline;
public GetSavingsAccountsResponse.GetSavingsPageItems.GetSavingsCurrency currency;
@@ -319,13 +319,13 @@ final class SavingsAccountsApiResourceSwagger {
}
@Schema(example = "2")
public Integer officeId;
public Long officeId;
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "1")
public Integer savingsId;
public Long savingsId;
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
public PutSavingsAccountsChanges changes;
}
@@ -355,11 +355,11 @@ final class SavingsAccountsApiResourceSwagger {
}
@Schema(example = "2")
public Integer officeId;
public Long officeId;
@Schema(example = "8")
public Integer clientId;
public Long clientId;
@Schema(example = "8")
public Integer resourceId;
public Long resourceId;
public PostSavingsAccountsAccountIdChanges changes;
}
@@ -369,10 +369,10 @@ final class SavingsAccountsApiResourceSwagger {
private DeleteSavingsAccountsAccountIdResponse() {}
@Schema(example = "1")
public Integer officeId;
public Long officeId;
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResourceSwagger.java
+18 -18
View File
@@ -40,7 +40,7 @@ final class SavingsProductsApiResourceSwagger {
private PostSavingsCharges() {}
@Schema(example = "1")
public Integer id;
public Long id;
}
@Schema(example = "Passbook Savings")
@@ -80,7 +80,7 @@ final class SavingsProductsApiResourceSwagger {
private PostSavingsProductsResponse() {}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "PutSavingsProductsProductIdRequest")
@@ -114,7 +114,7 @@ final class SavingsProductsApiResourceSwagger {
}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
public PutSavingsChanges changes;
}
@@ -231,7 +231,7 @@ final class SavingsProductsApiResourceSwagger {
private GetSavingsProductsGlAccount() {}
@Schema(example = "12")
public Integer id;
public Long id;
@Schema(example = "savings control")
public String name;
@Schema(example = "2000001")
@@ -265,7 +265,7 @@ final class SavingsProductsApiResourceSwagger {
private GetSavingsProductsPaymentType() {}
@Schema(example = "10")
public Integer id;
public Long id;
@Schema(example = "check")
public String name;
}
@@ -275,7 +275,7 @@ final class SavingsProductsApiResourceSwagger {
private GetSavingsProductsFundSourceAccount() {}
@Schema(example = "12")
public Integer id;
public Long id;
@Schema(example = "savings ref")
public String name;
@Schema(example = "20")
@@ -295,7 +295,7 @@ final class SavingsProductsApiResourceSwagger {
private GetSavingsProductsFeeToIncomeAccountMappingsCharge() {}
@Schema(example = "11")
public Integer id;
public Long id;
@Schema(example = "sav charge")
public String name;
@Schema(example = "false")
@@ -309,7 +309,7 @@ final class SavingsProductsApiResourceSwagger {
private GetSavingsProductsFeeToIncomeAccountMappingsIncomeAccount() {}
@Schema(example = "16")
public Integer id;
public Long id;
@Schema(example = "income from savings fee")
public String name;
@Schema(example = "24")
@@ -329,7 +329,7 @@ final class SavingsProductsApiResourceSwagger {
private GetSavingsProductsPenaltyToIncomeAccountMappingsCharge() {}
@Schema(example = "12")
public Integer id;
public Long id;
@Schema(example = "sav 2")
public String name;
@Schema(example = "false")
@@ -343,7 +343,7 @@ final class SavingsProductsApiResourceSwagger {
}
@Schema(example = "1")
public Integer id;
public Long id;
@Schema(example = "savings product")
public String name;
@Schema(example = "sa1")
@@ -365,7 +365,7 @@ final class SavingsProductsApiResourceSwagger {
public Set<GetSavingsProductsFeeToIncomeAccountMappings> feeToIncomeAccountMappings;
public Set<GetSavingsProductsPenaltyToIncomeAccountMappings> penaltyToIncomeAccountMappings;
@Schema(example = "[]")
public List<Integer> charges;
public List<Long> charges;
}
@Schema(description = "GetSavingsProductsTemplateResponse")
@@ -462,11 +462,11 @@ final class SavingsProductsApiResourceSwagger {
private GetSavingsProductsLiabilityTagId() {}
@Schema(example = "0")
public Integer id;
public Long id;
}
@Schema(example = "15")
public Integer id;
public Long id;
@Schema(example = "Savings Control")
public String name;
@Schema(example = "50001")
@@ -504,7 +504,7 @@ final class SavingsProductsApiResourceSwagger {
}
@Schema(example = "2")
public Integer id;
public Long id;
@Schema(example = "Cash")
public String name;
@Schema(example = "100001")
@@ -535,7 +535,7 @@ final class SavingsProductsApiResourceSwagger {
}
@Schema(example = "6")
public Integer id;
public Long id;
@Schema(example = "Write Off Expenses")
public String name;
@Schema(example = "60001")
@@ -566,7 +566,7 @@ final class SavingsProductsApiResourceSwagger {
}
@Schema(example = "3")
public Integer id;
public Long id;
@Schema(example = "income from interest")
public String name;
@Schema(example = "40001")
@@ -649,7 +649,7 @@ final class SavingsProductsApiResourceSwagger {
public GetSavingsChargeTimeType chargeTimeType;
public GetSavingsProductsResponse.GetSavingsCurrency currency;
@Schema(example = "4")
public Integer id;
public Long id;
@Schema(example = "Savings charge 1")
public String name;
@Schema(example = "false")
@@ -683,6 +683,6 @@ final class SavingsProductsApiResourceSwagger {
private DeleteSavingsProductsProductIdResponse() {}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfAccountTransferApiResourceSwagger.java
+6 -6
View File
@@ -99,21 +99,21 @@ final class SelfAccountTransferApiResourceSwagger {
private PostNewTransferRequest() {}
@Schema(example = "1")
public Integer fromOfficeId;
public Long fromOfficeId;
@Schema(example = "1")
public Integer fromClientId;
public Long fromClientId;
@Schema(example = "2")
public Integer fromAccountType;
@Schema(example = "1")
public Integer fromAccountId;
public Long fromAccountId;
@Schema(example = "1")
public Integer toOfficeId;
public Long toOfficeId;
@Schema(example = "1")
public Integer toClientId;
public Long toClientId;
@Schema(example = "2")
public Integer toAccountType;
@Schema(example = "2")
public Integer toAccountId;
public Long toAccountId;
@Schema(example = "dd MMMM YYYY")
public String dateFormat;
@Schema(example = "en")
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfBeneficiariesTPTApiResourceSwagger.java
+4 -4
View File
@@ -73,7 +73,7 @@ final class SelfBeneficiariesTPTApiResourceSwagger {
private PostSelfBeneficiariesTPTResponse() {}
@Schema(example = "5")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "PutSelfBeneficiariesTPTBeneficiaryIdRequest")
@@ -103,7 +103,7 @@ final class SelfBeneficiariesTPTApiResourceSwagger {
}
@Schema(example = "5")
public Integer resourceId;
public Long resourceId;
public PutSelfBeneficiariesChanges changes;
}
@@ -113,7 +113,7 @@ final class SelfBeneficiariesTPTApiResourceSwagger {
private DeleteSelfBeneficiariesTPTBeneficiaryIdResponse() {}
@Schema(example = "5")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "GetSelfBeneficiariesTPTResponse")
@@ -122,7 +122,7 @@ final class SelfBeneficiariesTPTApiResourceSwagger {
private GetSelfBeneficiariesTPTResponse() {}
@Schema(example = "1")
public Integer id;
public Long id;
@Schema(example = "Client2Savings")
public String name;
@Schema(example = "Test Office")
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/api/SelfClientsApiResourceSwagger.java
+21 -21
View File
@@ -53,7 +53,7 @@ final class SelfClientsApiResourceSwagger {
}
@Schema(example = "1")
public Integer id;
public Long id;
@Schema(example = "000000001")
public Long accountNo;
public GetSelfClientsStatus status;
@@ -66,7 +66,7 @@ final class SelfClientsApiResourceSwagger {
@Schema(example = "Small shop")
public String displayName;
@Schema(example = "1")
public Integer officeId;
public Long officeId;
@Schema(example = "Head Office")
public String officeName;
}
@@ -105,7 +105,7 @@ final class SelfClientsApiResourceSwagger {
}
@Schema(example = "27")
public Integer id;
public Long id;
@Schema(example = "000000027")
public Long accountNo;
public GetSelfClientsResponse.GetSelfClientsPageItems.GetSelfClientsStatus status;
@@ -120,12 +120,12 @@ final class SelfClientsApiResourceSwagger {
@Schema(example = "savings test")
public String displayName;
@Schema(example = "1")
public Integer officeId;
public Long officeId;
@Schema(example = "Head Office")
public String officeName;
public GetSelfClientsTimeline timeline;
@Schema(example = "4")
public Integer savingsProductId;
public Long savingsProductId;
@Schema(example = "account overdraft")
public String savingsProductName;
@Schema(example = "")
@@ -182,13 +182,13 @@ final class SelfClientsApiResourceSwagger {
}
@Schema(example = "1")
public Integer id;
public Long id;
@Schema(example = "000000001")
public Long accountNo;
@Schema(example = "456")
public Integer externalId;
@Schema(example = "36efeb06-d835-48a1-99eb-09bd1d348c1e")
public String externalId;
@Schema(example = "1")
public Integer productId;
public Long productId;
@Schema(example = "TestOne")
public String productName;
public GetSelfClientsLoanAccountsStatus status;
@@ -244,11 +244,11 @@ final class SelfClientsApiResourceSwagger {
}
@Schema(example = "7")
public Integer id;
public Long id;
@Schema(example = "000000007")
public Long accountNo;
@Schema(example = "2")
public Integer productId;
public Long productId;
@Schema(example = "Other product")
public String productName;
public GetSelfClientsSavingsAccountsStatus status;
@@ -293,11 +293,11 @@ final class SelfClientsApiResourceSwagger {
}
@Schema(example = "5")
public Integer id;
public Long id;
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "6")
public Integer chargeId;
public Long chargeId;
@Schema(example = "Client Fees 2")
public String name;
public GetSelfClientsChargeTimeType chargeTimeType;
@@ -336,11 +336,11 @@ final class SelfClientsApiResourceSwagger {
private GetSelfClientsClientIdChargesChargeIdResponse() {}
@Schema(example = "3")
public Integer id;
public Long id;
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "5")
public Integer chargeId;
public Long chargeId;
@Schema(example = "Client Fee 1")
public String name;
public GetSelfClientsClientIdChargesResponse.GetSelfClientsChargesPageItems.GetSelfClientsChargeTimeType chargeTimeType;
@@ -390,9 +390,9 @@ final class SelfClientsApiResourceSwagger {
}
@Schema(example = "226")
public Integer id;
public Long id;
@Schema(example = "1")
public Integer officeId;
public Long officeId;
@Schema(example = "Head Office")
public String officeName;
public GetSelfClientsClientIdTransactionsType type;
@@ -418,9 +418,9 @@ final class SelfClientsApiResourceSwagger {
private GetSelfClientsClientIdTransactionsTransactionIdResponse() {}
@Schema(example = "1")
public Integer id;
public Long id;
@Schema(example = "1")
public Integer officeId;
public Long officeId;
@Schema(example = "Head Office")
public String officeName;
public GetSelfClientsClientIdTransactionsResponse.GetSelfClientsClientIdTransactionsPageItems.GetSelfClientsClientIdTransactionsType type;
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/loanaccount/api/SelfLoansApiResourceSwagger.java
+28 -28
View File
@@ -215,7 +215,7 @@ final class SelfLoansApiResourceSwagger {
private GetLoansLoanIdLinkedAccount() {}
@Schema(example = "1")
public Integer id;
public Long id;
@Schema(example = "000000001")
public Long accountNo;
}
@@ -225,7 +225,7 @@ final class SelfLoansApiResourceSwagger {
private GetLoansLoanIdDisbursementDetails() {}
@Schema(example = "71")
public Integer id;
public Long id;
@Schema(example = "[2013, 11, 1]")
public LocalDate expectedDisbursementDate;
@Schema(example = "[2022, 07, 01]")
@@ -333,7 +333,7 @@ final class SelfLoansApiResourceSwagger {
}
@Schema(example = "20")
public Integer id;
public Long id;
@Schema(example = "overdraft penality")
public String name;
@Schema(example = "true")
@@ -469,13 +469,13 @@ final class SelfLoansApiResourceSwagger {
public Long accountNo;
public GetLoansLoanIdStatus status;
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "Kampala first Client")
public String clientName;
@Schema(example = "2")
public Integer clientOfficeId;
public Long clientOfficeId;
@Schema(example = "1")
public Integer loanProductId;
public Long loanProductId;
@Schema(example = "Kampala Product (with cash accounting)")
public String loanProductName;
@Schema(example = "Typical Kampala loan product with cash accounting enabled for testing.")
@@ -485,7 +485,7 @@ final class SelfLoansApiResourceSwagger {
@Schema(example = "option.HousingImprovement")
public String loanPurposeName;
@Schema(example = "2")
public Integer loanOfficerId;
public Long loanOfficerId;
@Schema(example = "LoanOfficer, Kampala")
public String loanOfficerName;
public GetLoansLoanIdLoanType loanType;
@@ -548,7 +548,7 @@ final class SelfLoansApiResourceSwagger {
}
@Schema(example = "3")
public Integer id;
public Long id;
public GetSelfLoansLoanIdTransactionsType type;
@Schema(example = "[2012, 5, 14]")
public LocalDate date;
@@ -591,9 +591,9 @@ final class SelfLoansApiResourceSwagger {
}
@Schema(example = "1")
public Integer id;
public Long id;
@Schema(example = "1")
public Integer chargeId;
public Long chargeId;
@Schema(example = "Loan Processing fee")
public String name;
public GetSelfLoansChargeTimeType chargeTimeType;
@@ -643,11 +643,11 @@ final class SelfLoansApiResourceSwagger {
}
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "Kampala first Client")
public String clientName;
@Schema(example = "2")
public Integer clientOfficeId;
public Long clientOfficeId;
public GetSelfLoansTimeline timeline;
public Set<GetSelfLoansProductOptions> productOptions;
}
@@ -695,9 +695,9 @@ final class SelfLoansApiResourceSwagger {
@Schema(example = "en_GB")
public String locale;
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "1")
public Integer productId;
public Long productId;
@Schema(example = "10,000.00")
public Double principal;
@Schema(example = "12")
@@ -727,7 +727,7 @@ final class SelfLoansApiResourceSwagger {
@Schema(example = "10 Jun 2013")
public String submittedOnDate;
@Schema(example = "1")
public Integer linkAccountId;
public Long linkAccountId;
@Schema(example = "1100")
public Integer fixedEmiAmount;
@Schema(example = "35000")
@@ -742,13 +742,13 @@ final class SelfLoansApiResourceSwagger {
private PostSelfLoansResponse() {}
@Schema(example = "1")
public Integer officeId;
public Long officeId;
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "1")
public Integer loanId;
public Long loanId;
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "PutSelfLoansLoanIdRequest")
@@ -761,7 +761,7 @@ final class SelfLoansApiResourceSwagger {
@Schema(example = "dd MMMM yyyy")
public String dateFormat;
@Schema(example = "1")
public Integer productId;
public Long productId;
@Schema(example = "5000")
public Long principal;
@Schema(example = "10")
@@ -804,13 +804,13 @@ final class SelfLoansApiResourceSwagger {
}
@Schema(example = "2")
public Integer officeId;
public Long officeId;
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "1")
public Integer loanId;
public Long loanId;
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
public PutSelfLoansChanges changes;
}
@@ -878,13 +878,13 @@ final class SelfLoansApiResourceSwagger {
}
@Schema(example = "1")
public Integer officeId;
public Long officeId;
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "2")
public Integer loanId;
public Long loanId;
@Schema(example = "2")
public Integer resourceId;
public Long resourceId;
public PostSelfLoansLoanIdChanges changes;
}
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/pockets/api/PocketApiResourceSwagger.java
+1 -1
View File
@@ -53,7 +53,7 @@ final class PocketApiResourceSwagger {
private PostLinkDelinkAccountsToFromPocketResponse() {}
@Schema(example = "6")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "GetAccountsLinkedToPocketResponse")
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/api/SelfSavingsApiResourceSwagger.java
+12 -12
View File
@@ -142,19 +142,19 @@ final class SelfSavingsApiResourceSwagger {
}
@Schema(example = "1")
public Integer id;
public Long id;
@Schema(example = "000000001")
public Long accountNo;
@Schema(example = "1")
public Integer clientId;
public Long clientId;
@Schema(example = "small business")
public String clientName;
@Schema(example = "1")
public Integer savingsProductId;
public Long savingsProductId;
@Schema(example = "Passbook Savings")
public String savingsProductName;
@Schema(example = "0")
public Integer fieldOfficerId;
public Long fieldOfficerId;
public GetSelfSavingsStatus status;
public GetSelfSavingsTimeline timeline;
public GetSelfSavingsCurrency currency;
@@ -227,7 +227,7 @@ final class SelfSavingsApiResourceSwagger {
}
@Schema(example = "62")
public Integer id;
public Long id;
public GetSelfSavingsPaymentType paymentType;
@Schema(example = "")
public Integer accountNumber;
@@ -242,10 +242,10 @@ final class SelfSavingsApiResourceSwagger {
}
@Schema(example = "1")
public Integer id;
public Long id;
public GetSelfSavingsTransactionType transactionType;
@Schema(example = "1")
public Integer accountId;
public Long accountId;
@Schema(example = "000000001")
public Long accountNo;
@Schema(example = "[2013, 8, 7]")
@@ -290,11 +290,11 @@ final class SelfSavingsApiResourceSwagger {
}
@Schema(example = "1")
public Integer id;
public Long id;
@Schema(example = "3")
public Integer chargeId;
public Long chargeId;
@Schema(example = "57")
public Integer accountId;
public Long accountId;
@Schema(example = "Savings account maintenance fee")
public String name;
public GetSelfSavingsChargeTimeType chargeTimeType;
@@ -326,9 +326,9 @@ final class SelfSavingsApiResourceSwagger {
private GetSelfSavingsAccountsAccountIdChargesSavingsAccountChargeIdResponse() {}
@Schema(example = "1")
public Integer id;
public Long id;
@Schema(example = "1")
public Integer chargeId;
public Long chargeId;
@Schema(example = "Passbook fee")
public String name;
public GetSelfSavingsAccountsAccountIdChargesResponse.GetSelfSavingsChargeTimeType chargeTimeType;
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfAuthenticationApiResourceSwagger.java
+4 -4
View File
@@ -61,17 +61,17 @@ final class SelfAuthenticationApiResourceSwagger {
@Schema(example = "mifos")
public String username;
@Schema(example = "1")
public Integer userId;
public Long userId;
@Schema(example = "bWlmb3M6cGFzc3dvcmQ=")
public String base64EncodedAuthenticationKey;
@Schema(example = "true")
public Boolean authenticated;
@Schema(example = "1")
public Integer officeId;
public Long officeId;
@Schema(example = "Head Office")
public String officeName;
@Schema(example = "1")
public Integer staffId;
public Long staffId;
@Schema(example = "Director, Program")
public String staffDisplayName;
public GetSelfUserDetailsOrganisationalRole organisationalRole;
@@ -81,6 +81,6 @@ final class SelfAuthenticationApiResourceSwagger {
@Schema(example = "true")
public Boolean isSelfServiceUser;
@Schema(example = "1, 2, 3")
public List<Integer> clients;
public List<Long> clients;
}
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserDetailsApiResourceSwagger.java
+1 -1
View File
@@ -81,6 +81,6 @@ final class SelfUserDetailsApiResourceSwagger {
@Schema(example = "true")
public Boolean isSelfServiceUser;
@Schema(example = "[1, 2, 3]")
public List<Integer> clients;
public List<Long> clients;
}
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/api/SelfShareAccountsApiResourceSwagger.java
+22 -22
View File
@@ -123,7 +123,7 @@ final class SelfShareAccountsApiResourceSwagger {
}
@Schema(example = "2")
public Integer id;
public Long id;
@Schema(example = "Activation fee")
public String name;
@Schema(example = "true")
@@ -141,7 +141,7 @@ final class SelfShareAccountsApiResourceSwagger {
}
@Schema(example = "14")
public Integer clientId;
public Long clientId;
public Set<GetShareAccountsProductOptions> productOptions;
public Set<GetShareAccountsChargeOptions> chargeOptions;
}
@@ -203,7 +203,7 @@ final class SelfShareAccountsApiResourceSwagger {
private GetShareAccountsShareReferenceId() {}
@Schema(example = "32")
public Integer id;
public Long id;
@Schema(example = "Cash in Hand")
public String name;
@Schema(example = "20301")
@@ -216,7 +216,7 @@ final class SelfShareAccountsApiResourceSwagger {
private GetShareAccountsIncomeFromFeeAccountId() {}
@Schema(example = "40")
public Integer id;
public Long id;
@Schema(example = "Other Operating Income")
public String name;
@Schema(example = "30105")
@@ -229,7 +229,7 @@ final class SelfShareAccountsApiResourceSwagger {
private GetShareAccountsShareEquityId() {}
@Schema(example = "56")
public Integer id;
public Long id;
@Schema(example = "Share Equity")
public String name;
@Schema(example = "00098")
@@ -242,7 +242,7 @@ final class SelfShareAccountsApiResourceSwagger {
private GetShareAccountsShareSuspenseId() {}
@Schema(example = "2")
public Integer id;
public Long id;
@Schema(example = "Overpayment Liability")
public String name;
@Schema(example = "10200")
@@ -321,7 +321,7 @@ final class SelfShareAccountsApiResourceSwagger {
private GetLiabilityAccountTagId() {}
@Schema(example = "0")
public Integer id;
public Long id;
@Schema(example = "false")
public Boolean active;
@Schema(example = "false")
@@ -330,11 +330,11 @@ final class SelfShareAccountsApiResourceSwagger {
}
@Schema(example = "30")
public Integer id;
public Long id;
@Schema(example = "Recurring Deposits")
public String name;
@Schema(example = "1")
public Integer parentId;
public Long parentId;
@Schema(example = "10104")
public String glCode;
@Schema(example = "false")
@@ -384,7 +384,7 @@ final class SelfShareAccountsApiResourceSwagger {
private GetAssetAccountTagId() {}
@Schema(example = "0")
public Integer id;
public Long id;
@Schema(example = "false")
public Boolean active;
@Schema(example = "false")
@@ -393,11 +393,11 @@ final class SelfShareAccountsApiResourceSwagger {
}
@Schema(example = "31")
public Integer id;
public Long id;
@Schema(example = "Furniture and Fixtures")
public String name;
@Schema(example = "8")
public Integer parentId;
public Long parentId;
@Schema(example = "20101")
public String glCode;
@Schema(example = "false")
@@ -447,7 +447,7 @@ final class SelfShareAccountsApiResourceSwagger {
private GetIncomeAccountTagId() {}
@Schema(example = "0")
public Integer id;
public Long id;
@Schema(example = "false")
public Boolean active;
@Schema(example = "false")
@@ -456,7 +456,7 @@ final class SelfShareAccountsApiResourceSwagger {
}
@Schema(example = "54")
public Integer id;
public Long id;
@Schema(example = "Loan Recovery (Temp)")
public String name;
@Schema(example = "220002-Temp")
@@ -509,7 +509,7 @@ final class SelfShareAccountsApiResourceSwagger {
private GetShareAccountsEquityAccountTagId() {}
@Schema(example = "0")
public Integer id;
public Long id;
@Schema(example = "false")
public Boolean active;
@Schema(example = "false")
@@ -518,11 +518,11 @@ final class SelfShareAccountsApiResourceSwagger {
}
@Schema(example = "56")
public Integer id;
public Long id;
@Schema(example = "Share Equity")
public String name;
@Schema(example = "25")
public Integer parentId;
public Long parentId;
@Schema(example = "00098")
public String glCode;
@Schema(example = "false")
@@ -540,7 +540,7 @@ final class SelfShareAccountsApiResourceSwagger {
}
@Schema(example = "3")
public Integer id;
public Long id;
@Schema(example = "SP")
public String name;
@Schema(example = "SP")
@@ -604,13 +604,13 @@ final class SelfShareAccountsApiResourceSwagger {
private GetShareAccountsCharges() {}
@Schema(example = "2")
public Integer chargeId;
public Long chargeId;
@Schema(example = "2")
public Integer amount;
}
@Schema(example = "3")
public Integer productId;
public Long productId;
@Schema(example = "1")
public Integer unitPrice;
@Schema(example = "500")
@@ -618,7 +618,7 @@ final class SelfShareAccountsApiResourceSwagger {
@Schema(example = "31 July 2018")
public String submittedDate;
@Schema(example = "2")
public Integer savingsAccountId;
public Long savingsAccountId;
@Schema(example = "31 July 2018")
public String applicationDate;
@Schema(example = "en")
@@ -627,7 +627,7 @@ final class SelfShareAccountsApiResourceSwagger {
public String dateFormat;
public GetShareAccountsCharges charges;
@Schema(example = "14")
public Integer clientId;
public Long clientId;
}
@Schema(description = "PostNewShareApplicationResponse")
fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxComponentApiResourceSwagger.java
+4 -4
View File
@@ -51,7 +51,7 @@ final class TaxComponentApiResourceSwagger {
private GetTaxesComponentsCreditAccount() {}
@Schema(example = "4")
public Integer id;
public Long id;
@Schema(example = "ACCOUNT_NAME_7BR9C")
public String name;
@Schema(example = "LIABILITY_PA1460364665046")
@@ -88,7 +88,7 @@ final class TaxComponentApiResourceSwagger {
@Schema(example = "2")
public Integer creditAccountType;
@Schema(example = "4")
public Integer creditAcountId;
public Long creditAcountId;
@Schema(example = "en")
public String locale;
@Schema(example = "dd MMMM yyyy")
@@ -103,7 +103,7 @@ final class TaxComponentApiResourceSwagger {
private PostTaxesComponentsResponse() {}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "PutTaxesComponentsTaxComponentIdRequest")
@@ -141,7 +141,7 @@ final class TaxComponentApiResourceSwagger {
}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
public PutTaxesComponentsChanges changes;
}
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxGroupApiResourceSwagger.java
+4 -4
View File
@@ -93,7 +93,7 @@ final class TaxGroupApiResourceSwagger {
private PostTaxesGroupResponse() {}
@Schema(example = "1")
public Integer resourceId;
public Long resourceId;
}
@Schema(description = "PutTaxesGroupTaxGroupIdRequest")
@@ -138,18 +138,18 @@ final class TaxGroupApiResourceSwagger {
@Schema(example = "Apr 22, 2016 12:00:00 AM")
public String endDate;
@Schema(example = "7")
public Integer taxComponentId;
public Long taxComponentId;
}
@Schema(example = "[6]")
public List<Integer> addComponents;
public List<Long> addComponents;
public Set<PutTaxesGroupModifiedComponents> modifiedComponents;
@Schema(example = "tax group 2")
public String name;
}
@Schema(example = "7")
public Integer resourceId;
public Long resourceId;
public PutTaxesGroupChanges changes;
}
}
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()));