Merge branch 'master' of https://gitlab.chiefsoft.net/DigiFi/digifi-BankToProductCore

app/models/loan.py

@@ -6,6 +6,10 @@ from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import relationship
 from dateutil.relativedelta import relativedelta 
 from datetime import timedelta
+import logging
+from sqlalchemy import and_, or_, not_
+
+logger = logging.getLogger(__name__)
 
 
 class Loan(db.Model):
@@ -36,6 +40,8 @@ class Loan(db.Model):
     created_at = db.Column(db.DateTime, default=datetime.now(timezone.utc))
     updated_at = db.Column(db.DateTime, default=datetime.now(timezone.utc), onupdate=datetime.now(timezone.utc))
     eligible_amount = db.Column(db.Float, nullable=True, default=0.0)
+    disburse_date = db.Column(db.DateTime, nullable=True)
+    disburse_verify = db.Column(db.DateTime, nullable=True)
 
     customer = relationship(
         "Customer",
@@ -134,24 +140,53 @@ class Loan(db.Model):
         return loan
 
     @classmethod
-    def get_customer_current_active_loan(cls, customer_id):
+    def get_customer_original_loan(cls, customer_id, original_transaction):
+        """
+        Get customer's original loan  offer.
+        """
+        original_loan = cls.query.filter(and_( cls.customer_id ==customer_id, cls.original_transaction==original_transaction, cls.transaction_id==original_transaction )).first()
+        if not original_loan:
+            return None
+
+        logger.info(f" get_customer_original_loan ==>>>>  {original_loan}")
+        return original_loan
+
+    @classmethod
+    def get_customer_last_loan(cls, customer_id):
         """
         Get customer's active loans.
         """
-        loan = cls.query.filter_by( customer_id = customer_id).first()
+        logger.info(f"get_customer_last_loan [customer_id] ==>>>>  {customer_id}")
+        # loan = cls.query.filter_by( cls.customer_id == customer_id).first()
+        loan = cls.query.filter(and_( cls.customer_id ==customer_id, cls.status=='active')).first()
+
         if not loan:
-            loan = {
-                "eligible_amount": 0,
-                "loan_amount": 0,
-                "customer_id": customer_id,
-                "transaction_id": "",
-                "resultDescription": "No Active Loan"
-            }
-
-            logger.info(f" Active Loan ==>>>>  {loan}")
-
+            return None
+            # loan = {
+            #     "original_transaction":"",
+            #     "eligible_amount": 0,
+            #     "loan_amount": 0,
+            #     "customer_id": customer_id,
+            #     "transaction_id": "",
+            #     "resultDescription": "No Active Loan"
+            # }
+        logger.info(f" get_customer_last_loan ==>>>>  {loan}")
         return loan
 
+    @classmethod
+    def get_active_loans_by_original_transaction(cls, original_transaction_id):
+        """
+        Get all active loans with the same original_transaction ID.
+        """
+
+        active_loans = cls.query.filter_by(
+        original_transaction=original_transaction_id,
+        # status='active'
+        ).all()
+
+        return active_loans
+
+
     @classmethod
     def update_status(cls, loan_id, status):
         """

app/models/transaction_offers.py

@@ -8,6 +8,7 @@ class TransactionOffer(db.Model):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     customer_id = db.Column(db.String(50), nullable=False)
     transaction_id = db.Column(db.String(50), nullable=False)
+    original_transaction = db.Column(db.String(50), nullable=True)
     offer_id = db.Column(db.String(20), nullable=False)
     product_id = db.Column(db.String(20), nullable=True)
     min_amount = db.Column(db.Float, nullable=False)
@@ -41,13 +42,14 @@ class TransactionOffer(db.Model):
         return transaction_offer
 
     @classmethod
-    def create_transaction_offer(cls, customer_id, transaction_id, offer_id, min_amount, max_amount, eligible_amount=None, product_id=None, tenor=None):
+    def create_transaction_offer(cls, customer_id, transaction_id, original_transaction, offer_id, min_amount, max_amount, eligible_amount=None, product_id=None, tenor=None):
         """
         Class method to create and save a TransactionOffer.
         """
         transaction_offer = cls(
             customer_id=customer_id,
             transaction_id=transaction_id,
+            original_transaction=original_transaction,
             offer_id=offer_id,
             min_amount=min_amount,
             max_amount=max_amount,