added verify date

app/models/loan.py

@@ -4,7 +4,7 @@ from sqlalchemy.orm import relationship
 from dateutil.relativedelta import relativedelta
 from datetime import timedelta
 import logging
-from sqlalchemy import and_, or_, not_
+from sqlalchemy import and_, or_, not_ 
 from sqlalchemy.sql import func
 from app.utils.logger import logger
 from app.extensions import db  
@@ -41,6 +41,8 @@ class Loan(db.Model):
     disburse_verify = db.Column(db.DateTime, nullable=True)
     disburse_result = db.Column(db.String(10), nullable=True)
     disburse_description = db.Column(db.String(100), nullable=True)
+    verify_result = db.Column(db.String(10), nullable=True)
+    verify_description = db.Column(db.String(100), nullable=True)
     reference = db.Column(db.String(50), nullable=True)
 
     customer = relationship(
@@ -76,12 +78,14 @@ class Loan(db.Model):
             'productId': self.product_id,
             'disburseResult': self.disburse_result,
             'disburseDescription': self.disburse_description,
+            'verifyResult': self.verify_result,
+            'verifyDescription': self.verify_description,
             'transactionId': self.transaction_id,
             'accountId':self.account_id,
             'dueDate': self.due_date.isoformat() if self.due_date else None,
             'loanDate': self.created_at.isoformat() if self.created_at else None,
             'disburseDate': self.disburse_date.isoformat() if self.disburse_date else None,
-            'disburseVerify': self.disburse_verify.isoformat if self.disburse_verify else None,
+            'disburseVerify': self.disburse_verify.isoformat() if self.disburse_verify else None,
             'reference': self.reference
         }
 
@@ -117,6 +121,35 @@ class Loan(db.Model):
             db.session.rollback()
             logger.error(f"Failed to update disburse date: {e}")
             raise
+    @classmethod
+    def set_disburse_verify_date(cls, loan_id, customer_id):
+        """
+        Update the disburse verify date of the loan with the given loan_id.
+        """
+        # Retrieve loan
+        loan = cls.query.get(loan_id)
+
+        if not loan:
+            raise ValueError(f"Loan with ID {loan_id} does not exist.")
+        
+        # Check if customer_id matches
+        if loan.customer_id != customer_id:
+            raise ValueError(f"Customer ID {customer_id} does not match the loan's customer ID.")
+
+        current_time = datetime.now()
+        logger.info(f"What is now    ======= ==== ==> : {current_time}")
+        # Update loan verify_date
+        loan.disburse_verify = current_time
+        
+        # Commit changes to database
+        try:
+            logger.info(f"Updating disburse verify date for loan ID {loan_id} to {current_time}")
+            db.session.commit()
+        except Exception as e:
+            db.session.rollback()
+            logger.error(f"Failed to update disburse verify date: {e}")
+            raise
+
 
     @classmethod
     def set_disbursement_result(cls, loan_id, result, description):
@@ -141,7 +174,29 @@ class Loan(db.Model):
             db.session.rollback()
             logger.error(f"Failed to update disbursement result: {e}")
             raise
+    @classmethod
+    def set_disburse_verify_result(cls, loan_id, result, description):
+        """
+        Update the  verify result and description of the loan with the given loan_id.
+        """
+        # Retrieve loan
+        loan = cls.query.get(loan_id)
 
+        if not loan:
+            raise ValueError(f"Loan with ID {loan_id} does not exist.")
+
+        # Update disburse result and description
+        loan.verify_result = result
+        loan.verify_description = description
+
+        # Commit changes to database
+        try:
+            logger.info(f"Updating verify result for loan ID {loan_id} to {result} with description {description}")
+            db.session.commit()
+        except Exception as e:
+            db.session.rollback()
+            logger.error(f"Failed to update verify result: {e}")
+            raise
     @classmethod
     def get_latest_loan_without_disburse_date(cls):
         """
@@ -154,8 +209,9 @@ class Loan(db.Model):
     @classmethod
     def get_latest_loan_with_disburse_date(cls):
         """
-        Get the latest loan without a disbursement date.
+        Get the latest loan with a disbursement date and no verification date.
         """
         return cls.query.filter(
-            cls.disburse_date.is_(None)
+            cls.disburse_date.isnot(None),
+            cls.disburse_verify.is_(None)
         ).order_by(cls.created_at.desc()).first()