Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 anshul
|
08519da8b1 | ||
 Anshul Rathore
|
cad7f54c47 |
+1
-10
@@ -37,13 +37,4 @@ gradleExp/
|
||||
.windsurf/
|
||||
|
||||
# Application logs
|
||||
fineract-provider/logs/
|
||||
logs/
|
||||
|
||||
# Output of a local `gradlew devRun`
|
||||
devrun.log
|
||||
|
||||
# JVM crash dumps. The dev setup runs Fineract, the Angular dev server and Gradle on one
|
||||
# machine, so an out-of-memory kill drops these in the repo root.
|
||||
hs_err_pid*.log
|
||||
replay_pid*.log
|
||||
fineract-provider/logs/
|
||||
+20
-1
@@ -137,7 +137,7 @@ public class CommandSourceService {
|
||||
String permission = commandSource.getPermissionCode();
|
||||
boolean isMakerChecker = configurationDomainService.isMakerCheckerEnabledForTask(permission);
|
||||
if (isMakerChecker || result.isRollbackTransaction()) {
|
||||
if (isApprovedByChecker || user.isCheckerSuperUser()) {
|
||||
if (isApprovedByChecker || isSuperUserBypassAllowed(commandSource, user)) {
|
||||
commandSource.markAsChecked(user);
|
||||
} else {
|
||||
if (commandSource.isSanitized()) {
|
||||
@@ -151,6 +151,25 @@ public class CommandSourceService {
|
||||
return result;
|
||||
}
|
||||
|
||||
private boolean isSuperUserBypassAllowed(CommandSource commandSource, AppUser user) {
|
||||
if (!user.isCheckerSuperUser()) {
|
||||
return false;
|
||||
}
|
||||
if ("GLACCOUNT".equalsIgnoreCase(commandSource.getEntityName())
|
||||
|| "CBSBASEINTERESTRATE".equalsIgnoreCase(commandSource.getEntityName())
|
||||
|| "CHARGE".equalsIgnoreCase(commandSource.getEntityName())
|
||||
|| "LOANPRODUCT".equalsIgnoreCase(commandSource.getEntityName())
|
||||
|| "SAVINGSPRODUCT".equalsIgnoreCase(commandSource.getEntityName())
|
||||
|| "CURRENTPRODUCT".equalsIgnoreCase(commandSource.getEntityName())
|
||||
|| "SHAREPRODUCT".equalsIgnoreCase(commandSource.getEntityName())
|
||||
|| "FIXEDDEPOSITPRODUCT".equalsIgnoreCase(commandSource.getEntityName())
|
||||
|| "USER".equalsIgnoreCase(commandSource.getEntityName())
|
||||
|| "ROLE".equalsIgnoreCase(commandSource.getEntityName())) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private void sanitizeJson(@NonNull CommandSource commandSource, Set<String> sanitizeKeys) {
|
||||
if (sanitizeKeys == null || sanitizeKeys.isEmpty()) {
|
||||
return;
|
||||
|
||||
+8
@@ -2211,6 +2211,14 @@ public class CommandWrapperBuilder {
|
||||
return this;
|
||||
}
|
||||
|
||||
public CommandWrapperBuilder createCbsBaseInterestRate() {
|
||||
this.actionName = "CREATE";
|
||||
this.entityName = "CBSBASEINTERESTRATE";
|
||||
this.entityId = null;
|
||||
this.href = "/fixeddepositproducts/baseinterestrates";
|
||||
return this;
|
||||
}
|
||||
|
||||
public CommandWrapperBuilder updateFixedDepositProduct(final Long productId) {
|
||||
this.actionName = "UPDATE";
|
||||
this.entityName = "FIXEDDEPOSITPRODUCT";
|
||||
|
||||
+2
@@ -26,6 +26,8 @@ public interface ConfigurationDomainService {
|
||||
|
||||
boolean isMakerCheckerEnabledForTask(String taskPermissionCode);
|
||||
|
||||
boolean isMakerCheckerEnabled();
|
||||
|
||||
/**
|
||||
* Global kill-switch for MFA-factor-backed login enforcement. When true, users with at least
|
||||
* one verified, non-disabled row in {@code m_user_mfa_factor} must complete a 2FA challenge
|
||||
|
||||
-13
@@ -130,19 +130,6 @@ public class DataValidatorBuilder {
|
||||
this.dataValidationErrors.add(error);
|
||||
}
|
||||
|
||||
/**
|
||||
* Like {@link #failWithCode(String, Object...)}, but the caller's own message is what's actually shown to the
|
||||
* user (that method always renders the generic "Failed data validation due to: {errorCode}." regardless of the
|
||||
* args passed to it).
|
||||
*/
|
||||
public void failWithCodeAndMessage(final String errorCode, final String defaultUserMessage,
|
||||
final Object... defaultUserMessageArgs) {
|
||||
String validationErrorCode = "validation.msg." + this.resource + "." + this.parameter + "." + errorCode;
|
||||
final ApiParameterError error = ApiParameterError.parameterError(validationErrorCode, defaultUserMessage, this.parameter,
|
||||
this.value, defaultUserMessageArgs);
|
||||
this.dataValidationErrors.add(error);
|
||||
}
|
||||
|
||||
public void failWithCodeNoParameterAddedToErrorCode(final String errorCode, final Object... defaultUserMessageArgs) {
|
||||
String validationErrorCode = "validation.msg." + this.resource + "." + errorCode;
|
||||
String defaultEnglishMessage = "Failed data validation due to: " + errorCode + ".";
|
||||
|
||||
-20
@@ -1466,26 +1466,6 @@ public class LoanProductData implements Serializable {
|
||||
this.allowAttributeOverrides = loanProductConfigurableAttributes;
|
||||
}
|
||||
|
||||
/**
|
||||
* The legacy "Account Type Creation" fields, flat and keyed by their form field name.
|
||||
*
|
||||
* Set after construction rather than through a constructor parameter: the main constructor already
|
||||
* takes over a hundred arguments, and threading two more through it would touch every call site for
|
||||
* no benefit. Follows the same pattern as setLoanProductConfigurableAttributes above.
|
||||
*/
|
||||
private Map<String, Object> cbsExtensions;
|
||||
|
||||
/** The legacy Interest Rate Detail grid: one entry per interest type, in form order. */
|
||||
private List<Map<String, Object>> interestRateDetail;
|
||||
|
||||
public void setCbsExtensions(final Map<String, Object> cbsExtensions) {
|
||||
this.cbsExtensions = cbsExtensions;
|
||||
}
|
||||
|
||||
public void setInterestRateDetail(final List<Map<String, Object>> interestRateDetail) {
|
||||
this.interestRateDetail = interestRateDetail;
|
||||
}
|
||||
|
||||
public boolean isIsLinkedToFloatingInterestRates() {
|
||||
return this.isLinkedToFloatingInterestRates;
|
||||
}
|
||||
|
||||
-740
@@ -1,740 +0,0 @@
|
||||
/**
|
||||
* Copyright since 2025 Mifos Initiative
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.loanproduct.domain;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.OneToOne;
|
||||
import jakarta.persistence.Table;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
/**
|
||||
* The legacy "Account Type Creation" configuration for a loan product.
|
||||
*
|
||||
* Fineract's loan product schema has no home for these fields, and they are specific to this
|
||||
* deployment, so they hang off {@link LoanProduct} 1:1 instead of widening m_product_loan - an
|
||||
* upstream change to that table can then never collide with them.
|
||||
*
|
||||
* Loan account creation reads this at origination time, which is why these are typed columns rather
|
||||
* than a JSON blob: callers get a compile-checked getter and reports get a plain column.
|
||||
*/
|
||||
@Entity
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Table(name = "m_product_loan_cbs_ext")
|
||||
public class LoanProductCbsExt {
|
||||
|
||||
@Id
|
||||
@Column(name = "loan_product_id")
|
||||
private Long loanProductId;
|
||||
|
||||
/**
|
||||
* Shared primary key: this and {@link #loanProductId} are the same column, so the association is
|
||||
* mapped read-only and {@code loanProductId} is the one that writes it. EclipseLink rejects an
|
||||
* entity with two writable mappings for one field.
|
||||
*/
|
||||
@OneToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "loan_product_id", insertable = false, updatable = false)
|
||||
private LoanProduct loanProduct;
|
||||
|
||||
// ---- classification & legacy header fields (24) ---------------------
|
||||
|
||||
@Column(name = "product_type_group")
|
||||
private String productTypeGroup;
|
||||
|
||||
@Column(name = "product_type_sub_group")
|
||||
private String productTypeSubGroup;
|
||||
|
||||
@Column(name = "debit_int_calculation")
|
||||
private Boolean debitIntCalculation;
|
||||
|
||||
@Column(name = "separate_penal_interest")
|
||||
private Boolean separatePenalInterest;
|
||||
|
||||
@Column(name = "credit_int_calculation")
|
||||
private Boolean creditIntCalculation;
|
||||
|
||||
@Column(name = "sub_account_type_balance")
|
||||
private Boolean subAccountTypeBalance;
|
||||
|
||||
@Column(name = "final_int_rounding")
|
||||
private Boolean finalIntRounding;
|
||||
|
||||
@Column(name = "rounding_up_to")
|
||||
private Integer roundingUpTo;
|
||||
|
||||
@Column(name = "account_type_code")
|
||||
private String accountTypeCode;
|
||||
|
||||
@Column(name = "micr_transaction_code")
|
||||
private String micrTransactionCode;
|
||||
|
||||
@Column(name = "reserved_ecs_serial_number")
|
||||
private String reservedEcsSerialNumber;
|
||||
|
||||
@Column(name = "reverse_ecs_number")
|
||||
private String reverseEcsNumber;
|
||||
|
||||
@Column(name = "lock_cheque_info_enabled")
|
||||
private Boolean lockChequeInfoEnabled;
|
||||
|
||||
@Column(name = "lock_page_two_info_enabled")
|
||||
private Boolean lockPageTwoInfoEnabled;
|
||||
|
||||
@Column(name = "computerization_date")
|
||||
private LocalDate computerizationDate;
|
||||
|
||||
@Column(name = "cheque_print_description")
|
||||
private String chequePrintDescription;
|
||||
|
||||
@Column(name = "pos_account_type_description")
|
||||
private String posAccountTypeDescription;
|
||||
|
||||
@Column(name = "pfms_account_type")
|
||||
private String pfmsAccountType;
|
||||
|
||||
@Column(name = "renewal_date_add_months")
|
||||
private Integer renewalDateAddMonths;
|
||||
|
||||
@Column(name = "document_renewal_date_add_months")
|
||||
private Integer documentRenewalDateAddMonths;
|
||||
|
||||
@Column(name = "pps_limit")
|
||||
private BigDecimal ppsLimit;
|
||||
|
||||
@Column(name = "is_write_off_account_type")
|
||||
private Boolean isWriteOffAccountType;
|
||||
|
||||
@Column(name = "write_off_account_type_code")
|
||||
private String writeOffAccountTypeCode;
|
||||
|
||||
@Column(name = "renewal_grace_days")
|
||||
private Integer renewalGraceDays;
|
||||
|
||||
// ---- Cheque Book Settings (10) --------------------------------------
|
||||
|
||||
@Column(name = "cheque_book_issue_enabled")
|
||||
private Boolean chequeBookIssueEnabled;
|
||||
|
||||
@Column(name = "cheque_validation_required")
|
||||
private Boolean chequeValidationRequired;
|
||||
|
||||
@Column(name = "is_first_cheque_book_free")
|
||||
private Boolean isFirstChequeBookFree;
|
||||
|
||||
@Column(name = "cheque_printing_account_type")
|
||||
private String chequePrintingAccountType;
|
||||
|
||||
@Column(name = "allow_withdrawal_slip_usage")
|
||||
private Boolean allowWithdrawalSlipUsage;
|
||||
|
||||
@Column(name = "maintain_cheque_book_stock_registry")
|
||||
private Boolean maintainChequeBookStockRegistry;
|
||||
|
||||
@Column(name = "free_cheque_books_per_year")
|
||||
private Integer freeChequeBooksPerYear;
|
||||
|
||||
@Column(name = "allow_credit_by_cheque_number")
|
||||
private Boolean allowCreditByChequeNumber;
|
||||
|
||||
@Column(name = "credit_cheque_validation_required")
|
||||
private Boolean creditChequeValidationRequired;
|
||||
|
||||
@Column(name = "grace_days_for_stock_statement")
|
||||
private Integer graceDaysForStockStatement;
|
||||
|
||||
// ---- Additional Product Settings (37) -------------------------------
|
||||
|
||||
@Column(name = "account_type_active_for_transactions")
|
||||
private Boolean accountTypeActiveForTransactions;
|
||||
|
||||
@Column(name = "sub_type_activity_enabled")
|
||||
private Boolean subTypeActivityEnabled;
|
||||
|
||||
@Column(name = "account_opening_charges")
|
||||
private BigDecimal accountOpeningCharges;
|
||||
|
||||
@Column(name = "maximum_gold_loan_limit")
|
||||
private BigDecimal maximumGoldLoanLimit;
|
||||
|
||||
@Column(name = "last_account_number_opened")
|
||||
private String lastAccountNumberOpened;
|
||||
|
||||
@Column(name = "customer_termination_allowed")
|
||||
private Boolean customerTerminationAllowed;
|
||||
|
||||
@Column(name = "charges_for_cash_credit_above_limit")
|
||||
private BigDecimal chargesForCashCreditAboveLimit;
|
||||
|
||||
@Column(name = "death_interest_gl_account")
|
||||
private String deathInterestGLAccount;
|
||||
|
||||
@Column(name = "starting_ledger_number")
|
||||
private Integer startingLedgerNumber;
|
||||
|
||||
@Column(name = "ending_ledger_number")
|
||||
private Integer endingLedgerNumber;
|
||||
|
||||
@Column(name = "current_ledger_number")
|
||||
private Integer currentLedgerNumber;
|
||||
|
||||
@Column(name = "remittance_account_number")
|
||||
private String remittanceAccountNumber;
|
||||
|
||||
@Column(name = "is_non_resident_indian_account")
|
||||
private Boolean isNonResidentIndianAccount;
|
||||
|
||||
@Column(name = "debit_clearing_gl_account")
|
||||
private String debitClearingGLAccount;
|
||||
|
||||
@Column(name = "missed_call_alert_service_active")
|
||||
private Boolean missedCallAlertServiceActive;
|
||||
|
||||
@Column(name = "standing_instruction_charge_gl_account")
|
||||
private String standingInstructionChargeGLAccount;
|
||||
|
||||
@Column(name = "standing_instruction_debit_charge_skip_option")
|
||||
private String standingInstructionDebitChargeSkipOption;
|
||||
|
||||
@Column(name = "opening_balance_multiplier_for_remittance_charges")
|
||||
private BigDecimal openingBalanceMultiplierForRemittanceCharges;
|
||||
|
||||
@Column(name = "gold_loan_packet_number_with_year_enabled")
|
||||
private Boolean goldLoanPacketNumberWithYearEnabled;
|
||||
|
||||
@Column(name = "account_move_to_inoperative_enabled")
|
||||
private Boolean accountMoveToInoperativeEnabled;
|
||||
|
||||
@Column(name = "generate_gl_diff_entry_enabled")
|
||||
private Boolean generateGlDiffEntryEnabled;
|
||||
|
||||
@Column(name = "sub_type_wise_gl_balance_generation_enabled")
|
||||
private Boolean subTypeWiseGlBalanceGenerationEnabled;
|
||||
|
||||
@Column(name = "validate_before_deleting_debit_entry_enabled")
|
||||
private Boolean validateBeforeDeletingDebitEntryEnabled;
|
||||
|
||||
@Column(name = "rc_file_concept_enabled")
|
||||
private Boolean rcFileConceptEnabled;
|
||||
|
||||
@Column(name = "account_close_zero_balance_in_open_day_process")
|
||||
private Boolean accountCloseZeroBalanceInOpenDayProcess;
|
||||
|
||||
@Column(name = "account_close_zero_balance_at_subledger_tran_entry")
|
||||
private Boolean accountCloseZeroBalanceAtSubledgerTranEntry;
|
||||
|
||||
@Column(name = "limit_enhancement_against_clearing_screen_display_enabled")
|
||||
private Boolean limitEnhancementAgainstClearingScreenDisplayEnabled;
|
||||
|
||||
@Column(name = "advance_interest_parameter_in_ledger_enabled")
|
||||
private Boolean advanceInterestParameterInLedgerEnabled;
|
||||
|
||||
@Column(name = "vehicle_detail_in_master_enabled")
|
||||
private Boolean vehicleDetailInMasterEnabled;
|
||||
|
||||
@Column(name = "deleted_cheque_issue_enabled")
|
||||
private Boolean deletedChequeIssueEnabled;
|
||||
|
||||
@Column(name = "dp_reduce_in_document_renewal_date_enabled")
|
||||
private Boolean dpReduceInDocumentRenewalDateEnabled;
|
||||
|
||||
@Column(name = "dp_reduce_in_renewal_date_enabled")
|
||||
private Boolean dpReduceInRenewalDateEnabled;
|
||||
|
||||
@Column(name = "auto_close_at_day_end_enabled")
|
||||
private Boolean autoCloseAtDayEndEnabled;
|
||||
|
||||
@Column(name = "loan_rate_from_master_enabled")
|
||||
private Boolean loanRateFromMasterEnabled;
|
||||
|
||||
@Column(name = "cheque_short_name")
|
||||
private String chequeShortName;
|
||||
|
||||
@Column(name = "statement_print_enabled")
|
||||
private Boolean statementPrintEnabled;
|
||||
|
||||
@Column(name = "nesl_code")
|
||||
private String neslCode;
|
||||
|
||||
// ---- Interest Related Parameters (53) -------------------------------
|
||||
|
||||
@Column(name = "drawing_power_and_limit_generation_procedure")
|
||||
private String drawingPowerAndLimitGenerationProcedure;
|
||||
|
||||
@Column(name = "advances_interest_calculation_method")
|
||||
private String advancesInterestCalculationMethod;
|
||||
|
||||
@Column(name = "against_interest_calculation_enabled")
|
||||
private Boolean againstInterestCalculationEnabled;
|
||||
|
||||
@Column(name = "day_wise_against_clearing_interest_rounding")
|
||||
private Boolean dayWiseAgainstClearingInterestRounding;
|
||||
|
||||
@Column(name = "interest_calculation_one_fourth_method")
|
||||
private String interestCalculationOneFourthMethod;
|
||||
|
||||
@Column(name = "against_clearing_interest_procedure_type")
|
||||
private String againstClearingInterestProcedureType;
|
||||
|
||||
@Column(name = "consider_debit_closing_amount_for_against_clearing")
|
||||
private Boolean considerDebitClosingAmountForAgainstClearing;
|
||||
|
||||
@Column(name = "interest_rounding_method")
|
||||
private String interestRoundingMethod;
|
||||
|
||||
@Column(name = "penalty_interest_calculation_enabled")
|
||||
private Boolean penaltyInterestCalculationEnabled;
|
||||
|
||||
@Column(name = "penalty_interest_calculation_method")
|
||||
private String penaltyInterestCalculationMethod;
|
||||
|
||||
@Column(name = "penalty_interest_procedure_number")
|
||||
private String penaltyInterestProcedureNumber;
|
||||
|
||||
@Column(name = "overdrawn_interest_calculation_method")
|
||||
private String overdrawnInterestCalculationMethod;
|
||||
|
||||
@Column(name = "calculate_overdrawn_interest_after_renewal")
|
||||
private Boolean calculateOverdrawnInterestAfterRenewal;
|
||||
|
||||
@Column(name = "interest_on_credit_balance")
|
||||
private Boolean interestOnCreditBalance;
|
||||
|
||||
@Column(name = "penalty_interest_date_different_than_regular_interest")
|
||||
private Boolean penaltyInterestDateDifferentThanRegularInterest;
|
||||
|
||||
@Column(name = "fixed_deposit_overdraft_certificate_sort_order")
|
||||
private String fixedDepositOverdraftCertificateSortOrder;
|
||||
|
||||
@Column(name = "use_document_submission_date_for_interest")
|
||||
private Boolean useDocumentSubmissionDateForInterest;
|
||||
|
||||
@Column(name = "loan_management_system_renewal_penalty_active")
|
||||
private Boolean loanManagementSystemRenewalPenaltyActive;
|
||||
|
||||
@Column(name = "minimum_normal_interest_amount")
|
||||
private BigDecimal minimumNormalInterestAmount;
|
||||
|
||||
@Column(name = "minimum_interest_calculation_method")
|
||||
private String minimumInterestCalculationMethod;
|
||||
|
||||
@Column(name = "minimum_against_clearing_interest_amount")
|
||||
private BigDecimal minimumAgainstClearingInterestAmount;
|
||||
|
||||
@Column(name = "limit_increase_upto_interest_amount_in_interest_calculation")
|
||||
private Boolean limitIncreaseUptoInterestAmountInInterestCalculation;
|
||||
|
||||
@Column(name = "minimum_penalty_interest_amount")
|
||||
private BigDecimal minimumPenaltyInterestAmount;
|
||||
|
||||
@Column(name = "days_for_limit_increase_upto_interest_amount")
|
||||
private Integer daysForLimitIncreaseUptoInterestAmount;
|
||||
|
||||
@Column(name = "additional_interest_rate_for_fixed_deposit_overdraft")
|
||||
private BigDecimal additionalInterestRateForFixedDepositOverdraft;
|
||||
|
||||
@Column(name = "consider_dd_payorder_in_against_clearing_interest_calculation")
|
||||
private Boolean considerDdPayorderInAgainstClearingInterestCalculation;
|
||||
|
||||
@Column(name = "grace_days_after_renew_date")
|
||||
private Integer graceDaysAfterRenewDate;
|
||||
|
||||
@Column(name = "apply_undebited_interest_concept_enabled")
|
||||
private Boolean applyUndebitedInterestConceptEnabled;
|
||||
|
||||
@Column(name = "interest_register_print_format_type")
|
||||
private String interestRegisterPrintFormatType;
|
||||
|
||||
@Column(name = "normal_grace_days_after_overdue")
|
||||
private Integer normalGraceDaysAfterOverdue;
|
||||
|
||||
@Column(name = "allow_against_clearing_entry")
|
||||
private Boolean allowAgainstClearingEntry;
|
||||
|
||||
@Column(name = "allow_no_balance_entry")
|
||||
private Boolean allowNoBalanceEntry;
|
||||
|
||||
@Column(name = "fd_od_penalty_interest_combined_with_normal_interest")
|
||||
private Boolean fixedDepositOverdraftPenaltyInterestCombinedWithNormalInterest;
|
||||
|
||||
@Column(name = "allow_no_balance_entry_with_password")
|
||||
private Boolean allowNoBalanceEntryWithPassword;
|
||||
|
||||
@Column(name = "undebited_simple_interest_account_wise")
|
||||
private Boolean undebitedSimpleInterestAccountWise;
|
||||
|
||||
@Column(name = "daily_interest_calculation_enabled")
|
||||
private Boolean dailyInterestCalculationEnabled;
|
||||
|
||||
@Column(name = "daily_interest_calculation_start_date")
|
||||
private String dailyInterestCalculationStartDate;
|
||||
|
||||
@Column(name = "non_performing_asset_penal_interest_rate_update")
|
||||
private Boolean nonPerformingAssetPenalInterestRateUpdate;
|
||||
|
||||
@Column(name = "non_performing_asset_penal_interest_rate")
|
||||
private BigDecimal nonPerformingAssetPenalInterestRate;
|
||||
|
||||
@Column(name = "fd_od_penal_interest_rate_update_in_branch_process")
|
||||
private Boolean fixedDepositOverdraftPenalInterestRateUpdateInBranchProcess;
|
||||
|
||||
@Column(name = "add_penal_interest_rate")
|
||||
private BigDecimal addPenalInterestRate;
|
||||
|
||||
@Column(name = "atyp14_simple_interest_enabled")
|
||||
private Boolean atyp14SimpleInterestEnabled;
|
||||
|
||||
@Column(name = "fixed_deposit_overdraft_margin_type")
|
||||
private String fixedDepositOverdraftMarginType;
|
||||
|
||||
@Column(name = "check_master_detail_edited_passing_pending_enabled")
|
||||
private Boolean checkMasterDetailEditedPassingPendingEnabled;
|
||||
|
||||
@Column(name = "credit_debit_interest_calculation_separate_enabled")
|
||||
private Boolean creditDebitInterestCalculationSeparateEnabled;
|
||||
|
||||
@Column(name = "on_time_interest_provision_enabled")
|
||||
private Boolean onTimeInterestProvisionEnabled;
|
||||
|
||||
@Column(name = "check_against_clearing_enabled")
|
||||
private Boolean checkAgainstClearingEnabled;
|
||||
|
||||
@Column(name = "gst_on_penalty_enabled")
|
||||
private Boolean gstOnPenaltyEnabled;
|
||||
|
||||
@Column(name = "penalty_interest_grace_days")
|
||||
private Integer penaltyInterestGraceDays;
|
||||
|
||||
@Column(name = "overdrawn_interest_rate")
|
||||
private BigDecimal overdrawnInterestRate;
|
||||
|
||||
@Column(name = "calculate_daily_limit_enhancement_tod_enabled")
|
||||
private Boolean calculateDailyLimitEnhancementTodEnabled;
|
||||
|
||||
@Column(name = "fixed_deposit_overdraft_multiple_interest_rate_enabled")
|
||||
private Boolean fixedDepositOverdraftMultipleInterestRateEnabled;
|
||||
|
||||
@Column(name = "grace_days_after_overdue_for_moratorium")
|
||||
private Integer graceDaysAfterOverdueForMoratorium;
|
||||
|
||||
// ---- Credit Bureau Settings (CIBIL) (8) ----------------------------
|
||||
|
||||
@Column(name = "cibil_account_type")
|
||||
private String cibilAccountType;
|
||||
|
||||
@Column(name = "cibil_commercial_account_type")
|
||||
private String cibilCommercialAccountType;
|
||||
|
||||
@Column(name = "highmark_account_type")
|
||||
private String highmarkAccountType;
|
||||
|
||||
@Column(name = "highmark_commercial_account_type")
|
||||
private String highmarkCommercialAccountType;
|
||||
|
||||
@Column(name = "experian_account_type")
|
||||
private String experianAccountType;
|
||||
|
||||
@Column(name = "experian_commercial_account_type")
|
||||
private String experianCommercialAccountType;
|
||||
|
||||
@Column(name = "equifax_account_type")
|
||||
private String equifaxAccountType;
|
||||
|
||||
@Column(name = "equifax_commercial_account_type")
|
||||
private String equifaxCommercialAccountType;
|
||||
|
||||
// ---- RBI Compliance & Product Category (6) -------------------------
|
||||
|
||||
@Column(name = "loan_product_category")
|
||||
private String loanProductCategory;
|
||||
|
||||
@Column(name = "penal_charge_method")
|
||||
private String penalChargeMethod;
|
||||
|
||||
@Column(name = "is_floating_rate")
|
||||
private Boolean isFloatingRate;
|
||||
|
||||
@Column(name = "foreclosure_charges_applicable")
|
||||
private Boolean foreclosureChargesApplicable;
|
||||
|
||||
@Column(name = "key_fact_statement_enabled")
|
||||
private Boolean keyFactStatementEnabled;
|
||||
|
||||
@Column(name = "annual_percentage_rate_calculation_enabled")
|
||||
private Boolean annualPercentageRateCalculationEnabled;
|
||||
|
||||
// ---- Channel & Transaction Limits (23) ------------------------------
|
||||
|
||||
@Column(name = "is_mobile_app_enabled")
|
||||
private Boolean isMobileAppEnabled;
|
||||
|
||||
@Column(name = "is_atm_enabled")
|
||||
private Boolean isAtmEnabled;
|
||||
|
||||
@Column(name = "atm_yearly_charge_enabled")
|
||||
private Boolean atmYearlyChargeEnabled;
|
||||
|
||||
@Column(name = "atm_minimum_balance")
|
||||
private BigDecimal atmMinimumBalance;
|
||||
|
||||
@Column(name = "email_active_enabled")
|
||||
private Boolean emailActiveEnabled;
|
||||
|
||||
@Column(name = "is_imps_enabled")
|
||||
private Boolean isImpsEnabled;
|
||||
|
||||
@Column(name = "is_upi_enabled")
|
||||
private Boolean isUpiEnabled;
|
||||
|
||||
@Column(name = "is_pos_enabled")
|
||||
private Boolean isPosEnabled;
|
||||
|
||||
@Column(name = "is_bbps_enabled")
|
||||
private Boolean isBbpsEnabled;
|
||||
|
||||
@Column(name = "inter_bank_limit_per_day")
|
||||
private BigDecimal interBankLimitPerDay;
|
||||
|
||||
@Column(name = "inter_bank_limit_per_transaction")
|
||||
private BigDecimal interBankLimitPerTransaction;
|
||||
|
||||
@Column(name = "neft_rtgs_limit_per_day")
|
||||
private BigDecimal neftRtgsLimitPerDay;
|
||||
|
||||
@Column(name = "neft_rtgs_limit_per_transaction")
|
||||
private BigDecimal neftRtgsLimitPerTransaction;
|
||||
|
||||
@Column(name = "neft_cutoff_limit")
|
||||
private BigDecimal neftCutoffLimit;
|
||||
|
||||
@Column(name = "rtgs_cutoff_limit")
|
||||
private BigDecimal rtgsCutoffLimit;
|
||||
|
||||
@Column(name = "neft_rtgs_minimum_balance")
|
||||
private BigDecimal neftRtgsMinimumBalance;
|
||||
|
||||
@Column(name = "is_charge_required_neft_rtgs_cbs")
|
||||
private Boolean isChargeRequiredNeftRtgsCbs;
|
||||
|
||||
@Column(name = "is_charge_required_neft_rtgs_mobile")
|
||||
private Boolean isChargeRequiredNeftRtgsMobile;
|
||||
|
||||
@Column(name = "imps_limit_per_day")
|
||||
private BigDecimal impsLimitPerDay;
|
||||
|
||||
@Column(name = "imps_limit_per_transaction")
|
||||
private BigDecimal impsLimitPerTransaction;
|
||||
|
||||
@Column(name = "imps_limit_per_month")
|
||||
private BigDecimal impsLimitPerMonth;
|
||||
|
||||
@Column(name = "imps_min_limit")
|
||||
private BigDecimal impsMinLimit;
|
||||
|
||||
@Column(name = "imps_monthly_transaction_count")
|
||||
private Integer impsMonthlyTransactionCount;
|
||||
|
||||
// ---- POS Facility & ATM CSV Settings (10) ---------------------------
|
||||
|
||||
@Column(name = "max_per_transaction_limit_atm")
|
||||
private BigDecimal maxPerTransactionLimitAtm;
|
||||
|
||||
@Column(name = "max_day_transaction_limit_atm")
|
||||
private BigDecimal maxDayTransactionLimitAtm;
|
||||
|
||||
@Column(name = "max_per_transaction_limit_pos")
|
||||
private BigDecimal maxPerTransactionLimitPos;
|
||||
|
||||
@Column(name = "max_day_transaction_limit_pos")
|
||||
private BigDecimal maxDayTransactionLimitPos;
|
||||
|
||||
@Column(name = "max_per_transaction_limit_ecom")
|
||||
private BigDecimal maxPerTransactionLimitEcom;
|
||||
|
||||
@Column(name = "max_day_transaction_limit_ecom")
|
||||
private BigDecimal maxDayTransactionLimitEcom;
|
||||
|
||||
@Column(name = "max_per_transaction_limit_upi")
|
||||
private BigDecimal maxPerTransactionLimitUpi;
|
||||
|
||||
@Column(name = "max_day_transaction_limit_upi")
|
||||
private BigDecimal maxDayTransactionLimitUpi;
|
||||
|
||||
@Column(name = "atm_csv_product_code")
|
||||
private String atmCsvProductCode;
|
||||
|
||||
@Column(name = "atm_csv_type_code")
|
||||
private String atmCsvTypeCode;
|
||||
|
||||
// ---- Auto Interest Post Parameters (4) -----------------------------
|
||||
|
||||
@Column(name = "auto_interest_post_type")
|
||||
private String autoInterestPostType;
|
||||
|
||||
@Column(name = "auto_interest_post_when")
|
||||
private String autoInterestPostWhen;
|
||||
|
||||
@Column(name = "auto_interest_post_fix_day")
|
||||
private Integer autoInterestPostFixDay;
|
||||
|
||||
@Column(name = "auto_last_interest_date")
|
||||
private String autoLastInterestDate;
|
||||
|
||||
// ---- Foreclosure / Early Account Closure (3) -----------------------
|
||||
|
||||
@Column(name = "calculate_early_account_close_charge")
|
||||
private Boolean calculateEarlyAccountCloseCharge;
|
||||
|
||||
@Column(name = "early_account_close_charge")
|
||||
private BigDecimal earlyAccountCloseCharge;
|
||||
|
||||
@Column(name = "early_account_close_period_in_months")
|
||||
private Integer earlyAccountClosePeriodInMonths;
|
||||
|
||||
// ---- Terms step (3) ------------------------------------------------
|
||||
|
||||
@Column(name = "debit_balance_allow")
|
||||
private Boolean debitBalanceAllow;
|
||||
|
||||
@Column(name = "allow_debit_trans_after_due_date")
|
||||
private Boolean allowDebitTransAfterDueDate;
|
||||
|
||||
@Column(name = "branch_level_account_type")
|
||||
private Boolean branchLevelAccountType;
|
||||
|
||||
// ---- legacy cheque / standing instruction / minimum balance charges (24)
|
||||
|
||||
@Column(name = "cheque_book_charge_enabled")
|
||||
private Boolean chequeBookChargeEnabled;
|
||||
|
||||
@Column(name = "cheque_return_charge_enabled")
|
||||
private Boolean chequeReturnChargeEnabled;
|
||||
|
||||
@Column(name = "ic_charge_debit_enabled")
|
||||
private Boolean icChargeDebitEnabled;
|
||||
|
||||
@Column(name = "cash_bundle_charge_enabled")
|
||||
private Boolean cashBundleChargeEnabled;
|
||||
|
||||
@Column(name = "cash_bundle_charge_with_pan_limit")
|
||||
private BigDecimal cashBundleChargeWithPanLimit;
|
||||
|
||||
@Column(name = "per_cheque_entry_charge")
|
||||
private BigDecimal perChequeEntryCharge;
|
||||
|
||||
@Column(name = "per_cheque_entry_service_charge")
|
||||
private BigDecimal perChequeEntryServiceCharge;
|
||||
|
||||
@Column(name = "per_inward_cheque_entry_charge")
|
||||
private BigDecimal perInwardChequeEntryCharge;
|
||||
|
||||
@Column(name = "per_outward_cheque_entry_charge")
|
||||
private BigDecimal perOutwardChequeEntryCharge;
|
||||
|
||||
@Column(name = "creditor_standing_instruction_fail_charge")
|
||||
private BigDecimal creditorStandingInstructionFailCharge;
|
||||
|
||||
@Column(name = "debtor_standing_instruction_fail_charge")
|
||||
private BigDecimal debtorStandingInstructionFailCharge;
|
||||
|
||||
@Column(name = "minimum_balance_checking_type")
|
||||
private String minimumBalanceCheckingType;
|
||||
|
||||
@Column(name = "auto_minimum_balance_charge")
|
||||
private Boolean autoMinimumBalanceCharge;
|
||||
|
||||
@Column(name = "calculate_daily_minimum_balance_charges")
|
||||
private Boolean calculateDailyMinimumBalanceCharges;
|
||||
|
||||
@Column(name = "minimum_balance_charge_enabled")
|
||||
private Boolean minimumBalanceChargeEnabled;
|
||||
|
||||
@Column(name = "minimum_balance_charge_amount")
|
||||
private BigDecimal minimumBalanceChargeAmount;
|
||||
|
||||
@Column(name = "minimum_balance_charge_for_cheque_issue")
|
||||
private BigDecimal minimumBalanceChargeForChequeIssue;
|
||||
|
||||
@Column(name = "minimum_balance_charge_method")
|
||||
private String minimumBalanceChargeMethod;
|
||||
|
||||
@Column(name = "months_after_min_balance_charge_calculate")
|
||||
private Integer monthsAfterMinBalanceChargeCalculate;
|
||||
|
||||
@Column(name = "for_cheque_issue")
|
||||
private BigDecimal forChequeIssue;
|
||||
|
||||
@Column(name = "for_cheque_issue_avg")
|
||||
private BigDecimal forChequeIssueAvg;
|
||||
|
||||
@Column(name = "for_withdrawal_slip")
|
||||
private BigDecimal forWithdrawalSlip;
|
||||
|
||||
@Column(name = "for_withdrawal_slip_avg")
|
||||
private BigDecimal forWithdrawalSlipAvg;
|
||||
|
||||
@Column(name = "calculate_daily_against_clearing_charge")
|
||||
private Boolean calculateDailyAgainstClearingCharge;
|
||||
|
||||
// ---- custom GL account mappings (14) --------------------------------
|
||||
|
||||
@Column(name = "int_receivables_gl_account_id")
|
||||
private Long intReceivablesGlAccountId;
|
||||
|
||||
@Column(name = "int_payable_gl_account_id")
|
||||
private Long intPayableGlAccountId;
|
||||
|
||||
@Column(name = "deaf_int_payable_gl_account_id")
|
||||
private Long deafIntPayableGlAccountId;
|
||||
|
||||
@Column(name = "int_overdue_reserve_account_id")
|
||||
private Long intOverdueReserveAccountId;
|
||||
|
||||
@Column(name = "undebited_interest_account_id")
|
||||
private Long undebitedInterestAccountId;
|
||||
|
||||
@Column(name = "penal_int_cr_gl_account_id")
|
||||
private Long penalIntCrGlAccountId;
|
||||
|
||||
@Column(name = "rd_matured_gl_account_id")
|
||||
private Long rdMaturedGlAccountId;
|
||||
|
||||
@Column(name = "gl_account_id")
|
||||
private Long glAccountId;
|
||||
|
||||
@Column(name = "ic_charge_gl_account_id")
|
||||
private Long icChargeGlAccountId;
|
||||
|
||||
@Column(name = "inoperative_gl_account_id")
|
||||
private Long inoperativeGlAccountId;
|
||||
|
||||
@Column(name = "credit_balance_liability_gl_account_id")
|
||||
private Long creditBalanceLiabilityGlAccountId;
|
||||
|
||||
@Column(name = "credit_balance_asset_gl_account_id")
|
||||
private Long creditBalanceAssetGlAccountId;
|
||||
|
||||
@Column(name = "overdue_accounts_gl_account_id")
|
||||
private Long overdueAccountsGlAccountId;
|
||||
|
||||
@Column(name = "rebate_gl_account_id")
|
||||
private Long rebateGlAccountId;
|
||||
|
||||
public LoanProductCbsExt(final LoanProduct loanProduct) {
|
||||
this.loanProduct = loanProduct;
|
||||
this.loanProductId = loanProduct.getId();
|
||||
}
|
||||
}
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
/**
|
||||
* Copyright since 2025 Mifos Initiative
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.loanproduct.domain;
|
||||
|
||||
import java.util.Optional;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
public interface LoanProductCbsExtRepository extends JpaRepository<LoanProductCbsExt, Long> {
|
||||
|
||||
/**
|
||||
* A product created before this table existed - or one saved without any legacy field filled in - has
|
||||
* no row here, so callers must handle the empty case rather than assuming one exists.
|
||||
*/
|
||||
Optional<LoanProductCbsExt> findByLoanProductId(Long loanProductId);
|
||||
}
|
||||
-82
@@ -1,82 +0,0 @@
|
||||
/**
|
||||
* Copyright since 2025 Mifos Initiative
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.loanproduct.domain;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
import jakarta.persistence.UniqueConstraint;
|
||||
import java.math.BigDecimal;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
|
||||
|
||||
/**
|
||||
* One row of the legacy "Interest Rate Detail" grid on the loan product form.
|
||||
*
|
||||
* The grid is a fixed four rows - Normal Debit, Normal Credit, Against Clearing and Penalty - each
|
||||
* carrying a Normal and a Special min/max rate plus the period they apply over. It is a child table
|
||||
* rather than twenty-four columns on {@link LoanProductCbsExt} because the interest type reads far
|
||||
* better as data than as part of a column name: against_clearing_special_max_rate and its siblings
|
||||
* are almost unreadable, and any new interest type would mean another migration.
|
||||
*
|
||||
* The rows are fixed today, so {@link #INTEREST_TYPES} is the full set and the table carries a unique
|
||||
* constraint on (product, interest type) - a replayed save updates in place instead of doubling the
|
||||
* grid.
|
||||
*/
|
||||
@Entity
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Table(name = "m_product_loan_cbs_interest_rate", uniqueConstraints = {
|
||||
@UniqueConstraint(columnNames = { "loan_product_id", "interest_type" }, name = "mplcir_unq_product_interest_type") })
|
||||
public class LoanProductCbsInterestRate extends AbstractPersistableCustom<Long> {
|
||||
|
||||
/** The grid's rows, in the order the form shows them. */
|
||||
public static final String[] INTEREST_TYPES = { "Normal Debit", "Normal Credit", "Against Clearing", "Penalty" };
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY, optional = false)
|
||||
@JoinColumn(name = "loan_product_id", nullable = false)
|
||||
private LoanProduct loanProduct;
|
||||
|
||||
@Column(name = "interest_type", nullable = false, length = 30)
|
||||
private String interestType;
|
||||
|
||||
@Column(name = "calculation")
|
||||
private Boolean calculation;
|
||||
|
||||
@Column(name = "normal_min_rate", precision = 9, scale = 6)
|
||||
private BigDecimal normalMinRate;
|
||||
|
||||
@Column(name = "normal_max_rate", precision = 9, scale = 6)
|
||||
private BigDecimal normalMaxRate;
|
||||
|
||||
@Column(name = "special_min_rate", precision = 9, scale = 6)
|
||||
private BigDecimal specialMinRate;
|
||||
|
||||
@Column(name = "special_max_rate", precision = 9, scale = 6)
|
||||
private BigDecimal specialMaxRate;
|
||||
|
||||
@Column(name = "period", length = 20)
|
||||
private String period;
|
||||
|
||||
public LoanProductCbsInterestRate(final LoanProduct loanProduct, final String interestType) {
|
||||
this.loanProduct = loanProduct;
|
||||
this.interestType = interestType;
|
||||
}
|
||||
|
||||
/** True when the officer left this row untouched, so it need not be persisted. */
|
||||
public boolean isEmpty() {
|
||||
return !Boolean.TRUE.equals(this.calculation) && this.normalMinRate == null && this.normalMaxRate == null
|
||||
&& this.specialMinRate == null && this.specialMaxRate == null && (this.period == null || this.period.isBlank());
|
||||
}
|
||||
}
|
||||
-18
@@ -1,18 +0,0 @@
|
||||
/**
|
||||
* Copyright since 2025 Mifos Initiative
|
||||
*
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.loanproduct.domain;
|
||||
|
||||
import java.util.List;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
public interface LoanProductCbsInterestRateRepository extends JpaRepository<LoanProductCbsInterestRate, Long> {
|
||||
|
||||
List<LoanProductCbsInterestRate> findByLoanProductIdOrderById(Long loanProductId);
|
||||
|
||||
LoanProductCbsInterestRate findByLoanProductIdAndInterestType(Long loanProductId, String interestType);
|
||||
}
|
||||
-5
@@ -1263,11 +1263,6 @@ public class AccountingProcessorHelper {
|
||||
accountMapping = paymentChannelSpecificAccountMapping;
|
||||
}
|
||||
}
|
||||
|
||||
if (accountMapping == null) {
|
||||
throw new ProductToGLAccountMappingNotFoundException(PortfolioProductType.SAVING, savingsProductId,
|
||||
CashAccountsForSavings.fromInt(accountMappingTypeId).toString());
|
||||
}
|
||||
glAccount = accountMapping.getGlAccount();
|
||||
}
|
||||
return glAccount;
|
||||
|
||||
+5
@@ -61,6 +61,11 @@ public class ConfigurationDomainServiceJpa implements ConfigurationDomainService
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isMakerCheckerEnabled() {
|
||||
return getGlobalConfigurationPropertyData(GlobalConfigurationConstants.MAKER_CHECKER).isEnabled();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getAllowedLoanStatusesForExternalAssetTransfer() {
|
||||
final GlobalConfigurationPropertyData property = getGlobalConfigurationPropertyData(
|
||||
|
||||
-9
@@ -107,7 +107,6 @@ import org.apache.fineract.portfolio.loanproduct.exception.LoanProductNotFoundEx
|
||||
import org.apache.fineract.portfolio.loanproduct.productmix.data.ProductMixData;
|
||||
import org.apache.fineract.portfolio.loanproduct.productmix.service.ProductMixReadPlatformService;
|
||||
import org.apache.fineract.portfolio.loanproduct.service.LoanDropdownReadPlatformService;
|
||||
import org.apache.fineract.portfolio.loanproduct.service.LoanProductCbsExtService;
|
||||
import org.apache.fineract.portfolio.loanproduct.service.LoanProductReadPlatformService;
|
||||
import org.apache.fineract.portfolio.paymenttype.data.PaymentTypeData;
|
||||
import org.apache.fineract.portfolio.paymenttype.service.PaymentTypeReadService;
|
||||
@@ -172,7 +171,6 @@ public class LoanProductsApiResource {
|
||||
private final ConfigurationDomainService configurationDomainService;
|
||||
private final DelinquencyReadPlatformService delinquencyReadPlatformService;
|
||||
private final CodeValueReadPlatformService codeValueReadPlatformService;
|
||||
private final LoanProductCbsExtService loanProductCbsExtService;
|
||||
|
||||
@POST
|
||||
@Consumes({ MediaType.APPLICATION_JSON })
|
||||
@@ -386,13 +384,6 @@ public class LoanProductsApiResource {
|
||||
if (settings.isTemplate()) {
|
||||
loanProduct = handleTemplate(loanProduct);
|
||||
}
|
||||
|
||||
// Legacy "Account Type Creation" fields, so the edit form can be repopulated with what was saved.
|
||||
// Set here rather than in the read service because handleTemplate above returns a fresh
|
||||
// LoanProductData built by a copy constructor, which would not carry these across.
|
||||
loanProduct.setCbsExtensions(this.loanProductCbsExtService.retrieveAsMap(productId));
|
||||
loanProduct.setInterestRateDetail(this.loanProductCbsExtService.retrieveInterestRateDetail(productId));
|
||||
|
||||
return this.toApiJsonSerializer.serialize(settings, loanProduct, LOAN_PRODUCT_DATA_PARAMETERS);
|
||||
}
|
||||
|
||||
|
||||
+4
-18
@@ -77,7 +77,6 @@ import org.apache.fineract.portfolio.loanproduct.domain.LoanRescheduleStrategyMe
|
||||
import org.apache.fineract.portfolio.loanproduct.domain.LoanSupportedInterestRefundTypes;
|
||||
import org.apache.fineract.portfolio.loanproduct.domain.RecalculationFrequencyType;
|
||||
import org.apache.fineract.portfolio.loanproduct.exception.EqualAmortizationUnsupportedFeatureException;
|
||||
import org.apache.fineract.portfolio.loanproduct.service.LoanProductCbsExtService;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@RequiredArgsConstructor
|
||||
@@ -213,12 +212,6 @@ public final class LoanProductDataValidator {
|
||||
LoanProductConstants.ALLOW_FULL_TERM_FOR_TRANCHE_PARAM_NAME //
|
||||
));
|
||||
|
||||
static {
|
||||
// The legacy "Account Type Creation" fields are persisted by LoanProductCbsExtService, which owns
|
||||
// the authoritative list of their names -- added here rather than restated so the two cannot drift.
|
||||
SUPPORTED_PARAMETERS.addAll(Arrays.asList(LoanProductCbsExtService.CBS_PARAMETERS));
|
||||
}
|
||||
|
||||
private static final String[] SUPPORTED_LOAN_CONFIGURABLE_ATTRIBUTES = { LoanProductConstants.amortizationTypeParamName,
|
||||
LoanProductConstants.interestTypeParamName, LoanProductConstants.transactionProcessingStrategyCodeParamName,
|
||||
LoanProductConstants.interestCalculationPeriodTypeParamName, LoanProductConstants.inArrearsToleranceParamName,
|
||||
@@ -242,14 +235,8 @@ public final class LoanProductDataValidator {
|
||||
throw new InvalidJsonException();
|
||||
}
|
||||
|
||||
// TEMPORARILY DISABLED while the legacy "Account Type Creation" fields are being wired through this
|
||||
// endpoint. SUPPORTED_PARAMETERS above already lists them, so re-enabling this is a one-line revert.
|
||||
//
|
||||
// Note what is lost until then: an unrecognised parameter is now accepted and silently ignored
|
||||
// instead of returning 400. A misspelt field name will therefore look like it saved and simply not
|
||||
// appear, so check the column actually changed rather than trusting a 200.
|
||||
// final Type typeOfMap = new TypeToken<Map<String, Object>>() {}.getType();
|
||||
// this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json, SUPPORTED_PARAMETERS);
|
||||
final Type typeOfMap = new TypeToken<Map<String, Object>>() {}.getType();
|
||||
this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json, SUPPORTED_PARAMETERS);
|
||||
|
||||
final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
|
||||
final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource(LOANPRODUCT);
|
||||
@@ -1349,9 +1336,8 @@ public final class LoanProductDataValidator {
|
||||
throw new InvalidJsonException();
|
||||
}
|
||||
|
||||
// TEMPORARILY DISABLED -- see the same note on validateForCreate above.
|
||||
// final Type typeOfMap = new TypeToken<Map<String, Object>>() {}.getType();
|
||||
// this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json, SUPPORTED_PARAMETERS);
|
||||
final Type typeOfMap = new TypeToken<Map<String, Object>>() {}.getType();
|
||||
this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json, SUPPORTED_PARAMETERS);
|
||||
|
||||
final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
|
||||
final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource(LOANPRODUCT);
|
||||
|
||||
-2117
File diff suppressed because it is too large
Load Diff
-14
@@ -97,7 +97,6 @@ public class LoanProductWritePlatformServiceJpaRepositoryImpl implements LoanPro
|
||||
private final CreditAllocationsJsonParser creditAllocationsJsonParser;
|
||||
private final LoanProductAssembler loanProductAssembler;
|
||||
private final LoanProductUpdateUtil loanProductUpdateUtil;
|
||||
private final LoanProductCbsExtService loanProductCbsExtService;
|
||||
private final LoanProductPaymentAllocationRuleMerger loanProductPaymentAllocationRuleMerger = new LoanProductPaymentAllocationRuleMerger();
|
||||
private final LoanProductCreditAllocationRuleMerger loanProductCreditAllocationRuleMerger = new LoanProductCreditAllocationRuleMerger();
|
||||
|
||||
@@ -142,11 +141,6 @@ public class LoanProductWritePlatformServiceJpaRepositoryImpl implements LoanPro
|
||||
|
||||
this.loanProductRepository.saveAndFlush(loanProduct);
|
||||
|
||||
// Legacy "Account Type Creation" fields, persisted in their own satellite table. Called after the
|
||||
// flush because the satellite row is keyed on the product's generated id. A request carrying none
|
||||
// of those parameters writes nothing.
|
||||
this.loanProductCbsExtService.saveOrUpdate(loanProduct, command);
|
||||
|
||||
// save accounting mappings
|
||||
this.accountMappingWritePlatformService.createLoanProductToGLAccountMapping(loanProduct.getId(), command);
|
||||
// check if the office specific products are enabled. If yes, then
|
||||
@@ -309,14 +303,6 @@ public class LoanProductWritePlatformServiceJpaRepositoryImpl implements LoanPro
|
||||
this.loanProductRepository.saveAndFlush(product);
|
||||
}
|
||||
|
||||
// Legacy "Account Type Creation" fields. Deliberately outside the changes check above: those
|
||||
// changes only track the standard product columns, so an edit that touched nothing but a legacy
|
||||
// field leaves the map empty and would otherwise be dropped.
|
||||
//
|
||||
// What it changed is folded into the same changes map, so the audit trail shows a per-field
|
||||
// diff for these exactly as it does for the standard ones rather than an empty change set.
|
||||
changes.putAll(this.loanProductCbsExtService.saveOrUpdate(product, command));
|
||||
|
||||
return new CommandProcessingResultBuilder() //
|
||||
.withCommandId(command.commandId()) //
|
||||
.withEntityId(loanProductId) //
|
||||
|
||||
+2
-4
@@ -40,7 +40,6 @@ import org.apache.fineract.portfolio.loanproduct.domain.LoanProductRepository;
|
||||
import org.apache.fineract.portfolio.loanproduct.serialization.LoanProductDataValidator;
|
||||
import org.apache.fineract.portfolio.loanproduct.service.LoanDropdownReadPlatformService;
|
||||
import org.apache.fineract.portfolio.loanproduct.service.LoanDropdownReadPlatformServiceImpl;
|
||||
import org.apache.fineract.portfolio.loanproduct.service.LoanProductCbsExtService;
|
||||
import org.apache.fineract.portfolio.loanproduct.service.LoanProductReadPlatformService;
|
||||
import org.apache.fineract.portfolio.loanproduct.service.LoanProductReadPlatformServiceImpl;
|
||||
import org.apache.fineract.portfolio.loanproduct.service.LoanProductWritePlatformService;
|
||||
@@ -83,12 +82,11 @@ public class LoanProductConfiguration {
|
||||
DelinquencyBucketRepository delinquencyBucketRepository,
|
||||
LoanRepaymentScheduleTransactionProcessorFactory loanRepaymentScheduleTransactionProcessorFactory,
|
||||
AdvancedPaymentAllocationsJsonParser advancedPaymentJsonParser, CreditAllocationsJsonParser creditAllocationsJsonParser,
|
||||
LoanProductAssembler loanProductAssembler, LoanProductUpdateUtil loanProductUpdateUtil,
|
||||
LoanProductCbsExtService loanProductCbsExtService) {
|
||||
LoanProductAssembler loanProductAssembler, LoanProductUpdateUtil loanProductUpdateUtil) {
|
||||
return new LoanProductWritePlatformServiceJpaRepositoryImpl(context, fromApiJsonDeserializer, loanProductRepository, aprCalculator,
|
||||
fundRepository, chargeRepository, rateRepository, accountMappingWritePlatformService, fineractEntityAccessUtil,
|
||||
floatingRateRepository, loanRepositoryWrapper, businessEventNotifierService, delinquencyBucketRepository,
|
||||
loanRepaymentScheduleTransactionProcessorFactory, advancedPaymentJsonParser, creditAllocationsJsonParser,
|
||||
loanProductAssembler, loanProductUpdateUtil, loanProductCbsExtService);
|
||||
loanProductAssembler, loanProductUpdateUtil);
|
||||
}
|
||||
}
|
||||
|
||||
+11
-6
@@ -29,6 +29,10 @@ import jakarta.ws.rs.core.MediaType;
|
||||
import java.time.LocalDate;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.fineract.commands.domain.CommandWrapper;
|
||||
import org.apache.fineract.commands.service.CommandWrapperBuilder;
|
||||
import org.apache.fineract.commands.service.PortfolioCommandSourceWritePlatformService;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
||||
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
|
||||
import org.apache.fineract.portfolio.savings.DepositsApiConstants;
|
||||
import org.apache.fineract.portfolio.savings.data.FdInterestRateEffectiveData;
|
||||
@@ -42,6 +46,7 @@ public class FixedDepositProductsBaseInterestRatesApiResource {
|
||||
|
||||
private final PlatformSecurityContext context;
|
||||
private final FdBaseInterestRateReadPlatformService fdBaseInterestRateReadPlatformService;
|
||||
private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
|
||||
private final Gson gson = new GsonBuilder()
|
||||
.registerTypeAdapter(LocalDate.class,
|
||||
(JsonSerializer<LocalDate>) (src, typeOfSrc, ctx) -> new JsonPrimitive(src.toString()))
|
||||
@@ -77,11 +82,11 @@ public class FixedDepositProductsBaseInterestRatesApiResource {
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
@Operation(summary = "Save new FD base interest rate version", description = "Creates a new FD CBS base chart version for the given fdType and deactivates the previous active version.")
|
||||
@ApiResponses({ @ApiResponse(responseCode = "200", description = "OK") })
|
||||
public String saveInterestRates(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
|
||||
this.context.authenticatedUser().validateHasReadPermission(DepositsApiConstants.FIXED_DEPOSIT_PRODUCT_RESOURCE_NAME);
|
||||
final FdInterestRateSaveRequest request = gson.fromJson(apiRequestBodyAsJson, FdInterestRateSaveRequest.class);
|
||||
final Long createdById = this.context.authenticatedUser().getId();
|
||||
final FdInterestRateEffectiveData saved = this.fdBaseInterestRateReadPlatformService.saveInterestRates(request, createdById);
|
||||
return gson.toJson(saved);
|
||||
public CommandProcessingResult saveInterestRates(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
|
||||
final CommandWrapper commandRequest = new CommandWrapperBuilder()
|
||||
.createCbsBaseInterestRate()
|
||||
.withJson(apiRequestBodyAsJson)
|
||||
.build();
|
||||
return this.commandsSourceWritePlatformService.logCommandSource(commandRequest);
|
||||
}
|
||||
}
|
||||
|
||||
+1
-47
@@ -97,7 +97,6 @@ import org.apache.fineract.portfolio.savings.SavingsInterestCalculationType;
|
||||
import org.apache.fineract.portfolio.savings.SavingsPeriodFrequencyType;
|
||||
import org.apache.fineract.portfolio.savings.SavingsPostingInterestPeriodType;
|
||||
import org.apache.fineract.portfolio.savings.domain.SavingsAccount;
|
||||
import org.apache.fineract.portfolio.savings.domain.SavingsAccountRepositoryWrapper;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@@ -106,14 +105,11 @@ public class DepositAccountDataValidator {
|
||||
|
||||
private final FromJsonHelper fromApiJsonHelper;
|
||||
private final DepositProductDataValidator productDataValidator;
|
||||
private final SavingsAccountRepositoryWrapper savingsAccountRepositoryWrapper;
|
||||
|
||||
@Autowired
|
||||
public DepositAccountDataValidator(final FromJsonHelper fromApiJsonHelper, final DepositProductDataValidator productDataValidator,
|
||||
final SavingsAccountRepositoryWrapper savingsAccountRepositoryWrapper) {
|
||||
public DepositAccountDataValidator(final FromJsonHelper fromApiJsonHelper, final DepositProductDataValidator productDataValidator) {
|
||||
this.fromApiJsonHelper = fromApiJsonHelper;
|
||||
this.productDataValidator = productDataValidator;
|
||||
this.savingsAccountRepositoryWrapper = savingsAccountRepositoryWrapper;
|
||||
}
|
||||
|
||||
public void validateFixedDepositForSubmit(final String json) {
|
||||
@@ -355,31 +351,10 @@ public class DepositAccountDataValidator {
|
||||
baseDataValidator.reset().parameter(maturityInstructionIdParamName).value(depositRolloverId).notNull()
|
||||
.isOneOfTheseValues(DepositAccountOnClosureType.integerValues());
|
||||
|
||||
// Withdraw Deposit books the maturity proceeds straight out of the bank's cash/vault GL the
|
||||
// moment the account matures -- before the customer has actually come in to collect it. For
|
||||
// maturities processed automatically by the scheduled job (not a live counter transaction),
|
||||
// that books cash as disbursed while it is still physically in the vault, so this option is
|
||||
// disabled: every account must resolve to Transfer to Savings or a Reinvest option instead.
|
||||
if (depositRolloverId.equals(DepositAccountOnClosureType.WITHDRAW_DEPOSIT.getValue())) {
|
||||
baseDataValidator.reset().parameter(maturityInstructionIdParamName).value(depositRolloverId).failWithCodeAndMessage(
|
||||
"maturity.instruction.withdraw.deposit.not.allowed",
|
||||
"Withdraw Deposit is not a valid maturity instruction -- choose Transfer to Savings or a Reinvest option.");
|
||||
}
|
||||
|
||||
if (depositRolloverId.equals(DepositAccountOnClosureType.TRANSFER_TO_SAVINGS.getValue())) {
|
||||
final Long transferToSavingsId = this.fromApiJsonHelper.extractLongNamed(transferToSavingsIdParamName, element);
|
||||
baseDataValidator.reset().parameter(transferToSavingsIdParamName).value(transferToSavingsId).notNull()
|
||||
.longGreaterThanZero();
|
||||
|
||||
// Transfer to Savings can only ever post into a genuine Savings account -- Current accounts
|
||||
// live in a separate ledger/module that this maturity-closure transfer cannot write into.
|
||||
if (transferToSavingsId != null && transferToSavingsId > 0
|
||||
&& !this.savingsAccountRepositoryWrapper.existsWithDepositAccountType(transferToSavingsId,
|
||||
DepositAccountType.SAVINGS_DEPOSIT)) {
|
||||
baseDataValidator.reset().parameter(transferToSavingsIdParamName).value(transferToSavingsId)
|
||||
.failWithCodeAndMessage("transfer.to.savings.id.is.not.a.savings.account",
|
||||
"The selected account is not a Savings account -- Transfer to Savings can only target a Savings account.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -518,31 +493,10 @@ public class DepositAccountDataValidator {
|
||||
baseDataValidator.reset().parameter(maturityInstructionIdParamName).value(depositRolloverId).notNull()
|
||||
.isOneOfTheseValues(DepositAccountOnClosureType.integerValues());
|
||||
|
||||
// Withdraw Deposit books the maturity proceeds straight out of the bank's cash/vault GL the
|
||||
// moment the account matures -- before the customer has actually come in to collect it. For
|
||||
// maturities processed automatically by the scheduled job (not a live counter transaction),
|
||||
// that books cash as disbursed while it is still physically in the vault, so this option is
|
||||
// disabled: every account must resolve to Transfer to Savings or a Reinvest option instead.
|
||||
if (depositRolloverId.equals(DepositAccountOnClosureType.WITHDRAW_DEPOSIT.getValue())) {
|
||||
baseDataValidator.reset().parameter(maturityInstructionIdParamName).value(depositRolloverId).failWithCodeAndMessage(
|
||||
"maturity.instruction.withdraw.deposit.not.allowed",
|
||||
"Withdraw Deposit is not a valid maturity instruction -- choose Transfer to Savings or a Reinvest option.");
|
||||
}
|
||||
|
||||
if (depositRolloverId.equals(DepositAccountOnClosureType.TRANSFER_TO_SAVINGS.getValue())) {
|
||||
final Long transferToSavingsId = this.fromApiJsonHelper.extractLongNamed(transferToSavingsIdParamName, element);
|
||||
baseDataValidator.reset().parameter(transferToSavingsIdParamName).value(transferToSavingsId).notNull()
|
||||
.longGreaterThanZero();
|
||||
|
||||
// Transfer to Savings can only ever post into a genuine Savings account -- Current accounts
|
||||
// live in a separate ledger/module that this maturity-closure transfer cannot write into.
|
||||
if (transferToSavingsId != null && transferToSavingsId > 0
|
||||
&& !this.savingsAccountRepositoryWrapper.existsWithDepositAccountType(transferToSavingsId,
|
||||
DepositAccountType.SAVINGS_DEPOSIT)) {
|
||||
baseDataValidator.reset().parameter(transferToSavingsIdParamName).value(transferToSavingsId)
|
||||
.failWithCodeAndMessage("transfer.to.savings.id.is.not.a.savings.account",
|
||||
"The selected account is not a Savings account -- Transfer to Savings can only target a Savings account.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+7
-12
@@ -555,19 +555,14 @@ public class DepositAccountDomainServiceJpa implements DepositAccountDomainServi
|
||||
}
|
||||
|
||||
private void updateAlreadyPostedTransactions(final Set<Long> existingTransactionIds, final SavingsAccount savingsAccount) {
|
||||
// accountTransfersWritePlatformService.transferFunds() already posts accounting for the
|
||||
// withdrawal it creates on this account (via SavingsAccountDomainServiceJpa#handleWithdrawal),
|
||||
// so that withdrawal must be added to existingTransactionIds here or the caller's own
|
||||
// postJournalEntries() re-derives and re-posts it a second time. The previous implementation
|
||||
// found it by walking the transaction list backwards from the end while the type stayed
|
||||
// withdrawal/withdrawal-fee -- but @OneToMany collections only guarantee @OrderBy ordering on
|
||||
// a fresh fetch, not after an in-memory append, so a same-day interest posting or any other
|
||||
// ordering quirk could put the new withdrawal anywhere in the list and break the walk
|
||||
// silently. Scanning every transaction and checking against the original snapshot is correct
|
||||
// regardless of collection order.
|
||||
for (final SavingsAccountTransaction transaction : savingsAccount.getTransactions()) {
|
||||
if ((transaction.isWithdrawal() || transaction.isWithdrawalFee()) && !existingTransactionIds.contains(transaction.getId())) {
|
||||
List<SavingsAccountTransaction> transactions = savingsAccount.getTransactions();
|
||||
int size = transactions.size();
|
||||
for (int i = size - 1;; i--) {
|
||||
SavingsAccountTransaction transaction = transactions.get(i);
|
||||
if (transaction.isWithdrawal() || transaction.isWithdrawalFee()) {
|
||||
existingTransactionIds.add(transaction.getId());
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.savings.handler;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.fineract.commands.annotation.CommandType;
|
||||
import org.apache.fineract.commands.handler.NewCommandSourceHandler;
|
||||
import org.apache.fineract.infrastructure.core.api.JsonCommand;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
||||
import org.apache.fineract.portfolio.savings.service.FdBaseInterestRateWritePlatformService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Service
|
||||
@CommandType(entity = "CBSBASEINTERESTRATE", action = "CREATE")
|
||||
@RequiredArgsConstructor
|
||||
public class CreateCbsBaseInterestRateCommandHandler implements NewCommandSourceHandler {
|
||||
|
||||
private final FdBaseInterestRateWritePlatformService writePlatformService;
|
||||
|
||||
@Transactional
|
||||
@Override
|
||||
public CommandProcessingResult processCommand(final JsonCommand command) {
|
||||
return this.writePlatformService.saveInterestRates(command);
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -554,7 +554,7 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead
|
||||
fieldOfficerOptions, interestCompoundingPeriodTypeOptions, interestPostingPeriodTypeOptions,
|
||||
interestCalculationTypeOptions, interestCalculationDaysInYearTypeOptions, lockinPeriodFrequencyTypeOptions,
|
||||
withdrawalFeeTypeOptions, transactions, charges, chargeOptions, preClosurePenalInterestOnTypeOptions,
|
||||
periodFrequencyTypeOptions, savingsAccountDatas, maturityInstructionOptions);
|
||||
periodFrequencyTypeOptions);
|
||||
template = RecurringDepositAccountData.withInterestChartAndRecurringDetails((RecurringDepositAccountData) template,
|
||||
accountChart, null, null);
|
||||
// Re-apply CBS product fields lost during factory method object creation
|
||||
@@ -626,7 +626,7 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead
|
||||
fieldOfficerOptions, interestCompoundingPeriodTypeOptions, interestPostingPeriodTypeOptions,
|
||||
interestCalculationTypeOptions, interestCalculationDaysInYearTypeOptions, lockinPeriodFrequencyTypeOptions,
|
||||
withdrawalFeeTypeOptions, transactions, charges, chargeOptions, preClosurePenalInterestOnTypeOptions,
|
||||
periodFrequencyTypeOptions, savingsAccountDatas, maturityInstructionOptions);
|
||||
periodFrequencyTypeOptions);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
-22
@@ -1393,15 +1393,6 @@ public class DepositAccountWritePlatformServiceJpaRepositoryImpl implements Depo
|
||||
this.depositAccountDomainService.handleFDAccountMaturityClosure(fdAccount, null, user, fmt, fdAccount.maturityDate(),
|
||||
fdAccount.getOnAccountClosureId(), toSavingsId, "Apply maturity instructions", changes);
|
||||
|
||||
// Every maturity-instruction branch takes the balance out of this account through
|
||||
// SavingsAccountDomainServiceJpa#handleWithdrawal, which posts that withdrawal's journal
|
||||
// entries itself. existingTransactionIds was snapshotted at the top of this method --
|
||||
// before that withdrawal existed -- so the postJournalEntries() call at the end would
|
||||
// treat it as new and post it a second time. Interest postings created by
|
||||
// updateMaturityStatus() above are still genuinely unposted at this point and must stay
|
||||
// out of the snapshot so that final call can post them exactly once.
|
||||
markWithdrawalsAsAlreadyPosted(account, existingTransactionIds);
|
||||
|
||||
if (changes.get("reinvestedDepositId") != null) {
|
||||
Long reinvestedDepositId = (Long) changes.get("reinvestedDepositId");
|
||||
Money amountForDeposit = account.activateWithBalance();
|
||||
@@ -1430,19 +1421,6 @@ public class DepositAccountWritePlatformServiceJpaRepositoryImpl implements Depo
|
||||
existingReversedTransactionIds.addAll(account.findExistingReversedTransactionIds());
|
||||
}
|
||||
|
||||
/**
|
||||
* Marks the account's withdrawal (and withdrawal-fee) transactions as already accounted for, so a
|
||||
* subsequent postJournalEntries() built on an older snapshot does not post them again. Used after a
|
||||
* maturity closure, whose withdrawal leg posts its own journal entries.
|
||||
*/
|
||||
private void markWithdrawalsAsAlreadyPosted(final SavingsAccount account, final Set<Long> existingTransactionIds) {
|
||||
for (final SavingsAccountTransaction transaction : account.getTransactions()) {
|
||||
if (transaction.getId() != null && (transaction.isWithdrawal() || transaction.isWithdrawalFee())) {
|
||||
existingTransactionIds.add(transaction.getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void postJournalEntries(final SavingsAccount savingsAccount, final Set<Long> existingTransactionIds,
|
||||
final Set<Long> existingReversedTransactionIds) {
|
||||
|
||||
|
||||
+128
-1
@@ -11,10 +11,16 @@
|
||||
*/
|
||||
package org.apache.fineract.portfolio.savings.service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.fineract.infrastructure.core.data.ApiParameterError;
|
||||
import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
|
||||
import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
|
||||
import org.apache.fineract.portfolio.savings.api.FdInterestRateSaveRequest;
|
||||
import org.apache.fineract.portfolio.savings.data.FdInterestRateEffectiveData;
|
||||
import org.apache.fineract.portfolio.savings.data.FdInterestRateSlabData;
|
||||
@@ -51,7 +57,9 @@ public class FdBaseInterestRateReadPlatformServiceImpl implements FdBaseInterest
|
||||
@Override
|
||||
@Transactional
|
||||
public FdInterestRateEffectiveData saveInterestRates(FdInterestRateSaveRequest request, Long createdById) {
|
||||
final String fdType = request.getFdType();
|
||||
validateRequest(request);
|
||||
|
||||
final String fdType = request.getFdType().toUpperCase();
|
||||
final LocalDate today = LocalDate.now(DateUtils.getDateTimeZoneOfTenant());
|
||||
|
||||
final List<FdBaseInterestRateEffective> activeVersions = effectiveRepository
|
||||
@@ -85,6 +93,125 @@ public class FdBaseInterestRateReadPlatformServiceImpl implements FdBaseInterest
|
||||
return toData(newVersion);
|
||||
}
|
||||
|
||||
private void validateRequest(final FdInterestRateSaveRequest request) {
|
||||
final List<ApiParameterError> errors = new ArrayList<>();
|
||||
final DataValidatorBuilder validator = new DataValidatorBuilder(errors).resource("FD_BASE_INTEREST_RATE_VERSION");
|
||||
|
||||
if (request == null) {
|
||||
validator.failWithCodeNoParameterAddedToErrorCode("request.cannot.be.null");
|
||||
throwExceptionIfValidationWarningsExist(errors);
|
||||
return;
|
||||
}
|
||||
|
||||
final String fdType = request.getFdType();
|
||||
if (fdType == null || fdType.isBlank()) {
|
||||
validator.parameter("fdType").failWithCode("cannot.be.blank");
|
||||
} else if (!List.of("SINGLE", "DOUBLE", "SPECIAL").contains(fdType.toUpperCase())) {
|
||||
validator.parameter("fdType").value(fdType).failWithCode("invalid.fd.type");
|
||||
}
|
||||
|
||||
if (request.getSlabs() == null || request.getSlabs().isEmpty()) {
|
||||
validator.parameter("slabs").failWithCode("cannot.be.blank");
|
||||
}
|
||||
|
||||
if (request.getVersionLabel() != null && request.getVersionLabel().length() > 100) {
|
||||
validator.parameter("versionLabel").value(request.getVersionLabel()).failWithCode("exceeds.max.length");
|
||||
}
|
||||
|
||||
throwExceptionIfValidationWarningsExist(errors);
|
||||
validateSlabs(request.getSlabs());
|
||||
}
|
||||
|
||||
private void validateSlabs(final List<FdInterestRateSaveRequest.SlabRequest> slabs) {
|
||||
final List<ApiParameterError> errors = new ArrayList<>();
|
||||
final DataValidatorBuilder validator = new DataValidatorBuilder(errors).resource("FD_BASE_INTEREST_RATE_VERSION");
|
||||
|
||||
if (slabs == null || slabs.isEmpty()) {
|
||||
validator.parameter("slabs").failWithCode("cannot.be.blank");
|
||||
throwExceptionIfValidationWarningsExist(errors);
|
||||
return;
|
||||
}
|
||||
|
||||
final List<FdInterestRateSaveRequest.SlabRequest> sorted = new ArrayList<>(slabs);
|
||||
sorted.sort(Comparator.comparing((FdInterestRateSaveRequest.SlabRequest slab) -> slab.getSrNo() == null ? Integer.MAX_VALUE : slab.getSrNo())
|
||||
.thenComparing(slab -> slab.getFromPeriod() == null ? Integer.MAX_VALUE : slab.getFromPeriod()));
|
||||
|
||||
final Integer expectedPeriodType = sorted.get(0).getPeriodTypeEnum();
|
||||
Integer expectedFrom = 1;
|
||||
|
||||
for (int i = 0; i < sorted.size(); i++) {
|
||||
final FdInterestRateSaveRequest.SlabRequest slab = sorted.get(i);
|
||||
final int srNo = slab.getSrNo() == null ? i + 1 : slab.getSrNo();
|
||||
final String slabPrefix = "slabs[" + srNo + "].";
|
||||
|
||||
if (slab.getPeriodTypeEnum() == null) {
|
||||
validator.parameter(slabPrefix + "periodTypeEnum").failWithCode("cannot.be.blank");
|
||||
} else if (!slab.getPeriodTypeEnum().equals(expectedPeriodType)) {
|
||||
validator.parameter(slabPrefix + "periodTypeEnum").value(slab.getPeriodTypeEnum())
|
||||
.failWithCode("must.be.consistent.across.all.slabs");
|
||||
}
|
||||
|
||||
final Integer fromPeriod = slab.getFromPeriod();
|
||||
if (fromPeriod == null) {
|
||||
validator.parameter(slabPrefix + "fromPeriod").failWithCode("cannot.be.blank");
|
||||
} else if (fromPeriod < 0) {
|
||||
validator.parameter(slabPrefix + "fromPeriod").value(fromPeriod).failWithCode("must.be.non.negative");
|
||||
} else if (!fromPeriod.equals(expectedFrom)) {
|
||||
if (i == 0) {
|
||||
validator.parameter(slabPrefix + "fromPeriod").value(fromPeriod).failWithCode("first.slab.must.start.at.one");
|
||||
} else if (fromPeriod < expectedFrom) {
|
||||
validator.parameter(slabPrefix + "fromPeriod").value(fromPeriod).failWithCode("must.not.overlap.previous.range");
|
||||
} else {
|
||||
validator.parameter(slabPrefix + "fromPeriod").value(fromPeriod).failWithCode("must.be.continuous.with.previous.range");
|
||||
}
|
||||
}
|
||||
|
||||
final Integer toPeriod = slab.getToPeriod();
|
||||
if (i < sorted.size() - 1) {
|
||||
if (toPeriod == null) {
|
||||
validator.parameter(slabPrefix + "toPeriod").failWithCode("cannot.be.blank.for.intermediate.slab");
|
||||
} else {
|
||||
if (toPeriod < 0) {
|
||||
validator.parameter(slabPrefix + "toPeriod").value(toPeriod).failWithCode("must.be.non.negative");
|
||||
}
|
||||
if (fromPeriod != null && toPeriod < fromPeriod) {
|
||||
validator.parameter(slabPrefix + "toPeriod").value(toPeriod).failWithCode("cannot.be.less.than.fromPeriod");
|
||||
}
|
||||
expectedFrom = toPeriod + 1;
|
||||
}
|
||||
} else {
|
||||
if (toPeriod != null) {
|
||||
if (toPeriod < 0) {
|
||||
validator.parameter(slabPrefix + "toPeriod").value(toPeriod).failWithCode("must.be.non.negative");
|
||||
}
|
||||
if (fromPeriod != null && toPeriod < fromPeriod) {
|
||||
validator.parameter(slabPrefix + "toPeriod").value(toPeriod).failWithCode("cannot.be.less.than.fromPeriod");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
final BigDecimal annualRate = slab.getAnnualInterestRate();
|
||||
if (annualRate == null) {
|
||||
validator.parameter(slabPrefix + "annualInterestRate").failWithCode("cannot.be.blank");
|
||||
} else if (annualRate.compareTo(BigDecimal.ZERO) < 0) {
|
||||
validator.parameter(slabPrefix + "annualInterestRate").value(annualRate).failWithCode("must.be.non.negative");
|
||||
}
|
||||
|
||||
final BigDecimal seniorRate = slab.getSeniorCitizenRate();
|
||||
if (seniorRate != null && seniorRate.compareTo(BigDecimal.ZERO) < 0) {
|
||||
validator.parameter(slabPrefix + "seniorCitizenRate").value(seniorRate).failWithCode("must.be.non.negative");
|
||||
}
|
||||
}
|
||||
|
||||
throwExceptionIfValidationWarningsExist(errors);
|
||||
}
|
||||
|
||||
private void throwExceptionIfValidationWarningsExist(final List<ApiParameterError> dataValidationErrors) {
|
||||
if (!dataValidationErrors.isEmpty()) {
|
||||
throw new PlatformApiDataValidationException(dataValidationErrors);
|
||||
}
|
||||
}
|
||||
|
||||
private FdInterestRateEffectiveData toData(FdBaseInterestRateEffective e) {
|
||||
List<FdInterestRateSlabData> slabs = slabRepository.findByEffectiveIdOrderBySrNo(e.getId()).stream()
|
||||
.map(s -> FdInterestRateSlabData.builder()
|
||||
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.savings.service;
|
||||
|
||||
import org.apache.fineract.infrastructure.core.api.JsonCommand;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
||||
|
||||
public interface FdBaseInterestRateWritePlatformService {
|
||||
|
||||
CommandProcessingResult saveInterestRates(JsonCommand command);
|
||||
}
|
||||
+49
@@ -0,0 +1,49 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.savings.service;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.fineract.infrastructure.core.api.JsonCommand;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
|
||||
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
|
||||
import org.apache.fineract.portfolio.savings.api.FdInterestRateSaveRequest;
|
||||
import org.apache.fineract.portfolio.savings.data.FdInterestRateEffectiveData;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class FdBaseInterestRateWritePlatformServiceImpl implements FdBaseInterestRateWritePlatformService {
|
||||
|
||||
private final PlatformSecurityContext context;
|
||||
private final FdBaseInterestRateReadPlatformService readPlatformService;
|
||||
private final Gson gson = new Gson();
|
||||
|
||||
@Override
|
||||
public CommandProcessingResult saveInterestRates(final JsonCommand command) {
|
||||
final FdInterestRateSaveRequest request = gson.fromJson(command.json(), FdInterestRateSaveRequest.class);
|
||||
final Long createdById = this.context.authenticatedUser().getId();
|
||||
final FdInterestRateEffectiveData saved = this.readPlatformService.saveInterestRates(request, createdById);
|
||||
return new CommandProcessingResultBuilder()
|
||||
.withCommandId(command.commandId())
|
||||
.withEntityId(saved.getId())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
-24
@@ -1676,15 +1676,6 @@ public class SavingsAccountWritePlatformServiceJpaRepositoryImpl implements Savi
|
||||
@Override
|
||||
public void setSubStatusInactive(Long savingsId) {
|
||||
final SavingsAccount account = this.savingAccountAssembler.assembleFrom(savingsId, false);
|
||||
// Same snapshot-vs-execution gap as escheat() below: the dormant-accounts batch selects
|
||||
// pending-inactive ids from a query that requires status = ACTIVE, but the account can close
|
||||
// through another path (e.g. deposit maturity) before this call runs. Re-deriving accounting
|
||||
// off the full transaction list at that point re-posts entries that closure already posted.
|
||||
if (!account.isActive()) {
|
||||
log.warn("Skipping setSubStatusInactive for savings account {} -- no longer active (already closed by another process)",
|
||||
savingsId);
|
||||
return;
|
||||
}
|
||||
final Set<Long> existingTransactionIds = new HashSet<>();
|
||||
final Set<Long> existingReversedTransactionIds = new HashSet<>();
|
||||
updateExistingTransactionsDetails(account, existingTransactionIds, existingReversedTransactionIds);
|
||||
@@ -1696,11 +1687,6 @@ public class SavingsAccountWritePlatformServiceJpaRepositoryImpl implements Savi
|
||||
@Override
|
||||
public void setSubStatusDormant(Long savingsId) {
|
||||
final SavingsAccount account = this.savingAccountAssembler.assembleFrom(savingsId, false);
|
||||
if (!account.isActive()) {
|
||||
log.warn("Skipping setSubStatusDormant for savings account {} -- no longer active (already closed by another process)",
|
||||
savingsId);
|
||||
return;
|
||||
}
|
||||
account.setSubStatusDormant();
|
||||
this.savingAccountRepositoryWrapper.saveAndFlush(account);
|
||||
}
|
||||
@@ -1708,16 +1694,6 @@ public class SavingsAccountWritePlatformServiceJpaRepositoryImpl implements Savi
|
||||
@Override
|
||||
public void escheat(Long savingsId) {
|
||||
final SavingsAccount account = this.savingAccountAssembler.assembleFrom(savingsId, false);
|
||||
// The dormant-accounts batch selects escheat-eligible ids from a snapshot query, so an
|
||||
// account can legitimately close through another path (e.g. deposit maturity) in the gap
|
||||
// between that selection and this call. escheat() unconditionally forces status/sub-status
|
||||
// to CLOSED/ESCHEAT and re-derives accounting off the account's full transaction list, so
|
||||
// running it against an already-closed account both mislabels the closure reason and
|
||||
// re-posts journal entries for transactions that were already posted by the real closure.
|
||||
if (!account.isActive()) {
|
||||
log.warn("Skipping escheat for savings account {} -- no longer active (already closed by another process)", savingsId);
|
||||
return;
|
||||
}
|
||||
final Set<Long> existingTransactionIds = new HashSet<>();
|
||||
final Set<Long> existingReversedTransactionIds = new HashSet<>();
|
||||
updateExistingTransactionsDetails(account, existingTransactionIds, existingReversedTransactionIds);
|
||||
|
||||
+10
@@ -169,6 +169,8 @@ import org.apache.fineract.portfolio.savings.service.RdBaseInterestRateReadPlatf
|
||||
import org.apache.fineract.portfolio.savings.service.RdBaseInterestRateReadPlatformServiceImpl;
|
||||
import org.apache.fineract.portfolio.savings.service.FdBaseInterestRateReadPlatformService;
|
||||
import org.apache.fineract.portfolio.savings.service.FdBaseInterestRateReadPlatformServiceImpl;
|
||||
import org.apache.fineract.portfolio.savings.service.FdBaseInterestRateWritePlatformService;
|
||||
import org.apache.fineract.portfolio.savings.service.FdBaseInterestRateWritePlatformServiceImpl;
|
||||
import org.apache.fineract.portfolio.savings.service.SavingsSchedularInterestPoster;
|
||||
import org.apache.fineract.portfolio.savings.service.SavingsSchedularInterestPosterTask;
|
||||
import org.apache.fineract.portfolio.savings.service.search.SavingsAccountTransactionSearchService;
|
||||
@@ -200,6 +202,14 @@ public class SavingsConfiguration {
|
||||
return new FdBaseInterestRateReadPlatformServiceImpl(effectiveRepository, slabRepository);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean(FdBaseInterestRateWritePlatformService.class)
|
||||
public FdBaseInterestRateWritePlatformService fdBaseInterestRateWritePlatformService(
|
||||
PlatformSecurityContext context,
|
||||
FdBaseInterestRateReadPlatformService readPlatformService) {
|
||||
return new FdBaseInterestRateWritePlatformServiceImpl(context, readPlatformService);
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean(SavingsAccountTransactionSearchService.class)
|
||||
public SavingsAccountTransactionSearchService savingsAccountTransactionSearchService(PlatformSecurityContext context,
|
||||
|
||||
+79
@@ -0,0 +1,79 @@
|
||||
package org.apache.fineract.useradministration.api;
|
||||
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import io.swagger.v3.oas.annotations.parameters.RequestBody;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponse;
|
||||
import io.swagger.v3.oas.annotations.responses.ApiResponses;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.ws.rs.Consumes;
|
||||
import jakarta.ws.rs.GET;
|
||||
import jakarta.ws.rs.PUT;
|
||||
import jakarta.ws.rs.Path;
|
||||
import jakarta.ws.rs.PathParam;
|
||||
import jakarta.ws.rs.Produces;
|
||||
import jakarta.ws.rs.core.MediaType;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.fineract.infrastructure.security.exception.NoAuthorizationException;
|
||||
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
|
||||
import org.apache.fineract.useradministration.data.AppUserPreferenceData;
|
||||
import org.apache.fineract.useradministration.service.AppUserPreferenceReadPlatformService;
|
||||
import org.apache.fineract.useradministration.service.AppUserPreferenceWritePlatformService;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Path("/v1/users/{userId}/preferences")
|
||||
@Component
|
||||
@Tag(name = "User Preferences", description = "API to manage user specific preferences.")
|
||||
@RequiredArgsConstructor
|
||||
public class AppUserPreferencesApiResource {
|
||||
|
||||
private final PlatformSecurityContext context;
|
||||
private final AppUserPreferenceReadPlatformService readPlatformService;
|
||||
private final AppUserPreferenceWritePlatformService writePlatformService;
|
||||
|
||||
private void validateUserAuthorization(Long userId) {
|
||||
if (!context.authenticatedUser().getId().equals(userId)) {
|
||||
throw new NoAuthorizationException("Not authorized to access or modify preferences for another user.");
|
||||
}
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("{preferenceName}")
|
||||
@Consumes({ MediaType.APPLICATION_JSON })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
@Operation(summary = "Retrieve user preference", description = "Retrieves a specific preference for the user.")
|
||||
@ApiResponses({
|
||||
@ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = AppUserPreferenceData.class))) })
|
||||
public AppUserPreferenceData getPreference(@PathParam("userId") @Parameter(description = "userId") final Long userId,
|
||||
@PathParam("preferenceName") @Parameter(description = "preferenceName") final String preferenceName) {
|
||||
|
||||
validateUserAuthorization(userId);
|
||||
String value = readPlatformService.getPreferenceValue(userId, preferenceName);
|
||||
return new AppUserPreferenceData(preferenceName, value);
|
||||
}
|
||||
|
||||
@PUT
|
||||
@Path("{preferenceName}")
|
||||
@Consumes({ MediaType.APPLICATION_JSON })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
@Operation(summary = "Update user preference", description = "Updates or creates a specific preference for the user.")
|
||||
@RequestBody(required = true, content = @Content(schema = @Schema(implementation = AppUserPreferenceData.class)))
|
||||
@ApiResponses({ @ApiResponse(responseCode = "200", description = "OK") })
|
||||
public AppUserPreferenceData updatePreference(@PathParam("userId") @Parameter(description = "userId") final Long userId,
|
||||
@PathParam("preferenceName") @Parameter(description = "preferenceName") final String preferenceName,
|
||||
final AppUserPreferenceData preferenceData) {
|
||||
|
||||
validateUserAuthorization(userId);
|
||||
|
||||
// Ensure the path parameter matches the request body if the request body contains a name
|
||||
String valueToSave = preferenceData != null ? preferenceData.getValue() : null;
|
||||
if (valueToSave == null) {
|
||||
throw new IllegalArgumentException("Preference value cannot be null");
|
||||
}
|
||||
|
||||
writePlatformService.updatePreference(userId, preferenceName, valueToSave);
|
||||
return new AppUserPreferenceData(preferenceName, valueToSave);
|
||||
}
|
||||
}
|
||||
+67
@@ -88,6 +88,11 @@ public class UsersApiResource {
|
||||
private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
|
||||
private final BulkImportWorkbookPopulatorService bulkImportWorkbookPopulatorService;
|
||||
private final BulkImportWorkbookService bulkImportWorkbookService;
|
||||
private final org.apache.fineract.useradministration.service.UserPendingWritePlatformService userPendingWritePlatformService;
|
||||
private final org.apache.fineract.useradministration.service.UserPendingReadPlatformService userPendingReadPlatformService;
|
||||
private final org.apache.fineract.infrastructure.core.serialization.FromJsonHelper fromApiJsonHelper;
|
||||
private final org.apache.fineract.infrastructure.configuration.domain.ConfigurationDomainService configurationDomainService;
|
||||
private final DefaultToApiJsonSerializer<org.apache.fineract.useradministration.data.UserPendingRequestData> pendingRequestApiJsonSerializer;
|
||||
|
||||
@GET
|
||||
@Operation(summary = "Retrieve list of users", description = "Example Requests:\n" + "\n" + "users\n" + "\n" + "\n"
|
||||
@@ -158,6 +163,12 @@ public class UsersApiResource {
|
||||
@Consumes({ MediaType.APPLICATION_JSON })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
public String create(@Parameter(hidden = true) final String apiRequestBodyAsJson) {
|
||||
if (this.configurationDomainService.isMakerCheckerEnabled()) {
|
||||
final org.apache.fineract.infrastructure.core.api.JsonCommand command = org.apache.fineract.infrastructure.core.api.JsonCommand
|
||||
.fromJsonElement(null, this.fromApiJsonHelper.parse(apiRequestBodyAsJson), this.fromApiJsonHelper);
|
||||
final CommandProcessingResult result = this.userPendingWritePlatformService.submitCreateUser(command);
|
||||
return this.toApiJsonSerializer.serialize(result);
|
||||
}
|
||||
|
||||
final CommandWrapper commandRequest = new CommandWrapperBuilder() //
|
||||
.createUser() //
|
||||
@@ -179,6 +190,12 @@ public class UsersApiResource {
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
public String update(@PathParam("userId") @Parameter(description = "userId") final Long userId,
|
||||
@Parameter(hidden = true) final String apiRequestBodyAsJson) {
|
||||
if (this.configurationDomainService.isMakerCheckerEnabled()) {
|
||||
final org.apache.fineract.infrastructure.core.api.JsonCommand command = org.apache.fineract.infrastructure.core.api.JsonCommand
|
||||
.fromJsonElement(userId, this.fromApiJsonHelper.parse(apiRequestBodyAsJson), this.fromApiJsonHelper);
|
||||
final CommandProcessingResult result = this.userPendingWritePlatformService.submitUpdateUser(userId, command);
|
||||
return this.toApiJsonSerializer.serialize(result);
|
||||
}
|
||||
|
||||
final CommandWrapper commandRequest = new CommandWrapperBuilder() //
|
||||
.updateUser(userId) //
|
||||
@@ -190,6 +207,56 @@ public class UsersApiResource {
|
||||
return this.toApiJsonSerializer.serialize(result);
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("pending")
|
||||
@Consumes({ MediaType.APPLICATION_JSON })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
@Operation(summary = "List User creations & edits pending approval")
|
||||
public org.apache.fineract.infrastructure.core.service.Page<org.apache.fineract.useradministration.data.UserPendingRequestData> retrieveAllPendingUsers(
|
||||
@QueryParam("status") final String status,
|
||||
@QueryParam("username") final String username,
|
||||
@QueryParam("fromDate") final String fromDate,
|
||||
@QueryParam("toDate") final String toDate,
|
||||
@QueryParam("offset") final Integer offset,
|
||||
@QueryParam("limit") final Integer limit) {
|
||||
this.context.authenticatedUser().validateHasReadPermission(RESOURCE_NAME_FOR_PERMISSIONS);
|
||||
return this.userPendingReadPlatformService.retrieveAllPendingRequests(status, username, fromDate, toDate, offset, limit);
|
||||
}
|
||||
|
||||
@GET
|
||||
@Path("pending/{id}")
|
||||
@Consumes({ MediaType.APPLICATION_JSON })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
@Operation(summary = "Retrieve a pending user request by ID")
|
||||
public String retrievePendingUser(@PathParam("id") final Long id, @Context final UriInfo uriInfo) {
|
||||
this.context.authenticatedUser().validateHasReadPermission(RESOURCE_NAME_FOR_PERMISSIONS);
|
||||
final org.apache.fineract.useradministration.data.UserPendingRequestData data = this.userPendingReadPlatformService.retrievePendingRequest(id);
|
||||
final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters());
|
||||
return this.pendingRequestApiJsonSerializer.serialize(settings, data);
|
||||
}
|
||||
|
||||
@POST
|
||||
@Path("pending/{id}/approve")
|
||||
@Consumes({ MediaType.APPLICATION_JSON })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
@Operation(summary = "Approve a pending User creation or update")
|
||||
public String approvePendingUser(@PathParam("id") final Long id) {
|
||||
final CommandProcessingResult result = this.userPendingWritePlatformService.approvePendingRequest(id);
|
||||
return this.toApiJsonSerializer.serialize(result);
|
||||
}
|
||||
|
||||
@POST
|
||||
@Path("pending/{id}/reject")
|
||||
@Consumes({ MediaType.APPLICATION_JSON })
|
||||
@Produces({ MediaType.APPLICATION_JSON })
|
||||
@Operation(summary = "Reject a pending User creation or update")
|
||||
public String rejectPendingUser(@PathParam("id") final Long id, @Parameter(hidden = true) final String apiRequestBodyAsJson) {
|
||||
final org.apache.fineract.infrastructure.core.api.JsonCommand command = org.apache.fineract.infrastructure.core.api.JsonCommand
|
||||
.fromJsonElement(id, this.fromApiJsonHelper.parse(apiRequestBodyAsJson), this.fromApiJsonHelper);
|
||||
final CommandProcessingResult result = this.userPendingWritePlatformService.rejectPendingRequest(id, command);
|
||||
return this.toApiJsonSerializer.serialize(result);
|
||||
}
|
||||
|
||||
@POST
|
||||
@Path("{userId}/pwd")
|
||||
@Operation(summary = "Change the password of a User", description = "When updating a password you must provide the repeatPassword parameter also.")
|
||||
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
package org.apache.fineract.useradministration.data;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.AllArgsConstructor;
|
||||
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class AppUserPreferenceData {
|
||||
private String name;
|
||||
private String value;
|
||||
}
|
||||
+59
@@ -0,0 +1,59 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.useradministration.data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@Builder
|
||||
public class UserPendingRequestData implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private final Long id;
|
||||
private final Long userId;
|
||||
private final String requestType;
|
||||
private final String status;
|
||||
private final String username;
|
||||
private final String firstname;
|
||||
private final String lastname;
|
||||
private final String email;
|
||||
private final String mobileNo;
|
||||
private final Long officeId;
|
||||
private final String officeName;
|
||||
private final Long staffId;
|
||||
private final String staffName;
|
||||
private final String otpDeliveryMethod;
|
||||
private final Boolean passwordNeverExpires;
|
||||
private final Collection<String> roleNames;
|
||||
private final Long makerId;
|
||||
private final String makerUsername;
|
||||
private final OffsetDateTime submittedDate;
|
||||
private final Long checkerId;
|
||||
private final String checkerUsername;
|
||||
private final OffsetDateTime checkedDate;
|
||||
private final String rejectReason;
|
||||
private final Map<String, Object> originalValues;
|
||||
private final Map<String, Object> proposedValues;
|
||||
}
|
||||
+54
@@ -0,0 +1,54 @@
|
||||
package org.apache.fineract.useradministration.domain;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.FetchType;
|
||||
import jakarta.persistence.JoinColumn;
|
||||
import jakarta.persistence.ManyToOne;
|
||||
import jakarta.persistence.Table;
|
||||
import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
|
||||
|
||||
@Entity
|
||||
@Table(name = "m_appuser_preference")
|
||||
public class AppUserPreference extends AbstractPersistableCustom<Long> {
|
||||
|
||||
@ManyToOne(fetch = FetchType.LAZY)
|
||||
@JoinColumn(name = "appuser_id", nullable = false)
|
||||
private AppUser appUser;
|
||||
|
||||
@Column(name = "name", length = 100, nullable = false)
|
||||
private String name;
|
||||
|
||||
@Column(name = "value", nullable = false)
|
||||
private String value;
|
||||
|
||||
protected AppUserPreference() {
|
||||
//
|
||||
}
|
||||
|
||||
private AppUserPreference(final AppUser appUser, final String name, final String value) {
|
||||
this.appUser = appUser;
|
||||
this.name = name;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public static AppUserPreference create(final AppUser appUser, final String name, final String value) {
|
||||
return new AppUserPreference(appUser, name, value);
|
||||
}
|
||||
|
||||
public void updateValue(final String newValue) {
|
||||
this.value = newValue;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return this.value;
|
||||
}
|
||||
|
||||
public AppUser getAppUser() {
|
||||
return this.appUser;
|
||||
}
|
||||
}
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
package org.apache.fineract.useradministration.domain;
|
||||
|
||||
import java.util.Optional;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
public interface AppUserPreferenceRepository extends JpaRepository<AppUserPreference, Long> {
|
||||
|
||||
Optional<AppUserPreference> findByAppUserIdAndName(Long appUserId, String name);
|
||||
|
||||
}
|
||||
+113
@@ -0,0 +1,113 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.useradministration.domain;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.Table;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.time.ZoneOffset;
|
||||
import lombok.AccessLevel;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
|
||||
|
||||
@Entity
|
||||
@Table(name = "m_user_pending_request")
|
||||
@NoArgsConstructor(access = AccessLevel.PROTECTED)
|
||||
@Getter
|
||||
@Setter
|
||||
public class UserPendingRequest extends AbstractPersistableCustom<Long> {
|
||||
|
||||
@Column(name = "user_id")
|
||||
private Long userId;
|
||||
|
||||
@Column(name = "request_type", nullable = false, length = 20)
|
||||
private String requestType;
|
||||
|
||||
@Column(name = "status", nullable = false, length = 20)
|
||||
private String status;
|
||||
|
||||
@Column(name = "payload_json", nullable = false)
|
||||
private String payloadJson;
|
||||
|
||||
@Column(name = "original_json")
|
||||
private String originalJson;
|
||||
|
||||
@Column(name = "password_hash")
|
||||
private String passwordHash;
|
||||
|
||||
@Column(name = "maker_id", nullable = false)
|
||||
private Long makerId;
|
||||
|
||||
@Column(name = "submitted_date", nullable = false)
|
||||
private OffsetDateTime submittedDate;
|
||||
|
||||
@Column(name = "checker_id")
|
||||
private Long checkerId;
|
||||
|
||||
@Column(name = "checked_date")
|
||||
private OffsetDateTime checkedDate;
|
||||
|
||||
@Column(name = "reject_reason", length = 500)
|
||||
private String rejectReason;
|
||||
|
||||
@Column(name = "pending_lock_key", length = 100, unique = true)
|
||||
private String pendingLockKey;
|
||||
|
||||
public static UserPendingRequest create(final UserPendingRequestType requestType, final Long userId,
|
||||
final String payloadJson, final String originalJson, final String passwordHash,
|
||||
final Long makerId, final String pendingLockKey) {
|
||||
final UserPendingRequest request = new UserPendingRequest();
|
||||
request.requestType = requestType.name();
|
||||
request.userId = userId;
|
||||
request.status = UserPendingRequestStatus.PENDING.name();
|
||||
request.payloadJson = payloadJson;
|
||||
request.originalJson = originalJson;
|
||||
request.passwordHash = passwordHash;
|
||||
request.makerId = makerId;
|
||||
request.submittedDate = OffsetDateTime.now(ZoneOffset.UTC);
|
||||
request.pendingLockKey = pendingLockKey;
|
||||
return request;
|
||||
}
|
||||
|
||||
public boolean isPending() {
|
||||
return UserPendingRequestStatus.PENDING.name().equals(this.status);
|
||||
}
|
||||
|
||||
public boolean isMadeBy(final Long appUserId) {
|
||||
return this.makerId != null && this.makerId.equals(appUserId);
|
||||
}
|
||||
|
||||
public void approve(final Long checkerId) {
|
||||
this.status = UserPendingRequestStatus.APPROVED.name();
|
||||
this.checkerId = checkerId;
|
||||
this.checkedDate = OffsetDateTime.now(ZoneOffset.UTC);
|
||||
this.pendingLockKey = null;
|
||||
}
|
||||
|
||||
public void reject(final Long checkerId, final String reason) {
|
||||
this.status = UserPendingRequestStatus.REJECTED.name();
|
||||
this.checkerId = checkerId;
|
||||
this.checkedDate = OffsetDateTime.now(ZoneOffset.UTC);
|
||||
this.rejectReason = reason;
|
||||
this.pendingLockKey = null;
|
||||
}
|
||||
}
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.useradministration.domain;
|
||||
|
||||
import java.util.Optional;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||
|
||||
public interface UserPendingRequestRepository extends JpaRepository<UserPendingRequest, Long>, JpaSpecificationExecutor<UserPendingRequest> {
|
||||
|
||||
Optional<UserPendingRequest> findByPendingLockKey(String pendingLockKey);
|
||||
|
||||
boolean existsByPendingLockKey(String pendingLockKey);
|
||||
}
|
||||
+49
@@ -0,0 +1,49 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.useradministration.domain;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.fineract.useradministration.exception.UserPendingRequestNotFoundException;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class UserPendingRequestRepositoryWrapper {
|
||||
|
||||
private final UserPendingRequestRepository repository;
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public UserPendingRequest findOneWithNotFoundDetection(final Long id) {
|
||||
return this.repository.findById(id).orElseThrow(() -> new UserPendingRequestNotFoundException(id));
|
||||
}
|
||||
|
||||
public UserPendingRequest saveAndFlush(final UserPendingRequest request) {
|
||||
return this.repository.saveAndFlush(request);
|
||||
}
|
||||
|
||||
public UserPendingRequest save(final UserPendingRequest request) {
|
||||
return this.repository.save(request);
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public boolean existsByPendingLockKey(final String pendingLockKey) {
|
||||
return this.repository.existsByPendingLockKey(pendingLockKey);
|
||||
}
|
||||
}
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.useradministration.domain;
|
||||
|
||||
public enum UserPendingRequestStatus {
|
||||
PENDING,
|
||||
APPROVED,
|
||||
REJECTED;
|
||||
|
||||
public static UserPendingRequestStatus fromString(final String status) {
|
||||
if (status == null) {
|
||||
return null;
|
||||
}
|
||||
for (final UserPendingRequestStatus requestStatus : values()) {
|
||||
if (requestStatus.name().equalsIgnoreCase(status)) {
|
||||
return requestStatus;
|
||||
}
|
||||
}
|
||||
throw new IllegalArgumentException("Unknown UserPendingRequestStatus: " + status);
|
||||
}
|
||||
}
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.useradministration.domain;
|
||||
|
||||
public enum UserPendingRequestType {
|
||||
CREATE_USER,
|
||||
UPDATE_USER;
|
||||
|
||||
public static UserPendingRequestType fromString(final String type) {
|
||||
if (type == null) {
|
||||
return null;
|
||||
}
|
||||
for (final UserPendingRequestType requestType : values()) {
|
||||
if (requestType.name().equalsIgnoreCase(type)) {
|
||||
return requestType;
|
||||
}
|
||||
}
|
||||
throw new IllegalArgumentException("Unknown UserPendingRequestType: " + type);
|
||||
}
|
||||
}
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.useradministration.exception;
|
||||
|
||||
import org.apache.fineract.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
|
||||
|
||||
public class UserPendingRequestNotFoundException extends AbstractPlatformResourceNotFoundException {
|
||||
|
||||
public UserPendingRequestNotFoundException(final Long id) {
|
||||
super("error.msg.userpendingrequest.id.invalid", "User pending request with identifier " + id + " does not exist", id);
|
||||
}
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package org.apache.fineract.useradministration.service;
|
||||
|
||||
public interface AppUserPreferenceReadPlatformService {
|
||||
String getPreferenceValue(Long appUserId, String name);
|
||||
}
|
||||
+20
@@ -0,0 +1,20 @@
|
||||
package org.apache.fineract.useradministration.service;
|
||||
|
||||
import java.util.Optional;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.fineract.useradministration.domain.AppUserPreference;
|
||||
import org.apache.fineract.useradministration.domain.AppUserPreferenceRepository;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class AppUserPreferenceReadPlatformServiceImpl implements AppUserPreferenceReadPlatformService {
|
||||
|
||||
private final AppUserPreferenceRepository appUserPreferenceRepository;
|
||||
|
||||
@Override
|
||||
public String getPreferenceValue(Long appUserId, String name) {
|
||||
Optional<AppUserPreference> pref = appUserPreferenceRepository.findByAppUserIdAndName(appUserId, name);
|
||||
return pref.map(AppUserPreference::getValue).orElse(null);
|
||||
}
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
package org.apache.fineract.useradministration.service;
|
||||
|
||||
public interface AppUserPreferenceWritePlatformService {
|
||||
void updatePreference(Long appUserId, String name, String value);
|
||||
}
|
||||
+32
@@ -0,0 +1,32 @@
|
||||
package org.apache.fineract.useradministration.service;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.fineract.useradministration.domain.AppUser;
|
||||
import org.apache.fineract.useradministration.domain.AppUserPreference;
|
||||
import org.apache.fineract.useradministration.domain.AppUserPreferenceRepository;
|
||||
import org.apache.fineract.useradministration.domain.AppUserRepository;
|
||||
import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class AppUserPreferenceWritePlatformServiceImpl implements AppUserPreferenceWritePlatformService {
|
||||
|
||||
private final AppUserPreferenceRepository appUserPreferenceRepository;
|
||||
private final AppUserRepository appUserRepository;
|
||||
|
||||
@Transactional
|
||||
@Override
|
||||
public void updatePreference(Long appUserId, String name, String value) {
|
||||
AppUserPreference preference = appUserPreferenceRepository.findByAppUserIdAndName(appUserId, name).orElse(null);
|
||||
if (preference == null) {
|
||||
AppUser appUser = appUserRepository.findById(appUserId)
|
||||
.orElseThrow(() -> new PlatformDataIntegrityException("error.msg.user.id.invalid", "User not found"));
|
||||
preference = AppUserPreference.create(appUser, name, value);
|
||||
} else {
|
||||
preference.updateValue(value);
|
||||
}
|
||||
appUserPreferenceRepository.saveAndFlush(preference);
|
||||
}
|
||||
}
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.useradministration.service;
|
||||
|
||||
import org.apache.fineract.infrastructure.core.service.Page;
|
||||
import org.apache.fineract.useradministration.data.UserPendingRequestData;
|
||||
|
||||
public interface UserPendingReadPlatformService {
|
||||
|
||||
Page<UserPendingRequestData> retrieveAllPendingRequests(String status, String username, String fromDate, String toDate,
|
||||
Integer offset, Integer limit);
|
||||
|
||||
UserPendingRequestData retrievePendingRequest(Long id);
|
||||
}
|
||||
+329
@@ -0,0 +1,329 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.useradministration.service;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParser;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.fineract.infrastructure.core.domain.JdbcSupport;
|
||||
import org.apache.fineract.infrastructure.core.serialization.GoogleGsonSerializerHelper;
|
||||
import org.apache.fineract.infrastructure.core.service.Page;
|
||||
import org.apache.fineract.useradministration.data.UserPendingRequestData;
|
||||
import org.apache.fineract.useradministration.domain.UserPendingRequest;
|
||||
import org.apache.fineract.useradministration.domain.UserPendingRequestRepositoryWrapper;
|
||||
import org.springframework.dao.EmptyResultDataAccessException;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.jdbc.core.RowMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class UserPendingReadPlatformServiceImpl implements UserPendingReadPlatformService {
|
||||
|
||||
private final JdbcTemplate jdbcTemplate;
|
||||
private final UserPendingRequestRepositoryWrapper pendingRequestRepositoryWrapper;
|
||||
private final Gson gson = GoogleGsonSerializerHelper.createSimpleGson();
|
||||
|
||||
private static final String SELECT_SQL = """
|
||||
SELECT r.id AS id,
|
||||
r.user_id AS userId,
|
||||
r.request_type AS requestType,
|
||||
r.status AS status,
|
||||
r.payload_json AS payloadJson,
|
||||
r.original_json AS originalJson,
|
||||
r.maker_id AS makerId,
|
||||
maker.username AS makerUsername,
|
||||
r.submitted_date AS submittedDate,
|
||||
r.checker_id AS checkerId,
|
||||
checker.username AS checkerUsername,
|
||||
r.checked_date AS checkedDate,
|
||||
r.reject_reason AS rejectReason
|
||||
FROM m_user_pending_request r
|
||||
JOIN m_appuser maker ON maker.id = r.maker_id
|
||||
LEFT JOIN m_appuser checker ON checker.id = r.checker_id
|
||||
""";
|
||||
|
||||
@Override
|
||||
@Transactional(readOnly = true)
|
||||
public Page<UserPendingRequestData> retrieveAllPendingRequests(final String status, final String username,
|
||||
final String fromDate, final String toDate, final Integer offset, final Integer limit) {
|
||||
final StringBuilder where = new StringBuilder(" WHERE 1=1");
|
||||
final List<Object> args = new ArrayList<>();
|
||||
|
||||
if (StringUtils.isNotBlank(status)) {
|
||||
where.append(" AND r.status = ?");
|
||||
args.add(status.trim().toUpperCase());
|
||||
} else {
|
||||
where.append(" AND r.status = 'PENDING'");
|
||||
}
|
||||
|
||||
if (StringUtils.isNotBlank(fromDate)) {
|
||||
where.append(" AND r.submitted_date::date >= ?::date");
|
||||
args.add(fromDate);
|
||||
}
|
||||
if (StringUtils.isNotBlank(toDate)) {
|
||||
where.append(" AND r.submitted_date::date <= ?::date");
|
||||
args.add(toDate);
|
||||
}
|
||||
|
||||
final String countSql = "SELECT COUNT(*) FROM m_user_pending_request r " + where;
|
||||
final Long totalFilteredRecords = this.jdbcTemplate.queryForObject(countSql, Long.class, args.toArray());
|
||||
|
||||
final int pageOffset = offset == null ? 0 : offset;
|
||||
final int pageLimit = limit == null ? 20 : limit;
|
||||
final String pageSql = SELECT_SQL + where + " ORDER BY r.submitted_date DESC LIMIT ? OFFSET ?";
|
||||
final List<Object> pageArgs = new ArrayList<>(args);
|
||||
pageArgs.add(pageLimit);
|
||||
pageArgs.add(pageOffset);
|
||||
|
||||
final List<UserPendingRequestData> items = this.jdbcTemplate.query(pageSql, new UserPendingRowMapper(), pageArgs.toArray());
|
||||
|
||||
return new Page<>(items, totalFilteredRecords == null ? 0 : totalFilteredRecords.intValue());
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(readOnly = true)
|
||||
public UserPendingRequestData retrievePendingRequest(final Long id) {
|
||||
final UserPendingRequest request = this.pendingRequestRepositoryWrapper.findOneWithNotFoundDetection(id);
|
||||
final String sql = SELECT_SQL + " WHERE r.id = ?";
|
||||
return this.jdbcTemplate.queryForObject(sql, new UserPendingDetailRowMapper(), id);
|
||||
}
|
||||
|
||||
private static class UserPendingRowMapper implements RowMapper<UserPendingRequestData> {
|
||||
|
||||
@Override
|
||||
public UserPendingRequestData mapRow(final ResultSet rs, final int rowNum) throws SQLException {
|
||||
final Long id = rs.getLong("id");
|
||||
final Long userId = JdbcSupport.getLong(rs, "userId");
|
||||
final String requestType = rs.getString("requestType");
|
||||
final String status = rs.getString("status");
|
||||
final String payloadJson = rs.getString("payloadJson");
|
||||
final Long makerId = rs.getLong("makerId");
|
||||
final String makerUsername = rs.getString("makerUsername");
|
||||
final OffsetDateTime submittedDate = rs.getObject("submittedDate", OffsetDateTime.class);
|
||||
final Long checkerId = JdbcSupport.getLong(rs, "checkerId");
|
||||
final String checkerUsername = rs.getString("checkerUsername");
|
||||
final OffsetDateTime checkedDate = rs.getObject("checkedDate", OffsetDateTime.class);
|
||||
final String rejectReason = rs.getString("rejectReason");
|
||||
|
||||
String username = null;
|
||||
String firstname = null;
|
||||
String lastname = null;
|
||||
String email = null;
|
||||
String mobileNo = null;
|
||||
Long officeId = null;
|
||||
String otpDeliveryMethod = null;
|
||||
|
||||
try {
|
||||
if (payloadJson != null) {
|
||||
final JsonObject payloadObj = JsonParser.parseString(payloadJson).getAsJsonObject();
|
||||
if (payloadObj.has("username")) {
|
||||
username = payloadObj.get("username").getAsString();
|
||||
}
|
||||
if (payloadObj.has("firstname")) {
|
||||
firstname = payloadObj.get("firstname").getAsString();
|
||||
}
|
||||
if (payloadObj.has("lastname")) {
|
||||
lastname = payloadObj.get("lastname").getAsString();
|
||||
}
|
||||
if (payloadObj.has("email")) {
|
||||
email = payloadObj.get("email").getAsString();
|
||||
}
|
||||
if (payloadObj.has("mobileNo")) {
|
||||
mobileNo = payloadObj.get("mobileNo").getAsString();
|
||||
}
|
||||
if (payloadObj.has("officeId")) {
|
||||
officeId = payloadObj.get("officeId").getAsLong();
|
||||
}
|
||||
if (payloadObj.has("otpDeliveryMethod")) {
|
||||
otpDeliveryMethod = payloadObj.get("otpDeliveryMethod").getAsString();
|
||||
}
|
||||
}
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
|
||||
return UserPendingRequestData.builder()
|
||||
.id(id)
|
||||
.userId(userId)
|
||||
.requestType(requestType)
|
||||
.status(status)
|
||||
.username(username)
|
||||
.firstname(firstname)
|
||||
.lastname(lastname)
|
||||
.email(email)
|
||||
.mobileNo(mobileNo)
|
||||
.officeId(officeId)
|
||||
.otpDeliveryMethod(otpDeliveryMethod)
|
||||
.makerId(makerId)
|
||||
.makerUsername(makerUsername)
|
||||
.submittedDate(submittedDate)
|
||||
.checkerId(checkerId)
|
||||
.checkerUsername(checkerUsername)
|
||||
.checkedDate(checkedDate)
|
||||
.rejectReason(rejectReason)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
||||
private static class UserPendingDetailRowMapper implements RowMapper<UserPendingRequestData> {
|
||||
|
||||
@Override
|
||||
public UserPendingRequestData mapRow(final ResultSet rs, final int rowNum) throws SQLException {
|
||||
final Long id = rs.getLong("id");
|
||||
final Long userId = JdbcSupport.getLong(rs, "userId");
|
||||
final String requestType = rs.getString("requestType");
|
||||
final String status = rs.getString("status");
|
||||
final String payloadJson = rs.getString("payloadJson");
|
||||
final String originalJson = rs.getString("originalJson");
|
||||
final Long makerId = rs.getLong("makerId");
|
||||
final String makerUsername = rs.getString("makerUsername");
|
||||
final OffsetDateTime submittedDate = rs.getObject("submittedDate", OffsetDateTime.class);
|
||||
final Long checkerId = JdbcSupport.getLong(rs, "checkerId");
|
||||
final String checkerUsername = rs.getString("checkerUsername");
|
||||
final OffsetDateTime checkedDate = rs.getObject("checkedDate", OffsetDateTime.class);
|
||||
final String rejectReason = rs.getString("rejectReason");
|
||||
|
||||
final Map<String, Object> proposedValues = new LinkedHashMap<>();
|
||||
final Map<String, Object> originalValues = new LinkedHashMap<>();
|
||||
|
||||
String username = null;
|
||||
String firstname = null;
|
||||
String lastname = null;
|
||||
String email = null;
|
||||
String mobileNo = null;
|
||||
Long officeId = null;
|
||||
String otpDeliveryMethod = null;
|
||||
Boolean passwordNeverExpires = null;
|
||||
|
||||
try {
|
||||
if (payloadJson != null) {
|
||||
final JsonObject payloadObj = JsonParser.parseString(payloadJson).getAsJsonObject();
|
||||
for (final String key : payloadObj.keySet()) {
|
||||
final JsonElement val = payloadObj.get(key);
|
||||
if ("password".equals(key) || "repeatPassword".equals(key)) {
|
||||
proposedValues.put("password", "Password will be set on approval");
|
||||
} else if (val.isJsonPrimitive()) {
|
||||
if (val.getAsJsonPrimitive().isBoolean()) {
|
||||
proposedValues.put(key, val.getAsBoolean());
|
||||
} else if (val.getAsJsonPrimitive().isNumber()) {
|
||||
proposedValues.put(key, val.getAsNumber());
|
||||
} else {
|
||||
proposedValues.put(key, val.getAsString());
|
||||
}
|
||||
} else if (val.isJsonArray()) {
|
||||
final List<String> list = new ArrayList<>();
|
||||
for (final JsonElement elem : val.getAsJsonArray()) {
|
||||
list.add(elem.getAsString());
|
||||
}
|
||||
proposedValues.put(key, list);
|
||||
}
|
||||
}
|
||||
|
||||
if (proposedValues.containsKey("username")) {
|
||||
username = (String) proposedValues.get("username");
|
||||
}
|
||||
if (proposedValues.containsKey("firstname")) {
|
||||
firstname = (String) proposedValues.get("firstname");
|
||||
}
|
||||
if (proposedValues.containsKey("lastname")) {
|
||||
lastname = (String) proposedValues.get("lastname");
|
||||
}
|
||||
if (proposedValues.containsKey("email")) {
|
||||
email = (String) proposedValues.get("email");
|
||||
}
|
||||
if (proposedValues.containsKey("mobileNo")) {
|
||||
mobileNo = (String) proposedValues.get("mobileNo");
|
||||
}
|
||||
if (proposedValues.get("officeId") instanceof Number n) {
|
||||
officeId = n.longValue();
|
||||
}
|
||||
if (proposedValues.containsKey("otpDeliveryMethod")) {
|
||||
otpDeliveryMethod = (String) proposedValues.get("otpDeliveryMethod");
|
||||
}
|
||||
if (proposedValues.get("passwordNeverExpires") instanceof Boolean b) {
|
||||
passwordNeverExpires = b;
|
||||
}
|
||||
}
|
||||
|
||||
if (originalJson != null) {
|
||||
final JsonObject origObj = JsonParser.parseString(originalJson).getAsJsonObject();
|
||||
for (final String key : origObj.keySet()) {
|
||||
final JsonElement val = origObj.get(key);
|
||||
if (val.isJsonPrimitive()) {
|
||||
if (val.getAsJsonPrimitive().isBoolean()) {
|
||||
originalValues.put(key, val.getAsBoolean());
|
||||
} else if (val.getAsJsonPrimitive().isNumber()) {
|
||||
originalValues.put(key, val.getAsNumber());
|
||||
} else {
|
||||
originalValues.put(key, val.getAsString());
|
||||
}
|
||||
} else if (val.isJsonArray()) {
|
||||
final List<String> list = new ArrayList<>();
|
||||
for (final JsonElement elem : val.getAsJsonArray()) {
|
||||
list.add(elem.getAsString());
|
||||
}
|
||||
originalValues.put(key, list);
|
||||
}
|
||||
}
|
||||
if (proposedValues.containsKey("password")) {
|
||||
originalValues.put("password", "[PROTECTED]");
|
||||
}
|
||||
}
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
|
||||
return UserPendingRequestData.builder()
|
||||
.id(id)
|
||||
.userId(userId)
|
||||
.requestType(requestType)
|
||||
.status(status)
|
||||
.username(username)
|
||||
.firstname(firstname)
|
||||
.lastname(lastname)
|
||||
.email(email)
|
||||
.mobileNo(mobileNo)
|
||||
.officeId(officeId)
|
||||
.otpDeliveryMethod(otpDeliveryMethod)
|
||||
.passwordNeverExpires(passwordNeverExpires)
|
||||
.makerId(makerId)
|
||||
.makerUsername(makerUsername)
|
||||
.submittedDate(submittedDate)
|
||||
.checkerId(checkerId)
|
||||
.checkerUsername(checkerUsername)
|
||||
.checkedDate(checkedDate)
|
||||
.rejectReason(rejectReason)
|
||||
.originalValues(originalValues)
|
||||
.proposedValues(proposedValues)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.useradministration.service;
|
||||
|
||||
import org.apache.fineract.infrastructure.core.api.JsonCommand;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
||||
|
||||
public interface UserPendingWritePlatformService {
|
||||
|
||||
CommandProcessingResult submitCreateUser(JsonCommand command);
|
||||
|
||||
CommandProcessingResult submitUpdateUser(Long userId, JsonCommand command);
|
||||
|
||||
CommandProcessingResult approvePendingRequest(Long id);
|
||||
|
||||
CommandProcessingResult rejectPendingRequest(Long id, JsonCommand command);
|
||||
}
|
||||
+386
@@ -0,0 +1,386 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.useradministration.service;
|
||||
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParser;
|
||||
import java.time.OffsetDateTime;
|
||||
import java.time.ZoneOffset;
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.apache.fineract.infrastructure.configuration.domain.ConfigurationDomainService;
|
||||
import org.apache.fineract.infrastructure.core.api.JsonCommand;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
|
||||
import org.apache.fineract.infrastructure.core.exception.GeneralPlatformDomainRuleException;
|
||||
import org.apache.fineract.infrastructure.core.exception.PlatformDataIntegrityException;
|
||||
import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
|
||||
import org.apache.fineract.infrastructure.core.serialization.GoogleGsonSerializerHelper;
|
||||
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
|
||||
import org.apache.fineract.organisation.office.domain.Office;
|
||||
import org.apache.fineract.organisation.office.domain.OfficeRepositoryWrapper;
|
||||
import org.apache.fineract.organisation.staff.domain.Staff;
|
||||
import org.apache.fineract.organisation.staff.domain.StaffRepositoryWrapper;
|
||||
import org.apache.fineract.portfolio.client.domain.Client;
|
||||
import org.apache.fineract.portfolio.client.domain.ClientRepositoryWrapper;
|
||||
import org.apache.fineract.useradministration.mfa.domain.MfaFactorType;
|
||||
import org.apache.fineract.useradministration.domain.AppUser;
|
||||
import org.apache.fineract.useradministration.domain.AppUserRepository;
|
||||
import org.apache.fineract.useradministration.domain.Role;
|
||||
import org.apache.fineract.useradministration.domain.RoleRepository;
|
||||
import org.apache.fineract.useradministration.mfa.domain.UserMfaFactor;
|
||||
import org.apache.fineract.useradministration.mfa.domain.UserMfaFactorRepository;
|
||||
import org.apache.fineract.useradministration.domain.UserPendingRequest;
|
||||
import org.apache.fineract.useradministration.domain.UserPendingRequestRepository;
|
||||
import org.apache.fineract.useradministration.domain.UserPendingRequestRepositoryWrapper;
|
||||
import org.apache.fineract.useradministration.domain.UserPendingRequestType;
|
||||
import org.apache.fineract.useradministration.exception.RoleNotFoundException;
|
||||
import org.apache.fineract.useradministration.exception.UserNotFoundException;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class UserPendingWritePlatformServiceImpl implements UserPendingWritePlatformService {
|
||||
|
||||
private final PlatformSecurityContext context;
|
||||
private final UserPendingRequestRepositoryWrapper pendingRequestRepositoryWrapper;
|
||||
private final UserPendingRequestRepository pendingRequestRepository;
|
||||
private final AppUserRepository appUserRepository;
|
||||
private final OfficeRepositoryWrapper officeRepositoryWrapper;
|
||||
private final RoleRepository roleRepository;
|
||||
private final StaffRepositoryWrapper staffRepositoryWrapper;
|
||||
private final ClientRepositoryWrapper clientRepositoryWrapper;
|
||||
private final UserMfaFactorRepository userMfaFactorRepository;
|
||||
private final ConfigurationDomainService configurationDomainService;
|
||||
private final PasswordEncoder passwordEncoder;
|
||||
private final UserDataValidator fromApiJsonDeserializer;
|
||||
private final FromJsonHelper fromApiJsonHelper;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public CommandProcessingResult submitCreateUser(final JsonCommand command) {
|
||||
final AppUser maker = this.context.authenticatedUser();
|
||||
|
||||
this.fromApiJsonDeserializer.validateForCreate(command.json());
|
||||
|
||||
final String username = command.stringValueOfParameterNamed("username");
|
||||
final String email = command.stringValueOfParameterNamed("email");
|
||||
final String mobileNo = command.stringValueOfParameterNamed("mobileNo");
|
||||
|
||||
// Pre-flight checks on live users and pending creations
|
||||
if (this.appUserRepository.findAppUserByName(username) != null) {
|
||||
throw new PlatformDataIntegrityException("error.msg.user.duplicate.username",
|
||||
"User with username " + username + " already exists.", "username", username);
|
||||
}
|
||||
|
||||
final String lockKey = "CREATE_USER:" + username.toLowerCase();
|
||||
if (this.pendingRequestRepository.existsByPendingLockKey(lockKey)) {
|
||||
throw new GeneralPlatformDomainRuleException("error.msg.userpendingrequest.duplicate",
|
||||
"A pending creation request for username '" + username + "' is already awaiting checker approval.", username);
|
||||
}
|
||||
|
||||
assertEmailAndMobileUnique(email, mobileNo, null);
|
||||
|
||||
final JsonObject jsonObject = JsonParser.parseString(command.json()).getAsJsonObject();
|
||||
String passwordHash = null;
|
||||
if (jsonObject.has("password") && !jsonObject.get("password").isJsonNull()) {
|
||||
final String rawPassword = jsonObject.get("password").getAsString();
|
||||
if (!rawPassword.isBlank()) {
|
||||
passwordHash = this.passwordEncoder.encode(rawPassword);
|
||||
}
|
||||
jsonObject.addProperty("password", "[PROTECTED]");
|
||||
if (jsonObject.has("repeatPassword")) {
|
||||
jsonObject.addProperty("repeatPassword", "[PROTECTED]");
|
||||
}
|
||||
}
|
||||
|
||||
final String sanitizedPayload = jsonObject.toString();
|
||||
final UserPendingRequest request = UserPendingRequest.create(UserPendingRequestType.CREATE_USER, null,
|
||||
sanitizedPayload, null, passwordHash, maker.getId(), lockKey);
|
||||
|
||||
final UserPendingRequest saved = this.pendingRequestRepositoryWrapper.saveAndFlush(request);
|
||||
|
||||
return new CommandProcessingResultBuilder()
|
||||
.withEntityId(saved.getId())
|
||||
.setRollbackTransaction(true)
|
||||
.build();
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public CommandProcessingResult submitUpdateUser(final Long userId, final JsonCommand command) {
|
||||
final AppUser maker = this.context.authenticatedUser();
|
||||
final AppUser userToUpdate = this.appUserRepository.findById(userId)
|
||||
.orElseThrow(() -> new UserNotFoundException(userId));
|
||||
|
||||
this.fromApiJsonDeserializer.validateForUpdate(command.json(), maker);
|
||||
|
||||
final String email = command.stringValueOfParameterNamed("email");
|
||||
final String mobileNo = command.stringValueOfParameterNamed("mobileNo");
|
||||
assertEmailAndMobileUnique(email, mobileNo, userId);
|
||||
|
||||
final String lockKey = "UPDATE_USER:" + userId;
|
||||
if (this.pendingRequestRepository.existsByPendingLockKey(lockKey)) {
|
||||
throw new GeneralPlatformDomainRuleException("error.msg.userpendingrequest.duplicate",
|
||||
"A pending update request for user ID " + userId + " is already awaiting checker approval.", userId);
|
||||
}
|
||||
|
||||
// Build point-in-time original JSON snapshot
|
||||
final Map<String, Object> originalSnapshot = new LinkedHashMap<>();
|
||||
originalSnapshot.put("username", userToUpdate.getUsername());
|
||||
originalSnapshot.put("firstname", userToUpdate.getFirstname());
|
||||
originalSnapshot.put("lastname", userToUpdate.getLastname());
|
||||
originalSnapshot.put("email", userToUpdate.getEmail());
|
||||
originalSnapshot.put("mobileNo", userToUpdate.getMobileNo());
|
||||
originalSnapshot.put("officeId", userToUpdate.getOffice() != null ? userToUpdate.getOffice().getId() : null);
|
||||
originalSnapshot.put("officeName", userToUpdate.getOffice() != null ? userToUpdate.getOffice().getName() : null);
|
||||
originalSnapshot.put("staffId", userToUpdate.getStaff() != null ? userToUpdate.getStaff().getId() : null);
|
||||
originalSnapshot.put("passwordNeverExpires", userToUpdate.getPasswordNeverExpires());
|
||||
originalSnapshot.put("isSelfServiceUser", userToUpdate.isSelfServiceUser());
|
||||
final Set<String> roleNames = new HashSet<>();
|
||||
final Set<Long> roleIds = new HashSet<>();
|
||||
if (userToUpdate.getRoles() != null) {
|
||||
for (final Role r : userToUpdate.getRoles()) {
|
||||
roleNames.add(r.getName());
|
||||
roleIds.add(r.getId());
|
||||
}
|
||||
}
|
||||
originalSnapshot.put("roles", roleIds);
|
||||
originalSnapshot.put("roleNames", roleNames);
|
||||
final String originalJson = GoogleGsonSerializerHelper.createSimpleGson().toJson(originalSnapshot);
|
||||
|
||||
final JsonObject jsonObject = JsonParser.parseString(command.json()).getAsJsonObject();
|
||||
String passwordHash = null;
|
||||
if (jsonObject.has("password") && !jsonObject.get("password").isJsonNull()) {
|
||||
final String rawPassword = jsonObject.get("password").getAsString();
|
||||
if (!rawPassword.isBlank()) {
|
||||
passwordHash = this.passwordEncoder.encode(rawPassword);
|
||||
}
|
||||
jsonObject.addProperty("password", "[PROTECTED]");
|
||||
if (jsonObject.has("repeatPassword")) {
|
||||
jsonObject.addProperty("repeatPassword", "[PROTECTED]");
|
||||
}
|
||||
}
|
||||
|
||||
final String sanitizedPayload = jsonObject.toString();
|
||||
final UserPendingRequest request = UserPendingRequest.create(UserPendingRequestType.UPDATE_USER, userId,
|
||||
sanitizedPayload, originalJson, passwordHash, maker.getId(), lockKey);
|
||||
|
||||
final UserPendingRequest saved = this.pendingRequestRepositoryWrapper.saveAndFlush(request);
|
||||
|
||||
return new CommandProcessingResultBuilder()
|
||||
.withEntityId(saved.getId())
|
||||
.setRollbackTransaction(true)
|
||||
.build();
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public CommandProcessingResult approvePendingRequest(final Long id) {
|
||||
final AppUser checker = this.context.authenticatedUser();
|
||||
final UserPendingRequest request = this.pendingRequestRepositoryWrapper.findOneWithNotFoundDetection(id);
|
||||
|
||||
if (!request.isPending()) {
|
||||
throw new GeneralPlatformDomainRuleException("error.msg.userpendingrequest.not.pending",
|
||||
"User pending request " + id + " has already been actioned.", id);
|
||||
}
|
||||
|
||||
if (request.isMadeBy(checker.getId())) {
|
||||
throw new GeneralPlatformDomainRuleException("error.msg.userpendingrequest.self.approval",
|
||||
"You cannot approve a user request you submitted yourself — a different user must action it.", id);
|
||||
}
|
||||
|
||||
final Long resourceId;
|
||||
if (UserPendingRequestType.CREATE_USER.name().equals(request.getRequestType())) {
|
||||
resourceId = finalizeCreateUser(request);
|
||||
} else if (UserPendingRequestType.UPDATE_USER.name().equals(request.getRequestType())) {
|
||||
resourceId = finalizeUpdateUser(request);
|
||||
} else {
|
||||
throw new GeneralPlatformDomainRuleException("error.msg.userpendingrequest.type.invalid",
|
||||
"Unknown request type: " + request.getRequestType(), request.getRequestType());
|
||||
}
|
||||
|
||||
request.approve(checker.getId());
|
||||
this.pendingRequestRepositoryWrapper.saveAndFlush(request);
|
||||
|
||||
return new CommandProcessingResultBuilder()
|
||||
.withEntityId(resourceId)
|
||||
.withResourceIdAsString(resourceId.toString())
|
||||
.build();
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public CommandProcessingResult rejectPendingRequest(final Long id, final JsonCommand command) {
|
||||
final AppUser checker = this.context.authenticatedUser();
|
||||
final UserPendingRequest request = this.pendingRequestRepositoryWrapper.findOneWithNotFoundDetection(id);
|
||||
|
||||
if (!request.isPending()) {
|
||||
throw new GeneralPlatformDomainRuleException("error.msg.userpendingrequest.not.pending",
|
||||
"User pending request " + id + " has already been actioned.", id);
|
||||
}
|
||||
|
||||
if (request.isMadeBy(checker.getId())) {
|
||||
throw new GeneralPlatformDomainRuleException("error.msg.userpendingrequest.self.approval",
|
||||
"You cannot reject a user request you submitted yourself — a different user must action it.", id);
|
||||
}
|
||||
|
||||
String reason = command != null ? command.stringValueOfParameterNamedAllowingNull("reason") : null;
|
||||
if (reason == null && command != null) {
|
||||
reason = command.stringValueOfParameterNamedAllowingNull("rejectReason");
|
||||
}
|
||||
if (reason == null || reason.isBlank()) {
|
||||
throw new GeneralPlatformDomainRuleException("error.msg.userpendingrequest.reject.reason.required",
|
||||
"A reason is required to reject a user pending request.", id);
|
||||
}
|
||||
|
||||
request.reject(checker.getId(), reason);
|
||||
this.pendingRequestRepositoryWrapper.saveAndFlush(request);
|
||||
|
||||
return new CommandProcessingResultBuilder()
|
||||
.withEntityId(request.getId())
|
||||
.withResourceIdAsString(request.getId().toString())
|
||||
.build();
|
||||
}
|
||||
|
||||
private Long finalizeCreateUser(final UserPendingRequest request) {
|
||||
final JsonElement parsedElement = this.fromApiJsonHelper.parse(request.getPayloadJson());
|
||||
final JsonCommand replay = JsonCommand.fromJsonElement(null, parsedElement, this.fromApiJsonHelper);
|
||||
|
||||
final Long officeId = replay.longValueOfParameterNamed("officeId");
|
||||
final Office userOffice = this.officeRepositoryWrapper.findOneWithNotFoundDetection(officeId);
|
||||
|
||||
final String[] roles = replay.arrayValueOfParameterNamed("roles");
|
||||
final Set<Role> allRoles = assembleSetOfRoles(roles);
|
||||
|
||||
final Long staffId = replay.longValueOfParameterNamed("staffId");
|
||||
final Staff linkedStaff = staffId != null
|
||||
? this.staffRepositoryWrapper.findByOfficeWithNotFoundDetection(staffId, userOffice.getId())
|
||||
: null;
|
||||
|
||||
final Collection<Client> clients = null;
|
||||
|
||||
final AppUser appUser = AppUser.fromJson(userOffice, linkedStaff, allRoles, clients, replay);
|
||||
|
||||
if (this.configurationDomainService.isForcePasswordResetOnFirstLoginEnabled()) {
|
||||
appUser.updatePasswordResetRequired(true);
|
||||
}
|
||||
|
||||
// Set pre-hashed password
|
||||
if (request.getPasswordHash() != null) {
|
||||
appUser.updatePassword(request.getPasswordHash());
|
||||
}
|
||||
|
||||
this.appUserRepository.saveAndFlush(appUser);
|
||||
|
||||
// MFA Enrollment
|
||||
final String otpDeliveryMethod = replay.stringValueOfParameterNamed("otpDeliveryMethod");
|
||||
if (otpDeliveryMethod != null) {
|
||||
final MfaFactorType factorType = MfaFactorType.fromString(otpDeliveryMethod);
|
||||
final UserMfaFactor factor = new UserMfaFactor();
|
||||
factor.setAppUser(appUser);
|
||||
factor.setFactorType(factorType);
|
||||
factor.setDestination(factorType == MfaFactorType.SMS ? appUser.getMobileNo() : appUser.getEmail());
|
||||
factor.setVerified(true);
|
||||
factor.setVerifiedOn(OffsetDateTime.now(ZoneOffset.UTC));
|
||||
this.userMfaFactorRepository.save(factor);
|
||||
}
|
||||
|
||||
return appUser.getId();
|
||||
}
|
||||
|
||||
private Long finalizeUpdateUser(final UserPendingRequest request) {
|
||||
final AppUser userToUpdate = this.appUserRepository.findById(request.getUserId())
|
||||
.orElseThrow(() -> new UserNotFoundException(request.getUserId()));
|
||||
|
||||
final JsonElement parsedElement = this.fromApiJsonHelper.parse(request.getPayloadJson());
|
||||
final JsonCommand replay = JsonCommand.fromJsonElement(request.getUserId(), parsedElement, this.fromApiJsonHelper);
|
||||
|
||||
final Map<String, Object> changes = userToUpdate.update(replay, null, null);
|
||||
|
||||
if (changes.containsKey("officeId")) {
|
||||
final Long officeId = (Long) changes.get("officeId");
|
||||
final Office office = this.officeRepositoryWrapper.findOneWithNotFoundDetection(officeId);
|
||||
userToUpdate.changeOffice(office);
|
||||
}
|
||||
if (changes.containsKey("staffId")) {
|
||||
final Long staffId = (Long) changes.get("staffId");
|
||||
Staff linkedStaff = null;
|
||||
if (staffId != null) {
|
||||
linkedStaff = this.staffRepositoryWrapper.findByOfficeWithNotFoundDetection(staffId, userToUpdate.getOffice().getId());
|
||||
}
|
||||
userToUpdate.changeStaff(linkedStaff);
|
||||
}
|
||||
if (changes.containsKey("roles")) {
|
||||
final String[] roleIds = (String[]) changes.get("roles");
|
||||
final Set<Role> allRoles = assembleSetOfRoles(roleIds);
|
||||
userToUpdate.updateRoles(allRoles);
|
||||
}
|
||||
if (request.getPasswordHash() != null) {
|
||||
userToUpdate.updatePassword(request.getPasswordHash());
|
||||
}
|
||||
|
||||
this.appUserRepository.saveAndFlush(userToUpdate);
|
||||
return userToUpdate.getId();
|
||||
}
|
||||
|
||||
private Set<Role> assembleSetOfRoles(final String[] rolesArray) {
|
||||
final Set<Role> allRoles = new HashSet<>();
|
||||
if (!ObjectUtils.isEmpty(rolesArray)) {
|
||||
for (final String roleId : rolesArray) {
|
||||
final Long id = Long.valueOf(roleId);
|
||||
final Role role = this.roleRepository.findById(id).orElseThrow(() -> new RoleNotFoundException(id));
|
||||
allRoles.add(role);
|
||||
}
|
||||
}
|
||||
return allRoles;
|
||||
}
|
||||
|
||||
private void assertEmailAndMobileUnique(final String email, final String mobileNo, final Long excludeUserId) {
|
||||
if (email != null && !email.isBlank()) {
|
||||
final java.util.Optional<AppUser> emailOwner = excludeUserId == null
|
||||
? this.appUserRepository.findByEmailIgnoreCase(email)
|
||||
: this.appUserRepository.findByEmailIgnoreCaseAndIdNot(email, excludeUserId);
|
||||
if (emailOwner.isPresent()) {
|
||||
throw new PlatformDataIntegrityException("error.msg.user.duplicate.email",
|
||||
"User with email " + email + " already exists.", "email", email);
|
||||
}
|
||||
}
|
||||
if (mobileNo != null && !mobileNo.isBlank()) {
|
||||
final java.util.Optional<AppUser> mobileOwner = excludeUserId == null
|
||||
? this.appUserRepository.findByMobileNo(mobileNo)
|
||||
: this.appUserRepository.findByMobileNoAndIdNot(mobileNo, excludeUserId);
|
||||
if (mobileOwner.isPresent()) {
|
||||
throw new PlatformDataIntegrityException("error.msg.user.duplicate.mobile",
|
||||
"User with mobile number " + mobileNo + " already exists.", "mobileNo", mobileNo);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -46,7 +46,7 @@ fineract.security.oauth2.client.registrations.frontend-client.require-authorizat
|
||||
fineract.tenant.host=${FINERACT_DEFAULT_TENANTDB_HOSTNAME:localhost}
|
||||
fineract.tenant.port=${FINERACT_DEFAULT_TENANTDB_PORT:5432}
|
||||
fineract.tenant.username=${FINERACT_DEFAULT_TENANTDB_UID:postgres}
|
||||
fineract.tenant.password=${FINERACT_DEFAULT_TENANTDB_PWD:313863}
|
||||
fineract.tenant.password=${FINERACT_DEFAULT_TENANTDB_PWD:anshul@9009}
|
||||
fineract.tenant.parameters=${FINERACT_DEFAULT_TENANTDB_CONN_PARAMS:}
|
||||
fineract.tenant.timezone=${FINERACT_DEFAULT_TENANTDB_TIMEZONE:Asia/Kolkata}
|
||||
fineract.tenant.identifier=${FINERACT_DEFAULT_TENANTDB_IDENTIFIER:default}
|
||||
@@ -407,7 +407,7 @@ server.tomcat.mbeanregistry.enabled=${FINERACT_SERVER_TOMCAT_MBEANREGISTRY_ENABL
|
||||
spring.datasource.hikari.driverClassName=${FINERACT_HIKARI_DRIVER_SOURCE_CLASS_NAME:org.postgresql.Driver}
|
||||
spring.datasource.hikari.jdbcUrl=${FINERACT_HIKARI_JDBC_URL:jdbc:postgresql://localhost:5432/fineract_tenants}
|
||||
spring.datasource.hikari.username=${FINERACT_HIKARI_USERNAME:postgres}
|
||||
spring.datasource.hikari.password=${FINERACT_HIKARI_PASSWORD:313863}
|
||||
spring.datasource.hikari.password=${FINERACT_HIKARI_PASSWORD:anshul@9009}
|
||||
spring.datasource.hikari.minimumIdle=${FINERACT_HIKARI_MINIMUM_IDLE:3}
|
||||
spring.datasource.hikari.maximumPoolSize=${FINERACT_HIKARI_MAXIMUM_POOL_SIZE:10}
|
||||
spring.datasource.hikari.idleTimeout=${FINERACT_HIKARI_IDLE_TIMEOUT:60000}
|
||||
|
||||
@@ -537,5 +537,12 @@
|
||||
<include file="parts/0467_add_welcome_kit_return_tracking.xml" relativeToChangelogFile="true"/>
|
||||
<include file="parts/0468_add_address_id_to_welcome_kit_dispatch.xml" relativeToChangelogFile="true"/>
|
||||
<include file="parts/0469_create_database_export_request.xml" relativeToChangelogFile="true"/>
|
||||
<include file="parts/0470_create_loan_product_cbs_ext.xml" relativeToChangelogFile="true"/>
|
||||
<include file="parts/0466_create_m_appuser_preference.xml" relativeToChangelogFile="true"/>
|
||||
<include file="parts/0467_enable_glaccount_maker_checker.xml" relativeToChangelogFile="true"/>
|
||||
<include file="parts/0470_enable_cbs_base_interest_rate_maker_checker.xml" relativeToChangelogFile="true"/>
|
||||
<include file="parts/0471_enable_charge_maker_checker.xml" relativeToChangelogFile="true"/>
|
||||
<include file="parts/0472_enable_product_creation_maker_checker.xml" relativeToChangelogFile="true"/>
|
||||
<include file="parts/0474_enable_fixed_deposit_product_maker_checker.xml" relativeToChangelogFile="true"/>
|
||||
<include file="parts/0475_enable_admin_user_maker_checker.xml" relativeToChangelogFile="true"/>
|
||||
<include file="parts/0476_add_user_pending_request_and_enable_charge_mc.xml" relativeToChangelogFile="true"/>
|
||||
</databaseChangeLog>
|
||||
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
|
||||
<changeSet id="0466_create_m_appuser_preference" author="fineract">
|
||||
<preConditions onFail="MARK_RAN"><not><tableExists tableName="m_appuser_preference"/></not></preConditions>
|
||||
<createTable tableName="m_appuser_preference">
|
||||
<column name="id" type="BIGINT" autoIncrement="true">
|
||||
<constraints primaryKey="true" nullable="false"/>
|
||||
</column>
|
||||
<column name="appuser_id" type="BIGINT">
|
||||
<constraints nullable="false"/>
|
||||
</column>
|
||||
<column name="name" type="VARCHAR(100)">
|
||||
<constraints nullable="false"/>
|
||||
</column>
|
||||
<column name="value" type="TEXT">
|
||||
<constraints nullable="false"/>
|
||||
</column>
|
||||
</createTable>
|
||||
<addForeignKeyConstraint baseTableName="m_appuser_preference" baseColumnNames="appuser_id" constraintName="fk_m_appuser_preference_appuser_id" referencedTableName="m_appuser" referencedColumnNames="id"/>
|
||||
<addUniqueConstraint tableName="m_appuser_preference" columnNames="appuser_id, name" constraintName="uq_appuser_preference_name"/>
|
||||
</changeSet>
|
||||
</databaseChangeLog>
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
|
||||
|
||||
<changeSet id="0467_enable_glaccount_maker_checker" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<preConditions onFail="HALT">
|
||||
<sqlCheck expectedResult="3">
|
||||
SELECT COUNT(*)
|
||||
FROM m_permission
|
||||
WHERE entity_name = 'GLACCOUNT'
|
||||
AND action_name IN ('CREATE', 'UPDATE', 'DELETE')
|
||||
</sqlCheck>
|
||||
</preConditions>
|
||||
<sql>
|
||||
UPDATE m_permission
|
||||
SET can_maker_checker = TRUE
|
||||
WHERE entity_name = 'GLACCOUNT'
|
||||
AND action_name IN ('CREATE', 'UPDATE', 'DELETE');
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
</databaseChangeLog>
|
||||
+1
@@ -7,6 +7,7 @@
|
||||
address as verified or not verified once the outcome is known. Deliberately a plain column rather than
|
||||
a foreign key: the dispatch is a historical record and must survive the address being edited or removed. -->
|
||||
<changeSet id="0468_add_address_id_to_welcome_kit_dispatch" author="CBS" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<preConditions onFail="MARK_RAN">
|
||||
<not>
|
||||
<columnExists tableName="m_welcome_kit_dispatch" columnName="address_id"/>
|
||||
|
||||
+2
@@ -7,6 +7,7 @@
|
||||
person's authority. The requester states a reason, an admin approves or rejects, and only an approved
|
||||
request can produce a dump. Every step is stamped so the trail survives the file itself. -->
|
||||
<changeSet id="0469_create_database_export_request" author="CBS" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<createTable tableName="m_database_export_request">
|
||||
<column name="id" type="BIGSERIAL">
|
||||
<constraints primaryKey="true" nullable="false"/>
|
||||
@@ -50,6 +51,7 @@
|
||||
<!-- Requesting an export and approving one are deliberately separate permissions: the whole control
|
||||
depends on no single user holding both. -->
|
||||
<changeSet id="0469_database_export_permissions" author="CBS" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<sql>
|
||||
INSERT INTO m_permission (grouping, code, entity_name, action_name, can_maker_checker)
|
||||
SELECT 'authorisation', 'CREATE_DATABASEEXPORT', 'DATABASEEXPORT', 'CREATE', false
|
||||
|
||||
-377
@@ -1,377 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
|
||||
|
||||
<!-- The legacy "Account Type Creation" screen carries a large block of product configuration that
|
||||
Fineract's own loan product schema has no home for - cheque book rules, channel and transaction
|
||||
limits, credit bureau account types, the older interest parameters, and a set of extra GL
|
||||
mappings. Those fields were being collected by the create/edit form and then dropped before the
|
||||
request was sent, so nothing survived a page reload.
|
||||
|
||||
They live in a satellite table keyed 1:1 on the loan product rather than as more columns on
|
||||
m_product_loan: the set is specific to this deployment, and keeping it separate means an upstream
|
||||
Fineract change to m_product_loan will never collide with it. Typed columns rather than a JSON
|
||||
blob because loan account creation reads these at origination time, so they need to be queryable
|
||||
and compile-checked, not string-keyed. -->
|
||||
<changeSet id="0470_create_loan_product_cbs_ext" author="CBS" runOnChange="false">
|
||||
<createTable tableName="m_product_loan_cbs_ext">
|
||||
<column name="loan_product_id" type="BIGINT">
|
||||
<constraints primaryKey="true" nullable="false"/>
|
||||
</column>
|
||||
|
||||
<!-- classification & legacy header fields (24) -->
|
||||
<column name="product_type_group" type="VARCHAR(20)"/>
|
||||
<column name="product_type_sub_group" type="VARCHAR(30)"/>
|
||||
<column name="debit_int_calculation" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="separate_penal_interest" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="credit_int_calculation" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="sub_account_type_balance" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="final_int_rounding" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="rounding_up_to" type="INTEGER"/>
|
||||
<column name="account_type_code" type="VARCHAR(10)"/>
|
||||
<column name="micr_transaction_code" type="VARCHAR(100)"/>
|
||||
<column name="reserved_ecs_serial_number" type="VARCHAR(100)"/>
|
||||
<column name="reverse_ecs_number" type="VARCHAR(100)"/>
|
||||
<column name="lock_cheque_info_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="lock_page_two_info_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="computerization_date" type="DATE"/>
|
||||
<column name="cheque_print_description" type="VARCHAR(100)"/>
|
||||
<column name="pos_account_type_description" type="VARCHAR(100)"/>
|
||||
<column name="pfms_account_type" type="VARCHAR(100)"/>
|
||||
<column name="renewal_date_add_months" type="INTEGER"/>
|
||||
<column name="document_renewal_date_add_months" type="INTEGER"/>
|
||||
<column name="pps_limit" type="DECIMAL(19,6)"/>
|
||||
<column name="is_write_off_account_type" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="write_off_account_type_code" type="VARCHAR(100)"/>
|
||||
<column name="renewal_grace_days" type="INTEGER"/>
|
||||
|
||||
<!-- Cheque Book Settings (10) -->
|
||||
<column name="cheque_book_issue_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="cheque_validation_required" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="is_first_cheque_book_free" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="cheque_printing_account_type" type="VARCHAR(30)"/>
|
||||
<column name="allow_withdrawal_slip_usage" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="maintain_cheque_book_stock_registry" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="free_cheque_books_per_year" type="DECIMAL(19,6)"/>
|
||||
<column name="allow_credit_by_cheque_number" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="credit_cheque_validation_required" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="grace_days_for_stock_statement" type="INTEGER"/>
|
||||
|
||||
<!-- Additional Product Settings (37) -->
|
||||
<column name="account_type_active_for_transactions" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="sub_type_activity_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="account_opening_charges" type="INTEGER"/>
|
||||
<column name="maximum_gold_loan_limit" type="DECIMAL(19,6)"/>
|
||||
<column name="last_account_number_opened" type="VARCHAR(100)"/>
|
||||
<column name="customer_termination_allowed" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="charges_for_cash_credit_above_limit" type="DECIMAL(19,6)"/>
|
||||
<column name="death_interest_gl_account" type="VARCHAR(100)"/>
|
||||
<column name="starting_ledger_number" type="INTEGER"/>
|
||||
<column name="ending_ledger_number" type="INTEGER"/>
|
||||
<column name="current_ledger_number" type="INTEGER"/>
|
||||
<column name="remittance_account_number" type="VARCHAR(100)"/>
|
||||
<column name="is_non_resident_indian_account" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="debit_clearing_gl_account" type="VARCHAR(100)"/>
|
||||
<column name="missed_call_alert_service_active" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="standing_instruction_charge_gl_account" type="VARCHAR(100)"/>
|
||||
<column name="standing_instruction_debit_charge_skip_option" type="VARCHAR(50)"/>
|
||||
<column name="opening_balance_multiplier_for_remittance_charges" type="DECIMAL(19,6)"/>
|
||||
<column name="gold_loan_packet_number_with_year_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="account_move_to_inoperative_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="generate_gl_diff_entry_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="sub_type_wise_gl_balance_generation_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="validate_before_deleting_debit_entry_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="rc_file_concept_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="account_close_zero_balance_in_open_day_process" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="account_close_zero_balance_at_subledger_tran_entry" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="limit_enhancement_against_clearing_screen_display_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="advance_interest_parameter_in_ledger_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="vehicle_detail_in_master_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="deleted_cheque_issue_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="dp_reduce_in_document_renewal_date_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="dp_reduce_in_renewal_date_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="auto_close_at_day_end_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="loan_rate_from_master_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="cheque_short_name" type="VARCHAR(100)"/>
|
||||
<column name="statement_print_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="nesl_code" type="VARCHAR(100)"/>
|
||||
|
||||
<!-- Interest Related Parameters (53) -->
|
||||
<column name="drawing_power_and_limit_generation_procedure" type="VARCHAR(100)"/>
|
||||
<column name="advances_interest_calculation_method" type="VARCHAR(100)"/>
|
||||
<column name="against_interest_calculation_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="day_wise_against_clearing_interest_rounding" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="interest_calculation_one_fourth_method" type="VARCHAR(20)"/>
|
||||
<column name="against_clearing_interest_procedure_type" type="VARCHAR(50)"/>
|
||||
<column name="consider_debit_closing_amount_for_against_clearing" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="interest_rounding_method" type="VARCHAR(30)"/>
|
||||
<column name="penalty_interest_calculation_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="penalty_interest_calculation_method" type="VARCHAR(30)"/>
|
||||
<column name="penalty_interest_procedure_number" type="VARCHAR(100)"/>
|
||||
<column name="overdrawn_interest_calculation_method" type="VARCHAR(50)"/>
|
||||
<column name="calculate_overdrawn_interest_after_renewal" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="interest_on_credit_balance" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="penalty_interest_date_different_than_regular_interest" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="fixed_deposit_overdraft_certificate_sort_order" type="VARCHAR(50)"/>
|
||||
<column name="use_document_submission_date_for_interest" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="loan_management_system_renewal_penalty_active" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="minimum_normal_interest_amount" type="DECIMAL(19,6)"/>
|
||||
<column name="minimum_interest_calculation_method" type="VARCHAR(50)"/>
|
||||
<column name="minimum_against_clearing_interest_amount" type="DECIMAL(19,6)"/>
|
||||
<column name="limit_increase_upto_interest_amount_in_interest_calculation" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="minimum_penalty_interest_amount" type="DECIMAL(19,6)"/>
|
||||
<column name="days_for_limit_increase_upto_interest_amount" type="INTEGER"/>
|
||||
<column name="additional_interest_rate_for_fixed_deposit_overdraft" type="DECIMAL(19,6)"/>
|
||||
<column name="consider_dd_payorder_in_against_clearing_interest_calculation" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="grace_days_after_renew_date" type="INTEGER"/>
|
||||
<column name="apply_undebited_interest_concept_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="interest_register_print_format_type" type="VARCHAR(50)"/>
|
||||
<column name="normal_grace_days_after_overdue" type="INTEGER"/>
|
||||
<column name="allow_against_clearing_entry" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="allow_no_balance_entry" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="fd_od_penalty_interest_combined_with_normal_interest" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="allow_no_balance_entry_with_password" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="undebited_simple_interest_account_wise" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="daily_interest_calculation_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="daily_interest_calculation_start_date" type="VARCHAR(100)"/>
|
||||
<column name="non_performing_asset_penal_interest_rate_update" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="non_performing_asset_penal_interest_rate" type="DECIMAL(19,6)"/>
|
||||
<column name="fd_od_penal_interest_rate_update_in_branch_process" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="add_penal_interest_rate" type="DECIMAL(19,6)"/>
|
||||
<column name="atyp14_simple_interest_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="fixed_deposit_overdraft_margin_type" type="VARCHAR(100)"/>
|
||||
<column name="check_master_detail_edited_passing_pending_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="credit_debit_interest_calculation_separate_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="on_time_interest_provision_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="check_against_clearing_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="gst_on_penalty_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="penalty_interest_grace_days" type="INTEGER"/>
|
||||
<column name="overdrawn_interest_rate" type="DECIMAL(19,6)"/>
|
||||
<column name="calculate_daily_limit_enhancement_tod_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="fixed_deposit_overdraft_multiple_interest_rate_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="grace_days_after_overdue_for_moratorium" type="INTEGER"/>
|
||||
|
||||
<!-- Credit Bureau Settings (CIBIL) (8) -->
|
||||
<column name="cibil_account_type" type="VARCHAR(100)"/>
|
||||
<column name="cibil_commercial_account_type" type="VARCHAR(100)"/>
|
||||
<column name="highmark_account_type" type="VARCHAR(100)"/>
|
||||
<column name="highmark_commercial_account_type" type="VARCHAR(100)"/>
|
||||
<column name="experian_account_type" type="VARCHAR(100)"/>
|
||||
<column name="experian_commercial_account_type" type="VARCHAR(100)"/>
|
||||
<column name="equifax_account_type" type="VARCHAR(100)"/>
|
||||
<column name="equifax_commercial_account_type" type="VARCHAR(100)"/>
|
||||
|
||||
<!-- RBI Compliance & Product Category (6) -->
|
||||
<column name="loan_product_category" type="VARCHAR(30)"/>
|
||||
<column name="penal_charge_method" type="VARCHAR(50)"/>
|
||||
<column name="is_floating_rate" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="foreclosure_charges_applicable" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="key_fact_statement_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="annual_percentage_rate_calculation_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
|
||||
<!-- Channel & Transaction Limits (23) -->
|
||||
<column name="is_mobile_app_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="is_atm_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="atm_yearly_charge_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="atm_minimum_balance" type="DECIMAL(19,6)"/>
|
||||
<column name="email_active_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="is_imps_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="is_upi_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="is_pos_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="is_bbps_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="inter_bank_limit_per_day" type="DECIMAL(19,6)"/>
|
||||
<column name="inter_bank_limit_per_transaction" type="DECIMAL(19,6)"/>
|
||||
<column name="neft_rtgs_limit_per_day" type="DECIMAL(19,6)"/>
|
||||
<column name="neft_rtgs_limit_per_transaction" type="DECIMAL(19,6)"/>
|
||||
<column name="neft_cutoff_limit" type="DECIMAL(19,6)"/>
|
||||
<column name="rtgs_cutoff_limit" type="DECIMAL(19,6)"/>
|
||||
<column name="neft_rtgs_minimum_balance" type="DECIMAL(19,6)"/>
|
||||
<column name="is_charge_required_neft_rtgs_cbs" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="is_charge_required_neft_rtgs_mobile" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="imps_limit_per_day" type="DECIMAL(19,6)"/>
|
||||
<column name="imps_limit_per_transaction" type="DECIMAL(19,6)"/>
|
||||
<column name="imps_limit_per_month" type="DECIMAL(19,6)"/>
|
||||
<column name="imps_min_limit" type="DECIMAL(19,6)"/>
|
||||
<column name="imps_monthly_transaction_count" type="INTEGER"/>
|
||||
|
||||
<!-- POS Facility & ATM CSV Settings (10) -->
|
||||
<column name="max_per_transaction_limit_atm" type="DECIMAL(19,6)"/>
|
||||
<column name="max_day_transaction_limit_atm" type="DECIMAL(19,6)"/>
|
||||
<column name="max_per_transaction_limit_pos" type="DECIMAL(19,6)"/>
|
||||
<column name="max_day_transaction_limit_pos" type="DECIMAL(19,6)"/>
|
||||
<column name="max_per_transaction_limit_ecom" type="DECIMAL(19,6)"/>
|
||||
<column name="max_day_transaction_limit_ecom" type="DECIMAL(19,6)"/>
|
||||
<column name="max_per_transaction_limit_upi" type="DECIMAL(19,6)"/>
|
||||
<column name="max_day_transaction_limit_upi" type="DECIMAL(19,6)"/>
|
||||
<column name="atm_csv_product_code" type="VARCHAR(100)"/>
|
||||
<column name="atm_csv_type_code" type="VARCHAR(100)"/>
|
||||
|
||||
<!-- Auto Interest Post Parameters (4) -->
|
||||
<column name="auto_interest_post_type" type="VARCHAR(30)"/>
|
||||
<column name="auto_interest_post_when" type="VARCHAR(20)"/>
|
||||
<column name="auto_interest_post_fix_day" type="INTEGER"/>
|
||||
<column name="auto_last_interest_date" type="VARCHAR(100)"/>
|
||||
|
||||
<!-- Foreclosure / Early Account Closure (3) -->
|
||||
<column name="calculate_early_account_close_charge" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="early_account_close_charge" type="INTEGER"/>
|
||||
<column name="early_account_close_period_in_months" type="INTEGER"/>
|
||||
|
||||
<!-- Terms step (3) -->
|
||||
<column name="debit_balance_allow" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="allow_debit_trans_after_due_date" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="branch_level_account_type" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
|
||||
<!-- legacy cheque / standing instruction / minimum balance charges (24) -->
|
||||
<column name="cheque_book_charge_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="cheque_return_charge_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="ic_charge_debit_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="cash_bundle_charge_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="cash_bundle_charge_with_pan_limit" type="DECIMAL(19,6)"/>
|
||||
<column name="per_cheque_entry_charge" type="DECIMAL(19,6)"/>
|
||||
<column name="per_cheque_entry_service_charge" type="DECIMAL(19,6)"/>
|
||||
<column name="per_inward_cheque_entry_charge" type="DECIMAL(19,6)"/>
|
||||
<column name="per_outward_cheque_entry_charge" type="DECIMAL(19,6)"/>
|
||||
<column name="creditor_standing_instruction_fail_charge" type="DECIMAL(19,6)"/>
|
||||
<column name="debtor_standing_instruction_fail_charge" type="DECIMAL(19,6)"/>
|
||||
<column name="minimum_balance_checking_type" type="VARCHAR(20)"/>
|
||||
<column name="auto_minimum_balance_charge" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="calculate_daily_minimum_balance_charges" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="minimum_balance_charge_enabled" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="minimum_balance_charge_amount" type="DECIMAL(19,6)"/>
|
||||
<column name="minimum_balance_charge_for_cheque_issue" type="DECIMAL(19,6)"/>
|
||||
<column name="minimum_balance_charge_method" type="VARCHAR(20)"/>
|
||||
<column name="months_after_min_balance_charge_calculate" type="INTEGER"/>
|
||||
<column name="for_cheque_issue" type="DECIMAL(19,6)"/>
|
||||
<column name="for_cheque_issue_avg" type="DECIMAL(19,6)"/>
|
||||
<column name="for_withdrawal_slip" type="DECIMAL(19,6)"/>
|
||||
<column name="for_withdrawal_slip_avg" type="DECIMAL(19,6)"/>
|
||||
<column name="calculate_daily_against_clearing_charge" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
|
||||
<!-- custom GL account mappings (14) -->
|
||||
<column name="int_receivables_gl_account_id" type="BIGINT"/>
|
||||
<column name="int_payable_gl_account_id" type="BIGINT"/>
|
||||
<column name="deaf_int_payable_gl_account_id" type="BIGINT"/>
|
||||
<column name="int_overdue_reserve_account_id" type="BIGINT"/>
|
||||
<column name="undebited_interest_account_id" type="BIGINT"/>
|
||||
<column name="penal_int_cr_gl_account_id" type="BIGINT"/>
|
||||
<column name="rd_matured_gl_account_id" type="BIGINT"/>
|
||||
<column name="gl_account_id" type="BIGINT"/>
|
||||
<column name="ic_charge_gl_account_id" type="BIGINT"/>
|
||||
<column name="inoperative_gl_account_id" type="BIGINT"/>
|
||||
<column name="credit_balance_liability_gl_account_id" type="BIGINT"/>
|
||||
<column name="credit_balance_asset_gl_account_id" type="BIGINT"/>
|
||||
<column name="overdue_accounts_gl_account_id" type="BIGINT"/>
|
||||
<column name="rebate_gl_account_id" type="BIGINT"/>
|
||||
</createTable>
|
||||
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="loan_product_id"
|
||||
constraintName="fk_mplce_loan_product"
|
||||
referencedTableName="m_product_loan" referencedColumnNames="id"
|
||||
onDelete="CASCADE"/>
|
||||
</changeSet>
|
||||
|
||||
<!-- The extra GL mappings hold real account ids, so they are constrained rather than left as loose
|
||||
numbers: deleting a GL account that a product still points at should fail, not leave the product
|
||||
holding a dangling id. -->
|
||||
<changeSet id="0470_loan_product_cbs_ext_gl_fks" author="CBS" runOnChange="false">
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="int_receivables_gl_account_id"
|
||||
constraintName="fk_mplce_int_receivables"
|
||||
referencedTableName="acc_gl_account" referencedColumnNames="id"/>
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="int_payable_gl_account_id"
|
||||
constraintName="fk_mplce_int_payable"
|
||||
referencedTableName="acc_gl_account" referencedColumnNames="id"/>
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="deaf_int_payable_gl_account_id"
|
||||
constraintName="fk_mplce_deaf_int_payable"
|
||||
referencedTableName="acc_gl_account" referencedColumnNames="id"/>
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="int_overdue_reserve_account_id"
|
||||
constraintName="fk_mplce_int_overdue_reserve"
|
||||
referencedTableName="acc_gl_account" referencedColumnNames="id"/>
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="undebited_interest_account_id"
|
||||
constraintName="fk_mplce_undebited_interest"
|
||||
referencedTableName="acc_gl_account" referencedColumnNames="id"/>
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="penal_int_cr_gl_account_id"
|
||||
constraintName="fk_mplce_penal_int_cr"
|
||||
referencedTableName="acc_gl_account" referencedColumnNames="id"/>
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="rd_matured_gl_account_id"
|
||||
constraintName="fk_mplce_rd_matured"
|
||||
referencedTableName="acc_gl_account" referencedColumnNames="id"/>
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="gl_account_id"
|
||||
constraintName="fk_mplce_gl"
|
||||
referencedTableName="acc_gl_account" referencedColumnNames="id"/>
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="ic_charge_gl_account_id"
|
||||
constraintName="fk_mplce_ic_charge"
|
||||
referencedTableName="acc_gl_account" referencedColumnNames="id"/>
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="inoperative_gl_account_id"
|
||||
constraintName="fk_mplce_inoperative"
|
||||
referencedTableName="acc_gl_account" referencedColumnNames="id"/>
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="credit_balance_liability_gl_account_id"
|
||||
constraintName="fk_mplce_credit_balance_liability"
|
||||
referencedTableName="acc_gl_account" referencedColumnNames="id"/>
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="credit_balance_asset_gl_account_id"
|
||||
constraintName="fk_mplce_credit_balance_asset"
|
||||
referencedTableName="acc_gl_account" referencedColumnNames="id"/>
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="overdue_accounts_gl_account_id"
|
||||
constraintName="fk_mplce_overdue_accounts"
|
||||
referencedTableName="acc_gl_account" referencedColumnNames="id"/>
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_ext" baseColumnNames="rebate_gl_account_id"
|
||||
constraintName="fk_mplce_rebate"
|
||||
referencedTableName="acc_gl_account" referencedColumnNames="id"/>
|
||||
</changeSet>
|
||||
|
||||
<!-- The legacy Interest Rate Detail grid: four fixed interest types, each with a Normal and a Special
|
||||
min/max rate plus a period. A child table rather than twenty-four flat columns because the
|
||||
interest type reads far better as data than as part of a column name
|
||||
(against_clearing_special_max_rate and friends). -->
|
||||
<changeSet id="0470_create_loan_product_cbs_interest_rate" author="CBS" runOnChange="false">
|
||||
<createTable tableName="m_product_loan_cbs_interest_rate">
|
||||
<column name="id" type="BIGSERIAL">
|
||||
<constraints primaryKey="true" nullable="false"/>
|
||||
</column>
|
||||
<column name="loan_product_id" type="BIGINT">
|
||||
<constraints nullable="false"/>
|
||||
</column>
|
||||
<!-- Normal Debit | Normal Credit | Against Clearing | Penalty -->
|
||||
<column name="interest_type" type="VARCHAR(30)">
|
||||
<constraints nullable="false"/>
|
||||
</column>
|
||||
<column name="calculation" type="BOOLEAN" defaultValueBoolean="false"/>
|
||||
<column name="normal_min_rate" type="DECIMAL(9,6)"/>
|
||||
<column name="normal_max_rate" type="DECIMAL(9,6)"/>
|
||||
<column name="special_min_rate" type="DECIMAL(9,6)"/>
|
||||
<column name="special_max_rate" type="DECIMAL(9,6)"/>
|
||||
<!-- DAILY | MONTHLY | QUARTERLY | HALF YEARLY | YEARLY -->
|
||||
<column name="period" type="VARCHAR(20)"/>
|
||||
</createTable>
|
||||
|
||||
<addForeignKeyConstraint baseTableName="m_product_loan_cbs_interest_rate" baseColumnNames="loan_product_id"
|
||||
constraintName="fk_mplcir_loan_product"
|
||||
referencedTableName="m_product_loan" referencedColumnNames="id"
|
||||
onDelete="CASCADE"/>
|
||||
|
||||
<!-- One row per interest type per product; the grid is fixed, so this also stops a replayed
|
||||
save from doubling the rows. -->
|
||||
<addUniqueConstraint tableName="m_product_loan_cbs_interest_rate"
|
||||
columnNames="loan_product_id, interest_type"
|
||||
constraintName="mplcir_unq_product_interest_type"/>
|
||||
</changeSet>
|
||||
|
||||
<!-- Both of these are money, not counts, and were created as INTEGER by mistake - a charge of 250.75
|
||||
was rejected outright. Kept as a follow-on changeset rather than a correction to the two above,
|
||||
which have already run and whose checksums must not change. -->
|
||||
<changeSet id="0470_fix_charge_column_types" author="CBS" runOnChange="false">
|
||||
<modifyDataType tableName="m_product_loan_cbs_ext" columnName="account_opening_charges"
|
||||
newDataType="DECIMAL(19,6)"/>
|
||||
<modifyDataType tableName="m_product_loan_cbs_ext" columnName="early_account_close_charge"
|
||||
newDataType="DECIMAL(19,6)"/>
|
||||
</changeSet>
|
||||
|
||||
<!-- A count of cheque books, not an amount. Created as DECIMAL by the same name-based type guess
|
||||
that got the two charges above wrong, and stored "3.000000" for three books. -->
|
||||
<changeSet id="0470_free_cheque_books_is_a_count" author="CBS" runOnChange="false">
|
||||
<modifyDataType tableName="m_product_loan_cbs_ext" columnName="free_cheque_books_per_year"
|
||||
newDataType="INTEGER"/>
|
||||
</changeSet>
|
||||
|
||||
</databaseChangeLog>
|
||||
+68
@@ -0,0 +1,68 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
|
||||
|
||||
<changeSet id="0470_cbs_base_interest_rate_maker_checker_permissions" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<sql>
|
||||
INSERT INTO m_permission (grouping, code, entity_name, action_name, can_maker_checker)
|
||||
SELECT 'portfolio', 'CREATE_CBSBASEINTERESTRATE', 'CBSBASEINTERESTRATE', 'CREATE', true
|
||||
WHERE NOT EXISTS (SELECT 1 FROM m_permission WHERE code = 'CREATE_CBSBASEINTERESTRATE');
|
||||
|
||||
INSERT INTO m_permission (grouping, code, entity_name, action_name, can_maker_checker)
|
||||
SELECT 'portfolio', 'CREATE_CBSBASEINTERESTRATE_CHECKER', 'CBSBASEINTERESTRATE', 'CREATE_CHECKER', false
|
||||
WHERE NOT EXISTS (SELECT 1 FROM m_permission WHERE code = 'CREATE_CBSBASEINTERESTRATE_CHECKER');
|
||||
|
||||
UPDATE m_permission
|
||||
SET can_maker_checker = TRUE
|
||||
WHERE entity_name = 'CBSBASEINTERESTRATE'
|
||||
AND action_name = 'CREATE';
|
||||
|
||||
UPDATE m_permission
|
||||
SET action_name = 'CREATE_CHECKER'
|
||||
WHERE entity_name = 'CBSBASEINTERESTRATE'
|
||||
AND code = 'CREATE_CBSBASEINTERESTRATE_CHECKER';
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="0470_grant_cbs_base_interest_rate_permissions_to_roles" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<sql>
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT r.id, p.id
|
||||
FROM m_role r
|
||||
CROSS JOIN m_permission p
|
||||
WHERE r.name = 'Super user'
|
||||
AND p.code IN ('CREATE_CBSBASEINTERESTRATE', 'CREATE_CBSBASEINTERESTRATE_CHECKER')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = r.id AND rp.permission_id = p.id
|
||||
);
|
||||
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT ur.role_id, p.id
|
||||
FROM m_appuser u
|
||||
JOIN m_appuser_role ur ON ur.appuser_id = u.id
|
||||
CROSS JOIN m_permission p
|
||||
WHERE u.username = 'bankadmin'
|
||||
AND p.code IN ('CREATE_CBSBASEINTERESTRATE', 'CREATE_CBSBASEINTERESTRATE_CHECKER')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = ur.role_id AND rp.permission_id = p.id
|
||||
);
|
||||
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT r.id, p.id
|
||||
FROM m_role r
|
||||
CROSS JOIN m_permission p
|
||||
WHERE LOWER(r.name) = 'clerk'
|
||||
AND p.code IN ('CREATE_CBSBASEINTERESTRATE', 'CREATE_CBSBASEINTERESTRATE_CHECKER')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = r.id AND rp.permission_id = p.id
|
||||
);
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
</databaseChangeLog>
|
||||
+63
@@ -0,0 +1,63 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
|
||||
|
||||
<changeSet id="0471_enable_charge_maker_checker" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<preConditions onFail="HALT">
|
||||
<sqlCheck expectedResult="1">
|
||||
SELECT COUNT(*)
|
||||
FROM m_permission
|
||||
WHERE entity_name = 'CHARGE'
|
||||
AND action_name = 'CREATE'
|
||||
</sqlCheck>
|
||||
</preConditions>
|
||||
<sql>
|
||||
UPDATE m_permission
|
||||
SET can_maker_checker = TRUE
|
||||
WHERE entity_name = 'CHARGE'
|
||||
AND action_name = 'CREATE';
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="0471_grant_charge_maker_checker_permissions_to_roles" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<sql>
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT r.id, p.id
|
||||
FROM m_role r
|
||||
CROSS JOIN m_permission p
|
||||
WHERE r.name = 'Super user'
|
||||
AND p.code IN ('CREATE_CHARGE', 'CREATE_CHARGE_CHECKER')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = r.id AND rp.permission_id = p.id
|
||||
);
|
||||
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT ur.role_id, p.id
|
||||
FROM m_appuser u
|
||||
JOIN m_appuser_role ur ON ur.appuser_id = u.id
|
||||
CROSS JOIN m_permission p
|
||||
WHERE u.username = 'bankadmin'
|
||||
AND p.code IN ('CREATE_CHARGE', 'CREATE_CHARGE_CHECKER')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = ur.role_id AND rp.permission_id = p.id
|
||||
);
|
||||
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT r.id, p.id
|
||||
FROM m_role r
|
||||
CROSS JOIN m_permission p
|
||||
WHERE LOWER(r.name) = 'clerk'
|
||||
AND p.code IN ('CREATE_CHARGE', 'CREATE_CHARGE_CHECKER')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = r.id AND rp.permission_id = p.id
|
||||
);
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
</databaseChangeLog>
|
||||
+87
@@ -0,0 +1,87 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
|
||||
|
||||
<changeSet id="0472_add_shareproduct_checker_permission_if_not_exists" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<sql>
|
||||
INSERT INTO m_permission (grouping, code, entity_name, action_name, can_maker_checker)
|
||||
SELECT 'SHAREPRODUCT', 'CREATE_SHAREPRODUCT_CHECKER', 'SHAREPRODUCT', 'CREATE_CHECKER', FALSE
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM m_permission WHERE code = 'CREATE_SHAREPRODUCT_CHECKER'
|
||||
);
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="0472_enable_product_creation_maker_checker" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<preConditions onFail="HALT">
|
||||
<sqlCheck expectedResult="4">
|
||||
SELECT COUNT(*)
|
||||
FROM m_permission
|
||||
WHERE code IN ('CREATE_LOANPRODUCT', 'CREATE_SAVINGSPRODUCT', 'CREATE_CURRENTPRODUCT', 'CREATE_SHAREPRODUCT')
|
||||
</sqlCheck>
|
||||
</preConditions>
|
||||
<sql>
|
||||
UPDATE m_permission
|
||||
SET can_maker_checker = TRUE
|
||||
WHERE code IN ('CREATE_LOANPRODUCT', 'CREATE_SAVINGSPRODUCT', 'CREATE_CURRENTPRODUCT', 'CREATE_SHAREPRODUCT');
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="0472_grant_product_creation_maker_checker_permissions_to_roles" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<sql>
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT r.id, p.id
|
||||
FROM m_role r
|
||||
CROSS JOIN m_permission p
|
||||
WHERE r.name = 'Super user'
|
||||
AND p.code IN (
|
||||
'CREATE_LOANPRODUCT', 'CREATE_LOANPRODUCT_CHECKER',
|
||||
'CREATE_SAVINGSPRODUCT', 'CREATE_SAVINGSPRODUCT_CHECKER',
|
||||
'CREATE_CURRENTPRODUCT', 'CREATE_CURRENTPRODUCT_CHECKER',
|
||||
'CREATE_SHAREPRODUCT', 'CREATE_SHAREPRODUCT_CHECKER'
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = r.id AND rp.permission_id = p.id
|
||||
);
|
||||
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT ur.role_id, p.id
|
||||
FROM m_appuser u
|
||||
JOIN m_appuser_role ur ON ur.appuser_id = u.id
|
||||
CROSS JOIN m_permission p
|
||||
WHERE u.username = 'bankadmin'
|
||||
AND p.code IN (
|
||||
'CREATE_LOANPRODUCT', 'CREATE_LOANPRODUCT_CHECKER',
|
||||
'CREATE_SAVINGSPRODUCT', 'CREATE_SAVINGSPRODUCT_CHECKER',
|
||||
'CREATE_CURRENTPRODUCT', 'CREATE_CURRENTPRODUCT_CHECKER',
|
||||
'CREATE_SHAREPRODUCT', 'CREATE_SHAREPRODUCT_CHECKER'
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = ur.role_id AND rp.permission_id = p.id
|
||||
);
|
||||
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT r.id, p.id
|
||||
FROM m_role r
|
||||
CROSS JOIN m_permission p
|
||||
WHERE LOWER(r.name) = 'clerk'
|
||||
AND p.code IN (
|
||||
'CREATE_LOANPRODUCT', 'CREATE_LOANPRODUCT_CHECKER',
|
||||
'CREATE_SAVINGSPRODUCT', 'CREATE_SAVINGSPRODUCT_CHECKER',
|
||||
'CREATE_CURRENTPRODUCT', 'CREATE_CURRENTPRODUCT_CHECKER',
|
||||
'CREATE_SHAREPRODUCT', 'CREATE_SHAREPRODUCT_CHECKER'
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = r.id AND rp.permission_id = p.id
|
||||
);
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
</databaseChangeLog>
|
||||
+72
@@ -0,0 +1,72 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
|
||||
|
||||
<changeSet id="0474_add_fixeddepositproduct_checker_permission_if_not_exists" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<sql>
|
||||
INSERT INTO m_permission (grouping, code, entity_name, action_name, can_maker_checker)
|
||||
SELECT 'portfolio', 'CREATE_FIXEDDEPOSITPRODUCT_CHECKER', 'FIXEDDEPOSITPRODUCT', 'CREATE_CHECKER', FALSE
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM m_permission WHERE code = 'CREATE_FIXEDDEPOSITPRODUCT_CHECKER'
|
||||
);
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="0474_enable_fixed_deposit_product_creation_maker_checker" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<preConditions onFail="HALT">
|
||||
<sqlCheck expectedResult="1">
|
||||
SELECT COUNT(*)
|
||||
FROM m_permission
|
||||
WHERE code = 'CREATE_FIXEDDEPOSITPRODUCT'
|
||||
</sqlCheck>
|
||||
</preConditions>
|
||||
<sql>
|
||||
UPDATE m_permission
|
||||
SET can_maker_checker = TRUE
|
||||
WHERE code = 'CREATE_FIXEDDEPOSITPRODUCT';
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="0474_grant_fixed_deposit_product_creation_maker_checker_permissions_to_roles" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<sql>
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT r.id, p.id
|
||||
FROM m_role r
|
||||
CROSS JOIN m_permission p
|
||||
WHERE r.name = 'Super user'
|
||||
AND p.code IN ('CREATE_FIXEDDEPOSITPRODUCT', 'CREATE_FIXEDDEPOSITPRODUCT_CHECKER')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = r.id AND rp.permission_id = p.id
|
||||
);
|
||||
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT ur.role_id, p.id
|
||||
FROM m_appuser u
|
||||
JOIN m_appuser_role ur ON ur.appuser_id = u.id
|
||||
CROSS JOIN m_permission p
|
||||
WHERE u.username = 'bankadmin'
|
||||
AND p.code IN ('CREATE_FIXEDDEPOSITPRODUCT', 'CREATE_FIXEDDEPOSITPRODUCT_CHECKER')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = ur.role_id AND rp.permission_id = p.id
|
||||
);
|
||||
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT r.id, p.id
|
||||
FROM m_role r
|
||||
CROSS JOIN m_permission p
|
||||
WHERE LOWER(r.name) = 'clerk'
|
||||
AND p.code IN ('CREATE_FIXEDDEPOSITPRODUCT', 'CREATE_FIXEDDEPOSITPRODUCT_CHECKER')
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = r.id AND rp.permission_id = p.id
|
||||
);
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
</databaseChangeLog>
|
||||
+77
@@ -0,0 +1,77 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
|
||||
|
||||
<changeSet id="0475_add_permissions_role_checker_if_not_exists" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<sql>
|
||||
INSERT INTO m_permission (grouping, code, entity_name, action_name, can_maker_checker)
|
||||
SELECT 'authorisation', 'PERMISSIONS_ROLE_CHECKER', 'ROLE', 'PERMISSIONS_CHECKER', FALSE
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM m_permission WHERE code = 'PERMISSIONS_ROLE_CHECKER'
|
||||
);
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="0475_enable_admin_user_and_role_maker_checker" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<preConditions onFail="HALT">
|
||||
<sqlCheck expectedResult="9">
|
||||
SELECT COUNT(*)
|
||||
FROM m_permission
|
||||
WHERE code IN (
|
||||
'CREATE_USER', 'UPDATE_USER', 'DELETE_USER',
|
||||
'CREATE_ROLE', 'UPDATE_ROLE', 'PERMISSIONS_ROLE',
|
||||
'DELETE_ROLE', 'ENABLE_ROLE', 'DISABLE_ROLE'
|
||||
)
|
||||
</sqlCheck>
|
||||
</preConditions>
|
||||
<sql>
|
||||
UPDATE m_permission
|
||||
SET can_maker_checker = TRUE
|
||||
WHERE code IN (
|
||||
'CREATE_USER', 'UPDATE_USER', 'DELETE_USER',
|
||||
'CREATE_ROLE', 'UPDATE_ROLE', 'PERMISSIONS_ROLE',
|
||||
'DELETE_ROLE', 'ENABLE_ROLE', 'DISABLE_ROLE'
|
||||
);
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="0475_grant_admin_user_and_role_checker_permissions_to_roles" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<sql>
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT r.id, p.id
|
||||
FROM m_role r
|
||||
CROSS JOIN m_permission p
|
||||
WHERE r.name = 'Super user'
|
||||
AND p.code IN (
|
||||
'CREATE_USER_CHECKER', 'UPDATE_USER_CHECKER', 'DELETE_USER_CHECKER',
|
||||
'CREATE_ROLE_CHECKER', 'UPDATE_ROLE_CHECKER', 'PERMISSIONS_ROLE_CHECKER',
|
||||
'DELETE_ROLE_CHECKER', 'ENABLE_ROLE_CHECKER', 'DISABLE_ROLE_CHECKER'
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = r.id AND rp.permission_id = p.id
|
||||
);
|
||||
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT ur.role_id, p.id
|
||||
FROM m_appuser u
|
||||
JOIN m_appuser_role ur ON ur.appuser_id = u.id
|
||||
CROSS JOIN m_permission p
|
||||
WHERE u.username = 'bankadmin'
|
||||
AND p.code IN (
|
||||
'CREATE_USER_CHECKER', 'UPDATE_USER_CHECKER', 'DELETE_USER_CHECKER',
|
||||
'CREATE_ROLE_CHECKER', 'UPDATE_ROLE_CHECKER', 'PERMISSIONS_ROLE_CHECKER',
|
||||
'DELETE_ROLE_CHECKER', 'ENABLE_ROLE_CHECKER', 'DISABLE_ROLE_CHECKER'
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = ur.role_id AND rp.permission_id = p.id
|
||||
);
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
</databaseChangeLog>
|
||||
+98
@@ -0,0 +1,98 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
|
||||
|
||||
<changeSet id="0476_create_m_user_pending_request_table" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<sql>
|
||||
CREATE TABLE IF NOT EXISTS m_user_pending_request (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
user_id BIGINT NULL REFERENCES m_appuser(id) ON DELETE SET NULL,
|
||||
request_type VARCHAR(20) NOT NULL,
|
||||
status VARCHAR(20) NOT NULL,
|
||||
payload_json TEXT NOT NULL,
|
||||
original_json TEXT NULL,
|
||||
password_hash VARCHAR(255) NULL,
|
||||
maker_id BIGINT NOT NULL REFERENCES m_appuser(id),
|
||||
submitted_date TIMESTAMPTZ NOT NULL,
|
||||
checker_id BIGINT NULL REFERENCES m_appuser(id),
|
||||
checked_date TIMESTAMPTZ NULL,
|
||||
reject_reason VARCHAR(500) NULL,
|
||||
pending_lock_key VARCHAR(100) NULL UNIQUE
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_user_pending_req_status ON m_user_pending_request(status);
|
||||
CREATE INDEX IF NOT EXISTS idx_user_pending_req_user_id ON m_user_pending_request(user_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_user_pending_req_maker ON m_user_pending_request(maker_id);
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="0476_configure_user_and_charge_maker_checker_permissions" author="fineract" runOnChange="false">
|
||||
<validCheckSum>ANY</validCheckSum>
|
||||
<sql>
|
||||
-- Disable native MC on CREATE_USER and UPDATE_USER to avoid core password sanitization error
|
||||
UPDATE m_permission
|
||||
SET can_maker_checker = FALSE
|
||||
WHERE code IN ('CREATE_USER', 'UPDATE_USER');
|
||||
|
||||
-- Enable native MC on UPDATE_CHARGE and DELETE_CHARGE
|
||||
UPDATE m_permission
|
||||
SET can_maker_checker = TRUE
|
||||
WHERE code IN ('UPDATE_CHARGE', 'DELETE_CHARGE');
|
||||
|
||||
-- Insert bespoke user maker-checker permissions
|
||||
INSERT INTO m_permission (grouping, code, entity_name, action_name, can_maker_checker)
|
||||
SELECT 'user_administration', 'SUBMIT_CREATE_USER', 'USER', 'SUBMIT_CREATE', FALSE
|
||||
WHERE NOT EXISTS (SELECT 1 FROM m_permission WHERE code = 'SUBMIT_CREATE_USER');
|
||||
|
||||
INSERT INTO m_permission (grouping, code, entity_name, action_name, can_maker_checker)
|
||||
SELECT 'user_administration', 'SUBMIT_UPDATE_USER', 'USER', 'SUBMIT_UPDATE', FALSE
|
||||
WHERE NOT EXISTS (SELECT 1 FROM m_permission WHERE code = 'SUBMIT_UPDATE_USER');
|
||||
|
||||
INSERT INTO m_permission (grouping, code, entity_name, action_name, can_maker_checker)
|
||||
SELECT 'user_administration', 'APPROVE_USER', 'USER', 'APPROVE', FALSE
|
||||
WHERE NOT EXISTS (SELECT 1 FROM m_permission WHERE code = 'APPROVE_USER');
|
||||
|
||||
INSERT INTO m_permission (grouping, code, entity_name, action_name, can_maker_checker)
|
||||
SELECT 'user_administration', 'REJECT_USER', 'USER', 'REJECT', FALSE
|
||||
WHERE NOT EXISTS (SELECT 1 FROM m_permission WHERE code = 'REJECT_USER');
|
||||
|
||||
INSERT INTO m_permission (grouping, code, entity_name, action_name, can_maker_checker)
|
||||
SELECT 'user_administration', 'READ_USER_PENDING_REQUEST', 'USER', 'READ_PENDING', FALSE
|
||||
WHERE NOT EXISTS (SELECT 1 FROM m_permission WHERE code = 'READ_USER_PENDING_REQUEST');
|
||||
|
||||
-- Grant permissions to Super user
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT r.id, p.id
|
||||
FROM m_role r
|
||||
CROSS JOIN m_permission p
|
||||
WHERE r.name = 'Super user'
|
||||
AND p.code IN (
|
||||
'UPDATE_CHARGE', 'UPDATE_CHARGE_CHECKER', 'DELETE_CHARGE', 'DELETE_CHARGE_CHECKER',
|
||||
'SUBMIT_CREATE_USER', 'SUBMIT_UPDATE_USER', 'APPROVE_USER', 'REJECT_USER', 'READ_USER_PENDING_REQUEST'
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = r.id AND rp.permission_id = p.id
|
||||
);
|
||||
|
||||
-- Grant permissions to bankadmin
|
||||
INSERT INTO m_role_permission (role_id, permission_id)
|
||||
SELECT ur.role_id, p.id
|
||||
FROM m_appuser u
|
||||
JOIN m_appuser_role ur ON ur.appuser_id = u.id
|
||||
CROSS JOIN m_permission p
|
||||
WHERE u.username = 'bankadmin'
|
||||
AND p.code IN (
|
||||
'UPDATE_CHARGE', 'UPDATE_CHARGE_CHECKER', 'DELETE_CHARGE', 'DELETE_CHARGE_CHECKER',
|
||||
'SUBMIT_CREATE_USER', 'SUBMIT_UPDATE_USER', 'APPROVE_USER', 'REJECT_USER', 'READ_USER_PENDING_REQUEST'
|
||||
)
|
||||
AND NOT EXISTS (
|
||||
SELECT 1 FROM m_role_permission rp
|
||||
WHERE rp.role_id = ur.role_id AND rp.permission_id = p.id
|
||||
);
|
||||
</sql>
|
||||
</changeSet>
|
||||
|
||||
</databaseChangeLog>
|
||||
+525
@@ -28,6 +28,7 @@ import org.apache.fineract.batch.exception.ErrorInfo;
|
||||
import org.apache.fineract.commands.domain.CommandSource;
|
||||
import org.apache.fineract.commands.domain.CommandSourceRepository;
|
||||
import org.apache.fineract.commands.domain.CommandWrapper;
|
||||
import org.apache.fineract.commands.handler.NewCommandSourceHandler;
|
||||
import org.apache.fineract.infrastructure.codes.exception.CodeNotFoundException;
|
||||
import org.apache.fineract.infrastructure.configuration.domain.ConfigurationDomainService;
|
||||
import org.apache.fineract.infrastructure.core.api.JsonCommand;
|
||||
@@ -113,4 +114,528 @@ public class CommandSourceServiceTest {
|
||||
Assertions.assertEquals(1001, result.getErrorCode());
|
||||
Assertions.assertTrue(result.getMessage().contains("Code with name `foo` does not exist"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_NonGLAccount_SuperUser_BypassesMakerChecker() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser superUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("WITHDRAW_SAVINGSACCOUNT");
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("SAVINGSACCOUNT");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn("WITHDRAW");
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("WITHDRAW_SAVINGSACCOUNT")).thenReturn(true);
|
||||
Mockito.when(superUser.isCheckerSuperUser()).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult result = underTest.processCommand(handler, jsonCommand,
|
||||
commandSource, superUser, false);
|
||||
|
||||
Assertions.assertNotNull(result);
|
||||
Mockito.verify(commandSource).markAsChecked(superUser);
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsAwaitingApproval();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_GLAccount_SuperUser_EnforcesMakerChecker_Create() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser superUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("CREATE_GLACCOUNT");
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("GLACCOUNT");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn("CREATE");
|
||||
Mockito.when(commandSource.getId()).thenReturn(100L);
|
||||
Mockito.when(commandSource.getResourceId()).thenReturn(200L);
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("CREATE_GLACCOUNT")).thenReturn(true);
|
||||
Mockito.when(superUser.isCheckerSuperUser()).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
Assertions.assertThrows(org.apache.fineract.commands.exception.RollbackTransactionNotApprovedException.class, () -> {
|
||||
underTest.processCommand(handler, jsonCommand, commandSource, superUser, false);
|
||||
});
|
||||
|
||||
Mockito.verify(commandSource).markAsAwaitingApproval();
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsChecked(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_GLAccount_SuperUser_EnforcesMakerChecker_Update_And_Disable() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser superUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("UPDATE_GLACCOUNT");
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("GLACCOUNT");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn("UPDATE");
|
||||
Mockito.when(commandSource.getId()).thenReturn(101L);
|
||||
Mockito.when(commandSource.getResourceId()).thenReturn(201L);
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("UPDATE_GLACCOUNT")).thenReturn(true);
|
||||
Mockito.when(superUser.isCheckerSuperUser()).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
Assertions.assertThrows(org.apache.fineract.commands.exception.RollbackTransactionNotApprovedException.class, () -> {
|
||||
underTest.processCommand(handler, jsonCommand, commandSource, superUser, false);
|
||||
});
|
||||
|
||||
Mockito.verify(commandSource).markAsAwaitingApproval();
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsChecked(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_GLAccount_SuperUser_EnforcesMakerChecker_Delete() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser superUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("DELETE_GLACCOUNT");
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("GLACCOUNT");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn("DELETE");
|
||||
Mockito.when(commandSource.getId()).thenReturn(102L);
|
||||
Mockito.when(commandSource.getResourceId()).thenReturn(202L);
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("DELETE_GLACCOUNT")).thenReturn(true);
|
||||
Mockito.when(superUser.isCheckerSuperUser()).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
Assertions.assertThrows(org.apache.fineract.commands.exception.RollbackTransactionNotApprovedException.class, () -> {
|
||||
underTest.processCommand(handler, jsonCommand, commandSource, superUser, false);
|
||||
});
|
||||
|
||||
Mockito.verify(commandSource).markAsAwaitingApproval();
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsChecked(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_GLAccount_CheckerApproval_ExecutesSuccessfully() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser checkerUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("UPDATE_GLACCOUNT");
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("GLACCOUNT");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn("UPDATE");
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("UPDATE_GLACCOUNT")).thenReturn(true);
|
||||
Mockito.when(checkerUser.isCheckerSuperUser()).thenReturn(false);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult result = underTest.processCommand(handler, jsonCommand,
|
||||
commandSource, checkerUser, true);
|
||||
|
||||
Assertions.assertNotNull(result);
|
||||
Mockito.verify(commandSource).markAsChecked(checkerUser);
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsAwaitingApproval();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_GLAccount_NonSuperUser_EnforcesMakerChecker() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser regularUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("CREATE_GLACCOUNT");
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("GLACCOUNT");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn("CREATE");
|
||||
Mockito.when(commandSource.getId()).thenReturn(103L);
|
||||
Mockito.when(commandSource.getResourceId()).thenReturn(203L);
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("CREATE_GLACCOUNT")).thenReturn(true);
|
||||
Mockito.when(regularUser.isCheckerSuperUser()).thenReturn(false);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
Assertions.assertThrows(org.apache.fineract.commands.exception.RollbackTransactionNotApprovedException.class, () -> {
|
||||
underTest.processCommand(handler, jsonCommand, commandSource, regularUser, false);
|
||||
});
|
||||
|
||||
Mockito.verify(commandSource).markAsAwaitingApproval();
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsChecked(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_CBSBaseInterestRate_SuperUser_EnforcesMakerChecker() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser superUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("CREATE_CBSBASEINTERESTRATE");
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("CBSBASEINTERESTRATE");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn("CREATE");
|
||||
Mockito.when(commandSource.getId()).thenReturn(104L);
|
||||
Mockito.when(commandSource.getResourceId()).thenReturn(204L);
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("CREATE_CBSBASEINTERESTRATE")).thenReturn(true);
|
||||
Mockito.when(superUser.isCheckerSuperUser()).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
Assertions.assertThrows(org.apache.fineract.commands.exception.RollbackTransactionNotApprovedException.class, () -> {
|
||||
underTest.processCommand(handler, jsonCommand, commandSource, superUser, false);
|
||||
});
|
||||
|
||||
Mockito.verify(commandSource).markAsAwaitingApproval();
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsChecked(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_CBSBaseInterestRate_CheckerApproval_MarksAsChecked() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser checkerUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("CREATE_CBSBASEINTERESTRATE");
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("CREATE_CBSBASEINTERESTRATE")).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult result = underTest.processCommand(handler, jsonCommand,
|
||||
commandSource, checkerUser, true);
|
||||
|
||||
Assertions.assertNotNull(result);
|
||||
Mockito.verify(commandSource).markAsChecked(checkerUser);
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsAwaitingApproval();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_Charge_SuperUser_EnforcesMakerChecker() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser superUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("CREATE_CHARGE");
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("CHARGE");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn("CREATE");
|
||||
Mockito.when(commandSource.getId()).thenReturn(105L);
|
||||
Mockito.when(commandSource.getResourceId()).thenReturn(205L);
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("CREATE_CHARGE")).thenReturn(true);
|
||||
Mockito.when(superUser.isCheckerSuperUser()).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
Assertions.assertThrows(org.apache.fineract.commands.exception.RollbackTransactionNotApprovedException.class, () -> {
|
||||
underTest.processCommand(handler, jsonCommand, commandSource, superUser, false);
|
||||
});
|
||||
|
||||
Mockito.verify(commandSource).markAsAwaitingApproval();
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsChecked(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_Charge_NonSuperUser_EnforcesMakerChecker() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser regularUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("CREATE_CHARGE");
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("CHARGE");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn("CREATE");
|
||||
Mockito.when(commandSource.getId()).thenReturn(106L);
|
||||
Mockito.when(commandSource.getResourceId()).thenReturn(206L);
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("CREATE_CHARGE")).thenReturn(true);
|
||||
Mockito.when(regularUser.isCheckerSuperUser()).thenReturn(false);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
Assertions.assertThrows(org.apache.fineract.commands.exception.RollbackTransactionNotApprovedException.class, () -> {
|
||||
underTest.processCommand(handler, jsonCommand, commandSource, regularUser, false);
|
||||
});
|
||||
|
||||
Mockito.verify(commandSource).markAsAwaitingApproval();
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsChecked(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_LoanProduct_SuperUser_EnforcesMakerChecker() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser superUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("CREATE_LOANPRODUCT");
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("LOANPRODUCT");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn("CREATE");
|
||||
Mockito.when(commandSource.getId()).thenReturn(110L);
|
||||
Mockito.when(commandSource.getResourceId()).thenReturn(210L);
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("CREATE_LOANPRODUCT")).thenReturn(true);
|
||||
Mockito.when(superUser.isCheckerSuperUser()).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
Assertions.assertThrows(org.apache.fineract.commands.exception.RollbackTransactionNotApprovedException.class, () -> {
|
||||
underTest.processCommand(handler, jsonCommand, commandSource, superUser, false);
|
||||
});
|
||||
|
||||
Mockito.verify(commandSource).markAsAwaitingApproval();
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsChecked(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_SavingsProduct_SuperUser_EnforcesMakerChecker() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser superUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("CREATE_SAVINGSPRODUCT");
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("SAVINGSPRODUCT");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn("CREATE");
|
||||
Mockito.when(commandSource.getId()).thenReturn(111L);
|
||||
Mockito.when(commandSource.getResourceId()).thenReturn(211L);
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("CREATE_SAVINGSPRODUCT")).thenReturn(true);
|
||||
Mockito.when(superUser.isCheckerSuperUser()).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
Assertions.assertThrows(org.apache.fineract.commands.exception.RollbackTransactionNotApprovedException.class, () -> {
|
||||
underTest.processCommand(handler, jsonCommand, commandSource, superUser, false);
|
||||
});
|
||||
|
||||
Mockito.verify(commandSource).markAsAwaitingApproval();
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsChecked(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_CurrentProduct_SuperUser_EnforcesMakerChecker() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser superUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("CREATE_CURRENTPRODUCT");
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("CURRENTPRODUCT");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn("CREATE");
|
||||
Mockito.when(commandSource.getId()).thenReturn(112L);
|
||||
Mockito.when(commandSource.getResourceId()).thenReturn(212L);
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("CREATE_CURRENTPRODUCT")).thenReturn(true);
|
||||
Mockito.when(superUser.isCheckerSuperUser()).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
Assertions.assertThrows(org.apache.fineract.commands.exception.RollbackTransactionNotApprovedException.class, () -> {
|
||||
underTest.processCommand(handler, jsonCommand, commandSource, superUser, false);
|
||||
});
|
||||
|
||||
Mockito.verify(commandSource).markAsAwaitingApproval();
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsChecked(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_ShareProduct_SuperUser_EnforcesMakerChecker() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser superUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("CREATE_SHAREPRODUCT");
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("SHAREPRODUCT");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn("CREATE");
|
||||
Mockito.when(commandSource.getId()).thenReturn(113L);
|
||||
Mockito.when(commandSource.getResourceId()).thenReturn(213L);
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("CREATE_SHAREPRODUCT")).thenReturn(true);
|
||||
Mockito.when(superUser.isCheckerSuperUser()).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
Assertions.assertThrows(org.apache.fineract.commands.exception.RollbackTransactionNotApprovedException.class, () -> {
|
||||
underTest.processCommand(handler, jsonCommand, commandSource, superUser, false);
|
||||
});
|
||||
|
||||
Mockito.verify(commandSource).markAsAwaitingApproval();
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsChecked(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_FixedDepositProduct_SuperUser_EnforcesMakerChecker() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser superUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("CREATE_FIXEDDEPOSITPRODUCT");
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("FIXEDDEPOSITPRODUCT");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn("CREATE");
|
||||
Mockito.when(commandSource.getId()).thenReturn(114L);
|
||||
Mockito.when(commandSource.getResourceId()).thenReturn(214L);
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("CREATE_FIXEDDEPOSITPRODUCT")).thenReturn(true);
|
||||
Mockito.when(superUser.isCheckerSuperUser()).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
Assertions.assertThrows(org.apache.fineract.commands.exception.RollbackTransactionNotApprovedException.class, () -> {
|
||||
underTest.processCommand(handler, jsonCommand, commandSource, superUser, false);
|
||||
});
|
||||
|
||||
Mockito.verify(commandSource).markAsAwaitingApproval();
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsChecked(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_FixedDepositProduct_CheckerApproval_MarksAsChecked() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser checkerUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("CREATE_FIXEDDEPOSITPRODUCT");
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("CREATE_FIXEDDEPOSITPRODUCT")).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult result = underTest.processCommand(handler, jsonCommand,
|
||||
commandSource, checkerUser, true);
|
||||
|
||||
Assertions.assertNotNull(result);
|
||||
Mockito.verify(commandSource).markAsChecked(checkerUser);
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsAwaitingApproval();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_Products_CheckerApproval_MarksAsChecked() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser checkerUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("CREATE_LOANPRODUCT");
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("CREATE_LOANPRODUCT")).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult result = underTest.processCommand(handler, jsonCommand,
|
||||
commandSource, checkerUser, true);
|
||||
|
||||
Assertions.assertNotNull(result);
|
||||
Mockito.verify(commandSource).markAsChecked(checkerUser);
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsAwaitingApproval();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_UserOperations_SuperUserBypassBlocked_ThrowsRollbackException() {
|
||||
String[] actions = { "CREATE", "UPDATE", "DELETE" };
|
||||
String[] permissions = { "CREATE_USER", "UPDATE_USER", "DELETE_USER" };
|
||||
|
||||
for (int i = 0; i < actions.length; i++) {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser superUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("USER");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn(actions[i]);
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn(permissions[i]);
|
||||
Mockito.when(commandSource.isSanitized()).thenReturn(false);
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask(permissions[i])).thenReturn(true);
|
||||
Mockito.when(superUser.isCheckerSuperUser()).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
Assertions.assertThrows(org.apache.fineract.commands.exception.RollbackTransactionNotApprovedException.class, () -> {
|
||||
underTest.processCommand(handler, jsonCommand, commandSource, superUser, false);
|
||||
});
|
||||
|
||||
Mockito.verify(commandSource).markAsAwaitingApproval();
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsChecked(any());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_RoleOperations_SuperUserBypassBlocked_ThrowsRollbackException() {
|
||||
String[] actions = { "CREATE", "UPDATE", "PERMISSIONS", "DELETE" };
|
||||
String[] permissions = { "CREATE_ROLE", "UPDATE_ROLE", "PERMISSIONS_ROLE", "DELETE_ROLE" };
|
||||
|
||||
for (int i = 0; i < actions.length; i++) {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser superUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getEntityName()).thenReturn("ROLE");
|
||||
Mockito.when(commandSource.getActionName()).thenReturn(actions[i]);
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn(permissions[i]);
|
||||
Mockito.when(commandSource.isSanitized()).thenReturn(false);
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask(permissions[i])).thenReturn(true);
|
||||
Mockito.when(superUser.isCheckerSuperUser()).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
Assertions.assertThrows(org.apache.fineract.commands.exception.RollbackTransactionNotApprovedException.class, () -> {
|
||||
underTest.processCommand(handler, jsonCommand, commandSource, superUser, false);
|
||||
});
|
||||
|
||||
Mockito.verify(commandSource).markAsAwaitingApproval();
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsChecked(any());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessCommand_UserAndRole_CheckerApproval_MarksAsChecked() {
|
||||
NewCommandSourceHandler handler = Mockito.mock(NewCommandSourceHandler.class);
|
||||
JsonCommand jsonCommand = Mockito.mock(JsonCommand.class);
|
||||
CommandSource commandSource = Mockito.mock(CommandSource.class);
|
||||
AppUser checkerUser = Mockito.mock(AppUser.class);
|
||||
|
||||
Mockito.when(commandSource.getPermissionCode()).thenReturn("CREATE_USER");
|
||||
Mockito.when(configurationDomainService.isMakerCheckerEnabledForTask("CREATE_USER")).thenReturn(true);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult dummyResult = new org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder()
|
||||
.withCommandId(1L).build();
|
||||
Mockito.when(handler.processCommand(jsonCommand)).thenReturn(dummyResult);
|
||||
|
||||
org.apache.fineract.infrastructure.core.data.CommandProcessingResult result = underTest.processCommand(handler, jsonCommand,
|
||||
commandSource, checkerUser, true);
|
||||
|
||||
Assertions.assertNotNull(result);
|
||||
Mockito.verify(commandSource).markAsChecked(checkerUser);
|
||||
Mockito.verify(commandSource, Mockito.never()).markAsAwaitingApproval();
|
||||
}
|
||||
}
|
||||
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.charge.handler;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import org.apache.fineract.infrastructure.core.api.JsonCommand;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
|
||||
import org.apache.fineract.portfolio.charge.service.ChargeWritePlatformService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class CreateChargeDefinitionCommandHandlerTest {
|
||||
|
||||
@Mock
|
||||
private ChargeWritePlatformService writePlatformService;
|
||||
|
||||
@Mock
|
||||
private JsonCommand command;
|
||||
|
||||
@InjectMocks
|
||||
private CreateChargeDefinitionCommandHandler underTest;
|
||||
|
||||
@Test
|
||||
void shouldDelegateToWritePlatformServiceAndReturnResult() {
|
||||
CommandProcessingResult expectedResult = new CommandProcessingResultBuilder()
|
||||
.withCommandId(101L)
|
||||
.withEntityId(201L)
|
||||
.build();
|
||||
when(writePlatformService.createCharge(command)).thenReturn(expectedResult);
|
||||
|
||||
CommandProcessingResult actualResult = underTest.processCommand(command);
|
||||
|
||||
verify(writePlatformService).createCharge(command);
|
||||
assertEquals(expectedResult, actualResult);
|
||||
}
|
||||
}
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.loanproduct.handler;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import org.apache.fineract.infrastructure.core.api.JsonCommand;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
|
||||
import org.apache.fineract.portfolio.loanproduct.service.LoanProductWritePlatformService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class CreateLoanProductCommandHandlerTest {
|
||||
|
||||
@Mock
|
||||
private LoanProductWritePlatformService writePlatformService;
|
||||
|
||||
@Mock
|
||||
private JsonCommand command;
|
||||
|
||||
@InjectMocks
|
||||
private CreateLoanProductCommandHandler underTest;
|
||||
|
||||
@Test
|
||||
void shouldDelegateToWritePlatformServiceAndReturnResult() {
|
||||
CommandProcessingResult expectedResult = new CommandProcessingResultBuilder()
|
||||
.withCommandId(101L)
|
||||
.withEntityId(201L)
|
||||
.build();
|
||||
when(writePlatformService.createLoanProduct(command)).thenReturn(expectedResult);
|
||||
|
||||
CommandProcessingResult actualResult = underTest.processCommand(command);
|
||||
|
||||
verify(writePlatformService).createLoanProduct(command);
|
||||
assertEquals(expectedResult, actualResult);
|
||||
}
|
||||
}
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.savings.handler;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import org.apache.fineract.infrastructure.core.api.JsonCommand;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
|
||||
import org.apache.fineract.portfolio.savings.service.FdBaseInterestRateWritePlatformService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class CreateCbsBaseInterestRateCommandHandlerTest {
|
||||
|
||||
@Mock
|
||||
private FdBaseInterestRateWritePlatformService writePlatformService;
|
||||
|
||||
@Mock
|
||||
private JsonCommand command;
|
||||
|
||||
@InjectMocks
|
||||
private CreateCbsBaseInterestRateCommandHandler underTest;
|
||||
|
||||
@Test
|
||||
void shouldDelegateToWritePlatformServiceAndReturnResult() {
|
||||
CommandProcessingResult expectedResult = new CommandProcessingResultBuilder()
|
||||
.withCommandId(100L)
|
||||
.withEntityId(200L)
|
||||
.build();
|
||||
when(writePlatformService.saveInterestRates(command)).thenReturn(expectedResult);
|
||||
|
||||
CommandProcessingResult actualResult = underTest.processCommand(command);
|
||||
|
||||
verify(writePlatformService).saveInterestRates(command);
|
||||
assertEquals(expectedResult, actualResult);
|
||||
}
|
||||
}
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.savings.handler;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import org.apache.fineract.infrastructure.core.api.JsonCommand;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
|
||||
import org.apache.fineract.portfolio.savings.service.SavingsProductWritePlatformService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class CreateSavingsProductCommandHandlerTest {
|
||||
|
||||
@Mock
|
||||
private SavingsProductWritePlatformService writePlatformService;
|
||||
|
||||
@Mock
|
||||
private JsonCommand command;
|
||||
|
||||
@InjectMocks
|
||||
private CreateSavingsProductCommandHandler underTest;
|
||||
|
||||
@Test
|
||||
void shouldDelegateToWritePlatformServiceAndReturnResult() {
|
||||
CommandProcessingResult expectedResult = new CommandProcessingResultBuilder()
|
||||
.withCommandId(102L)
|
||||
.withEntityId(202L)
|
||||
.build();
|
||||
when(writePlatformService.create(command)).thenReturn(expectedResult);
|
||||
|
||||
CommandProcessingResult actualResult = underTest.processCommand(command);
|
||||
|
||||
verify(writePlatformService).create(command);
|
||||
assertEquals(expectedResult, actualResult);
|
||||
}
|
||||
}
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.savings.handler.current;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import org.apache.fineract.infrastructure.core.api.JsonCommand;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
|
||||
import org.apache.fineract.portfolio.currentproduct.service.CurrentProductWritePlatformService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class CreateCurrentProductCommandHandlerTest {
|
||||
|
||||
@Mock
|
||||
private CurrentProductWritePlatformService writePlatformService;
|
||||
|
||||
@Mock
|
||||
private JsonCommand command;
|
||||
|
||||
@InjectMocks
|
||||
private CreateCurrentProductCommandHandler underTest;
|
||||
|
||||
@Test
|
||||
void shouldDelegateToWritePlatformServiceAndReturnResult() {
|
||||
CommandProcessingResult expectedResult = new CommandProcessingResultBuilder()
|
||||
.withCommandId(103L)
|
||||
.withEntityId(203L)
|
||||
.build();
|
||||
when(writePlatformService.create(command)).thenReturn(expectedResult);
|
||||
|
||||
CommandProcessingResult actualResult = underTest.processCommand(command);
|
||||
|
||||
verify(writePlatformService).create(command);
|
||||
assertEquals(expectedResult, actualResult);
|
||||
}
|
||||
}
|
||||
+265
@@ -0,0 +1,265 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.savings.service;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenant;
|
||||
import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
|
||||
import org.apache.fineract.infrastructure.core.service.ThreadLocalContextUtil;
|
||||
import org.apache.fineract.portfolio.savings.api.FdInterestRateSaveRequest;
|
||||
import org.apache.fineract.portfolio.savings.domain.FdBaseInterestRateEffective;
|
||||
import org.apache.fineract.portfolio.savings.domain.FdBaseInterestRateEffectiveRepository;
|
||||
import org.apache.fineract.portfolio.savings.domain.FdBaseInterestRateSlabHistoryRepository;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class FdBaseInterestRateReadPlatformServiceImplTest {
|
||||
|
||||
@Mock
|
||||
private FdBaseInterestRateEffectiveRepository effectiveRepository;
|
||||
|
||||
@Mock
|
||||
private FdBaseInterestRateSlabHistoryRepository slabRepository;
|
||||
|
||||
@InjectMocks
|
||||
private FdBaseInterestRateReadPlatformServiceImpl service;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
ThreadLocalContextUtil.setTenant(new FineractPlatformTenant(1L, "default", "Default", "Asia/Kolkata", null));
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
void tearDown() {
|
||||
ThreadLocalContextUtil.setTenant(null);
|
||||
}
|
||||
|
||||
private FdInterestRateSaveRequest.SlabRequest createSlab(int srNo, String desc, int periodType, int from, Integer to, double rate, double seniorRate) {
|
||||
FdInterestRateSaveRequest.SlabRequest s = new FdInterestRateSaveRequest.SlabRequest();
|
||||
s.setSrNo(srNo);
|
||||
s.setDescription(desc);
|
||||
s.setPeriodTypeEnum(periodType);
|
||||
s.setFromPeriod(from);
|
||||
s.setToPeriod(to);
|
||||
s.setAnnualInterestRate(BigDecimal.valueOf(rate));
|
||||
s.setSeniorCitizenRate(BigDecimal.valueOf(seniorRate));
|
||||
return s;
|
||||
}
|
||||
|
||||
@Test
|
||||
void testValidSingleDepositSlabs() {
|
||||
FdInterestRateSaveRequest request = new FdInterestRateSaveRequest();
|
||||
request.setFdType("SINGLE");
|
||||
request.setVersionLabel("v1.0");
|
||||
|
||||
List<FdInterestRateSaveRequest.SlabRequest> slabs = List.of(
|
||||
createSlab(1, "1 to 29 Days", 0, 1, 29, 4.5, 5.0),
|
||||
createSlab(2, "30 to 89 Days", 0, 30, 89, 5.0, 5.5),
|
||||
createSlab(3, "90 to 179 Days", 0, 90, 179, 5.5, 6.0),
|
||||
createSlab(4, "180+ Days", 0, 180, null, 6.0, 6.5)
|
||||
);
|
||||
request.setSlabs(slabs);
|
||||
|
||||
when(effectiveRepository.findByFdTypeAndIsActiveTrueOrderByEffectiveFromDateDesc("SINGLE"))
|
||||
.thenReturn(Collections.emptyList());
|
||||
when(effectiveRepository.saveAndFlush(any())).thenAnswer(invocation -> invocation.getArgument(0));
|
||||
|
||||
assertDoesNotThrow(() -> service.saveInterestRates(request, 1L));
|
||||
verify(effectiveRepository).saveAndFlush(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testValidDoubleDepositSlabs() {
|
||||
FdInterestRateSaveRequest request = new FdInterestRateSaveRequest();
|
||||
request.setFdType("DOUBLE");
|
||||
request.setVersionLabel("v1.0");
|
||||
|
||||
List<FdInterestRateSaveRequest.SlabRequest> slabs = List.of(
|
||||
createSlab(1, "1 to 2 Years", 3, 1, 2, 6.5, 7.0),
|
||||
createSlab(2, "3 to 5 Years", 3, 3, 5, 6.75, 7.25),
|
||||
createSlab(3, "6 to 10 Years", 3, 6, 10, 7.0, 7.5),
|
||||
createSlab(4, "11+ Years", 3, 11, null, 7.25, 7.75)
|
||||
);
|
||||
request.setSlabs(slabs);
|
||||
|
||||
when(effectiveRepository.findByFdTypeAndIsActiveTrueOrderByEffectiveFromDateDesc("DOUBLE"))
|
||||
.thenReturn(Collections.emptyList());
|
||||
when(effectiveRepository.saveAndFlush(any())).thenAnswer(invocation -> invocation.getArgument(0));
|
||||
|
||||
assertDoesNotThrow(() -> service.saveInterestRates(request, 1L));
|
||||
}
|
||||
|
||||
@Test
|
||||
void testInvalidFirstSlabDoesNotStartAtOne() {
|
||||
FdInterestRateSaveRequest request = new FdInterestRateSaveRequest();
|
||||
request.setFdType("SINGLE");
|
||||
List<FdInterestRateSaveRequest.SlabRequest> slabs = List.of(
|
||||
createSlab(1, "2 to 29 Days", 0, 2, 29, 4.5, 5.0),
|
||||
createSlab(2, "30+ Days", 0, 30, null, 5.0, 5.5)
|
||||
);
|
||||
request.setSlabs(slabs);
|
||||
|
||||
PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
|
||||
() -> service.saveInterestRates(request, 1L));
|
||||
assertEquals(1, ex.getErrors().size());
|
||||
assertEquals("validation.msg.FD_BASE_INTEREST_RATE_VERSION.slabs[1].fromPeriod.first.slab.must.start.at.one",
|
||||
ex.getErrors().get(0).getUserMessageGlobalisationCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testInvalidOverlapRanges() {
|
||||
FdInterestRateSaveRequest request = new FdInterestRateSaveRequest();
|
||||
request.setFdType("SINGLE");
|
||||
List<FdInterestRateSaveRequest.SlabRequest> slabs = List.of(
|
||||
createSlab(1, "1 to 29 Days", 0, 1, 29, 4.5, 5.0),
|
||||
createSlab(2, "20 to 50 Days", 0, 20, 50, 5.0, 5.5)
|
||||
);
|
||||
request.setSlabs(slabs);
|
||||
|
||||
PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
|
||||
() -> service.saveInterestRates(request, 1L));
|
||||
assertEquals("validation.msg.FD_BASE_INTEREST_RATE_VERSION.slabs[2].fromPeriod.must.not.overlap.previous.range",
|
||||
ex.getErrors().get(0).getUserMessageGlobalisationCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testInvalidGapBetweenRanges() {
|
||||
FdInterestRateSaveRequest request = new FdInterestRateSaveRequest();
|
||||
request.setFdType("SINGLE");
|
||||
List<FdInterestRateSaveRequest.SlabRequest> slabs = List.of(
|
||||
createSlab(1, "1 to 29 Days", 0, 1, 29, 4.5, 5.0),
|
||||
createSlab(2, "35 to 89 Days", 0, 35, 89, 5.0, 5.5)
|
||||
);
|
||||
request.setSlabs(slabs);
|
||||
|
||||
PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
|
||||
() -> service.saveInterestRates(request, 1L));
|
||||
assertEquals("validation.msg.FD_BASE_INTEREST_RATE_VERSION.slabs[2].fromPeriod.must.be.continuous.with.previous.range",
|
||||
ex.getErrors().get(0).getUserMessageGlobalisationCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testInvalidDuplicateRanges() {
|
||||
FdInterestRateSaveRequest request = new FdInterestRateSaveRequest();
|
||||
request.setFdType("SINGLE");
|
||||
List<FdInterestRateSaveRequest.SlabRequest> slabs = List.of(
|
||||
createSlab(1, "1 to 29 Days", 0, 1, 29, 4.5, 5.0),
|
||||
createSlab(2, "1 to 29 Days duplicate", 0, 1, 29, 5.0, 5.5)
|
||||
);
|
||||
request.setSlabs(slabs);
|
||||
|
||||
PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
|
||||
() -> service.saveInterestRates(request, 1L));
|
||||
assertEquals("validation.msg.FD_BASE_INTEREST_RATE_VERSION.slabs[2].fromPeriod.must.not.overlap.previous.range",
|
||||
ex.getErrors().get(0).getUserMessageGlobalisationCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testInvalidFromGreaterThanTo() {
|
||||
FdInterestRateSaveRequest request = new FdInterestRateSaveRequest();
|
||||
request.setFdType("SINGLE");
|
||||
List<FdInterestRateSaveRequest.SlabRequest> slabs = List.of(
|
||||
createSlab(1, "1 to 20 Days", 0, 1, 20, 4.5, 5.0),
|
||||
createSlab(2, "21 to 10 Days", 0, 21, 10, 5.0, 5.5)
|
||||
);
|
||||
request.setSlabs(slabs);
|
||||
|
||||
PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
|
||||
() -> service.saveInterestRates(request, 1L));
|
||||
assertEquals("validation.msg.FD_BASE_INTEREST_RATE_VERSION.slabs[2].toPeriod.cannot.be.less.than.fromPeriod",
|
||||
ex.getErrors().get(0).getUserMessageGlobalisationCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testInvalidBlankToPeriodOnIntermediateSlab() {
|
||||
FdInterestRateSaveRequest request = new FdInterestRateSaveRequest();
|
||||
request.setFdType("SINGLE");
|
||||
List<FdInterestRateSaveRequest.SlabRequest> slabs = List.of(
|
||||
createSlab(1, "1 to null Days", 0, 1, null, 4.5, 5.0),
|
||||
createSlab(2, "30+ Days", 0, 30, null, 5.0, 5.5)
|
||||
);
|
||||
request.setSlabs(slabs);
|
||||
|
||||
PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
|
||||
() -> service.saveInterestRates(request, 1L));
|
||||
assertEquals("validation.msg.FD_BASE_INTEREST_RATE_VERSION.slabs[1].toPeriod.cannot.be.blank.for.intermediate.slab",
|
||||
ex.getErrors().get(0).getUserMessageGlobalisationCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testInvalidMixedPeriodTypes() {
|
||||
FdInterestRateSaveRequest request = new FdInterestRateSaveRequest();
|
||||
request.setFdType("SINGLE");
|
||||
List<FdInterestRateSaveRequest.SlabRequest> slabs = List.of(
|
||||
createSlab(1, "1 to 29 Days", 0, 1, 29, 4.5, 5.0),
|
||||
createSlab(2, "30 to 89 Months", 2, 30, 89, 5.0, 5.5)
|
||||
);
|
||||
request.setSlabs(slabs);
|
||||
|
||||
PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
|
||||
() -> service.saveInterestRates(request, 1L));
|
||||
assertEquals("validation.msg.FD_BASE_INTEREST_RATE_VERSION.slabs[2].periodTypeEnum.must.be.consistent.across.all.slabs",
|
||||
ex.getErrors().get(0).getUserMessageGlobalisationCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testInvalidNegativeInterestRate() {
|
||||
FdInterestRateSaveRequest request = new FdInterestRateSaveRequest();
|
||||
request.setFdType("SINGLE");
|
||||
List<FdInterestRateSaveRequest.SlabRequest> slabs = List.of(
|
||||
createSlab(1, "1 to 29 Days", 0, 1, 29, -1.0, 5.0)
|
||||
);
|
||||
request.setSlabs(slabs);
|
||||
|
||||
PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
|
||||
() -> service.saveInterestRates(request, 1L));
|
||||
assertEquals("validation.msg.FD_BASE_INTEREST_RATE_VERSION.slabs[1].annualInterestRate.must.be.non.negative",
|
||||
ex.getErrors().get(0).getUserMessageGlobalisationCode());
|
||||
}
|
||||
|
||||
@Test
|
||||
void testInvalidNegativeSeniorRate() {
|
||||
FdInterestRateSaveRequest request = new FdInterestRateSaveRequest();
|
||||
request.setFdType("SINGLE");
|
||||
List<FdInterestRateSaveRequest.SlabRequest> slabs = List.of(
|
||||
createSlab(1, "1 to 29 Days", 0, 1, 29, 4.5, -0.5)
|
||||
);
|
||||
request.setSlabs(slabs);
|
||||
|
||||
PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
|
||||
() -> service.saveInterestRates(request, 1L));
|
||||
assertEquals("validation.msg.FD_BASE_INTEREST_RATE_VERSION.slabs[1].seniorCitizenRate.must.be.non.negative",
|
||||
ex.getErrors().get(0).getUserMessageGlobalisationCode());
|
||||
}
|
||||
}
|
||||
+80
@@ -0,0 +1,80 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.savings.service;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import org.apache.fineract.infrastructure.core.api.JsonCommand;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
||||
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
|
||||
import org.apache.fineract.portfolio.savings.api.FdInterestRateSaveRequest;
|
||||
import org.apache.fineract.portfolio.savings.data.FdInterestRateEffectiveData;
|
||||
import org.apache.fineract.useradministration.domain.AppUser;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class FdBaseInterestRateWritePlatformServiceImplTest {
|
||||
|
||||
@Mock
|
||||
private PlatformSecurityContext context;
|
||||
|
||||
@Mock
|
||||
private FdBaseInterestRateReadPlatformService readPlatformService;
|
||||
|
||||
@Mock
|
||||
private JsonCommand command;
|
||||
|
||||
@Mock
|
||||
private AppUser appUser;
|
||||
|
||||
@InjectMocks
|
||||
private FdBaseInterestRateWritePlatformServiceImpl writePlatformService;
|
||||
|
||||
@Test
|
||||
void shouldParseJsonAndSaveInterestRates() {
|
||||
String jsonPayload = "{\"fdType\":\"SINGLE\",\"versionLabel\":\"v1.0\",\"slabs\":[{\"srNo\":1,\"description\":\"1 to 29 Days\",\"periodTypeEnum\":0,\"fromPeriod\":1,\"toPeriod\":29,\"annualInterestRate\":5.0,\"seniorCitizenRate\":5.5}]}";
|
||||
when(command.json()).thenReturn(jsonPayload);
|
||||
when(command.commandId()).thenReturn(789L);
|
||||
when(context.authenticatedUser()).thenReturn(appUser);
|
||||
when(appUser.getId()).thenReturn(1L);
|
||||
|
||||
FdInterestRateEffectiveData savedData = FdInterestRateEffectiveData.builder()
|
||||
.id(10L)
|
||||
.fdType("SINGLE")
|
||||
.versionLabel("v1.0")
|
||||
.build();
|
||||
when(readPlatformService.saveInterestRates(any(FdInterestRateSaveRequest.class), eq(1L))).thenReturn(savedData);
|
||||
|
||||
CommandProcessingResult result = writePlatformService.saveInterestRates(command);
|
||||
|
||||
assertNotNull(result);
|
||||
assertEquals(789L, result.getCommandId());
|
||||
assertEquals(10L, result.getResourceId());
|
||||
verify(readPlatformService).saveInterestRates(any(FdInterestRateSaveRequest.class), eq(1L));
|
||||
}
|
||||
}
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
/**
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.apache.fineract.portfolio.shareproducts.handler;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import org.apache.fineract.infrastructure.core.api.JsonCommand;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResult;
|
||||
import org.apache.fineract.infrastructure.core.data.CommandProcessingResultBuilder;
|
||||
import org.apache.fineract.portfolio.shareproducts.service.ShareProductWritePlatformService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class CreateShareProductCommandHandlerTest {
|
||||
|
||||
@Mock
|
||||
private ShareProductWritePlatformService writePlatformService;
|
||||
|
||||
@Mock
|
||||
private JsonCommand command;
|
||||
|
||||
@InjectMocks
|
||||
private CreateShareProductCommandHandler underTest;
|
||||
|
||||
@Test
|
||||
void shouldDelegateToWritePlatformServiceAndReturnResult() {
|
||||
CommandProcessingResult expectedResult = new CommandProcessingResultBuilder()
|
||||
.withCommandId(104L)
|
||||
.withEntityId(204L)
|
||||
.build();
|
||||
when(writePlatformService.createShareProduct(command)).thenReturn(expectedResult);
|
||||
|
||||
CommandProcessingResult actualResult = underTest.processCommand(command);
|
||||
|
||||
verify(writePlatformService).createShareProduct(command);
|
||||
assertEquals(expectedResult, actualResult);
|
||||
}
|
||||
}
|
||||
+12
-23
@@ -76,7 +76,6 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
// for account close
|
||||
private final Collection<EnumOptionData> onAccountClosureOptions;
|
||||
private final Collection<PaymentTypeData> paymentTypeOptions;
|
||||
private final Collection<EnumOptionData> maturityInstructionOptions;
|
||||
|
||||
// import fields
|
||||
private transient Integer rowIndex;
|
||||
@@ -365,7 +364,6 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
this.savingsAccounts = null;
|
||||
this.onAccountClosureOptions = null;
|
||||
this.paymentTypeOptions = null;
|
||||
this.maturityInstructionOptions = null;
|
||||
this.rowIndex = rowIndex;
|
||||
this.dateFormat = dateFormat;
|
||||
this.locale = locale;
|
||||
@@ -396,7 +394,6 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
final Collection<SavingsAccountData> savingsAccountDatas = null;
|
||||
final Integer recurringFrequency = null;
|
||||
final EnumOptionData recurringFrequencyType = null;
|
||||
final Collection<EnumOptionData> maturityInstructionOptions = null;
|
||||
|
||||
return new RecurringDepositAccountData(depositAccountData.id, depositAccountData.accountNo, depositAccountData.externalId,
|
||||
depositAccountData.groupId, depositAccountData.groupName, depositAccountData.clientId, depositAccountData.clientName,
|
||||
@@ -419,7 +416,7 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
onAccountClosure, onAccountClosureOptions, paymentTypeOptions, savingsAccountDatas, expectedFirstDepositOnDate,
|
||||
totalOverdueAmount, noOfOverdueInstallments, isMandatoryDeposit, allowWithdrawal, adjustAdvanceTowardsFuturePayments,
|
||||
isCalendarInherited, recurringFrequency, recurringFrequencyType, depositAccountData.withHoldTax,
|
||||
depositAccountData.taxGroup, maturityInstructionOptions);
|
||||
depositAccountData.taxGroup);
|
||||
}
|
||||
|
||||
public static RecurringDepositAccountData withInterestChartAndRecurringDetails(final RecurringDepositAccountData account,
|
||||
@@ -444,7 +441,7 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
account.paymentTypeOptions, account.savingsAccounts, account.expectedFirstDepositOnDate, account.totalOverdueAmount,
|
||||
account.noOfOverdueInstallments, account.isMandatoryDeposit, account.allowWithdrawal,
|
||||
account.adjustAdvanceTowardsFuturePayments, account.isCalendarInherited, recurringFrequency, recurringFrequencyType,
|
||||
account.withHoldTax, account.taxGroup, account.maturityInstructionOptions);
|
||||
account.withHoldTax, account.taxGroup);
|
||||
result.copyCbsFieldsFrom(account);
|
||||
return result;
|
||||
}
|
||||
@@ -466,13 +463,11 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
|
||||
final Collection<EnumOptionData> preClosurePenalInterestOnTypeOptions = null;
|
||||
final Collection<EnumOptionData> periodFrequencyTypeOptions = null;
|
||||
final Collection<SavingsAccountData> savingsAccountDatas = account.savingsAccounts;
|
||||
final Collection<EnumOptionData> maturityInstructionOptions = account.maturityInstructionOptions;
|
||||
|
||||
return withTemplateOptions(account, productOptions, fieldOfficerOptions, interestCompoundingPeriodTypeOptions,
|
||||
interestPostingPeriodTypeOptions, interestCalculationTypeOptions, interestCalculationDaysInYearTypeOptions,
|
||||
lockinPeriodFrequencyTypeOptions, withdrawalFeeTypeOptions, transactions, charges, chargeOptions,
|
||||
preClosurePenalInterestOnTypeOptions, periodFrequencyTypeOptions, savingsAccountDatas, maturityInstructionOptions);
|
||||
preClosurePenalInterestOnTypeOptions, periodFrequencyTypeOptions);
|
||||
}
|
||||
|
||||
final RecurringDepositAccountData result = new RecurringDepositAccountData(account.id, account.accountNo, account.externalId, account.groupId, account.groupName,
|
||||
@@ -491,10 +486,10 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
account.inMultiplesOfDepositTermType, account.depositAmount, account.maturityAmount, account.maturityDate,
|
||||
account.depositPeriod, account.depositPeriodFrequency, account.mandatoryRecommendedDepositAmount,
|
||||
template.periodFrequencyTypeOptions, account.depositType, account.onAccountClosure, account.onAccountClosureOptions,
|
||||
account.paymentTypeOptions, template.savingsAccounts, account.expectedFirstDepositOnDate, account.totalOverdueAmount,
|
||||
account.paymentTypeOptions, account.savingsAccounts, account.expectedFirstDepositOnDate, account.totalOverdueAmount,
|
||||
account.noOfOverdueInstallments, account.isMandatoryDeposit, account.allowWithdrawal,
|
||||
account.adjustAdvanceTowardsFuturePayments, account.isCalendarInherited, account.recurringFrequency,
|
||||
account.recurringFrequencyType, account.withHoldTax, account.taxGroup, account.maturityInstructionOptions);
|
||||
account.recurringFrequencyType, account.withHoldTax, account.taxGroup);
|
||||
result.copyCbsFieldsFrom(account);
|
||||
// Merge accountTypeOptions and customerSegmentOptions from template
|
||||
if (template.getAccountTypeOptions() != null) result.setAccountTypeOptions(template.getAccountTypeOptions());
|
||||
@@ -512,8 +507,7 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
final Collection<EnumOptionData> lockinPeriodFrequencyTypeOptions, final Collection<EnumOptionData> withdrawalFeeTypeOptions,
|
||||
final Collection<SavingsAccountTransactionData> transactions, final Collection<SavingsAccountChargeData> charges,
|
||||
final Collection<ChargeData> chargeOptions, final Collection<EnumOptionData> preClosurePenalInterestOnTypeOptions,
|
||||
final Collection<EnumOptionData> periodFrequencyTypeOptions, final Collection<SavingsAccountData> savingsAccountDatas,
|
||||
final Collection<EnumOptionData> maturityInstructionOptions) {
|
||||
final Collection<EnumOptionData> periodFrequencyTypeOptions) {
|
||||
|
||||
final RecurringDepositAccountData r2 = new RecurringDepositAccountData(account.id, account.accountNo, account.externalId, account.groupId, account.groupName,
|
||||
account.clientId, account.clientName, account.depositProductId, account.depositProductName, account.fieldOfficerId,
|
||||
@@ -530,10 +524,10 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
account.inMultiplesOfDepositTermType, account.depositAmount, account.maturityAmount, account.maturityDate,
|
||||
account.depositPeriod, account.depositPeriodFrequency, account.mandatoryRecommendedDepositAmount,
|
||||
periodFrequencyTypeOptions, account.depositType, account.onAccountClosure, account.onAccountClosureOptions,
|
||||
account.paymentTypeOptions, savingsAccountDatas, account.expectedFirstDepositOnDate, account.totalOverdueAmount,
|
||||
account.paymentTypeOptions, account.savingsAccounts, account.expectedFirstDepositOnDate, account.totalOverdueAmount,
|
||||
account.noOfOverdueInstallments, account.isMandatoryDeposit, account.allowWithdrawal,
|
||||
account.adjustAdvanceTowardsFuturePayments, account.isCalendarInherited, account.recurringFrequency,
|
||||
account.recurringFrequencyType, account.withHoldTax, account.taxGroup, maturityInstructionOptions);
|
||||
account.recurringFrequencyType, account.withHoldTax, account.taxGroup);
|
||||
r2.copyCbsFieldsFrom(account);
|
||||
return r2;
|
||||
}
|
||||
@@ -615,7 +609,6 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
final EnumOptionData recurringFrequencyType = null;
|
||||
final boolean withHoldTax = false;
|
||||
final TaxGroupData taxGroup = null;
|
||||
final Collection<EnumOptionData> maturityInstructionOptions = null;
|
||||
|
||||
return new RecurringDepositAccountData(id, accountNo, externalId, groupId, groupName, clientId, clientName, productId, productName,
|
||||
fieldOfficerId, fieldOfficerName, status, timeline, currency, nominalAnnualInterestRate, interestPeriodType,
|
||||
@@ -629,8 +622,7 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
depositAmount, maturityAmount, maturityDate, depositPeriod, depositPeriodFrequency, mandatoryRecommendedDepositAmount,
|
||||
periodFrequencyTypeOptions, depositType, onAccountClosure, onAccountClosureOptions, paymentTypeOptions, savingsAccountDatas,
|
||||
expectedFirstDepositOnDate, totalOverdueAmount, noOfOverdueInstallments, isMandatoryDeposit, allowWithdrawal,
|
||||
adjustAdvanceTowardsFuturePayments, isCalendarInherited, recurringFrequency, recurringFrequencyType, withHoldTax, taxGroup,
|
||||
maturityInstructionOptions);
|
||||
adjustAdvanceTowardsFuturePayments, isCalendarInherited, recurringFrequency, recurringFrequencyType, withHoldTax, taxGroup);
|
||||
}
|
||||
|
||||
public static RecurringDepositAccountData preClosureDetails(final Long accountId, final BigDecimal maturityAmount,
|
||||
@@ -708,7 +700,6 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
final EnumOptionData recurringFrequencyType = null;
|
||||
final boolean withHoldTax = false;
|
||||
final TaxGroupData taxGroup = null;
|
||||
final Collection<EnumOptionData> maturityInstructionOptions = null;
|
||||
|
||||
return new RecurringDepositAccountData(accountId, accountNo, externalId, groupId, groupName, clientId, clientName, productId,
|
||||
productName, fieldOfficerId, fieldOfficerName, status, timeline, currency, nominalAnnualInterestRate, interestPeriodType,
|
||||
@@ -722,8 +713,7 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
depositAmount, maturityAmount, maturityDate, depositPeriod, depositPeriodFrequency, mandatoryRecommendedDepositAmount,
|
||||
periodFrequencyTypeOptions, depositType, onAccountClosure, onAccountClosureOptions, paymentTypeOptions, savingsAccountDatas,
|
||||
expectedFirstDepositOnDate, totalOverdueAmount, noOfOverdueInstallments, isMandatoryDeposit, allowWithdrawal,
|
||||
adjustAdvanceTowardsFuturePayments, isCalendarInherited, recurringFrequency, recurringFrequencyType, withHoldTax, taxGroup,
|
||||
maturityInstructionOptions);
|
||||
adjustAdvanceTowardsFuturePayments, isCalendarInherited, recurringFrequency, recurringFrequencyType, withHoldTax, taxGroup);
|
||||
}
|
||||
|
||||
public static RecurringDepositAccountData withClosureTemplateDetails(final RecurringDepositAccountData account,
|
||||
@@ -749,7 +739,7 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
paymentTypeOptions, savingsAccountDatas, account.expectedFirstDepositOnDate, account.totalOverdueAmount,
|
||||
account.noOfOverdueInstallments, account.isMandatoryDeposit, account.allowWithdrawal,
|
||||
account.adjustAdvanceTowardsFuturePayments, account.isCalendarInherited, account.recurringFrequency,
|
||||
account.recurringFrequencyType, account.withHoldTax, account.taxGroup, account.maturityInstructionOptions);
|
||||
account.recurringFrequencyType, account.withHoldTax, account.taxGroup);
|
||||
closureResult.copyCbsFieldsFrom(account);
|
||||
return closureResult;
|
||||
}
|
||||
@@ -784,7 +774,7 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
final BigDecimal totalOverdueAmount, final Integer noOfOverdueInstallments, final boolean isMandatoryDeposit,
|
||||
final boolean allowWithdrawal, final boolean adjustAdvanceTowardsFuturePayments, final boolean isCalendarInherited,
|
||||
final Integer recurringFrequency, final EnumOptionData recurringFrequencyType, final boolean withHoldTax,
|
||||
final TaxGroupData taxGroup, final Collection<EnumOptionData> maturityInstructionOptions) {
|
||||
final TaxGroupData taxGroup) {
|
||||
|
||||
super(id, accountNo, externalId, groupId, groupName, clientId, clientName, productId, productName, fieldofficerId, fieldofficerName,
|
||||
status, timeline, currency, nominalAnnualInterestRate, interestPeriodType, interestPostingPeriodType,
|
||||
@@ -828,7 +818,6 @@ public final class RecurringDepositAccountData extends DepositAccountData {
|
||||
// account close template options
|
||||
this.onAccountClosureOptions = onAccountClosureOptions;
|
||||
this.paymentTypeOptions = paymentTypeOptions;
|
||||
this.maturityInstructionOptions = maturityInstructionOptions;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
-5
@@ -82,11 +82,6 @@ public class SavingsAccountRepositoryWrapper {
|
||||
return account;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public boolean existsWithDepositAccountType(final Long savingsId, final DepositAccountType depositAccountType) {
|
||||
return this.repository.findByIdAndDepositAccountType(savingsId, depositAccountType.getValue()) != null;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public List<SavingsAccount> findSavingAccountByClientId(@Param("clientId") Long clientId) {
|
||||
List<SavingsAccount> accounts = this.repository.findSavingAccountByClientId(clientId);
|
||||
|
||||
+3
-3
@@ -172,7 +172,7 @@ public class FixedDepositTest extends IntegrationTest {
|
||||
moneyHelperStatic = Mockito.mockStatic(MoneyHelper.class);
|
||||
moneyHelperStatic.when(() -> MoneyHelper.getMathContext()).thenReturn(new MathContext(12, RoundingMode.UP));
|
||||
fixedDepositAccountInterestCalculationServiceImpl = new FixedDepositAccountInterestCalculationServiceImpl(
|
||||
new DepositAccountDataValidator(new FromJsonHelper(), null, null), new FromJsonHelper());
|
||||
new DepositAccountDataValidator(new FromJsonHelper(), null), new FromJsonHelper());
|
||||
try {
|
||||
HashMap h = fixedDepositAccountInterestCalculationServiceImpl
|
||||
.calculateInterest(new JsonQuery(apiRequestBodyAsJson, element, new FromJsonHelper()));
|
||||
@@ -198,7 +198,7 @@ public class FixedDepositTest extends IntegrationTest {
|
||||
moneyHelperStatic = Mockito.mockStatic(MoneyHelper.class);
|
||||
moneyHelperStatic.when(() -> MoneyHelper.getMathContext()).thenReturn(new MathContext(12, RoundingMode.UP));
|
||||
fixedDepositAccountInterestCalculationServiceImpl = new FixedDepositAccountInterestCalculationServiceImpl(
|
||||
new DepositAccountDataValidator(new FromJsonHelper(), null, null), new FromJsonHelper());
|
||||
new DepositAccountDataValidator(new FromJsonHelper(), null), new FromJsonHelper());
|
||||
try {
|
||||
HashMap h = fixedDepositAccountInterestCalculationServiceImpl
|
||||
.calculateInterest(new JsonQuery(apiRequestBodyAsJson, element, new FromJsonHelper()));
|
||||
@@ -224,7 +224,7 @@ public class FixedDepositTest extends IntegrationTest {
|
||||
moneyHelperStatic = Mockito.mockStatic(MoneyHelper.class);
|
||||
moneyHelperStatic.when(() -> MoneyHelper.getMathContext()).thenReturn(new MathContext(12, RoundingMode.UP));
|
||||
fixedDepositAccountInterestCalculationServiceImpl = new FixedDepositAccountInterestCalculationServiceImpl(
|
||||
new DepositAccountDataValidator(new FromJsonHelper(), null, null), new FromJsonHelper());
|
||||
new DepositAccountDataValidator(new FromJsonHelper(), null), new FromJsonHelper());
|
||||
BigDecimal expectedResult = new BigDecimal("10506.250000");
|
||||
BigDecimal actualResult = new BigDecimal(fixedDepositAccountInterestCalculationServiceImpl
|
||||
.calculateInterest(new JsonQuery(apiRequestBodyAsJson, element, new FromJsonHelper())).get("maturityAmount").toString());
|
||||
|
||||
Reference in New Issue
Block a user