Update offer_analysis.py

app/api/integrations/simbrella.py

@@ -1,14 +1,64 @@
+from os import access
 import httpx
-import json
+import time
 from app.utils.logger import logger
 from app.config import settings
-import logging
 
 
 class SimbrellaIntegration:
     BASE_URL = settings.SIMBRELLA_BASE_URL
     ENDPOINT_RAC_CHECKS = settings.SIMBRELLA_ENDPOINT_RAC_CHECKS
     HEALTH_ENDPOINT = settings.SIMBRELLA_HEALTH
+    AUTH_ENDPOINT =  settings.BANK_CALL_AUTH_ENDPOINT
+
+    _access_token = None  # cache token in memory
+    _token_expiry = 0 
+
+    @staticmethod
+    def generate_token():
+        """
+        Generate a new access token using the username and password from settings.
+        """
+        url = f"{SimbrellaIntegration.BASE_URL}{SimbrellaIntegration.AUTH_ENDPOINT}"
+
+        payload = {
+            "username": settings.BANK_CALL_USERNAME,
+            "password": settings.BANK_CALL_PASSWORD,
+            "grant_type": "password"
+        }
+
+        headers = {"Content-Type": "application/json"}
+
+        try:
+            logger.info(f"Requesting Bank token from {url}")
+
+            response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
+            response.raise_for_status()
+
+            data = response.json()
+            expires_in = data.get("expires_in", 1800)
+            
+            SimbrellaIntegration._access_token = data.get("access_token")
+            SimbrellaIntegration._token_expiry = time.time() + expires_in - 60
+
+            if not SimbrellaIntegration._access_token:
+                raise Exception("Access token not found in Bank Authorization response")
+
+            logger.info("Successfully retrieved Bank access token")
+            return SimbrellaIntegration._access_token
+
+        except Exception as e:
+            logger.error(f"Token generation failed: {str(e)}", exc_info=True)
+            raise Exception(f"Token generation failed: {str(e)}")
+
+    @staticmethod
+    def _get_token():
+        """
+        Return a valid token, refreshing if expired or missing
+        """
+        if not SimbrellaIntegration._access_token or time.time() >= SimbrellaIntegration._token_expiry:
+            return SimbrellaIntegration.generate_token()
+        return SimbrellaIntegration._access_token
 
     @staticmethod
     def rac_check(customer_id, account_id, transaction_id):
@@ -27,13 +77,14 @@ class SimbrellaIntegration:
             "channel": "USSD"
         }
 
-        headers = {
-            "Content-Type": "application/json",
-            "x-api-key": f"{settings.VALID_API_KEY}",
-            "App-Id": f"{settings.VALID_APP_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=10.0)
 
             logger.info(f"This is Response: {str(response)}", exc_info=True)
@@ -47,17 +98,23 @@ class SimbrellaIntegration:
     @staticmethod
     def health_check():
         """
-        Health check for Simbrella Service
+        Health check for Bank Service
         """
        
         url = f"{SimbrellaIntegration.BASE_URL}/{SimbrellaIntegration.HEALTH_ENDPOINT}"
-        logger.info(f"Simbrella Health Check URL: {url}")
+        logger.info(f"Bank Health Check URL: {url}")
         
         try:
-            response = httpx.get(url, timeout=10.0)
-            logger.info(f"Simbrella Health Check Response: {response.text}")
+            access_token = SimbrellaIntegration._get_token()
+            headers = {
+                "Content-Type": "application/json",
+                "Authorization": f"Bearer {access_token}"
+            }
+
+            response = httpx.get(url, headers=headers, timeout=10.0)
+            logger.info(f"Bank Health Check Response: {response.text}")
             return response
         except Exception as e:
-            logger.error(f"Simbrella Health Check API call failed: {str(e)}", exc_info=True)
-            raise
+            logger.error(f"Bank Health Check API call failed: {str(e)}", exc_info=True)
+            raise Exception(f"Bank Health Check API call failed: {str(e)}")
   

app/api/routes/routes.py

@@ -1,5 +1,3 @@
-from re import S
-from sqlite3 import DatabaseError
 from app.api.integrations.events_service import EventServiceIntegration
 from app.api.integrations.simbrella import SimbrellaIntegration
 from flask import Blueprint, request, jsonify, send_from_directory
@@ -127,7 +125,7 @@ def health_check():
     response = {}
     db_status = "Connection Successful"
     events_service_status = "Connection Successful"
-    emulator_status = "Connection Successful"
+    bank_status = "Connection Successful"
     errors = []
     status = "ok"
 
@@ -165,26 +163,26 @@ def health_check():
         status = "failed"
         errors.append(f"Events Service connection failed: {str(e)}")
 
-    # Check Emulator health
+    # Check Bank health
     try:
         emulator_response = SimbrellaIntegration.health_check()
 
         if emulator_response.status_code != 200:
-            emulator_status = "Connection Failed"
+            bank_status = "Connection Failed"
             status = "failed"
-            errors.append(f"Emulator response: {emulator_response.text}")
+            errors.append(f"Bank Connection response: {emulator_response.text}")
 
     except Exception as e:
-        emulator_status = "Connection Failed"
+        bank_status = "Connection Failed"
         status = "failed"
-        errors.append(f"Emulator connection failed: {str(e)}")
+        errors.append(f"Connection to Bank failed: {str(e)}")
 
 
     response = {
         "status": status,
         "db_status": db_status,
         "events_service_status": events_service_status,
-        "emulator_status": emulator_status,
+        "bank_status": bank_status,
         "db_uri": db_uri,
         "errors": errors or None
     }

app/api/services/eligibility_check.py

@@ -51,6 +51,13 @@ class EligibilityCheckService(BaseService):
                 
                 db.session.flush()
 
+                # Determine if there is any loan of 3MPC active
+                current_loan  =  EligibilityCheckService.get_current_active_loans_by_account_id(account_id = account_id)
+                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")
+
                 # Determine Loan count
                 is_eligible = EligibilityCheckService.check_loan_limits(customer_id)
 
@@ -167,7 +174,12 @@ class EligibilityCheckService(BaseService):
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
             db.session.rollback()
             return ResponseHelper.internal_server_error()
-        
+
+    @staticmethod
+    def get_current_active_loans_by_account_id(account_id):
+        current_loan  = Loan.get_current_active_loans_by_account_id(account_id)
+        return current_loan
+
 
     @staticmethod
     def check_loan_limits(customer_id):

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.")
+                    raise ValueError("You are not eligible for a loan at this time - Minimum amount not met.")
 
                 # 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,7 +225,8 @@ 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}).")
-                    raise ValueError("You are not eligible for a loan at this time.")
+                    continue
+                    # 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}).")
@@ -255,4 +256,8 @@ 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

@@ -250,9 +250,6 @@ class ProvideLoanService(BaseService):
                 "startDate": charge.created_at.isoformat(),
             }
 
-            if charge.code.upper() == "VAT":
-                item["loanRef"] = loan_ref
-
             charge_schedule_items.append(item)
             id_counter += 1
 
@@ -282,8 +279,7 @@ class ProvideLoanService(BaseService):
                 "dueDate": schedule.due_date.isoformat(),
                 "amountDue": round(interest_amount, 2),
                 "componentName": "INTEREST",
-                "startDate": schedule.created_at.isoformat(),
-                "loanRef": loan_ref
+                "startDate": schedule.created_at.isoformat()
             }
 
             charge_schedule_items.append(interest)

app/api/services/repayment.py

@@ -57,7 +57,7 @@ class RepaymentService(BaseService):
                         return ResponseHelper.error(result_description="Failed to save repayment details.")
 
                     #Update Loan status
-                    Loan.update_status(loan_id = loan_id, status = LoanStatus.START_REPAY) # repay started bu user
+                    Loan.update_status(loan_id = loan_id, status = LoanStatus.START_REPAY) # repay started by user
                     transaction = RepaymentService.log_transaction(validated_data = validated_data)
 
                     if not transaction:

app/config.py

@@ -44,11 +44,12 @@ class Config:
    # SIMBRELLA_ENDPOINT_RAC_CHECKS = os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS", "RACCheck")
     VALID_APP_ID = os.getenv("SIMBRELLA_APP_ID", "app1")
     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_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")
 
 
 

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 already exists")
+            raise ValueError("Customer ID '{id}' already exists.")
         elif Account.query.filter_by(id=account_id).first():
-            raise ValueError("Account already exists")
+            raise ValueError(f"Account ID '{account_id}' already exists.")
         elif cls.query.filter_by(msisdn=msisdn).first():
-            raise ValueError("msisdn already exists")
+            raise ValueError("MSISDN '{msisdn}'  already exists")
         
         # Create the customer
         customer = cls(

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,13 +193,32 @@ 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
 
+    @classmethod
+    def get_current_active_loans_by_account_id(cls, account_id):
+        """
+        Get the first active loan based on the accountID.
+        """
+        first_active_loan = cls.query.filter(
+        cls.account_id == account_id,
+        or_(
+            cls.status == LoanStatus.ACTIVE.value,
+            cls.status == LoanStatus.START_REPAY.value,
+            cls.status == LoanStatus.ACTIVE_PARTIAL.value,
+        )
+        ).order_by(cls.id.desc()).first()
+
+        return first_active_loan
 
     @classmethod
     def update_status(cls, loan_id, status):

app/models/repayment.py

@@ -36,9 +36,8 @@ class Repayment(db.Model):
     def create_repayment(cls, customer_id, loan, transaction_id):
         
         # Check that the loan is active
-        if loan.status not in [LoanStatus.ACTIVE, LoanStatus.START_REPAY]:
+        if loan.status not in [LoanStatus.ACTIVE, LoanStatus.START_REPAY, LoanStatus.ACTIVE_PARTIAL]:
             raise ValueError(f"Repayment cannot be processed. Loan status: ({loan.status})")
-        
 
         repayment = cls(
             customer_id=customer_id,

app/models/transaction.py

@@ -4,6 +4,12 @@ from app.models import account
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy import and_, or_, not_
 from sqlalchemy.sql import func
+from app.api.enums import TransactionType
+
+import logging
+logger = logging.getLogger(__name__)
+
+
 
 class Transaction(db.Model):
     __tablename__ = 'transactions'
@@ -20,7 +26,7 @@ class Transaction(db.Model):
     phone_number = db.Column(db.String(50), nullable=True)
     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())
-    
+
     def __repr__(self):
         return f'<Transaction {self.id}>'
 
@@ -30,17 +36,21 @@ class Transaction(db.Model):
         # if cls.query.filter_by(transaction_id=transaction_id).first():
         #     raise ValueError("Duplicate Transaction")
 
-        if cls.query.filter( and_( cls.transaction_id ==transaction_id, cls.type==type) ).first():
-            raise ValueError("Duplicate Transaction")
-
-
+        if cls.query.filter(and_(cls.transaction_id == transaction_id, cls.type == type)).first():
+            if type == TransactionType.REPAYMENT:
+                logger.info('Repayment transaction already exists :::: But we like to continue.')
+                now = datetime.now()
+                type = TransactionType.REPAYMENT + '.'+ now.strftime("%Y%m%d%H%M%S")
+                logger.info('Modify Type  :::: {0}'.format(type))
+            else:
+                raise ValueError("Duplicate Transaction")
 
         transaction = cls(
-            transaction_id = transaction_id,
-            customer_id = customer_id,
-            account_id = account_id,
-            type = type,
-            channel = channel,
+            transaction_id=transaction_id,
+            customer_id=customer_id,
+            account_id=account_id,
+            type=type,
+            channel=channel,
             created_at=datetime.now(timezone.utc),
             updated_at=datetime.now(timezone.utc)
         )
@@ -54,4 +64,4 @@ class Transaction(db.Model):
 
     @classmethod
     def get_transaction_by_id(cls, transaction_id):
-        return cls.query.get(transaction_id)
+        return cls.query.get(transaction_id)

app/swagger/digifi_swagger.json

@@ -104,7 +104,7 @@
                   "status": "ok",
                   "db_status": "Connection Successful",
                   "events_service_status":"Connection Successful",
-                  "emulator_status":"Connection Successful",
+                  "bank_status":"Connection Successful",
                   "db_uri": "postgresql://user:****@localhost:5432/digifi_db",
                   "error": []
                 }
@@ -119,7 +119,7 @@
                   "status": "failed",
                   "db_status": "Connection Failed",
                   "events_service_status":"Connection Failed",
-                  "emulator_status":"Connection Failed",
+                  "bank_status":"Connection Failed",
                   "db_uri": "Unavailable",
                   "error":["could not connect to server: Connection refused"]
                 }