[fix]: settled amount
This commit was merged in pull request #66.
This commit is contained in:
@@ -47,6 +47,7 @@ class LoanStatusService(BaseService):
|
|||||||
loans = [
|
loans = [
|
||||||
loan.to_dict()
|
loan.to_dict()
|
||||||
for loan in customer_loans
|
for loan in customer_loans
|
||||||
|
if loan.status in [LoanStatus.ACTIVE, LoanStatus.START_REPAY, LoanStatus.ACTIVE_PARTIAL]
|
||||||
]
|
]
|
||||||
|
|
||||||
transaction = LoanStatusService.log_transaction(
|
transaction = LoanStatusService.log_transaction(
|
||||||
@@ -68,22 +69,14 @@ class LoanStatusService(BaseService):
|
|||||||
)
|
)
|
||||||
|
|
||||||
total_outstanding_amount = sum(
|
total_outstanding_amount = sum(
|
||||||
loan.balance
|
loan.get("currentLoanAmount") or 0 for loan in loans
|
||||||
for loan in customer_loans
|
|
||||||
if loan.status in [LoanStatus.ACTIVE, LoanStatus.START_REPAY, LoanStatus.ACTIVE_PARTIAL]
|
|
||||||
)
|
)
|
||||||
|
|
||||||
total_active_loan_amount = sum(
|
total_active_loan_amount = sum(
|
||||||
loan.repayment_amount
|
loan.get("repaymentAmount") or 0 for loan in loans
|
||||||
for loan in customer_loans
|
|
||||||
if loan.status in [LoanStatus.ACTIVE, LoanStatus.START_REPAY, LoanStatus.ACTIVE_PARTIAL]
|
|
||||||
)
|
)
|
||||||
|
|
||||||
total_settled_amount = sum(
|
total_settled_amount = total_active_loan_amount - total_outstanding_amount
|
||||||
loan.repayment_amount
|
|
||||||
for loan in customer_loans
|
|
||||||
if loan.status == LoanStatus.REPAID
|
|
||||||
)
|
|
||||||
|
|
||||||
# Simulated processing logic
|
# Simulated processing logic
|
||||||
response_data = {
|
response_data = {
|
||||||
|
|||||||
@@ -57,6 +57,12 @@ class Repayment(db.Model):
|
|||||||
|
|
||||||
return repayment
|
return repayment
|
||||||
|
|
||||||
|
# Get loan repayments
|
||||||
|
@classmethod
|
||||||
|
def get_repayments_by_id(cls, loan_id):
|
||||||
|
return cls.query.filter_by(loan_id=loan_id).all()
|
||||||
|
|
||||||
|
|
||||||
def to_dict(self):
|
def to_dict(self):
|
||||||
return {
|
return {
|
||||||
"id": self.id,
|
"id": self.id,
|
||||||
|
|||||||
Reference in New Issue
Block a user