Update provide_loan.py

app/api/enums/__init__.py

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

app/api/enums/repayment_schedule_status.py

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

app/api/integrations/events_service.py

@@ -8,7 +8,6 @@ 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):
@@ -24,7 +23,7 @@ class EventServiceIntegration:
         }
 
         try:
-            response = httpx.post(url, json=payload, headers=headers, timeout=EventServiceIntegration.TIMEOUT)
+            response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
             logger.info(f"Loan Response: {response.text}")
             return response
         except Exception as e:
@@ -45,7 +44,7 @@ class EventServiceIntegration:
         }
 
         try:
-            response = httpx.post(url, json=payload, headers=headers, timeout=EventServiceIntegration.TIMEOUT)
+            response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
             logger.info(f"Repayment Response: {response.text}")
             return response
         except Exception as e:
@@ -62,7 +61,7 @@ class EventServiceIntegration:
         logger.info(f"Health Check URL: {url}")
 
         try:
-            response = httpx.get(url, timeout=EventServiceIntegration.TIMEOUT)
+            response = httpx.get(url, timeout=5.0)
             logger.info(f"Health Check Response: {response.text}")
             return response
         except Exception as e:

app/api/integrations/simbrella.py

@@ -10,8 +10,6 @@ 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 
@@ -34,7 +32,7 @@ class SimbrellaIntegration:
         try:
             logger.info(f"Requesting Bank token from {url}")
 
-            response = httpx.post(url, json=payload, headers=headers, timeout=SimbrellaIntegration.TIMEOUT)
+            response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
             response.raise_for_status()
 
             data = response.json()
@@ -87,7 +85,7 @@ class SimbrellaIntegration:
             }
 
        
-            response = httpx.post(url, json=payload, headers=headers, timeout=SimbrellaIntegration.TIMEOUT)
+            response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
 
             logger.info(f"This is Response: {str(response)}", exc_info=True)
 
@@ -96,58 +94,6 @@ 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():
@@ -165,7 +111,7 @@ class SimbrellaIntegration:
                 "Authorization": f"Bearer {access_token}"
             }
 
-            response = httpx.get(url, headers=headers, timeout=SimbrellaIntegration.TIMEOUT)
+            response = httpx.get(url, headers=headers, timeout=10.0)
             logger.info(f"Bank Health Check Response: {response.text}")
             return response
         except Exception as e:

app/api/routes/routes.py

@@ -93,8 +93,8 @@ def loan_status():
 @jwt_required()
 def repayment():
     data = request.get_json()
-    # logger.error(f"Loan Repayment Data: {data} ")
-    logger.info(f"Repayment request received: {data}")
+    logger.error(f"HERE 0000a **** ")
+    # logger.info(f"Repayment request received: {data}")
     response = RepaymentService.process_request(data)
     return response
 

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="CUSTOMER HAS EXCEEDED THE NUMBER OF DISBURSALS: Disbursal Count 1")
+                        return ResponseHelper.error(result_description="Max loan count for 3MPC reached")
 
                 # Determine Loan count
-                is_eligible, count = EligibilityCheckService.check_loan_limits(customer_id)
+                is_eligible = EligibilityCheckService.check_loan_limits(customer_id)
 
                 if not is_eligible:
-                    return ResponseHelper.error(result_description=f"CUSTOMER HAS EXCEEDED THE NUMBER OF DISBURSALS FOR THE DAY: Disbursal Count Today {count}")
+                    return ResponseHelper.error(result_description="Max loan count reached")
                 
                 # 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, 0
+            return True
         
         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, 0
+            return False
 
         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, daily_count
+            return False
         
 
-        return True, daily_count
+        return True

app/api/services/offer_analysis.py

@@ -180,7 +180,7 @@ class OfferAnalysis:
 
                 if real_eligible_amount < original_transaction_offer.min_amount:
                     logger.error(f"Max eligible amount ({real_eligible_amount}) is less than the minimum offer amount ({original_transaction_offer.min_amount}).")
-                    raise ValueError("You are not eligible for a loan at this time - Minimum amount not met.")
+                    raise ValueError("You are not eligible for a loan at this time.")
 
                 # if real_eligible_amount < 100:
                 #     logger.error(f"Max eligible amount ({real_eligible_amount}) is less than the minimum offer amount ({original_transaction_offer.min_amount}).")
@@ -225,8 +225,7 @@ class OfferAnalysis:
 
             if approved_amount < offer.min_amount:
                     logger.error(f"Max eligible amount ({approved_amount}) is less than the minimum offer amount ({offer.min_amount}).")
-                    continue
-                    # raise ValueError("You are not eligible for a loan at this time.")
+                    raise ValueError("You are not eligible for a loan at this time.")
 
             # if approved_amount < 100:
             #         logger.error(f"Max eligible amount ({approved_amount}) is less than the minimum offer amount ({offer.min_amount}).")
@@ -256,8 +255,4 @@ class OfferAnalysis:
                 "tenor": offer.tenor
             })
 
-        if not eligible_offers:
-            logger.error("No eligible offers found for customer: {customer_id} - Minimum amount not met")
-            raise ValueError("You are not eligible for a loan at this time - Minimum amount not met")
-
         return eligible_offers

app/api/services/provide_loan.py

@@ -18,6 +18,7 @@ from app.api.integrations import EventServiceIntegration
 from app.models import LoanRepaymentSchedule 
 from app.api.services.offer_analysis import OfferAnalysis
 from app.api.helpers.response_helper import ResponseHelper
+from datetime import datetime
 
 class ProvideLoanService(BaseService):
     TRANSACTION_TYPE = TransactionType.PROVIDE_LOAN 
@@ -113,9 +114,12 @@ class ProvideLoanService(BaseService):
                     management = charges["management"]
                     insurance = charges["insurance"]
                     vat = charges["vat"]
+
+                    # Generate Loan Reference
+                    loan_ref = f"SIM{datetime.now().strftime('%Y%m%d%H%M%S%f')}"
                     
-                    padded_id = str(transaction_id).zfill(12)
-                    loan_ref = f"{padded_id}{channel}{offer.product_id}"
+                    # padded_id = str(transaction_id).zfill(12)
+                    # loan_ref = f"{padded_id}{channel}{offer.product_id}"
 
 
                     # Save the loan details

app/api/services/repayment.py

@@ -1,4 +1,3 @@
-from app.api.integrations.simbrella import SimbrellaIntegration
 from flask import request, jsonify
 from marshmallow import ValidationError
 from app.api.enums.loan_status import LoanStatus
@@ -13,11 +12,9 @@ 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):
@@ -42,51 +39,16 @@ class RepaymentService(BaseService):
                 # customer = Customer.get_customer_with_loan_list(customer_id)
                 transaction_id  = validated_data.get('transactionId')
                 initiated_by = validated_data.get('initiatedBy')
-                logger.error(f"RepaymentService Received **** {data}")
-
+                logger.error(f"HERE 0002a **** ")
                 if(RepaymentService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
                     logger.error(f"HERE 0001a **** ")
                     # 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")
-                        
-                        
-                        try:
-                            response = response.json()
-                        except Exception as e:
-                            logger.error(f"Balance Check failed: Invalid JSON response - {str(e)}")
-                            return ResponseHelper.error(result_description="Balance Check failed")
-
-                        logger.info(f"This is Response (Balance Check): {str(response)}", exc_info=True)
-
-                            
-                        verify_account_balance_response = response.get('isSufficient', None) if response else None
-
-                        if verify_account_balance_response is None:
-                            return ResponseHelper.error(result_description="Balance Check failed")
-
-                        if verify_account_balance_response in [False, "false"]:
-                            logger.error("Balance Check failed: Insufficient Account Balance")
-                            return ResponseHelper.error(result_description="Insufficient Account Balance")
-
-                        
+                    loan = Loan.get_customer_loan(loan_id = loan_id, customer_id = customer_id)
 
                     # Save the repayment details  
                     repayment = Repayment.create_repayment(
                         customer_id = customer_id,
-                        loan = load_loan,
+                        loan = loan,
                         transaction_id = transaction_id
                     )
 
@@ -94,8 +56,6 @@ class RepaymentService(BaseService):
                         logger.error(f"Failed to save repayment details")
                         return ResponseHelper.error(result_description="Failed to save repayment details.")
 
-                    loan_transaction_id  = load_loan.transaction_id
-
                     #Update Loan status
                     Loan.update_status(loan_id = loan_id, status = LoanStatus.START_REPAY) # repay started by user
                     transaction = RepaymentService.log_transaction(validated_data = validated_data)
@@ -113,14 +73,14 @@ class RepaymentService(BaseService):
                     "Id": repayment.id,
                     "repayment_id": repayment.id,
                     "initiated_by": repayment.initiated_by,
-                    "transactionId": loan_transaction_id,
+                    "transactionId": transaction_id,
                     "customerId": customer_id,
-                    "productId": load_loan.product_id,
+                    "productId": loan.product_id,
                     "loanRef": loan_ref,
                     "debtId": loan_id
                 }
 
-                event_thread = Thread(target=RepaymentService.trigger_loan_repayment, args=(loan_transaction_id,))
+                event_thread = Thread(target=RepaymentService.trigger_loan_repayment, args=(transaction_id,))
                 event_thread.start()
 
                 # Call Kafka in a background thread

app/config.py

@@ -46,13 +46,11 @@ 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/customer.py

@@ -47,11 +47,11 @@ class Customer(db.Model):
     @classmethod
     def create_customer(cls, id, msisdn, country_code, account_id, account_type='savings'):
         if cls.query.filter_by(id=id).first():
-            raise ValueError("Customer ID '{id}' already exists.")
+            raise ValueError("Customer already exists")
         elif Account.query.filter_by(id=account_id).first():
-            raise ValueError(f"Account ID '{account_id}' already exists.")
+            raise ValueError("Account already exists")
         elif cls.query.filter_by(msisdn=msisdn).first():
-            raise ValueError("MSISDN '{msisdn}'  already exists")
+            raise ValueError("msisdn already exists")
         
         # Create the customer
         customer = cls(

app/models/loan.py

@@ -52,9 +52,6 @@ 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,7 +3,6 @@ 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'
@@ -26,11 +25,6 @@ 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",
@@ -57,7 +51,6 @@ 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)
             )
@@ -77,7 +70,6 @@ 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

@@ -1,32 +0,0 @@
-"""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

@@ -1,42 +0,0 @@
-"""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 ###