mariiaKraievska commented on code in PR #5760:
URL: https://github.com/apache/fineract/pull/5760#discussion_r3079906130
##########
fineract-working-capital-loan/src/main/java/org/apache/fineract/portfolio/workingcapitalloan/service/WorkingCapitalLoanWritePlatformServiceImpl.java:
##########
@@ -415,6 +418,77 @@ public CommandProcessingResult updateDiscount(final Long
loanId, final JsonComma
.withLoanId(loanId).with(changes).build();
}
+ @Override
+ public CommandProcessingResult makeRepayment(final Long loanId, final
JsonCommand command) {
+ final WorkingCapitalLoan loan = this.loanRepository.findById(loanId)
+ .orElseThrow(() -> new
WorkingCapitalLoanNotFoundException(loanId));
+ this.validator.validateRepayment(command.json(), loan);
+
+ if (loan.getLoanStatus() != LoanStatus.ACTIVE && loan.getLoanStatus()
!= LoanStatus.OVERPAID) {
+ throw new
PlatformApiDataValidationException("validation.msg.wc.loan.transition.not.allowed",
+ "Repayment is allowed only for active/overpaid loans",
"loanStatus");
+ }
+
+ final LocalDate transactionDate =
command.localDateValueOfParameterNamed(WorkingCapitalLoanConstants.transactionDateParamName);
+ final BigDecimal transactionAmount = this.fromApiJsonHelper
+
.extractBigDecimalNamed(WorkingCapitalLoanConstants.transactionAmountParamName,
command.parsedJson(), new HashSet<>());
+ final Map<String, Object> changes = new LinkedHashMap<>();
+ changes.put(WorkingCapitalLoanConstants.transactionDateParamName,
transactionDate);
+ changes.put(WorkingCapitalLoanConstants.transactionAmountParamName,
transactionAmount);
+ final PaymentDetail paymentDetail =
createAndPersistPaymentDetailFromCommand(command, changes);
+
+ final Long classificationId =
command.longValueOfParameterNamed(WorkingCapitalLoanConstants.classificationIdParamName);
+ final CodeValue classification = classificationId != null
+ ?
codeValueRepository.findByCodeNameAndId(WorkingCapitalLoanConstants.REPAYMENT_CLASSIFICATION_CODE_NAME,
classificationId)
+ : null;
+ changes.put(WorkingCapitalLoanConstants.classificationIdParamName,
classificationId);
+
+ final ExternalId txnExternalId =
this.externalIdFactory.createFromCommand(command,
+ WorkingCapitalLoanConstants.externalIdParameterName);
+ final WorkingCapitalLoanTransaction repaymentTransaction =
WorkingCapitalLoanTransaction.repayment(loan, transactionAmount,
+ paymentDetail, transactionDate, classification, txnExternalId);
+ this.transactionRepository.saveAndFlush(repaymentTransaction);
+
+ final WorkingCapitalLoanTransactionAllocation allocation =
WorkingCapitalLoanTransactionAllocation
+ .forPrincipalAllocation(repaymentTransaction,
transactionAmount);
+ this.allocationRepository.saveAndFlush(allocation);
+
+ final RepaymentAmortizationData amortizationData =
amortizationScheduleWriteService.applyRepayment(loan, transactionDate,
+ transactionAmount);
+ updateBalanceOnRepayment(loan, transactionAmount, amortizationData);
+ internalWorkingCapitalLoanPaymentService.makePayment(loanId,
transactionAmount, transactionDate);
+
+ if (loan.getBalance() != null &&
loan.getBalance().getPrincipalOutstanding() != null) {
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
