Merge branch 'increase-timeout' of DigiFi/digifi-BankToProductCore into master

app/api/enums/__init__.py

@@ -1,2 +1,3 @@
 from .transaction_type import TransactionType
-from .loan_status import LoanStatus
+from .loan_status import LoanStatus
+from .repayment_schedule_status import RepaymentScheduleStatus

app/api/enums/repayment_schedule_status.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+class RepaymentScheduleStatus(str, Enum):
+    ACTIVE = "active"
+    PARTIALLY_PAID = "partially_paid"
+    REPAID = "repaid"

app/api/integrations/events_service.py

@@ -8,6 +8,7 @@ class EventServiceIntegration:
     EVENTS_SERVICE_BASE_URL = settings.EVENTS_SERVICE_BASE_URL
     ENDPOINT_DIRECT_LOAN = settings.ENDPOINT_DIRECT_LOAN
     ENDPOINT_DIRECT_REPAYMENT = settings.ENDPOINT_DIRECT_REPAYMENT
+    TIMEOUT = settings.TIMEOUT
 
     @staticmethod
     def direct_loan(transaction_id: str):
@@ -23,7 +24,7 @@ class EventServiceIntegration:
         }
 
         try:
-            response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
+            response = httpx.post(url, json=payload, headers=headers, timeout=EventServiceIntegration.TIMEOUT)
             logger.info(f"Loan Response: {response.text}")
             return response
         except Exception as e:
@@ -44,7 +45,7 @@ class EventServiceIntegration:
         }
 
         try:
-            response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
+            response = httpx.post(url, json=payload, headers=headers, timeout=EventServiceIntegration.TIMEOUT)
             logger.info(f"Repayment Response: {response.text}")
             return response
         except Exception as e:
@@ -61,7 +62,7 @@ class EventServiceIntegration:
         logger.info(f"Health Check URL: {url}")
 
         try:
-            response = httpx.get(url, timeout=5.0)
+            response = httpx.get(url, timeout=EventServiceIntegration.TIMEOUT)
             logger.info(f"Health Check Response: {response.text}")
             return response
         except Exception as e:

app/api/integrations/simbrella.py

@@ -10,6 +10,8 @@ class SimbrellaIntegration:
     ENDPOINT_RAC_CHECKS = settings.SIMBRELLA_ENDPOINT_RAC_CHECKS
     HEALTH_ENDPOINT = settings.SIMBRELLA_HEALTH
     AUTH_ENDPOINT =  settings.BANK_CALL_AUTH_ENDPOINT
+    SIMBRELLA_VERIFY_BALANCE_ENDPOINT = settings.SIMBRELLA_VERIFY_BALANCE_ENDPOINT
+    TIMEOUT = settings.TIMEOUT
 
     _access_token = None  # cache token in memory
     _token_expiry = 0 
@@ -32,7 +34,7 @@ class SimbrellaIntegration:
         try:
             logger.info(f"Requesting Bank token from {url}")
 
-            response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
+            response = httpx.post(url, json=payload, headers=headers, timeout=SimbrellaIntegration.TIMEOUT)
             response.raise_for_status()
 
             data = response.json()
@@ -85,7 +87,7 @@ class SimbrellaIntegration:
             }
 
        
-            response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
+            response = httpx.post(url, json=payload, headers=headers, timeout=SimbrellaIntegration.TIMEOUT)
 
             logger.info(f"This is Response: {str(response)}", exc_info=True)
 
@@ -94,6 +96,58 @@ class SimbrellaIntegration:
         except Exception as e:
             logger.error(f"RACCheck API call failed: {str(e)}", exc_info=True)
             raise Exception(f"RACCheck API call failed: {str(e)}")
+
+
+    @staticmethod
+    def verify_account_balance(account_id: str, amount: float, request_id: str):
+        """
+        Calls the Verify Account Balance endpoint
+        """
+        url = f"{SimbrellaIntegration.BASE_URL}/{SimbrellaIntegration.SIMBRELLA_VERIFY_BALANCE_ENDPOINT}"
+        logger.info(f"Contacting Verify Account Balance Endpoint: {url}")
+
+        payload = {
+            "accountId": account_id,
+            "amount": amount,
+            "requestId": str(request_id),
+        }
+
+        try:
+            access_token = SimbrellaIntegration._get_token()
+            headers = {
+                "Content-Type": "application/json",
+                "Authorization": f"Bearer {access_token}",
+            }
+
+            response = httpx.post(
+                url,
+                json=payload,
+                headers=headers,
+                timeout=SimbrellaIntegration.TIMEOUT,
+            )
+
+            logger.info(
+                f"Verify Account Balance Response: "
+                f"status={response.status_code}, body={response.text}"
+            )
+
+            response.raise_for_status()
+            return response
+
+        except httpx.HTTPStatusError as e:
+            logger.error(
+                f"Verify Account Balance failed with status "
+                f"{e.response.status_code}: {e.response.text}",
+                exc_info=True,
+            )
+            raise Exception("Verify Account Balance API returned an error")
+
+        except Exception as e:
+            logger.error(
+                f"Verify Account Balance API call failed: {str(e)}",
+                exc_info=True,
+            )
+            raise Exception(f"Verify Account Balance API call failed: {str(e)}")
         
     @staticmethod
     def health_check():
@@ -111,7 +165,7 @@ class SimbrellaIntegration:
                 "Authorization": f"Bearer {access_token}"
             }
 
-            response = httpx.get(url, headers=headers, timeout=10.0)
+            response = httpx.get(url, headers=headers, timeout=SimbrellaIntegration.TIMEOUT)
             logger.info(f"Bank Health Check Response: {response.text}")
             return response
         except Exception as e:

app/api/services/eligibility_check.py

@@ -56,13 +56,13 @@ class EligibilityCheckService(BaseService):
                 if current_loan:
                     logger.info(f"Account {current_loan.account_id} has active loan {current_loan}")
                     if current_loan.product_id =='3MPC':
-                        return ResponseHelper.error(result_description="Max loan count for 3MPC reached")
+                        return ResponseHelper.error(result_description="CUSTOMER HAS EXCEEDED THE NUMBER OF DISBURSALS: Disbursal Count 1")
 
                 # Determine Loan count
-                is_eligible = EligibilityCheckService.check_loan_limits(customer_id)
+                is_eligible, count = EligibilityCheckService.check_loan_limits(customer_id)
 
                 if not is_eligible:
-                    return ResponseHelper.error(result_description="Max loan count reached")
+                    return ResponseHelper.error(result_description=f"CUSTOMER HAS EXCEEDED THE NUMBER OF DISBURSALS FOR THE DAY: Disbursal Count Today {count}")
                 
                 # Call RACCheck
                 response = SimbrellaIntegration.rac_check(
@@ -189,14 +189,14 @@ class EligibilityCheckService(BaseService):
         loan = Loan.get_customer_last_loan(customer_id)
 
         if not loan:
-            return True
+            return True, 0
         
         offer_id = loan.offer_id[:5]
 
         offer = Offer.get_offer_by_id(offer_id)
         if not offer:
             logger.error(f"Offer not found for offer_id: {offer_id} (customer_id: {customer_id})")
-            return False
+            return False, 0
 
         daily_count = Loan.get_daily_loan_count(customer_id, offer.product_id)
         
@@ -204,7 +204,7 @@ class EligibilityCheckService(BaseService):
         logger.info(f"daily_count: {daily_count}, Max: {offer.max_daily_loans}")
 
         if offer.max_daily_loans is not None and daily_count >= offer.max_daily_loans:
-            return False
+            return False, daily_count
         
 
-        return True
+        return True, daily_count

app/api/services/repayment.py

@@ -1,3 +1,4 @@
+from app.api.integrations.simbrella import SimbrellaIntegration
 from flask import request, jsonify
 from marshmallow import ValidationError
 from app.api.enums.loan_status import LoanStatus
@@ -12,9 +13,11 @@ from app.api.enums import TransactionType
 from threading import Thread
 from app.extensions import db
 from app.api.integrations import EventServiceIntegration
+from app.config import settings
 
 class RepaymentService(BaseService):
     TRANSACTION_TYPE = TransactionType.REPAYMENT 
+    ENABLE_ACCOUNT_BALANCE_CHECK = settings.ENABLE_ACCOUNT_BALANCE_CHECK
 
     @staticmethod
     def process_request(data):
@@ -46,6 +49,38 @@ class RepaymentService(BaseService):
                     # Check loan exists
                     load_loan = Loan.get_customer_loan(loan_id = loan_id, customer_id = customer_id)
 
+
+                    # Check Customer Account Balance if enabled
+                    if RepaymentService.ENABLE_ACCOUNT_BALANCE_CHECK:
+                        response = SimbrellaIntegration.verify_account_balance(
+                            account_id = account_id,
+                            amount = load_loan.balance,
+                            request_id = request_id,
+                        )
+
+                        # this check for error is not valid
+                        if response.status_code != 200:
+                            return ResponseHelper.error(result_description="Balance Check failed")
+                        
+                        response = response.json()
+
+                        logger.info(f"This is Response (Balance Check): {str(response)}", exc_info=True)
+
+                        
+                        if not response or response['responseCode'] != '00':
+
+                            if response:
+                                logger.error(f"{response['responseMessage']}")
+
+                            return ResponseHelper.error(result_description=f"Balance Check failed")
+
+                        verify_account_balance_response = response['isSufficient']
+
+                        if not verify_account_balance_response or verify_account_balance_response in [False, "false"]:
+                            logger.error(f"Balance Check failed: Insufficient Account Balance")
+                            return ResponseHelper.error(result_description=f"Insufficient Account Balance")
+
+
                     # Save the repayment details  
                     repayment = Repayment.create_repayment(
                         customer_id = customer_id,

app/config.py

@@ -46,11 +46,13 @@ class Config:
     VALID_API_KEY = os.getenv("SIMBRELLA_API_KEY", "test-api-key-12345")
     SIMBRELLA_BASE_URL = os.getenv("SIMBRELLA_BASE_URL", "http://127.0.0.1:6337")
     SIMBRELLA_ENDPOINT_RAC_CHECKS = os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS","api/rac-check")
+    SIMBRELLA_VERIFY_BALANCE_ENDPOINT = os.getenv("SIMBRELLA_VERIFY_BALANCE_ENDPOINT", "api/VerifyAccountBalance")
+    ENABLE_ACCOUNT_BALANCE_CHECK = os.getenv("ENABLE_ACCOUNT_BALANCE_CHECK", True)
     SIMBRELLA_HEALTH =  os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS","api/system-health-check")
     BANK_CALL_AUTH_ENDPOINT = os.getenv("BANK_CALL_AUTH_ENDPOINT", "/api/Auth/generate-token")
     BANK_CALL_USERNAME = os.getenv("BANK_CALL_USERNAME", "simbrella")
     BANK_CALL_PASSWORD = os.getenv("BANK_CALL_PASSWORD", "G7$k9@pL2!qR")
-
+    TIMEOUT = os.getenv("TIMEOUT", 60.0)
 
 
     EVENTS_SERVICE_BASE_URL = os.getenv("EVENTS_SERVICE_BASE_URL","https://event-core.simbrellang.net")

app/models/loan.py

@@ -52,6 +52,9 @@ class Loan(db.Model):
     verify_result = db.Column(db.String(10), nullable=True)
     verify_description = db.Column(db.String(100), nullable=True)
 
+    total_penal_charge = db.Column(db.Float, default=0.0)
+    last_penal_date = db.Column(db.DateTime, nullable=True)
+
     customer = relationship(
         "Customer",
         primaryjoin="Customer.id == Loan.customer_id",

app/models/loan_repayment_schedule.py

@@ -3,6 +3,7 @@ from app.extensions import db
 from sqlalchemy.orm import relationship
 from dateutil.relativedelta import relativedelta
 from sqlalchemy.sql import func
+from app.api.enums.repayment_schedule_status import RepaymentScheduleStatus
 
 class LoanRepaymentSchedule(db.Model):
     __tablename__ = 'loan_repayment_schedules'
@@ -25,6 +26,11 @@ class LoanRepaymentSchedule(db.Model):
 
     created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
     updated_at = db.Column(db.DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
+
+    penal_charge = db.Column(db.Float, default=0.0)
+    penal_count = db.Column(db.Integer, default=0)
+    last_penal_date = db.Column(db.DateTime, nullable=True)
+
     loan = relationship(
         "Loan",
         primaryjoin="LoanRepaymentSchedule.loan_id == Loan.id",
@@ -51,6 +57,7 @@ class LoanRepaymentSchedule(db.Model):
                 installment_amount=round(loan.installment_amount, 2),
                 product_id = loan.product_id,
                 transaction_id = transaction_id,
+                paid_status = RepaymentScheduleStatus.ACTIVE,
                 created_at=datetime.now(timezone.utc),
                 updated_at=datetime.now(timezone.utc)
             )
@@ -70,6 +77,7 @@ class LoanRepaymentSchedule(db.Model):
             'interestAmount': self.interest_amount,
             'totalInstallment': self.total_installment,
             'paid': self.paid,
+            'paidStatus': self.paid_status,
             'paidAt': self.paid_at.isoformat() if self.paid_at else None
         }
 

migrations/versions/284be77cb54e_.py

@@ -0,0 +1,32 @@
+"""empty message
+
+Revision ID: 284be77cb54e
+Revises: 718dc29fbd38
+Create Date: 2026-03-12 09:10:37.170288
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "284be77cb54e"
+down_revision = "718dc29fbd38"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "loan_repayment_schedules",
+        sa.Column("last_penal_date", sa.Float(), nullable=True),
+    )
+    ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("loan_repayment_schedules", "last_penal_date")
+    # ### end Alembic commands ###

migrations/versions/718dc29fbd38_.py

@@ -0,0 +1,42 @@
+"""empty message
+
+Revision ID: 718dc29fbd38
+Revises: 30b45df851fa
+Create Date: 2026-03-11 14:18:47.523948
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '718dc29fbd38'
+down_revision = '30b45df851fa'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('loan_repayment_schedules',
+    sa.Column('penal_charge', sa.Float(), nullable=True),
+    )
+    op.add_column('loan_repayment_schedules',
+    sa.Column('penal_count', sa.Integer(), nullable=True),
+    )
+    op.add_column('loans',
+    sa.Column('total_penal_charge', sa.Float(), nullable=True),
+    )
+    op.add_column('loans',
+    sa.Column('last_penal_date', sa.DateTime(), nullable=True),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('loan_repayment_schedules', 'penal_count')
+    op.drop_column('loan_repayment_schedules', 'penal_charge')
+    op.drop_column('loans', 'total_penal_charge')
+    op.drop_column('loans', 'last_penal_date')
+    # ### end Alembic commands ###