You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by "abraham-menyhart (via GitHub)" <gi...@apache.org> on 2023/07/20 18:22:34 UTC
[GitHub] [fineract] abraham-menyhart opened a new pull request, #3318: FINERACT-1724: Asset externalization of non-active loans
abraham-menyhart opened a new pull request, #3318:
URL: https://github.com/apache/fineract/pull/3318
## Description
Describe the changes made and why they were made.
Ignore if these details are present on the associated [Apache Fineract JIRA ticket](https://github.com/apache/fineract/pull/1284).
## Checklist
Please make sure these boxes are checked before submitting your pull request - thanks!
- [ ] Write the commit message as per https://github.com/apache/fineract/#pull-requests
- [ ] Acknowledge that we will not review PRs that are not passing the build _("green")_ - it is your responsibility to get a proposed PR to pass the build, not primarily the project's maintainers.
- [ ] Create/update unit or integration tests for verifying the changes made.
- [ ] Follow coding conventions at https://cwiki.apache.org/confluence/display/FINERACT/Coding+Conventions.
- [ ] Add required Swagger annotation and update API documentation at fineract-provider/src/main/resources/static/legacy-docs/apiLive.htm with details of any API changes
- [ ] Submission is not a "code dump". (Large changes can be made "in repository" via a branch. Ask on the developer mailing list for guidance, if required.)
FYI our guidelines for code reviews are at https://cwiki.apache.org/confluence/display/FINERACT/Code+Review+Guide.
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270614737
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,210 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
+ Long loanId = loan.getId();
+ List<ExternalAssetOwnerTransfer> transferDataList = findAllPendingOrBuybackTransfers(loanId);
+ LocalDate settlementDate = DateUtils.getBusinessLocalDate();
+
+ if (transferDataList.size() == 2) {
+ ExternalTransferSubStatus subStatus;
+ if (isSameDayTransfers(transferDataList)) {
+ subStatus = SAMEDAY_TRANSFERS;
+ } else {
+ subStatus = isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO;
+ }
+ cancelPendingSaleAndBuybackTransfer(loan, transferDataList, settlementDate, subStatus);
+ } else if (transferDataList.size() == 1) {
+ ExternalAssetOwnerTransfer transfer = transferDataList.get(0);
+ if (PENDING.equals(transfer.getStatus())) {
+ declinePendingSaleTransfer(loan, transfer, settlementDate);
+ } else if (BUYBACK.equals(transfer.getStatus())) {
+ executePendingBuybackTransfer(loan, transfer, settlementDate);
+ }
+ }
+ }
+
+ private void cancelPendingSaleAndBuybackTransfer(Loan loan, List<ExternalAssetOwnerTransfer> transferDataList, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer pendingSaleTransfer = transferDataList.get(0);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledSaleTransfer = createCancelledTransfer(pendingSaleTransfer, settlementDate, subStatus);
+
+ ExternalAssetOwnerTransfer pendingBuybackTransfer = transferDataList.get(1);
+ updatePendingTransfer(pendingBuybackTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledBuybackTransfer = createCancelledTransfer(pendingBuybackTransfer, settlementDate, subStatus);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledSaleTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledBuybackTransfer, loan));
+ }
+
+ private void declinePendingSaleTransfer(Loan loan, ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer declinedSaleTransfer = createDeclinedTransfer(pendingSaleTransfer, settlementDate, loan);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(declinedSaleTransfer, loan));
+ }
+
+ private void executePendingBuybackTransfer(final Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ final LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer activeTransfer = findActiveTransfer(loan, buybackTransfer);
+ updateActiveTransfer(activeTransfer, settlementDate);
+ buybackTransfer = updatePendingBuybackTransfer(loan, buybackTransfer, settlementDate);
+
+ externalAssetOwnerTransferLoanMappingRepository.deleteByLoanIdAndOwnerTransfer(loan.getId(), activeTransfer);
+ accountingService.createJournalEntriesForBuybackAssetTransfer(loan, buybackTransfer);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(buybackTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanAccountSnapshotBusinessEvent(loan));
+ }
+
+ private ExternalAssetOwnerTransfer createCancelledTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer cancelledTransfer = new ExternalAssetOwnerTransfer();
+ cancelledTransfer.setOwner(pendingTransfer.getOwner());
+ cancelledTransfer.setExternalId(pendingTransfer.getExternalId());
+ cancelledTransfer.setStatus(CANCELLED);
+ cancelledTransfer.setSubStatus(subStatus);
+ cancelledTransfer.setSettlementDate(settlementDate);
+ cancelledTransfer.setLoanId(pendingTransfer.getLoanId());
+ cancelledTransfer.setExternalLoanId(pendingTransfer.getExternalLoanId());
+ cancelledTransfer.setPurchasePriceRatio(pendingTransfer.getPurchasePriceRatio());
+ cancelledTransfer.setEffectiveDateFrom(settlementDate);
+ cancelledTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(cancelledTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer createDeclinedTransfer(ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate,
+ Loan loan) {
+ ExternalAssetOwnerTransfer declinedTransfer = new ExternalAssetOwnerTransfer();
+ declinedTransfer.setOwner(pendingSaleTransfer.getOwner());
+ declinedTransfer.setExternalId(pendingSaleTransfer.getExternalId());
+ declinedTransfer.setStatus(DECLINED);
+ declinedTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
+ declinedTransfer.setSettlementDate(settlementDate);
+ declinedTransfer.setLoanId(pendingSaleTransfer.getLoanId());
+ declinedTransfer.setExternalLoanId(pendingSaleTransfer.getExternalLoanId());
+ declinedTransfer.setPurchasePriceRatio(pendingSaleTransfer.getPurchasePriceRatio());
+ declinedTransfer.setEffectiveDateFrom(settlementDate);
+ declinedTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(declinedTransfer);
+ }
+
+ private void updatePendingTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate) {
+ pendingTransfer.setEffectiveDateTo(settlementDate);
+ externalAssetOwnerTransferRepository.save(pendingTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer updatePendingBuybackTransfer(Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ LocalDate settlementDate) {
+ buybackTransfer.setEffectiveDateTo(settlementDate);
+ buybackTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
+ buybackTransfer.setExternalAssetOwnerTransferDetails(createAssetOwnerTransferDetails(loan, buybackTransfer));
+ return externalAssetOwnerTransferRepository.save(buybackTransfer);
+ }
+
+ private void updateActiveTransfer(ExternalAssetOwnerTransfer activeTransfer, LocalDate settlementDate) {
+ activeTransfer.setEffectiveDateTo(settlementDate);
+ externalAssetOwnerTransferRepository.save(activeTransfer);
+ }
+
+ private ExternalAssetOwnerTransferDetails createAssetOwnerTransferDetails(Loan loan,
+ ExternalAssetOwnerTransfer externalAssetOwnerTransfer) {
+ ExternalAssetOwnerTransferDetails details = new ExternalAssetOwnerTransferDetails();
+ details.setExternalAssetOwnerTransfer(externalAssetOwnerTransfer);
+ details.setTotalOutstanding(Objects.requireNonNullElse(loan.getLoanSummary().getTotalOutstanding(), BigDecimal.ZERO));
+ details.setTotalPrincipalOutstanding(
+ Objects.requireNonNullElse(loan.getLoanSummary().getTotalPrincipalOutstanding(), BigDecimal.ZERO));
+ details.setTotalInterestOutstanding(
+ Objects.requireNonNullElse(loan.getLoanSummary().getTotalInterestOutstanding(), BigDecimal.ZERO));
+ details.setTotalFeeChargesOutstanding(
+ Objects.requireNonNullElse(loan.getLoanSummary().getTotalFeeChargesOutstanding(), BigDecimal.ZERO));
+ details.setTotalPenaltyChargesOutstanding(
+ Objects.requireNonNullElse(loan.getLoanSummary().getTotalPenaltyChargesOutstanding(), BigDecimal.ZERO));
+ details.setTotalOverpaid(Objects.requireNonNullElse(loan.getTotalOverpaid(), BigDecimal.ZERO));
+ return details;
+ }
+
+ private ExternalAssetOwnerTransfer findActiveTransfer(Loan loan, ExternalAssetOwnerTransfer buybackTransfer) {
+ return externalAssetOwnerTransferRepository
+ .findOne((root, query, criteriaBuilder) -> criteriaBuilder.and(criteriaBuilder.equal(root.get("loanId"), loan.getId()),
+ criteriaBuilder.equal(root.get("owner"), buybackTransfer.getOwner()),
+ criteriaBuilder.equal(root.get("status"), ExternalTransferStatus.ACTIVE),
+ criteriaBuilder.equal(root.get("effectiveDateTo"), FUTURE_DATE_9999_12_31)))
+ .orElseThrow();
+ }
+
+ private List<ExternalAssetOwnerTransfer> findAllPendingOrBuybackTransfers(Long loanId) {
+ return externalAssetOwnerTransferRepository.findAll(
+ (root, query, criteriaBuilder) -> criteriaBuilder.and(criteriaBuilder.equal(root.get("loanId"), loanId),
+ root.get("status").in(List.of(PENDING, BUYBACK)),
+ criteriaBuilder.greaterThanOrEqualTo(root.get("effectiveDateTo"), FUTURE_DATE_9999_12_31)),
Review Comment:
equal looks enought, we dont need the greater than
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,210 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
+ Long loanId = loan.getId();
+ List<ExternalAssetOwnerTransfer> transferDataList = findAllPendingOrBuybackTransfers(loanId);
+ LocalDate settlementDate = DateUtils.getBusinessLocalDate();
+
+ if (transferDataList.size() == 2) {
+ ExternalTransferSubStatus subStatus;
+ if (isSameDayTransfers(transferDataList)) {
+ subStatus = SAMEDAY_TRANSFERS;
+ } else {
+ subStatus = isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO;
+ }
+ cancelPendingSaleAndBuybackTransfer(loan, transferDataList, settlementDate, subStatus);
+ } else if (transferDataList.size() == 1) {
+ ExternalAssetOwnerTransfer transfer = transferDataList.get(0);
+ if (PENDING.equals(transfer.getStatus())) {
+ declinePendingSaleTransfer(loan, transfer, settlementDate);
+ } else if (BUYBACK.equals(transfer.getStatus())) {
+ executePendingBuybackTransfer(loan, transfer, settlementDate);
+ }
+ }
+ }
+
+ private void cancelPendingSaleAndBuybackTransfer(Loan loan, List<ExternalAssetOwnerTransfer> transferDataList, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer pendingSaleTransfer = transferDataList.get(0);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledSaleTransfer = createCancelledTransfer(pendingSaleTransfer, settlementDate, subStatus);
+
+ ExternalAssetOwnerTransfer pendingBuybackTransfer = transferDataList.get(1);
+ updatePendingTransfer(pendingBuybackTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledBuybackTransfer = createCancelledTransfer(pendingBuybackTransfer, settlementDate, subStatus);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledSaleTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledBuybackTransfer, loan));
+ }
+
+ private void declinePendingSaleTransfer(Loan loan, ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer declinedSaleTransfer = createDeclinedTransfer(pendingSaleTransfer, settlementDate, loan);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(declinedSaleTransfer, loan));
+ }
+
+ private void executePendingBuybackTransfer(final Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ final LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer activeTransfer = findActiveTransfer(loan, buybackTransfer);
+ updateActiveTransfer(activeTransfer, settlementDate);
+ buybackTransfer = updatePendingBuybackTransfer(loan, buybackTransfer, settlementDate);
+
+ externalAssetOwnerTransferLoanMappingRepository.deleteByLoanIdAndOwnerTransfer(loan.getId(), activeTransfer);
+ accountingService.createJournalEntriesForBuybackAssetTransfer(loan, buybackTransfer);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(buybackTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanAccountSnapshotBusinessEvent(loan));
+ }
+
+ private ExternalAssetOwnerTransfer createCancelledTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer cancelledTransfer = new ExternalAssetOwnerTransfer();
+ cancelledTransfer.setOwner(pendingTransfer.getOwner());
+ cancelledTransfer.setExternalId(pendingTransfer.getExternalId());
+ cancelledTransfer.setStatus(CANCELLED);
+ cancelledTransfer.setSubStatus(subStatus);
+ cancelledTransfer.setSettlementDate(settlementDate);
+ cancelledTransfer.setLoanId(pendingTransfer.getLoanId());
+ cancelledTransfer.setExternalLoanId(pendingTransfer.getExternalLoanId());
+ cancelledTransfer.setPurchasePriceRatio(pendingTransfer.getPurchasePriceRatio());
+ cancelledTransfer.setEffectiveDateFrom(settlementDate);
+ cancelledTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(cancelledTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer createDeclinedTransfer(ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate,
+ Loan loan) {
+ ExternalAssetOwnerTransfer declinedTransfer = new ExternalAssetOwnerTransfer();
+ declinedTransfer.setOwner(pendingSaleTransfer.getOwner());
+ declinedTransfer.setExternalId(pendingSaleTransfer.getExternalId());
+ declinedTransfer.setStatus(DECLINED);
+ declinedTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
+ declinedTransfer.setSettlementDate(settlementDate);
+ declinedTransfer.setLoanId(pendingSaleTransfer.getLoanId());
+ declinedTransfer.setExternalLoanId(pendingSaleTransfer.getExternalLoanId());
+ declinedTransfer.setPurchasePriceRatio(pendingSaleTransfer.getPurchasePriceRatio());
+ declinedTransfer.setEffectiveDateFrom(settlementDate);
+ declinedTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(declinedTransfer);
+ }
+
+ private void updatePendingTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate) {
+ pendingTransfer.setEffectiveDateTo(settlementDate);
+ externalAssetOwnerTransferRepository.save(pendingTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer updatePendingBuybackTransfer(Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ LocalDate settlementDate) {
+ buybackTransfer.setEffectiveDateTo(settlementDate);
+ buybackTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
+ buybackTransfer.setExternalAssetOwnerTransferDetails(createAssetOwnerTransferDetails(loan, buybackTransfer));
+ return externalAssetOwnerTransferRepository.save(buybackTransfer);
+ }
+
+ private void updateActiveTransfer(ExternalAssetOwnerTransfer activeTransfer, LocalDate settlementDate) {
+ activeTransfer.setEffectiveDateTo(settlementDate);
+ externalAssetOwnerTransferRepository.save(activeTransfer);
+ }
+
+ private ExternalAssetOwnerTransferDetails createAssetOwnerTransferDetails(Loan loan,
+ ExternalAssetOwnerTransfer externalAssetOwnerTransfer) {
+ ExternalAssetOwnerTransferDetails details = new ExternalAssetOwnerTransferDetails();
+ details.setExternalAssetOwnerTransfer(externalAssetOwnerTransfer);
+ details.setTotalOutstanding(Objects.requireNonNullElse(loan.getLoanSummary().getTotalOutstanding(), BigDecimal.ZERO));
+ details.setTotalPrincipalOutstanding(
+ Objects.requireNonNullElse(loan.getLoanSummary().getTotalPrincipalOutstanding(), BigDecimal.ZERO));
+ details.setTotalInterestOutstanding(
+ Objects.requireNonNullElse(loan.getLoanSummary().getTotalInterestOutstanding(), BigDecimal.ZERO));
+ details.setTotalFeeChargesOutstanding(
+ Objects.requireNonNullElse(loan.getLoanSummary().getTotalFeeChargesOutstanding(), BigDecimal.ZERO));
+ details.setTotalPenaltyChargesOutstanding(
+ Objects.requireNonNullElse(loan.getLoanSummary().getTotalPenaltyChargesOutstanding(), BigDecimal.ZERO));
+ details.setTotalOverpaid(Objects.requireNonNullElse(loan.getTotalOverpaid(), BigDecimal.ZERO));
+ return details;
+ }
+
+ private ExternalAssetOwnerTransfer findActiveTransfer(Loan loan, ExternalAssetOwnerTransfer buybackTransfer) {
+ return externalAssetOwnerTransferRepository
+ .findOne((root, query, criteriaBuilder) -> criteriaBuilder.and(criteriaBuilder.equal(root.get("loanId"), loan.getId()),
+ criteriaBuilder.equal(root.get("owner"), buybackTransfer.getOwner()),
+ criteriaBuilder.equal(root.get("status"), ExternalTransferStatus.ACTIVE),
+ criteriaBuilder.equal(root.get("effectiveDateTo"), FUTURE_DATE_9999_12_31)))
+ .orElseThrow();
+ }
+
+ private List<ExternalAssetOwnerTransfer> findAllPendingOrBuybackTransfers(Long loanId) {
+ return externalAssetOwnerTransferRepository.findAll(
+ (root, query, criteriaBuilder) -> criteriaBuilder.and(criteriaBuilder.equal(root.get("loanId"), loanId),
+ root.get("status").in(List.of(PENDING, BUYBACK)),
+ criteriaBuilder.greaterThanOrEqualTo(root.get("effectiveDateTo"), FUTURE_DATE_9999_12_31)),
Review Comment:
equal looks enought, we dont need the greater than condition
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] galovics commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "galovics (via GitHub)" <gi...@apache.org>.
galovics commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1271816349
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,206 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.infrastructure.core.service.DateUtils.getBusinessLocalDate;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
Review Comment:
I really really dislike the fact that you used an entity as a parameter here. It's super hard to understand what's happening to this entity anyway, it would've been much better to use a specific DTO that contains all the data you need to do the business logic.
Bonus: you don't have a transaction around this service class.
##########
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanStatusChangePlatformServiceImpl.java:
##########
@@ -54,6 +62,11 @@ public void onBusinessEvent(LoanStatusChangedBusinessEvent event) {
if (loan.isOpen()) {
loan.handleMaturityDateActivate();
}
+
+ if (configurationReadPlatformService.retrieveGlobalConfiguration(ASSET_EXTERNALIZATION_OF_NON_ACTIVE_LOANS).isEnabled()
Review Comment:
Why didn't we create a separate listener within the investor module?
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] abraham-menyhart commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "abraham-menyhart (via GitHub)" <gi...@apache.org>.
abraham-menyhart commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270639387
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,210 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
+ Long loanId = loan.getId();
+ List<ExternalAssetOwnerTransfer> transferDataList = findAllPendingOrBuybackTransfers(loanId);
+ LocalDate settlementDate = DateUtils.getBusinessLocalDate();
+
+ if (transferDataList.size() == 2) {
+ ExternalTransferSubStatus subStatus;
+ if (isSameDayTransfers(transferDataList)) {
+ subStatus = SAMEDAY_TRANSFERS;
+ } else {
+ subStatus = isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO;
+ }
+ cancelPendingSaleAndBuybackTransfer(loan, transferDataList, settlementDate, subStatus);
+ } else if (transferDataList.size() == 1) {
+ ExternalAssetOwnerTransfer transfer = transferDataList.get(0);
+ if (PENDING.equals(transfer.getStatus())) {
+ declinePendingSaleTransfer(loan, transfer, settlementDate);
+ } else if (BUYBACK.equals(transfer.getStatus())) {
+ executePendingBuybackTransfer(loan, transfer, settlementDate);
+ }
+ }
+ }
+
+ private void cancelPendingSaleAndBuybackTransfer(Loan loan, List<ExternalAssetOwnerTransfer> transferDataList, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer pendingSaleTransfer = transferDataList.get(0);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledSaleTransfer = createCancelledTransfer(pendingSaleTransfer, settlementDate, subStatus);
+
+ ExternalAssetOwnerTransfer pendingBuybackTransfer = transferDataList.get(1);
+ updatePendingTransfer(pendingBuybackTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledBuybackTransfer = createCancelledTransfer(pendingBuybackTransfer, settlementDate, subStatus);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledSaleTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledBuybackTransfer, loan));
+ }
+
+ private void declinePendingSaleTransfer(Loan loan, ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer declinedSaleTransfer = createDeclinedTransfer(pendingSaleTransfer, settlementDate, loan);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(declinedSaleTransfer, loan));
+ }
+
+ private void executePendingBuybackTransfer(final Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ final LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer activeTransfer = findActiveTransfer(loan, buybackTransfer);
+ updateActiveTransfer(activeTransfer, settlementDate);
+ buybackTransfer = updatePendingBuybackTransfer(loan, buybackTransfer, settlementDate);
+
+ externalAssetOwnerTransferLoanMappingRepository.deleteByLoanIdAndOwnerTransfer(loan.getId(), activeTransfer);
+ accountingService.createJournalEntriesForBuybackAssetTransfer(loan, buybackTransfer);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(buybackTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanAccountSnapshotBusinessEvent(loan));
+ }
+
+ private ExternalAssetOwnerTransfer createCancelledTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer cancelledTransfer = new ExternalAssetOwnerTransfer();
+ cancelledTransfer.setOwner(pendingTransfer.getOwner());
+ cancelledTransfer.setExternalId(pendingTransfer.getExternalId());
+ cancelledTransfer.setStatus(CANCELLED);
+ cancelledTransfer.setSubStatus(subStatus);
+ cancelledTransfer.setSettlementDate(settlementDate);
+ cancelledTransfer.setLoanId(pendingTransfer.getLoanId());
+ cancelledTransfer.setExternalLoanId(pendingTransfer.getExternalLoanId());
+ cancelledTransfer.setPurchasePriceRatio(pendingTransfer.getPurchasePriceRatio());
+ cancelledTransfer.setEffectiveDateFrom(settlementDate);
+ cancelledTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(cancelledTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer createDeclinedTransfer(ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate,
+ Loan loan) {
+ ExternalAssetOwnerTransfer declinedTransfer = new ExternalAssetOwnerTransfer();
+ declinedTransfer.setOwner(pendingSaleTransfer.getOwner());
+ declinedTransfer.setExternalId(pendingSaleTransfer.getExternalId());
+ declinedTransfer.setStatus(DECLINED);
+ declinedTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
+ declinedTransfer.setSettlementDate(settlementDate);
Review Comment:
Okay.
Question: is this the case for the new `CANCELLED` transfers as well? Should I use the original settlement date for them, or the current businessDate?
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270641456
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,210 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
+ Long loanId = loan.getId();
+ List<ExternalAssetOwnerTransfer> transferDataList = findAllPendingOrBuybackTransfers(loanId);
+ LocalDate settlementDate = DateUtils.getBusinessLocalDate();
+
+ if (transferDataList.size() == 2) {
+ ExternalTransferSubStatus subStatus;
+ if (isSameDayTransfers(transferDataList)) {
+ subStatus = SAMEDAY_TRANSFERS;
+ } else {
+ subStatus = isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO;
+ }
+ cancelPendingSaleAndBuybackTransfer(loan, transferDataList, settlementDate, subStatus);
+ } else if (transferDataList.size() == 1) {
+ ExternalAssetOwnerTransfer transfer = transferDataList.get(0);
+ if (PENDING.equals(transfer.getStatus())) {
+ declinePendingSaleTransfer(loan, transfer, settlementDate);
+ } else if (BUYBACK.equals(transfer.getStatus())) {
+ executePendingBuybackTransfer(loan, transfer, settlementDate);
+ }
+ }
+ }
+
+ private void cancelPendingSaleAndBuybackTransfer(Loan loan, List<ExternalAssetOwnerTransfer> transferDataList, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer pendingSaleTransfer = transferDataList.get(0);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledSaleTransfer = createCancelledTransfer(pendingSaleTransfer, settlementDate, subStatus);
+
+ ExternalAssetOwnerTransfer pendingBuybackTransfer = transferDataList.get(1);
+ updatePendingTransfer(pendingBuybackTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledBuybackTransfer = createCancelledTransfer(pendingBuybackTransfer, settlementDate, subStatus);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledSaleTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledBuybackTransfer, loan));
+ }
+
+ private void declinePendingSaleTransfer(Loan loan, ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer declinedSaleTransfer = createDeclinedTransfer(pendingSaleTransfer, settlementDate, loan);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(declinedSaleTransfer, loan));
+ }
+
+ private void executePendingBuybackTransfer(final Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ final LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer activeTransfer = findActiveTransfer(loan, buybackTransfer);
+ updateActiveTransfer(activeTransfer, settlementDate);
+ buybackTransfer = updatePendingBuybackTransfer(loan, buybackTransfer, settlementDate);
+
+ externalAssetOwnerTransferLoanMappingRepository.deleteByLoanIdAndOwnerTransfer(loan.getId(), activeTransfer);
+ accountingService.createJournalEntriesForBuybackAssetTransfer(loan, buybackTransfer);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(buybackTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanAccountSnapshotBusinessEvent(loan));
+ }
+
+ private ExternalAssetOwnerTransfer createCancelledTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer cancelledTransfer = new ExternalAssetOwnerTransfer();
+ cancelledTransfer.setOwner(pendingTransfer.getOwner());
+ cancelledTransfer.setExternalId(pendingTransfer.getExternalId());
+ cancelledTransfer.setStatus(CANCELLED);
+ cancelledTransfer.setSubStatus(subStatus);
+ cancelledTransfer.setSettlementDate(settlementDate);
+ cancelledTransfer.setLoanId(pendingTransfer.getLoanId());
+ cancelledTransfer.setExternalLoanId(pendingTransfer.getExternalLoanId());
+ cancelledTransfer.setPurchasePriceRatio(pendingTransfer.getPurchasePriceRatio());
+ cancelledTransfer.setEffectiveDateFrom(settlementDate);
+ cancelledTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(cancelledTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer createDeclinedTransfer(ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate,
+ Loan loan) {
+ ExternalAssetOwnerTransfer declinedTransfer = new ExternalAssetOwnerTransfer();
+ declinedTransfer.setOwner(pendingSaleTransfer.getOwner());
+ declinedTransfer.setExternalId(pendingSaleTransfer.getExternalId());
+ declinedTransfer.setStatus(DECLINED);
+ declinedTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
+ declinedTransfer.setSettlementDate(settlementDate);
+ declinedTransfer.setLoanId(pendingSaleTransfer.getLoanId());
+ declinedTransfer.setExternalLoanId(pendingSaleTransfer.getExternalLoanId());
+ declinedTransfer.setPurchasePriceRatio(pendingSaleTransfer.getPurchasePriceRatio());
+ declinedTransfer.setEffectiveDateFrom(settlementDate);
+ declinedTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(declinedTransfer);
+ }
+
+ private void updatePendingTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate) {
+ pendingTransfer.setEffectiveDateTo(settlementDate);
+ externalAssetOwnerTransferRepository.save(pendingTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer updatePendingBuybackTransfer(Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ LocalDate settlementDate) {
+ buybackTransfer.setEffectiveDateTo(settlementDate);
+ buybackTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
Review Comment:
when it is CANCELLED / DECLINED, yes we need the substatus as clarification.
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270617878
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/ExternalAssetOwnersWriteServiceImpl.java:
##########
@@ -256,7 +259,11 @@ private void validateSettlementDate(LocalDate settlementDate) {
}
private void validateLoanStatus(LoanIdAndExternalIdAndStatus entity) {
- if (!NON_CLOSED_LOAN_STATUSES.contains(LoanStatus.fromInt(entity.getLoanStatus()))) {
+ validateLoanStatus(entity.getLoanStatus());
+ }
+
+ private void validateLoanStatus(Integer loanStatus) {
Review Comment:
Probably does can be removed as we dont need loan status check for buyback
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] abraham-menyhart commented on pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "abraham-menyhart (via GitHub)" <gi...@apache.org>.
abraham-menyhart commented on PR #3318:
URL: https://github.com/apache/fineract/pull/3318#issuecomment-1645604304
@adamsaghy updated the PR, can you please recheck it? I also added a `GlobalConfiguration` entry, which was left out from the previous version.
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] galovics commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "galovics (via GitHub)" <gi...@apache.org>.
galovics commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1271816349
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,206 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.infrastructure.core.service.DateUtils.getBusinessLocalDate;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
Review Comment:
I really really dislike the fact that you used an entity as a parameter here. It's super hard to understand what's happening to this entity anyway, it would've been much better to use a specific DTO that contains all the data you need to do the business logic.
Bonus: you don't have a transaction around this service class.
The refactoring on the DTO doesn't have to be done in this PR, let's keep that for the future.
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] abraham-menyhart commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "abraham-menyhart (via GitHub)" <gi...@apache.org>.
abraham-menyhart commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270670051
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,210 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
+ Long loanId = loan.getId();
+ List<ExternalAssetOwnerTransfer> transferDataList = findAllPendingOrBuybackTransfers(loanId);
+ LocalDate settlementDate = DateUtils.getBusinessLocalDate();
+
+ if (transferDataList.size() == 2) {
+ ExternalTransferSubStatus subStatus;
+ if (isSameDayTransfers(transferDataList)) {
+ subStatus = SAMEDAY_TRANSFERS;
+ } else {
+ subStatus = isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO;
+ }
+ cancelPendingSaleAndBuybackTransfer(loan, transferDataList, settlementDate, subStatus);
+ } else if (transferDataList.size() == 1) {
+ ExternalAssetOwnerTransfer transfer = transferDataList.get(0);
+ if (PENDING.equals(transfer.getStatus())) {
+ declinePendingSaleTransfer(loan, transfer, settlementDate);
+ } else if (BUYBACK.equals(transfer.getStatus())) {
+ executePendingBuybackTransfer(loan, transfer, settlementDate);
+ }
+ }
+ }
+
+ private void cancelPendingSaleAndBuybackTransfer(Loan loan, List<ExternalAssetOwnerTransfer> transferDataList, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer pendingSaleTransfer = transferDataList.get(0);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledSaleTransfer = createCancelledTransfer(pendingSaleTransfer, settlementDate, subStatus);
+
+ ExternalAssetOwnerTransfer pendingBuybackTransfer = transferDataList.get(1);
+ updatePendingTransfer(pendingBuybackTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledBuybackTransfer = createCancelledTransfer(pendingBuybackTransfer, settlementDate, subStatus);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledSaleTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledBuybackTransfer, loan));
+ }
+
+ private void declinePendingSaleTransfer(Loan loan, ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer declinedSaleTransfer = createDeclinedTransfer(pendingSaleTransfer, settlementDate, loan);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(declinedSaleTransfer, loan));
+ }
+
+ private void executePendingBuybackTransfer(final Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ final LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer activeTransfer = findActiveTransfer(loan, buybackTransfer);
+ updateActiveTransfer(activeTransfer, settlementDate);
+ buybackTransfer = updatePendingBuybackTransfer(loan, buybackTransfer, settlementDate);
+
+ externalAssetOwnerTransferLoanMappingRepository.deleteByLoanIdAndOwnerTransfer(loan.getId(), activeTransfer);
+ accountingService.createJournalEntriesForBuybackAssetTransfer(loan, buybackTransfer);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(buybackTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanAccountSnapshotBusinessEvent(loan));
+ }
+
+ private ExternalAssetOwnerTransfer createCancelledTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer cancelledTransfer = new ExternalAssetOwnerTransfer();
+ cancelledTransfer.setOwner(pendingTransfer.getOwner());
+ cancelledTransfer.setExternalId(pendingTransfer.getExternalId());
+ cancelledTransfer.setStatus(CANCELLED);
+ cancelledTransfer.setSubStatus(subStatus);
+ cancelledTransfer.setSettlementDate(settlementDate);
+ cancelledTransfer.setLoanId(pendingTransfer.getLoanId());
+ cancelledTransfer.setExternalLoanId(pendingTransfer.getExternalLoanId());
+ cancelledTransfer.setPurchasePriceRatio(pendingTransfer.getPurchasePriceRatio());
+ cancelledTransfer.setEffectiveDateFrom(settlementDate);
+ cancelledTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(cancelledTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer createDeclinedTransfer(ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate,
+ Loan loan) {
+ ExternalAssetOwnerTransfer declinedTransfer = new ExternalAssetOwnerTransfer();
+ declinedTransfer.setOwner(pendingSaleTransfer.getOwner());
+ declinedTransfer.setExternalId(pendingSaleTransfer.getExternalId());
+ declinedTransfer.setStatus(DECLINED);
+ declinedTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
+ declinedTransfer.setSettlementDate(settlementDate);
+ declinedTransfer.setLoanId(pendingSaleTransfer.getLoanId());
+ declinedTransfer.setExternalLoanId(pendingSaleTransfer.getExternalLoanId());
+ declinedTransfer.setPurchasePriceRatio(pendingSaleTransfer.getPurchasePriceRatio());
+ declinedTransfer.setEffectiveDateFrom(settlementDate);
+ declinedTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(declinedTransfer);
+ }
+
+ private void updatePendingTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate) {
+ pendingTransfer.setEffectiveDateTo(settlementDate);
+ externalAssetOwnerTransferRepository.save(pendingTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer updatePendingBuybackTransfer(Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ LocalDate settlementDate) {
+ buybackTransfer.setEffectiveDateTo(settlementDate);
+ buybackTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
Review Comment:
Thanks, everything is clear now :) !
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270593787
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/ExternalAssetOwnersWriteServiceImpl.java:
##########
@@ -65,15 +69,13 @@
public class ExternalAssetOwnersWriteServiceImpl implements ExternalAssetOwnersWriteService {
private static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
- private static final List<LoanStatus> NON_CLOSED_LOAN_STATUSES = List.of(LoanStatus.SUBMITTED_AND_PENDING_APPROVAL, LoanStatus.APPROVED,
- LoanStatus.ACTIVE, LoanStatus.TRANSFER_IN_PROGRESS, LoanStatus.TRANSFER_ON_HOLD);
+ private static final List<LoanStatus> ACTIVE_LOAN_STATUSES = List.of(ACTIVE, TRANSFER_IN_PROGRESS, TRANSFER_ON_HOLD);
Review Comment:
why do you changed the list?
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] abraham-menyhart commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "abraham-menyhart (via GitHub)" <gi...@apache.org>.
abraham-menyhart commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270639387
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,210 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
+ Long loanId = loan.getId();
+ List<ExternalAssetOwnerTransfer> transferDataList = findAllPendingOrBuybackTransfers(loanId);
+ LocalDate settlementDate = DateUtils.getBusinessLocalDate();
+
+ if (transferDataList.size() == 2) {
+ ExternalTransferSubStatus subStatus;
+ if (isSameDayTransfers(transferDataList)) {
+ subStatus = SAMEDAY_TRANSFERS;
+ } else {
+ subStatus = isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO;
+ }
+ cancelPendingSaleAndBuybackTransfer(loan, transferDataList, settlementDate, subStatus);
+ } else if (transferDataList.size() == 1) {
+ ExternalAssetOwnerTransfer transfer = transferDataList.get(0);
+ if (PENDING.equals(transfer.getStatus())) {
+ declinePendingSaleTransfer(loan, transfer, settlementDate);
+ } else if (BUYBACK.equals(transfer.getStatus())) {
+ executePendingBuybackTransfer(loan, transfer, settlementDate);
+ }
+ }
+ }
+
+ private void cancelPendingSaleAndBuybackTransfer(Loan loan, List<ExternalAssetOwnerTransfer> transferDataList, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer pendingSaleTransfer = transferDataList.get(0);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledSaleTransfer = createCancelledTransfer(pendingSaleTransfer, settlementDate, subStatus);
+
+ ExternalAssetOwnerTransfer pendingBuybackTransfer = transferDataList.get(1);
+ updatePendingTransfer(pendingBuybackTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledBuybackTransfer = createCancelledTransfer(pendingBuybackTransfer, settlementDate, subStatus);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledSaleTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledBuybackTransfer, loan));
+ }
+
+ private void declinePendingSaleTransfer(Loan loan, ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer declinedSaleTransfer = createDeclinedTransfer(pendingSaleTransfer, settlementDate, loan);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(declinedSaleTransfer, loan));
+ }
+
+ private void executePendingBuybackTransfer(final Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ final LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer activeTransfer = findActiveTransfer(loan, buybackTransfer);
+ updateActiveTransfer(activeTransfer, settlementDate);
+ buybackTransfer = updatePendingBuybackTransfer(loan, buybackTransfer, settlementDate);
+
+ externalAssetOwnerTransferLoanMappingRepository.deleteByLoanIdAndOwnerTransfer(loan.getId(), activeTransfer);
+ accountingService.createJournalEntriesForBuybackAssetTransfer(loan, buybackTransfer);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(buybackTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanAccountSnapshotBusinessEvent(loan));
+ }
+
+ private ExternalAssetOwnerTransfer createCancelledTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer cancelledTransfer = new ExternalAssetOwnerTransfer();
+ cancelledTransfer.setOwner(pendingTransfer.getOwner());
+ cancelledTransfer.setExternalId(pendingTransfer.getExternalId());
+ cancelledTransfer.setStatus(CANCELLED);
+ cancelledTransfer.setSubStatus(subStatus);
+ cancelledTransfer.setSettlementDate(settlementDate);
+ cancelledTransfer.setLoanId(pendingTransfer.getLoanId());
+ cancelledTransfer.setExternalLoanId(pendingTransfer.getExternalLoanId());
+ cancelledTransfer.setPurchasePriceRatio(pendingTransfer.getPurchasePriceRatio());
+ cancelledTransfer.setEffectiveDateFrom(settlementDate);
+ cancelledTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(cancelledTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer createDeclinedTransfer(ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate,
+ Loan loan) {
+ ExternalAssetOwnerTransfer declinedTransfer = new ExternalAssetOwnerTransfer();
+ declinedTransfer.setOwner(pendingSaleTransfer.getOwner());
+ declinedTransfer.setExternalId(pendingSaleTransfer.getExternalId());
+ declinedTransfer.setStatus(DECLINED);
+ declinedTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
+ declinedTransfer.setSettlementDate(settlementDate);
Review Comment:
Okay.
Question: is this the case for the new `CANCELLED` transfers as well? Should I use the original settlement date for them, or the current businessDate?
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270611313
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,210 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
+ Long loanId = loan.getId();
+ List<ExternalAssetOwnerTransfer> transferDataList = findAllPendingOrBuybackTransfers(loanId);
+ LocalDate settlementDate = DateUtils.getBusinessLocalDate();
+
+ if (transferDataList.size() == 2) {
+ ExternalTransferSubStatus subStatus;
+ if (isSameDayTransfers(transferDataList)) {
+ subStatus = SAMEDAY_TRANSFERS;
+ } else {
+ subStatus = isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO;
+ }
+ cancelPendingSaleAndBuybackTransfer(loan, transferDataList, settlementDate, subStatus);
+ } else if (transferDataList.size() == 1) {
+ ExternalAssetOwnerTransfer transfer = transferDataList.get(0);
+ if (PENDING.equals(transfer.getStatus())) {
+ declinePendingSaleTransfer(loan, transfer, settlementDate);
+ } else if (BUYBACK.equals(transfer.getStatus())) {
+ executePendingBuybackTransfer(loan, transfer, settlementDate);
+ }
+ }
+ }
+
+ private void cancelPendingSaleAndBuybackTransfer(Loan loan, List<ExternalAssetOwnerTransfer> transferDataList, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer pendingSaleTransfer = transferDataList.get(0);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledSaleTransfer = createCancelledTransfer(pendingSaleTransfer, settlementDate, subStatus);
+
+ ExternalAssetOwnerTransfer pendingBuybackTransfer = transferDataList.get(1);
+ updatePendingTransfer(pendingBuybackTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledBuybackTransfer = createCancelledTransfer(pendingBuybackTransfer, settlementDate, subStatus);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledSaleTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledBuybackTransfer, loan));
+ }
+
+ private void declinePendingSaleTransfer(Loan loan, ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer declinedSaleTransfer = createDeclinedTransfer(pendingSaleTransfer, settlementDate, loan);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(declinedSaleTransfer, loan));
+ }
+
+ private void executePendingBuybackTransfer(final Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ final LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer activeTransfer = findActiveTransfer(loan, buybackTransfer);
+ updateActiveTransfer(activeTransfer, settlementDate);
+ buybackTransfer = updatePendingBuybackTransfer(loan, buybackTransfer, settlementDate);
+
+ externalAssetOwnerTransferLoanMappingRepository.deleteByLoanIdAndOwnerTransfer(loan.getId(), activeTransfer);
+ accountingService.createJournalEntriesForBuybackAssetTransfer(loan, buybackTransfer);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(buybackTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanAccountSnapshotBusinessEvent(loan));
+ }
+
+ private ExternalAssetOwnerTransfer createCancelledTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer cancelledTransfer = new ExternalAssetOwnerTransfer();
+ cancelledTransfer.setOwner(pendingTransfer.getOwner());
+ cancelledTransfer.setExternalId(pendingTransfer.getExternalId());
+ cancelledTransfer.setStatus(CANCELLED);
+ cancelledTransfer.setSubStatus(subStatus);
+ cancelledTransfer.setSettlementDate(settlementDate);
+ cancelledTransfer.setLoanId(pendingTransfer.getLoanId());
+ cancelledTransfer.setExternalLoanId(pendingTransfer.getExternalLoanId());
+ cancelledTransfer.setPurchasePriceRatio(pendingTransfer.getPurchasePriceRatio());
+ cancelledTransfer.setEffectiveDateFrom(settlementDate);
+ cancelledTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(cancelledTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer createDeclinedTransfer(ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate,
+ Loan loan) {
+ ExternalAssetOwnerTransfer declinedTransfer = new ExternalAssetOwnerTransfer();
+ declinedTransfer.setOwner(pendingSaleTransfer.getOwner());
+ declinedTransfer.setExternalId(pendingSaleTransfer.getExternalId());
+ declinedTransfer.setStatus(DECLINED);
+ declinedTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
+ declinedTransfer.setSettlementDate(settlementDate);
+ declinedTransfer.setLoanId(pendingSaleTransfer.getLoanId());
+ declinedTransfer.setExternalLoanId(pendingSaleTransfer.getExternalLoanId());
+ declinedTransfer.setPurchasePriceRatio(pendingSaleTransfer.getPurchasePriceRatio());
+ declinedTransfer.setEffectiveDateFrom(settlementDate);
+ declinedTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(declinedTransfer);
+ }
+
+ private void updatePendingTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate) {
+ pendingTransfer.setEffectiveDateTo(settlementDate);
+ externalAssetOwnerTransferRepository.save(pendingTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer updatePendingBuybackTransfer(Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ LocalDate settlementDate) {
+ buybackTransfer.setEffectiveDateTo(settlementDate);
Review Comment:
As we discussed the settlement date should not be changed
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] abraham-menyhart commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "abraham-menyhart (via GitHub)" <gi...@apache.org>.
abraham-menyhart commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270635887
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,210 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
+ Long loanId = loan.getId();
+ List<ExternalAssetOwnerTransfer> transferDataList = findAllPendingOrBuybackTransfers(loanId);
+ LocalDate settlementDate = DateUtils.getBusinessLocalDate();
+
+ if (transferDataList.size() == 2) {
+ ExternalTransferSubStatus subStatus;
+ if (isSameDayTransfers(transferDataList)) {
+ subStatus = SAMEDAY_TRANSFERS;
+ } else {
+ subStatus = isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO;
+ }
+ cancelPendingSaleAndBuybackTransfer(loan, transferDataList, settlementDate, subStatus);
+ } else if (transferDataList.size() == 1) {
+ ExternalAssetOwnerTransfer transfer = transferDataList.get(0);
+ if (PENDING.equals(transfer.getStatus())) {
+ declinePendingSaleTransfer(loan, transfer, settlementDate);
+ } else if (BUYBACK.equals(transfer.getStatus())) {
+ executePendingBuybackTransfer(loan, transfer, settlementDate);
+ }
+ }
+ }
+
+ private void cancelPendingSaleAndBuybackTransfer(Loan loan, List<ExternalAssetOwnerTransfer> transferDataList, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer pendingSaleTransfer = transferDataList.get(0);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledSaleTransfer = createCancelledTransfer(pendingSaleTransfer, settlementDate, subStatus);
+
+ ExternalAssetOwnerTransfer pendingBuybackTransfer = transferDataList.get(1);
+ updatePendingTransfer(pendingBuybackTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledBuybackTransfer = createCancelledTransfer(pendingBuybackTransfer, settlementDate, subStatus);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledSaleTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledBuybackTransfer, loan));
+ }
+
+ private void declinePendingSaleTransfer(Loan loan, ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer declinedSaleTransfer = createDeclinedTransfer(pendingSaleTransfer, settlementDate, loan);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(declinedSaleTransfer, loan));
+ }
+
+ private void executePendingBuybackTransfer(final Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ final LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer activeTransfer = findActiveTransfer(loan, buybackTransfer);
+ updateActiveTransfer(activeTransfer, settlementDate);
+ buybackTransfer = updatePendingBuybackTransfer(loan, buybackTransfer, settlementDate);
+
+ externalAssetOwnerTransferLoanMappingRepository.deleteByLoanIdAndOwnerTransfer(loan.getId(), activeTransfer);
+ accountingService.createJournalEntriesForBuybackAssetTransfer(loan, buybackTransfer);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(buybackTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanAccountSnapshotBusinessEvent(loan));
+ }
+
+ private ExternalAssetOwnerTransfer createCancelledTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer cancelledTransfer = new ExternalAssetOwnerTransfer();
+ cancelledTransfer.setOwner(pendingTransfer.getOwner());
+ cancelledTransfer.setExternalId(pendingTransfer.getExternalId());
+ cancelledTransfer.setStatus(CANCELLED);
+ cancelledTransfer.setSubStatus(subStatus);
+ cancelledTransfer.setSettlementDate(settlementDate);
+ cancelledTransfer.setLoanId(pendingTransfer.getLoanId());
+ cancelledTransfer.setExternalLoanId(pendingTransfer.getExternalLoanId());
+ cancelledTransfer.setPurchasePriceRatio(pendingTransfer.getPurchasePriceRatio());
+ cancelledTransfer.setEffectiveDateFrom(settlementDate);
+ cancelledTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(cancelledTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer createDeclinedTransfer(ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate,
+ Loan loan) {
+ ExternalAssetOwnerTransfer declinedTransfer = new ExternalAssetOwnerTransfer();
+ declinedTransfer.setOwner(pendingSaleTransfer.getOwner());
+ declinedTransfer.setExternalId(pendingSaleTransfer.getExternalId());
+ declinedTransfer.setStatus(DECLINED);
+ declinedTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
+ declinedTransfer.setSettlementDate(settlementDate);
+ declinedTransfer.setLoanId(pendingSaleTransfer.getLoanId());
+ declinedTransfer.setExternalLoanId(pendingSaleTransfer.getExternalLoanId());
+ declinedTransfer.setPurchasePriceRatio(pendingSaleTransfer.getPurchasePriceRatio());
+ declinedTransfer.setEffectiveDateFrom(settlementDate);
+ declinedTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(declinedTransfer);
+ }
+
+ private void updatePendingTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate) {
+ pendingTransfer.setEffectiveDateTo(settlementDate);
+ externalAssetOwnerTransferRepository.save(pendingTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer updatePendingBuybackTransfer(Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ LocalDate settlementDate) {
+ buybackTransfer.setEffectiveDateTo(settlementDate);
+ buybackTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
Review Comment:
Okay. Only for this case?
We have the other case: when the loan is closed, and we have a buyback and a sale transfer (with different settlement date). Those transfers will be closed, and a substatus will be either BALANCE_NEGATIVE or BALANCE_ZERO. Do we need the substatus there?
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270611242
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,210 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
+ Long loanId = loan.getId();
+ List<ExternalAssetOwnerTransfer> transferDataList = findAllPendingOrBuybackTransfers(loanId);
+ LocalDate settlementDate = DateUtils.getBusinessLocalDate();
+
+ if (transferDataList.size() == 2) {
+ ExternalTransferSubStatus subStatus;
+ if (isSameDayTransfers(transferDataList)) {
+ subStatus = SAMEDAY_TRANSFERS;
+ } else {
+ subStatus = isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO;
+ }
+ cancelPendingSaleAndBuybackTransfer(loan, transferDataList, settlementDate, subStatus);
+ } else if (transferDataList.size() == 1) {
+ ExternalAssetOwnerTransfer transfer = transferDataList.get(0);
+ if (PENDING.equals(transfer.getStatus())) {
+ declinePendingSaleTransfer(loan, transfer, settlementDate);
+ } else if (BUYBACK.equals(transfer.getStatus())) {
+ executePendingBuybackTransfer(loan, transfer, settlementDate);
+ }
+ }
+ }
+
+ private void cancelPendingSaleAndBuybackTransfer(Loan loan, List<ExternalAssetOwnerTransfer> transferDataList, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer pendingSaleTransfer = transferDataList.get(0);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledSaleTransfer = createCancelledTransfer(pendingSaleTransfer, settlementDate, subStatus);
+
+ ExternalAssetOwnerTransfer pendingBuybackTransfer = transferDataList.get(1);
+ updatePendingTransfer(pendingBuybackTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledBuybackTransfer = createCancelledTransfer(pendingBuybackTransfer, settlementDate, subStatus);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledSaleTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledBuybackTransfer, loan));
+ }
+
+ private void declinePendingSaleTransfer(Loan loan, ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer declinedSaleTransfer = createDeclinedTransfer(pendingSaleTransfer, settlementDate, loan);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(declinedSaleTransfer, loan));
+ }
+
+ private void executePendingBuybackTransfer(final Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ final LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer activeTransfer = findActiveTransfer(loan, buybackTransfer);
+ updateActiveTransfer(activeTransfer, settlementDate);
+ buybackTransfer = updatePendingBuybackTransfer(loan, buybackTransfer, settlementDate);
+
+ externalAssetOwnerTransferLoanMappingRepository.deleteByLoanIdAndOwnerTransfer(loan.getId(), activeTransfer);
+ accountingService.createJournalEntriesForBuybackAssetTransfer(loan, buybackTransfer);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(buybackTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanAccountSnapshotBusinessEvent(loan));
+ }
+
+ private ExternalAssetOwnerTransfer createCancelledTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer cancelledTransfer = new ExternalAssetOwnerTransfer();
+ cancelledTransfer.setOwner(pendingTransfer.getOwner());
+ cancelledTransfer.setExternalId(pendingTransfer.getExternalId());
+ cancelledTransfer.setStatus(CANCELLED);
+ cancelledTransfer.setSubStatus(subStatus);
+ cancelledTransfer.setSettlementDate(settlementDate);
+ cancelledTransfer.setLoanId(pendingTransfer.getLoanId());
+ cancelledTransfer.setExternalLoanId(pendingTransfer.getExternalLoanId());
+ cancelledTransfer.setPurchasePriceRatio(pendingTransfer.getPurchasePriceRatio());
+ cancelledTransfer.setEffectiveDateFrom(settlementDate);
+ cancelledTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(cancelledTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer createDeclinedTransfer(ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate,
+ Loan loan) {
+ ExternalAssetOwnerTransfer declinedTransfer = new ExternalAssetOwnerTransfer();
+ declinedTransfer.setOwner(pendingSaleTransfer.getOwner());
+ declinedTransfer.setExternalId(pendingSaleTransfer.getExternalId());
+ declinedTransfer.setStatus(DECLINED);
+ declinedTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
+ declinedTransfer.setSettlementDate(settlementDate);
+ declinedTransfer.setLoanId(pendingSaleTransfer.getLoanId());
+ declinedTransfer.setExternalLoanId(pendingSaleTransfer.getExternalLoanId());
+ declinedTransfer.setPurchasePriceRatio(pendingSaleTransfer.getPurchasePriceRatio());
+ declinedTransfer.setEffectiveDateFrom(settlementDate);
+ declinedTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(declinedTransfer);
+ }
+
+ private void updatePendingTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate) {
+ pendingTransfer.setEffectiveDateTo(settlementDate);
Review Comment:
As we discussed the settlement date should not be changed
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,210 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
+ Long loanId = loan.getId();
+ List<ExternalAssetOwnerTransfer> transferDataList = findAllPendingOrBuybackTransfers(loanId);
+ LocalDate settlementDate = DateUtils.getBusinessLocalDate();
+
+ if (transferDataList.size() == 2) {
+ ExternalTransferSubStatus subStatus;
+ if (isSameDayTransfers(transferDataList)) {
+ subStatus = SAMEDAY_TRANSFERS;
+ } else {
+ subStatus = isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO;
+ }
+ cancelPendingSaleAndBuybackTransfer(loan, transferDataList, settlementDate, subStatus);
+ } else if (transferDataList.size() == 1) {
+ ExternalAssetOwnerTransfer transfer = transferDataList.get(0);
+ if (PENDING.equals(transfer.getStatus())) {
+ declinePendingSaleTransfer(loan, transfer, settlementDate);
+ } else if (BUYBACK.equals(transfer.getStatus())) {
+ executePendingBuybackTransfer(loan, transfer, settlementDate);
+ }
+ }
+ }
+
+ private void cancelPendingSaleAndBuybackTransfer(Loan loan, List<ExternalAssetOwnerTransfer> transferDataList, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer pendingSaleTransfer = transferDataList.get(0);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledSaleTransfer = createCancelledTransfer(pendingSaleTransfer, settlementDate, subStatus);
+
+ ExternalAssetOwnerTransfer pendingBuybackTransfer = transferDataList.get(1);
+ updatePendingTransfer(pendingBuybackTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledBuybackTransfer = createCancelledTransfer(pendingBuybackTransfer, settlementDate, subStatus);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledSaleTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledBuybackTransfer, loan));
+ }
+
+ private void declinePendingSaleTransfer(Loan loan, ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer declinedSaleTransfer = createDeclinedTransfer(pendingSaleTransfer, settlementDate, loan);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(declinedSaleTransfer, loan));
+ }
+
+ private void executePendingBuybackTransfer(final Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ final LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer activeTransfer = findActiveTransfer(loan, buybackTransfer);
+ updateActiveTransfer(activeTransfer, settlementDate);
+ buybackTransfer = updatePendingBuybackTransfer(loan, buybackTransfer, settlementDate);
+
+ externalAssetOwnerTransferLoanMappingRepository.deleteByLoanIdAndOwnerTransfer(loan.getId(), activeTransfer);
+ accountingService.createJournalEntriesForBuybackAssetTransfer(loan, buybackTransfer);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(buybackTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanAccountSnapshotBusinessEvent(loan));
+ }
+
+ private ExternalAssetOwnerTransfer createCancelledTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer cancelledTransfer = new ExternalAssetOwnerTransfer();
+ cancelledTransfer.setOwner(pendingTransfer.getOwner());
+ cancelledTransfer.setExternalId(pendingTransfer.getExternalId());
+ cancelledTransfer.setStatus(CANCELLED);
+ cancelledTransfer.setSubStatus(subStatus);
+ cancelledTransfer.setSettlementDate(settlementDate);
+ cancelledTransfer.setLoanId(pendingTransfer.getLoanId());
+ cancelledTransfer.setExternalLoanId(pendingTransfer.getExternalLoanId());
+ cancelledTransfer.setPurchasePriceRatio(pendingTransfer.getPurchasePriceRatio());
+ cancelledTransfer.setEffectiveDateFrom(settlementDate);
+ cancelledTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(cancelledTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer createDeclinedTransfer(ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate,
+ Loan loan) {
+ ExternalAssetOwnerTransfer declinedTransfer = new ExternalAssetOwnerTransfer();
+ declinedTransfer.setOwner(pendingSaleTransfer.getOwner());
+ declinedTransfer.setExternalId(pendingSaleTransfer.getExternalId());
+ declinedTransfer.setStatus(DECLINED);
+ declinedTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
+ declinedTransfer.setSettlementDate(settlementDate);
+ declinedTransfer.setLoanId(pendingSaleTransfer.getLoanId());
+ declinedTransfer.setExternalLoanId(pendingSaleTransfer.getExternalLoanId());
+ declinedTransfer.setPurchasePriceRatio(pendingSaleTransfer.getPurchasePriceRatio());
+ declinedTransfer.setEffectiveDateFrom(settlementDate);
+ declinedTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(declinedTransfer);
+ }
+
+ private void updatePendingTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate) {
+ pendingTransfer.setEffectiveDateTo(settlementDate);
+ externalAssetOwnerTransferRepository.save(pendingTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer updatePendingBuybackTransfer(Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ LocalDate settlementDate) {
+ buybackTransfer.setEffectiveDateTo(settlementDate);
Review Comment:
As we discussed the settlement date should not be changed
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270612296
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,210 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
+ Long loanId = loan.getId();
+ List<ExternalAssetOwnerTransfer> transferDataList = findAllPendingOrBuybackTransfers(loanId);
+ LocalDate settlementDate = DateUtils.getBusinessLocalDate();
+
+ if (transferDataList.size() == 2) {
+ ExternalTransferSubStatus subStatus;
+ if (isSameDayTransfers(transferDataList)) {
+ subStatus = SAMEDAY_TRANSFERS;
+ } else {
+ subStatus = isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO;
+ }
+ cancelPendingSaleAndBuybackTransfer(loan, transferDataList, settlementDate, subStatus);
+ } else if (transferDataList.size() == 1) {
+ ExternalAssetOwnerTransfer transfer = transferDataList.get(0);
+ if (PENDING.equals(transfer.getStatus())) {
+ declinePendingSaleTransfer(loan, transfer, settlementDate);
+ } else if (BUYBACK.equals(transfer.getStatus())) {
+ executePendingBuybackTransfer(loan, transfer, settlementDate);
+ }
+ }
+ }
+
+ private void cancelPendingSaleAndBuybackTransfer(Loan loan, List<ExternalAssetOwnerTransfer> transferDataList, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer pendingSaleTransfer = transferDataList.get(0);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledSaleTransfer = createCancelledTransfer(pendingSaleTransfer, settlementDate, subStatus);
+
+ ExternalAssetOwnerTransfer pendingBuybackTransfer = transferDataList.get(1);
+ updatePendingTransfer(pendingBuybackTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledBuybackTransfer = createCancelledTransfer(pendingBuybackTransfer, settlementDate, subStatus);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledSaleTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledBuybackTransfer, loan));
+ }
+
+ private void declinePendingSaleTransfer(Loan loan, ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer declinedSaleTransfer = createDeclinedTransfer(pendingSaleTransfer, settlementDate, loan);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(declinedSaleTransfer, loan));
+ }
+
+ private void executePendingBuybackTransfer(final Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ final LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer activeTransfer = findActiveTransfer(loan, buybackTransfer);
+ updateActiveTransfer(activeTransfer, settlementDate);
+ buybackTransfer = updatePendingBuybackTransfer(loan, buybackTransfer, settlementDate);
+
+ externalAssetOwnerTransferLoanMappingRepository.deleteByLoanIdAndOwnerTransfer(loan.getId(), activeTransfer);
+ accountingService.createJournalEntriesForBuybackAssetTransfer(loan, buybackTransfer);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(buybackTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanAccountSnapshotBusinessEvent(loan));
+ }
+
+ private ExternalAssetOwnerTransfer createCancelledTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer cancelledTransfer = new ExternalAssetOwnerTransfer();
+ cancelledTransfer.setOwner(pendingTransfer.getOwner());
+ cancelledTransfer.setExternalId(pendingTransfer.getExternalId());
+ cancelledTransfer.setStatus(CANCELLED);
+ cancelledTransfer.setSubStatus(subStatus);
+ cancelledTransfer.setSettlementDate(settlementDate);
+ cancelledTransfer.setLoanId(pendingTransfer.getLoanId());
+ cancelledTransfer.setExternalLoanId(pendingTransfer.getExternalLoanId());
+ cancelledTransfer.setPurchasePriceRatio(pendingTransfer.getPurchasePriceRatio());
+ cancelledTransfer.setEffectiveDateFrom(settlementDate);
+ cancelledTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(cancelledTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer createDeclinedTransfer(ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate,
+ Loan loan) {
+ ExternalAssetOwnerTransfer declinedTransfer = new ExternalAssetOwnerTransfer();
+ declinedTransfer.setOwner(pendingSaleTransfer.getOwner());
+ declinedTransfer.setExternalId(pendingSaleTransfer.getExternalId());
+ declinedTransfer.setStatus(DECLINED);
+ declinedTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
+ declinedTransfer.setSettlementDate(settlementDate);
+ declinedTransfer.setLoanId(pendingSaleTransfer.getLoanId());
+ declinedTransfer.setExternalLoanId(pendingSaleTransfer.getExternalLoanId());
+ declinedTransfer.setPurchasePriceRatio(pendingSaleTransfer.getPurchasePriceRatio());
+ declinedTransfer.setEffectiveDateFrom(settlementDate);
+ declinedTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(declinedTransfer);
+ }
+
+ private void updatePendingTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate) {
+ pendingTransfer.setEffectiveDateTo(settlementDate);
+ externalAssetOwnerTransferRepository.save(pendingTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer updatePendingBuybackTransfer(Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ LocalDate settlementDate) {
+ buybackTransfer.setEffectiveDateTo(settlementDate);
+ buybackTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
Review Comment:
i was thinking and we dont need the substatus.
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270613976
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,210 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
+ Long loanId = loan.getId();
+ List<ExternalAssetOwnerTransfer> transferDataList = findAllPendingOrBuybackTransfers(loanId);
+ LocalDate settlementDate = DateUtils.getBusinessLocalDate();
+
+ if (transferDataList.size() == 2) {
+ ExternalTransferSubStatus subStatus;
+ if (isSameDayTransfers(transferDataList)) {
+ subStatus = SAMEDAY_TRANSFERS;
+ } else {
+ subStatus = isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO;
+ }
+ cancelPendingSaleAndBuybackTransfer(loan, transferDataList, settlementDate, subStatus);
+ } else if (transferDataList.size() == 1) {
+ ExternalAssetOwnerTransfer transfer = transferDataList.get(0);
+ if (PENDING.equals(transfer.getStatus())) {
+ declinePendingSaleTransfer(loan, transfer, settlementDate);
+ } else if (BUYBACK.equals(transfer.getStatus())) {
+ executePendingBuybackTransfer(loan, transfer, settlementDate);
+ }
+ }
+ }
+
+ private void cancelPendingSaleAndBuybackTransfer(Loan loan, List<ExternalAssetOwnerTransfer> transferDataList, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer pendingSaleTransfer = transferDataList.get(0);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledSaleTransfer = createCancelledTransfer(pendingSaleTransfer, settlementDate, subStatus);
+
+ ExternalAssetOwnerTransfer pendingBuybackTransfer = transferDataList.get(1);
+ updatePendingTransfer(pendingBuybackTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledBuybackTransfer = createCancelledTransfer(pendingBuybackTransfer, settlementDate, subStatus);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledSaleTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledBuybackTransfer, loan));
+ }
+
+ private void declinePendingSaleTransfer(Loan loan, ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer declinedSaleTransfer = createDeclinedTransfer(pendingSaleTransfer, settlementDate, loan);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(declinedSaleTransfer, loan));
+ }
+
+ private void executePendingBuybackTransfer(final Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ final LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer activeTransfer = findActiveTransfer(loan, buybackTransfer);
+ updateActiveTransfer(activeTransfer, settlementDate);
+ buybackTransfer = updatePendingBuybackTransfer(loan, buybackTransfer, settlementDate);
+
+ externalAssetOwnerTransferLoanMappingRepository.deleteByLoanIdAndOwnerTransfer(loan.getId(), activeTransfer);
+ accountingService.createJournalEntriesForBuybackAssetTransfer(loan, buybackTransfer);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(buybackTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanAccountSnapshotBusinessEvent(loan));
+ }
+
+ private ExternalAssetOwnerTransfer createCancelledTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer cancelledTransfer = new ExternalAssetOwnerTransfer();
+ cancelledTransfer.setOwner(pendingTransfer.getOwner());
+ cancelledTransfer.setExternalId(pendingTransfer.getExternalId());
+ cancelledTransfer.setStatus(CANCELLED);
+ cancelledTransfer.setSubStatus(subStatus);
+ cancelledTransfer.setSettlementDate(settlementDate);
Review Comment:
please use the orignal settlement date
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270613645
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/LoanAccountOwnerTransferServiceImpl.java:
##########
@@ -0,0 +1,210 @@
+/**
+ * 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.investor.service;
+
+import static org.apache.fineract.investor.data.ExternalTransferStatus.BUYBACK;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.CANCELLED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.DECLINED;
+import static org.apache.fineract.investor.data.ExternalTransferStatus.PENDING;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_NEGATIVE;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.BALANCE_ZERO;
+import static org.apache.fineract.investor.data.ExternalTransferSubStatus.SAMEDAY_TRANSFERS;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
+import org.apache.fineract.infrastructure.event.business.domain.loan.LoanAccountSnapshotBusinessEvent;
+import org.apache.fineract.infrastructure.event.business.service.BusinessEventNotifierService;
+import org.apache.fineract.interoperation.util.MathUtil;
+import org.apache.fineract.investor.data.ExternalTransferStatus;
+import org.apache.fineract.investor.data.ExternalTransferSubStatus;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransfer;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferDetails;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferLoanMappingRepository;
+import org.apache.fineract.investor.domain.ExternalAssetOwnerTransferRepository;
+import org.apache.fineract.investor.domain.LoanOwnershipTransferBusinessEvent;
+import org.apache.fineract.portfolio.loanaccount.domain.Loan;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LoanAccountOwnerTransferServiceImpl implements LoanAccountOwnerTransferService {
+
+ public static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
+ private final ExternalAssetOwnerTransferRepository externalAssetOwnerTransferRepository;
+ private final ExternalAssetOwnerTransferLoanMappingRepository externalAssetOwnerTransferLoanMappingRepository;
+ private final AccountingService accountingService;
+ private final BusinessEventNotifierService businessEventNotifierService;
+
+ @Override
+ public void handleLoanClosedOrOverpaid(Loan loan) {
+ Long loanId = loan.getId();
+ List<ExternalAssetOwnerTransfer> transferDataList = findAllPendingOrBuybackTransfers(loanId);
+ LocalDate settlementDate = DateUtils.getBusinessLocalDate();
+
+ if (transferDataList.size() == 2) {
+ ExternalTransferSubStatus subStatus;
+ if (isSameDayTransfers(transferDataList)) {
+ subStatus = SAMEDAY_TRANSFERS;
+ } else {
+ subStatus = isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO;
+ }
+ cancelPendingSaleAndBuybackTransfer(loan, transferDataList, settlementDate, subStatus);
+ } else if (transferDataList.size() == 1) {
+ ExternalAssetOwnerTransfer transfer = transferDataList.get(0);
+ if (PENDING.equals(transfer.getStatus())) {
+ declinePendingSaleTransfer(loan, transfer, settlementDate);
+ } else if (BUYBACK.equals(transfer.getStatus())) {
+ executePendingBuybackTransfer(loan, transfer, settlementDate);
+ }
+ }
+ }
+
+ private void cancelPendingSaleAndBuybackTransfer(Loan loan, List<ExternalAssetOwnerTransfer> transferDataList, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer pendingSaleTransfer = transferDataList.get(0);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledSaleTransfer = createCancelledTransfer(pendingSaleTransfer, settlementDate, subStatus);
+
+ ExternalAssetOwnerTransfer pendingBuybackTransfer = transferDataList.get(1);
+ updatePendingTransfer(pendingBuybackTransfer, settlementDate);
+ ExternalAssetOwnerTransfer cancelledBuybackTransfer = createCancelledTransfer(pendingBuybackTransfer, settlementDate, subStatus);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledSaleTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(cancelledBuybackTransfer, loan));
+ }
+
+ private void declinePendingSaleTransfer(Loan loan, ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer declinedSaleTransfer = createDeclinedTransfer(pendingSaleTransfer, settlementDate, loan);
+ updatePendingTransfer(pendingSaleTransfer, settlementDate);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(declinedSaleTransfer, loan));
+ }
+
+ private void executePendingBuybackTransfer(final Loan loan, ExternalAssetOwnerTransfer buybackTransfer,
+ final LocalDate settlementDate) {
+ ExternalAssetOwnerTransfer activeTransfer = findActiveTransfer(loan, buybackTransfer);
+ updateActiveTransfer(activeTransfer, settlementDate);
+ buybackTransfer = updatePendingBuybackTransfer(loan, buybackTransfer, settlementDate);
+
+ externalAssetOwnerTransferLoanMappingRepository.deleteByLoanIdAndOwnerTransfer(loan.getId(), activeTransfer);
+ accountingService.createJournalEntriesForBuybackAssetTransfer(loan, buybackTransfer);
+
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanOwnershipTransferBusinessEvent(buybackTransfer, loan));
+ businessEventNotifierService.notifyPostBusinessEvent(new LoanAccountSnapshotBusinessEvent(loan));
+ }
+
+ private ExternalAssetOwnerTransfer createCancelledTransfer(ExternalAssetOwnerTransfer pendingTransfer, LocalDate settlementDate,
+ ExternalTransferSubStatus subStatus) {
+ ExternalAssetOwnerTransfer cancelledTransfer = new ExternalAssetOwnerTransfer();
+ cancelledTransfer.setOwner(pendingTransfer.getOwner());
+ cancelledTransfer.setExternalId(pendingTransfer.getExternalId());
+ cancelledTransfer.setStatus(CANCELLED);
+ cancelledTransfer.setSubStatus(subStatus);
+ cancelledTransfer.setSettlementDate(settlementDate);
+ cancelledTransfer.setLoanId(pendingTransfer.getLoanId());
+ cancelledTransfer.setExternalLoanId(pendingTransfer.getExternalLoanId());
+ cancelledTransfer.setPurchasePriceRatio(pendingTransfer.getPurchasePriceRatio());
+ cancelledTransfer.setEffectiveDateFrom(settlementDate);
+ cancelledTransfer.setEffectiveDateTo(settlementDate);
+ return externalAssetOwnerTransferRepository.save(cancelledTransfer);
+ }
+
+ private ExternalAssetOwnerTransfer createDeclinedTransfer(ExternalAssetOwnerTransfer pendingSaleTransfer, LocalDate settlementDate,
+ Loan loan) {
+ ExternalAssetOwnerTransfer declinedTransfer = new ExternalAssetOwnerTransfer();
+ declinedTransfer.setOwner(pendingSaleTransfer.getOwner());
+ declinedTransfer.setExternalId(pendingSaleTransfer.getExternalId());
+ declinedTransfer.setStatus(DECLINED);
+ declinedTransfer.setSubStatus(isBiggerThanZero(loan.getTotalOverpaid()) ? BALANCE_NEGATIVE : BALANCE_ZERO);
+ declinedTransfer.setSettlementDate(settlementDate);
Review Comment:
please use the original settlement date
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270593787
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/ExternalAssetOwnersWriteServiceImpl.java:
##########
@@ -65,15 +69,13 @@
public class ExternalAssetOwnersWriteServiceImpl implements ExternalAssetOwnersWriteService {
private static final LocalDate FUTURE_DATE_9999_12_31 = LocalDate.of(9999, 12, 31);
- private static final List<LoanStatus> NON_CLOSED_LOAN_STATUSES = List.of(LoanStatus.SUBMITTED_AND_PENDING_APPROVAL, LoanStatus.APPROVED,
- LoanStatus.ACTIVE, LoanStatus.TRANSFER_IN_PROGRESS, LoanStatus.TRANSFER_ON_HOLD);
+ private static final List<LoanStatus> ACTIVE_LOAN_STATUSES = List.of(ACTIVE, TRANSFER_IN_PROGRESS, TRANSFER_ON_HOLD);
Review Comment:
why do you changed the list?
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy commented on a diff in pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy commented on code in PR #3318:
URL: https://github.com/apache/fineract/pull/3318#discussion_r1270594955
##########
fineract-investor/src/main/java/org/apache/fineract/investor/service/ExternalAssetOwnersWriteServiceImpl.java:
##########
@@ -99,6 +101,8 @@ public CommandProcessingResult buybackLoanByLoanId(JsonCommand command) {
validateBuybackRequestBody(command.json());
Long loanId = command.getLoanId();
validateLoan(loanId);
+ Integer loanStatus = fetchLoanStatus(loanId);
+ validateLoanStatus(loanStatus);
Review Comment:
It was not mistake to not checking the loan status for buyback! We dont wanna validate it!
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [fineract] adamsaghy merged pull request #3318: FINERACT-1724: Asset externalization of non-active loans
Posted by "adamsaghy (via GitHub)" <gi...@apache.org>.
adamsaghy merged PR #3318:
URL: https://github.com/apache/fineract/pull/3318
--
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: commits-unsubscribe@fineract.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org