Thanks to visit codestin.com
Credit goes to github.com

Skip to content

FINERACT-2090: Restructure Loan creation and modification #3909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamsaghy merged 1 commit into from
Jun 6, 2024
Merged

FINERACT-2090: Restructure Loan creation and modification #3909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions fineract-core/src/main/java/org/apache/fineract/portfolio/charge/domain/ChargeTimeType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,47 +143,51 @@ public static ChargeTimeType fromInt(final Integer chargeTime) {
}

public boolean isTimeOfDisbursement() {
return ChargeTimeType.DISBURSEMENT.getValue().equals(this.value);
return ChargeTimeType.DISBURSEMENT.equals(this);
}

public boolean isOnSpecifiedDueDate() {
return this.value.equals(ChargeTimeType.SPECIFIED_DUE_DATE.getValue());
return this.equals(ChargeTimeType.SPECIFIED_DUE_DATE);
}

public boolean isSavingsActivation() {
return this.value.equals(ChargeTimeType.SAVINGS_ACTIVATION.getValue());
return this.equals(ChargeTimeType.SAVINGS_ACTIVATION);
}

public boolean isSavingsClosure() {
return this.value.equals(ChargeTimeType.SAVINGS_CLOSURE.getValue());
return this.equals(ChargeTimeType.SAVINGS_CLOSURE);
}

public boolean isWithdrawalFee() {
return this.value.equals(ChargeTimeType.WITHDRAWAL_FEE.getValue());
return this.equals(ChargeTimeType.WITHDRAWAL_FEE);
}

public boolean isSavingsNoActivityFee() {
return this.value.equals(ChargeTimeType.SAVINGS_NOACTIVITY_FEE.getValue());
return this.equals(ChargeTimeType.SAVINGS_NOACTIVITY_FEE);
}

public boolean isAnnualFee() {
return this.value.equals(ChargeTimeType.ANNUAL_FEE.getValue());
return this.equals(ChargeTimeType.ANNUAL_FEE);
}

public boolean isMonthlyFee() {
return this.value.equals(ChargeTimeType.MONTHLY_FEE.getValue());
return this.equals(ChargeTimeType.MONTHLY_FEE);
}

public boolean isWeeklyFee() {
return this.value.equals(ChargeTimeType.WEEKLY_FEE.getValue());
return this.equals(ChargeTimeType.WEEKLY_FEE);
}

public boolean isInstalmentFee() {
return this.value.equals(ChargeTimeType.INSTALMENT_FEE.getValue());
return this.equals(ChargeTimeType.INSTALMENT_FEE);
}

public boolean isSpecifiedDueDate() {
return this.equals(ChargeTimeType.SPECIFIED_DUE_DATE);
}

public boolean isOverdueInstallment() {
return this.value.equals(ChargeTimeType.OVERDUE_INSTALLMENT.getValue());
return this.equals(ChargeTimeType.OVERDUE_INSTALLMENT);
}

public boolean isAllowedLoanChargeTime() {
Expand All @@ -200,22 +204,22 @@ public boolean isAllowedSavingsChargeTime() {
}

public boolean isOverdraftFee() {
return this.value.equals(ChargeTimeType.OVERDRAFT_FEE.getValue());
return this.equals(ChargeTimeType.OVERDRAFT_FEE);
}

public boolean isTrancheDisbursement() {
return this.value.equals(ChargeTimeType.TRANCHE_DISBURSEMENT.getValue());
return this.equals(ChargeTimeType.TRANCHE_DISBURSEMENT);
}

public boolean isShareAccountActivation() {
return this.value.equals(ChargeTimeType.SHAREACCOUNT_ACTIVATION.getValue());
return this.equals(ChargeTimeType.SHAREACCOUNT_ACTIVATION);
}

public boolean isSharesPurchase() {
return this.value.equals(ChargeTimeType.SHARE_PURCHASE.getValue());
return this.equals(ChargeTimeType.SHARE_PURCHASE);
}

public boolean isSharesRedeem() {
return this.value.equals(ChargeTimeType.SHARE_REDEEM.getValue());
return this.equals(ChargeTimeType.SHARE_REDEEM);
}
}
3 changes: 2 additions & 1 deletion ...ct-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanApiConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

public interface LoanApiConstants {

String emiAmountParameterName = "fixedEmiAmount";
String fixedEmiAmountParameterName = "fixedEmiAmount";
String maxOutstandingBalanceParameterName = "maxOutstandingLoanBalance";
String disbursementDataParameterName = "disbursementData";
String expectedDisbursementDateParameterName = "expectedDisbursementDate";
Expand All @@ -36,6 +36,7 @@ public interface LoanApiConstants {
String amountParameterName = "amount";
String chargeTimeTypeParameterName = "chargeTimeType";
String chargeCalculationTypeParameterName = "chargeCalculationType";
String chargePaymentModeParameterName = "chargePaymentMode";
String principalDisbursedParameterName = "transactionAmount";
String chargesParameterName = "charges";
String loanIdTobeApproved = "loanId";
Expand Down
42 changes: 14 additions & 28 deletions ...an/src/main/java/org/apache/fineract/portfolio/loanaccount/command/LoanChargeCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,44 +18,30 @@
*/
package org.apache.fineract.portfolio.loanaccount.command;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import lombok.Data;
import org.apache.fineract.portfolio.loanaccount.domain.LoanCharge;

/**
* Java object representation of {@link LoanCharge} API JSON.
*/
public class LoanChargeCommand implements Comparable<LoanChargeCommand> {
@Data
public class LoanChargeCommand implements Serializable {

Copy link
Contributor

@vidakovic vidakovic Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... minor: technically needs this

@Serial
private static final long serialVersionUID = 1L;

@Serial
private static final long serialVersionUID = 1L;

@SuppressWarnings("unused")
private final Long id;
private final Long chargeId;
private final BigDecimal amount;
private Long id;
private Long chargeId;
private BigDecimal amount;
@SuppressWarnings("unused")
private final Integer chargeTimeType;
private Integer chargeTimeType;
@SuppressWarnings("unused")
private final Integer chargeCalculationType;
private Integer chargeCalculationType;
@SuppressWarnings("unused")
private final LocalDate dueDate;

public LoanChargeCommand(final Long id, final Long chargeId, final BigDecimal amount, final Integer chargeTimeType,
final Integer chargeCalculationType, final LocalDate dueDate) {
this.id = id;
this.chargeId = chargeId;
this.amount = amount;
this.chargeTimeType = chargeTimeType;
this.chargeCalculationType = chargeCalculationType;
this.dueDate = dueDate;
}

@Override
@SuppressFBWarnings(value = "EQ_COMPARETO_USE_OBJECT_EQUALS", justification = "TODO: fix this! See: https://stackoverflow.com/questions/2609037/findbugs-how-to-solve-eq-compareto-use-object-equals")
public int compareTo(final LoanChargeCommand o) {
int comparison = this.chargeId.compareTo(o.chargeId);
if (comparison == 0) {
comparison = this.amount.compareTo(o.amount);
}
return comparison;
}
private LocalDate dueDate;
}
18 changes: 9 additions & 9 deletions ...ain/java/org/apache/fineract/portfolio/loanaccount/data/LoanCollateralManagementData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
package org.apache.fineract.portfolio.loanaccount.data;

import java.math.BigDecimal;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.AllArgsConstructor;
import lombok.Data;

@RequiredArgsConstructor
@Getter
@Data
@AllArgsConstructor
public class LoanCollateralManagementData {

private final Long clientCollateralId;
private Long clientCollateralId;

private final BigDecimal quantity;
private BigDecimal quantity;

private final BigDecimal total;
private BigDecimal total;

private final BigDecimal totalCollateral;
private BigDecimal totalCollateral;

private final Long id;
private Long id;
}
Loading