From 9f7435227f56e7fe5a4a55ab44a6d578a13f7df1 Mon Sep 17 00:00:00 2001
From: VivianDee <115420678+VivianDee@users.noreply.github.com>
Date: Wed, 5 Nov 2025 14:23:54 +0100
Subject: [PATCH] [fix]: Get active loans

---
 app/models/loan.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/models/loan.py b/app/models/loan.py
index 3004c1c..2b8f673 100644
--- a/app/models/loan.py
+++ b/app/models/loan.py
@@ -1,5 +1,6 @@
 from datetime import datetime, timezone, timedelta
 from itertools import product
+from app.api.enums.loan_status import LoanStatus
 from app.extensions import db
 from app.models.customer import Customer
 from app.models.account import Account
@@ -192,9 +193,13 @@ class Loan(db.Model):
         Get all active loans with the same original_transaction ID.
         """
 
-        active_loans = cls.query.filter_by(
-        original_transaction=original_transaction_id,
-        # status='active'
+        active_loans = cls.query.filter(
+        cls.original_transaction == original_transaction_id,
+        or_(
+            cls.status == LoanStatus.ACTIVE.value,
+            cls.status == LoanStatus.START_REPAY.value,
+            cls.status == LoanStatus.ACTIVE_PARTIAL.value,
+        )
         ).all()
 
         return active_loans
-- 
2.34.1