[add]: timestamp fix

# Conflicts:
#	app/models/loan.py

.env.local.example

@@ -0,0 +1,35 @@
+# Environment Variables
+BASIC_AUTH_USERNAME=user
+BASIC_AUTH_PASSWORD=password
+
+#swagger Configuration
+SWAGGER_URL="/documentation"
+API_URL="/swagger.json"
+
+# Database Configuration
+DATABASE_USER=firstadvance
+DATABASE_PASSWORD=FirstAdvance!
+DATABASE_HOST=dev-data.simbrellang.net
+DATABASE_PORT=10532
+DATABASE_NAME=firstadvancedev
+
+# DATABASE_HOST=10.20.30.60
+# DATABASE_USER=firstadvance
+# DATABASE_PASSWORD=firstadvance
+# DATABASE_NAME=firstadvancedev
+# DATABASE_PORT=5432
+
+# Flask Configuration
+FLASK_APP=wsgi.py
+FLASK_ENV=development
+APP_PORT=4500
+
+
+# Bank Call Service Connection
+SIMBRELLA_BASE_URL="https://bank-emulator.dev.simbrellang.net"
+VALID_APP_ID=app1
+VALID_API_KEY=test-api-key-12345
+
+
+# Event Bus Broker Configuration
+KAFKA_BROKER="10.0.0.246:9092"

app/api/enums/__init__.py

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

app/api/enums/loan_status.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+class LoanStatus(str, Enum):
+    PENDING = "pending"
+    ACTIVE = "active"
+    REPAID = "repaid"

app/api/helpers/response_helper.py

@@ -1,251 +1,112 @@
 from flask import jsonify
-from typing import List, Dict, Union, Optional, Any
+from typing import Optional, Union, Dict, List, Any
 
 
 class ResponseHelper:
     """
-    A helper class for building standardized JSON responses in Flask.
+    A helper class for building standardized JSON responses using resultCode and resultDescription.
     """
 
     @staticmethod
     def build_response(
-        status: bool,
-        message: str,
-        data: Optional[Union[Dict, List, str]] = None,
-        status_code: int = 200,
-        error: Optional[Union[Dict, str]] = None,
+        result_code: str,
+        result_description: str,
+        data: Optional[Union[Dict, List, str]] = None
     ) -> Dict[str, Any]:
-        """
-        Build a standardized JSON response.
-
-        Args:
-            status (bool): Indicates whether the request was successful.
-            message (str): A message describing the result of the request.
-            data (Optional[Union[Dict, List, str]]): The data to return in the response.
-            status_code (int): The HTTP status code for the response.
-            error (Optional[Union[Dict, str]]): Any error details to include in the response.
-
-        Returns:
-            Dict[str, Any]: A dictionary representing the JSON response.
-        """
         response = {
-            "status": status,
-            "statusCode": status_code,
-            "message": message,
-            "data": data if data is not None else {},
-            "error": error if error is not None else {},
+            "resultCode": result_code,
+            "resultDescription": result_description
         }
-        return jsonify(response), status_code
+
+        if isinstance(data, dict):
+            response.update(data)
+
+        return jsonify(response)
 
     @staticmethod
     def success(
-        data: Optional[Union[Dict, List, str]] = None,
-        message: str = "Successful",
-        status_code: int = 200,
-        error: Optional[Union[Dict, str]] = None,
+        result_description: str = "Successful",
+        result_code: str = "00",
+        data: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
-        """
-        Return a success response.
-
-        Args:
-            data (Optional[Union[Dict, List, str]]): The data to return in the response.
-            message (str): A message describing the result of the request.
-            status_code (int): The HTTP status code for the response.
-            error (Optional[Union[Dict, str]]): Any error details to include in the response.
-
-        Returns:
-            Dict[str, Any]: A dictionary representing the JSON response.
-        """
-        return ResponseHelper.build_response(True, message, data, status_code, error)
+        return ResponseHelper.build_response(result_code, result_description, data)
 
     @staticmethod
     def error(
-        message: str = "An error occurred",
-        status_code: int = 400,
-        data: Optional[Union[Dict, List, str]] = None,
-        error: Optional[Union[Dict, str]] = None,
+        result_description: str = "An error occurred",
+        result_code: str = "01",
+        data: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
-        """
-        Return an error response.
-
-        Args:
-            message (str): A message describing the error.
-            status_code (int): The HTTP status code for the response.
-            data (Optional[Union[Dict, List, str]]): The data to return in the response.
-            error (Optional[Union[Dict, str]]): Any error details to include in the response.
-
-        Returns:
-            Dict[str, Any]: A dictionary representing the JSON response.
-        """
-        return ResponseHelper.build_response(False, message, data, status_code, error)
+        return ResponseHelper.build_response(result_code, result_description, data)
 
     @staticmethod
     def created(
-        data: Optional[Union[Dict, List, str]] = None,
-        message: str = "Resource created successfully",
-        error: Optional[Union[Dict, str]] = None,
+        result_description: str = "Resource created successfully",
+        result_code: str = "00",
+        data: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
-        """
-        Return a response for a created resource.
-
-        Args:
-            data (Optional[Union[Dict, List, str]]): The data to return in the response.
-            message (str): A message describing the result of the request.
-            error (Optional[Union[Dict, str]]): Any error details to include in the response.
-
-        Returns:
-            Dict[str, Any]: A dictionary representing the JSON response.
-        """
-        return ResponseHelper.build_response(True, message, data, 201, error)
+        return ResponseHelper.build_response(result_code, result_description, data)
 
     @staticmethod
     def updated(
-        data: Optional[Union[Dict, List, str]] = None,
-        message: str = "Resource updated successfully",
-        error: Optional[Union[Dict, str]] = None,
+        result_description: str = "Resource updated successfully",
+        result_code: str = "00",
+        data: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
-        """
-        Return a response for an updated resource.
-
-        Args:
-            data (Optional[Union[Dict, List, str]]): The data to return in the response.
-            message (str): A message describing the result of the request.
-            error (Optional[Union[Dict, str]]): Any error details to include in the response.
-
-        Returns:
-            Dict[str, Any]: A dictionary representing the JSON response.
-        """
-        return ResponseHelper.build_response(True, message, data, 200, error)
+        return ResponseHelper.build_response(result_code, result_description, data)
 
     @staticmethod
     def internal_server_error(
-        message: str = "Internal Server Error",
-        data: Optional[Union[Dict, List, str]] = None,
-        error: Optional[Union[Dict, str]] = None,
+        result_description: str = "Internal Server Error",
+        result_code: str = "500",
+        data: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
-        """
-        Return a response for an internal server error.
-
-        Args:
-            message (str): A message describing the error.
-            data (Optional[Union[Dict, List, str]]): The data to return in the response.
-            error (Optional[Union[Dict, str]]): Any error details to include in the response.
-
-        Returns:
-            Dict[str, Any]: A dictionary representing the JSON response.
-        """
-        return ResponseHelper.build_response(False, message, data, 500, error)
+        return ResponseHelper.build_response(result_code, result_description, data)
 
     @staticmethod
     def unauthorized(
-        message: str = "Unauthorized",
-        data: Optional[Union[Dict, List, str]] = None,
-        error: Optional[Union[Dict, str]] = None,
+        result_description: str = "Unauthorized",
+        result_code: str = "401",
+        data: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
-        """
-        Return a response for an unauthorized request.
-
-        Args:
-            message (str): A message describing the error.
-            data (Optional[Union[Dict, List, str]]): The data to return in the response.
-            error (Optional[Union[Dict, str]]): Any error details to include in the response.
-
-        Returns:
-            Dict[str, Any]: A dictionary representing the JSON response.
-        """
-        return ResponseHelper.build_response(False, message, data, 401, error)
+        return ResponseHelper.build_response(result_code, result_description, data)
 
     @staticmethod
     def forbidden(
-        message: str = "Forbidden",
-        data: Optional[Union[Dict, List, str]] = None,
-        error: Optional[Union[Dict, str]] = None,
+        result_description: str = "Forbidden",
+        result_code: str = "403",
+        data: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
-        """
-        Return a response for a forbidden request.
-
-        Args:
-            message (str): A message describing the error.
-            data (Optional[Union[Dict, List, str]]): The data to return in the response.
-            error (Optional[Union[Dict, str]]): Any error details to include in the response.
-
-        Returns:
-            Dict[str, Any]: A dictionary representing the JSON response.
-        """
-        return ResponseHelper.build_response(False, message, data, 403, error)
+        return ResponseHelper.build_response(result_code, result_description, data)
 
     @staticmethod
     def not_found(
-        message: str = "Resource not found",
-        data: Optional[Union[Dict, List, str]] = None,
-        error: Optional[Union[Dict, str]] = None,
+        result_description: str = "Resource not found",
+        result_code: str = "404",
+        data: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
-        """
-        Return a response for a not found resource.
-
-        Args:
-            message (str): A message describing the error.
-            data (Optional[Union[Dict, List, str]]): The data to return in the response.
-            error (Optional[Union[Dict, str]]): Any error details to include in the response.
-
-        Returns:
-            Dict[str, Any]: A dictionary representing the JSON response.
-        """
-        return ResponseHelper.build_response(False, message, data, 404, error)
+        return ResponseHelper.build_response(result_code, result_description, data)
 
     @staticmethod
     def unprocessable_entity(
-        message: str = "Unprocessable entity",
-        data: Optional[Union[Dict, List, str]] = None,
-        error: Optional[Union[Dict, str]] = None,
+        result_description: str = "Unprocessable entity",
+        result_code: str = "422",
+        data: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
-        """
-        Return a response for an unprocessable entity.
+        return ResponseHelper.build_response(result_code, result_description, data)
 
-        Args:
-            message (str): A message describing the error.
-            data (Optional[Union[Dict, List, str]]): The data to return in the response.
-            error (Optional[Union[Dict, str]]): Any error details to include in the response.
-
-        Returns:
-            Dict[str, Any]: A dictionary representing the JSON response.
-        """
-        return ResponseHelper.build_response(False, message, data, 422, error)
-    
     @staticmethod
     def method_not_allowed(
-        message: str = "Method Not Allowed",
-        data: Optional[Union[Dict, List, str]] = None,
-        error: Optional[Union[Dict, str]] = None,
+        result_description: str = "Method Not Allowed",
+        result_code: str = "405",
+        data: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
-        """
-        Return a response for a method not allowed error.
+        return ResponseHelper.build_response(result_code, result_description, data)
 
-        Args:
-            message (str): A message describing the error.
-            data (Optional[Union[Dict, List, str]]): The data to return in the response.
-            error (Optional[Union[Dict, str]]): Any error details to include in the response.
-
-        Returns:
-            Dict[str, Any]: A dictionary representing the JSON response.
-        """
-        return ResponseHelper.build_response(False, message, data, 405, error)
-    
     @staticmethod
     def bad_request(
-        message: str = "Bad Request",
-        data: Optional[Union[Dict, List, str]] = None,
-        error: Optional[Union[Dict, str]] = None,
+        result_description: str = "Bad Request",
+        result_code: str = "400",
+        data: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
-        """
-        Return a response for a bad request error.
-
-        Args:
-            message (str): A message describing the error.
-            data (Optional[Union[Dict, List, str]]): The data to return in the response.
-            error (Optional[Union[Dict, str]]): Any error details to include in the response.
-
-        Returns:
-            Dict[str, Any]: A dictionary representing the JSON response.
-        """
-        return ResponseHelper.build_response(False, message, data, 400, error)
+        return ResponseHelper.build_response(result_code, result_description, data)

app/api/integrations/kafka.py

@@ -43,9 +43,9 @@ class KafkaIntegration:
 
 
     @staticmethod
-    def send_loan_request(loan_data, request_id):
+    def send_loan_request(loan_data, request_id, topic):
         """
-        Send loan request to PROCESS_PAYMENT topic
+        Send loan request to topic
 
         Args:
             loan_data: Loan request payload as dict
@@ -58,7 +58,7 @@ class KafkaIntegration:
 
             # Sending loan request message to Kafka
             producer.produce(
-                topic="PROCESS_PAYMENT",
+                topic=topic,
                 key=str(request_id),
                 value=json.dumps(loan_data).encode("utf-8"),
                 callback=KafkaIntegration.delivery_report,

app/api/integrations/simbrella.py

@@ -1,8 +1,9 @@
-import requests
+import httpx
 import json
-from requests.auth import HTTPBasicAuth
 from app.utils.logger import logger
 from app.config import settings
+import logging
+
 
 class SimbrellaIntegration:
     BASE_URL = settings.SIMBRELLA_BASE_URL
@@ -13,43 +14,43 @@ class SimbrellaIntegration:
         Calls the RACCheck endpoit
         """
         url = f"{SimbrellaIntegration.BASE_URL}/RACCheck"
-        
+
         payload = {
             "customerId": customer_id,
             "accountId": account_id,
-            "transactionId": transaction_id,
+            "transactionId": str(transaction_id),
+            "fbnTransactionId": f"FBN{transaction_id}",
             "RAC_Array": [
-                {
-                "salaryAccount": True,
-                "bvn": "12345678901",
-                "crc": False,
-                "crms": True,
-                "accountStatus": "active",
-                "lien": False,
-                "noBouncedCheck": True,
-                "existingLoan": False,
-                "whitelist": True,
-                "noPastDueSalaryLoan": True,
-                "noPastDueOtherLoans": False
-                }
-            ]
+                "SalaryAccount",
+                "BVN",
+                "BVNAttachedtoAccount",
+                "CRC",
+                "CRMS",
+                "AccountStatus",
+                "Lien",
+                "NoBouncedCheck",
+                "Whitelist",
+                "NoPastDueSalaryLoan",
+                "NoPastDueOtherLoan",
+            ],
         }
 
-        logger.error(f"This is PayLoad: {str(payload)}",exc_info=True)
+        # logger.info(f"This is PayLoad: {str(payload)}", exc_info=True)
+
         headers = {
-            'Content-Type': 'application/json',
-            'x-api-key': f'{settings.VALID_API_KEY}',
-            'App-Id': f'{settings.VALID_APP_ID}'
+            "Content-Type": "application/json",
+            "x-api-key": f"{settings.VALID_API_KEY}",
+            "App-Id": f"{settings.VALID_APP_ID}",
         }
 
         try:
-            response = requests.post(url, json=payload, timeout=10, headers=headers)
-            logger.error(f"This is Response: {str(response)}", exc_info=True)
-            # Raise an error for non-200 responses
-            if response.status_code != 200:
-                response.raise_for_status()
+            response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
 
-            return response.json()
-        except requests.exceptions.RequestException as err:
-            logger.error(f"RACCheck API call failed: {str(err)}", exc_info=True)
-            return {"error": "RACCheck API error"}
+            logger.info(f"This is Response: {str(response)}", exc_info=True)
+
+            return response
+           
+        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)}")
+  

app/api/schemas/loan_status.py

@@ -3,6 +3,7 @@ from marshmallow import Schema, fields
 # Loan Information Schema
 class LoanStatusSchema(Schema):
     transactionId = fields.Str(required=True)
+    accountId = fields.Str(required=True)
     customerId = fields.Str(required=True)
     msisdn = fields.Str(required=False)
     channel = fields.Str(required=True)

app/api/schemas/provide_loan.py

@@ -12,5 +12,5 @@ class ProvideLoanSchema(Schema):
     # lienAmount = fields.Float(required=True)
     requestedAmount = fields.Float(required=True)
     collectionType = fields.Int(required=True)
-    offerId = fields.Int(required=True)
+    offerId = fields.Str(required=True)
     channel = fields.Str(required=True)

app/api/schemas/repayment.py

@@ -7,5 +7,6 @@ class RepaymentSchema(Schema):
     debtId = fields.Str(required=True)
     productId = fields.Str(required=True)
     transactionId = fields.Str(required=True)
+    accountId = fields.Str(required=True)
     customerId = fields.Str(required=True)
     channel = fields.Str(required=True)

app/api/schemas/select_offer.py

@@ -9,5 +9,6 @@ class SelectOfferSchema(Schema):
     msisdn = fields.Str(required=True)
     requestedAmount = fields.Float(required=True)
     productId = fields.Str(required=True)
+    offerId = fields.Str(required=True)
     channel = fields.Str(required=True)
 

app/api/services/__init__.py

@@ -6,3 +6,4 @@ from app.api.services.repayment import RepaymentService
 from app.api.services.customer_consent import CustomerConsentService
 from app.api.services.notification_callback import NotificationCallbackService
 from app.api.services.authorization import AuthorizationService
+from app.api.services.offer_analysis import OfferAnalysis

app/api/services/authorization.py

@@ -34,7 +34,7 @@ class AuthorizationService(BaseService):
             logger.info("Processing Authorization request")
 
             if not data:
-                return ResponseHelper.bad_request(message="Missing JSON in request")
+                return ResponseHelper.bad_request(result_description="Missing JSON in request")
 
             # Validate input data using the Authorization schema
             schema = AuthorizeRequestSchema()
@@ -44,7 +44,7 @@ class AuthorizationService(BaseService):
                 validated_data["username"] != USERNAME
                 or validated_data["password"] != PASSWORD
             ):
-                return ResponseHelper.unauthorized(message="Invalid credentials")
+                return ResponseHelper.unauthorized(result_description="Invalid credentials")
 
             access_token = create_access_token(identity=validated_data["username"])
             refresh_token = create_refresh_token(identity=validated_data["username"])
@@ -56,17 +56,17 @@ class AuthorizationService(BaseService):
             }
 
             return ResponseHelper.success(
-                data=response_data, message="Authorization processed successfully"
+                data={"data": response_data}, result_description="Authorization processed successfully"
             )
 
         except ValidationError as e:
             logger.error(f"Validation error: {e}")
-            return ResponseHelper.bad_request(message=f"Validation error: {e}")
+            return ResponseHelper.bad_request(result_description=f"Validation error: {e}")
 
         except Exception as e:
             logger.error(f"Error processing Authorization request: {e}")
             return ResponseHelper.internal_server_error(
-                message=f"Error processing Authorization request: {e}"
+                result_description=f"Error processing Authorization request: {e}"
             )
 
     @staticmethod
@@ -92,11 +92,11 @@ class AuthorizationService(BaseService):
             }
 
             return ResponseHelper.success(
-                data=response_data, message="RefreshToken processed successfully"
+                data={"data": response_data}, result_description="RefreshToken processed successfully"
             )
 
         except Exception as e:
             logger.error(f"Error processing RefreshToken request: {e}")
             return ResponseHelper.internal_server_error(
-                message=f"Error processing RefreshToken request: {e}"
+                result_description=f"Error processing RefreshToken request: {e}"
             )

app/api/services/base_service.py

@@ -3,6 +3,7 @@ from app.api.enums import TransactionType
 from flask import jsonify
 from marshmallow import ValidationError
 import logging
+from app.api.integrations import KafkaIntegration
 
 logger = logging.getLogger(__name__)
 
@@ -48,8 +49,125 @@ class BaseService:
         Create a new transaction.
         """
         return Transaction.create_transaction(
-            transaction_id =validated_data.get("transactionId"),
-            account_id=validated_data.get("accountId"),
-            type=cls.TRANSACTION_TYPE,
-            channel=validated_data.get("channel"),
+            transaction_id = validated_data.get("transactionId"),
+            customer_id =  validated_data.get('customerId', None),
+            account_id = validated_data.get("accountId", None),  
+            type = cls.TRANSACTION_TYPE,
+            channel = validated_data.get("channel"),
         )
+    
+    @classmethod
+    def async_send_to_kafka(cls, loan_data, request_id, topic):
+        KafkaIntegration.send_loan_request(loan_data = loan_data, request_id = request_id, topic = topic)
+        KafkaIntegration.flush()
+
+
+    @classmethod
+    def calculate_charges(cls, offer, amount):
+        """
+        Calculates and returns the charges for the given offer and amount.
+        
+        Args:
+            offer (Offer): The offer object that contains the charges.
+            amount (float): The requested loan amount.
+        
+        Returns:
+            dict: A dictionary containing the calculated charges.
+        """
+        if not offer or not offer.charges:
+            logger.error(f"No charges found for offer ID {offer.id}")
+            return {"error": "No charges found for the offer"}
+
+        loan_charges = offer.charges
+        tenor = offer.schedule # offer.tenor // 30 # Convert to months
+        interest =  cls.get_charge_detail(rates = offer.interest_rate, charges = loan_charges, code = "INTEREST", amount = amount)
+        management = cls.get_charge_detail(rates = offer.management_rate,  charges = loan_charges, code = "MGTFEE", amount = amount)
+        insurance = cls.get_charge_detail(rates = offer.insurance_rate, charges = loan_charges, code = "INSURANCE", amount = amount)
+        vat = cls.get_charge_detail(rates = offer.vat_rate, charges = loan_charges, code = "VAT", amount = amount, management_fee = management["fee"])
+
+        # Separate fees into upfront and postpaid
+        upfront_fees = [
+            fee["fee"]
+            for fee in [interest, management, insurance, vat]
+            if fee["due_days"] == 0
+        ]
+
+        postpaid_fees = [
+            fee["fee"]
+            for fee in [interest, management, insurance, vat]
+            if fee["due_days"] != 0
+        ]
+        vat_test  = vat["fee"]
+        logger.info(f"VAT fee ==  *************** : {vat_test}")
+
+        # Up-front payment: (only those fees due immediately i.e due_days == 0)
+        # upfront_payment = sum(upfront_fees)
+        if offer.schedule == 1:
+            upfront_payment = vat["fee"] + management["fee"] + insurance["fee"] + interest["fee"]
+            interest_amount = interest["fee"]
+            repayment_amount = amount
+        else:
+            upfront_payment = vat["fee"] + insurance["fee"]+management["fee"]
+            interest_amount = interest["fee"]*offer.schedule
+            repayment_amount = amount +  interest_amount
+
+
+        # Repayment amount: (principal + only those fees not due immediately i.e due_days != 0)
+       # repayment_amount = amount + (sum(postpaid_fees) * tenor)
+
+        # Total amount: (upfront_payment + repayment_amount)
+        total_amount = upfront_payment + repayment_amount
+
+        # Calculate the installment amount
+        installment_amount = repayment_amount / offer.schedule
+
+        return {
+            "interest": interest,
+            "interest_amount": interest_amount,
+            "management": management,
+            "insurance": insurance,
+            "vat": vat,
+            "upfront_payment": round(upfront_payment, 2),
+            "repayment_amount": round(repayment_amount, 2),
+            "installment_amount": round(installment_amount, 2),
+            "total_amount": round(total_amount, 2)
+        }
+
+    
+    @classmethod
+    def get_charge_detail(cls, rates, charges, code, amount, management_fee= 0.0):
+        """
+        Get details for a specific charge code from a list of loan charges.
+
+        Returns default values if not found.
+        """
+        fee = 0.0
+
+        if code == "VAT" and management_fee > 0:
+            fee = management_fee * rates / 100
+        else:
+            fee = amount * rates / 100
+
+        return {
+            "rate": rates,
+            "fee": round(fee, 2),
+            "due_days": 30,
+            "code": code,
+            "description" :  "have no idea how to get this yet"
+        }
+
+        # if charge.code == code:
+        #     if code == "VAT" and management_fee > 0:
+        #         fee = management_fee * rates / 100
+        #     else:
+        #         fee = amount * rates / 100
+        #
+        #     return {
+        #         "rate": rates,
+        #         "fee": round(fee, 2),
+        #         "due_days": charge.due
+        #     }
+            
+       # return {"rate": 0, "fee": 0, "due_days": 0}
+
+

app/api/services/customer_consent.py

@@ -1,10 +1,12 @@
 from flask import request, jsonify
+from app.api.helpers.response_helper import ResponseHelper
 from app.api.services.base_service import BaseService
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.api.schemas.customer_consent import CustomerConsentSchema
 from app.api.services.base_service import BaseService
-from app.api.enums import TransactionType   
+from app.api.enums import TransactionType 
+from app.extensions import db
 
 
 class CustomerConsentService(BaseService):
@@ -22,50 +24,37 @@ class CustomerConsentService(BaseService):
             dict: A standardized response.
         """
         try:
+            with db.session.begin():
+                validated_data = CustomerConsentService.validate_data(data, CustomerConsentSchema())
+                account_id = validated_data.get('accountId')
+                customer_id =  validated_data.get('customerId')
 
-            validated_data = CustomerConsentService.validate_data(data, CustomerConsentSchema())
-            account_id = validated_data.get('accountId')
-            customer_id =  validated_data.get('customerId')
+                if(CustomerConsentService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
+                    
+                    transaction = CustomerConsentService.log_transaction(validated_data = validated_data)
 
-            if(CustomerConsentService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
-                transaction = CustomerConsentService.log_transaction(validated_data = validated_data)
+                    if not transaction:
+                        logger.error(f"Failed to log transaction")
+                        return ResponseHelper.error(result_description="Failed to log transaction.")
+                else:  
+                    return ResponseHelper.error(result_description="Invalid Customer or Account")
 
-                if not transaction:
-                    logger.error(f"Failed to log transaction")
-                    return jsonify({
-                        "message": "Failed to log transaction."
-                    }), 400
-            else:  
-                return jsonify({
-                        "message": "Invalid Customer or Account"
-                    }), 400
 
-                
-            # Simulated processing logic
-            response_data = {
-                "resultCode": "00",
-                "resultDescription": "Request is received"
-            }
-
-            return response_data
-        
+                db.session.commit()
+                return ResponseHelper.success(result_description="Request is received")
+            
         except ValidationError as err:
 
             logger.error(f"Validation Error: {getattr(err, 'messages', str(err))}")
-
-            return jsonify({
-                "message": "Validation exception"
-                }) , 422
+            db.session.rollback()
+            return ResponseHelper.unprocessable_entity(result_description="Validation exception")
         
         except  ValueError as err:
             logger.error(f"{getattr(err, 'messages', str(err))}")
-
-            return jsonify({
-                "message": str(err)
-                }) , 400
+            db.session.rollback()
+            return ResponseHelper.error(result_description=str(err))
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return jsonify({
-                "message": "Internal Server Error"
-                }) , 500
+            db.session.rollback()
+            return ResponseHelper.internal_server_error()

app/api/services/eligibility_check.py

@@ -1,10 +1,18 @@
 from flask import session, jsonify
+from app.models.transaction_offers import TransactionOffer
 from app.utils.logger import logger
 from app.api.services.base_service import BaseService
 from app.api.schemas.eligibility_check import EligibilityCheckSchema
 from marshmallow import ValidationError
 from app.api.enums import TransactionType
 from app.api.integrations import SimbrellaIntegration
+from app.extensions import db
+from app.models import Offer, RACCheck
+from app.api.services.offer_analysis import OfferAnalysis
+from app.api.helpers.response_helper import ResponseHelper
+
+import random
+
 
 class EligibilityCheckService(BaseService):
     TRANSACTION_TYPE = TransactionType.ELIGIBILITY_CHECK 
@@ -21,88 +29,121 @@ class EligibilityCheckService(BaseService):
             dict: A standardized response.
         """
         try:
+            with db.session.begin():
 
-            validated_data = EligibilityCheckService.validate_data(data, EligibilityCheckSchema())
-            account_id = validated_data.get('accountId')
-            customer_id =  validated_data.get('customerId')
-            transactionId = validated_data.get('transactionId')
-            msisdn = validated_data.get('msisdn')
+                validated_data = EligibilityCheckService.validate_data(data, EligibilityCheckSchema())
+                account_id = validated_data.get('accountId')
+                customer_id =  validated_data.get('customerId')
+                transactionId = validated_data.get('transactionId')
+                msisdn = validated_data.get('msisdn')
 
-            customer = EligibilityCheckService.get_or_create_customer(validated_data = validated_data)
+                customer = EligibilityCheckService.get_or_create_customer(validated_data = validated_data)
 
-            if (EligibilityCheckService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
-                transaction = EligibilityCheckService.log_transaction(validated_data = validated_data)
+                if (EligibilityCheckService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
+                
+                    transaction = EligibilityCheckService.log_transaction(validated_data = validated_data)
 
-                if not transaction:
-                    logger.error(f"Failed to log transaction")
-                    return jsonify({
-                        "message": "Failed to log transaction."
-                    }), 400
-            else: 
-                return jsonify({
-                        "message": "Invalid Customer or Account"
-                    }), 400
-            
-             # Call RACCheck
-            response = SimbrellaIntegration.rac_check(
-                customer_id = customer_id,
-                account_id = account_id,
-                transaction_id = transaction.id,
-            )
-            logger.error(f"This is Response Returned ****** : {str(response)}")
+                    if not transaction:
+                        logger.error(f"Failed to log transaction")
+                        return ResponseHelper.error(result_description="Failed to log transaction.")
+                else:  
+                    return ResponseHelper.error(result_description="Invalid Customer or Account")
+                
+                db.session.flush()
+                
+                # Call RACCheck
+                response = SimbrellaIntegration.rac_check(
+                    customer_id = customer_id,
+                    account_id = account_id,
+                    transaction_id = transaction.transaction_id,
+                )
 
-            # this chck for error is not valid
-            logger.error(f"Check for ERROR is not valid  ****** FIX THIS !!!!!")
-            #if "error" in response or response.get("status") != 200:
-            #    return jsonify({"message": "RACCheck failed"}), 400
+                # this chck for error is not valid
+                if response.status_code != 200:
+                    return ResponseHelper.error(result_description="RACCheck failed")
+                
+                response = response.json()
+                
+                rac_check = RACCheck.add_rac_check(
+                    customer_id = customer_id,
+                    account_id = account_id,
+                    transaction_id = transaction.transaction_id,
+                    data = response['RACResponse']
+                    )
+                
+                if not rac_check:
+                        logger.error(f"Failed to save RACCheck")
+                        return ResponseHelper.error(result_description="Failed to save RACCheck.")
+# -----------------TIME FOR ANALYSIS TO REGISTER OFFER ----------------------
+                # eligible_offers = []
+                try:
+                  eligible_offers = OfferAnalysis.decide_offer(
+                        transaction_id=transactionId,
+                        rac_check=rac_check,
+                        validated_data=validated_data,
+                        customer_id=customer_id
+                    )
+                except ValueError as ve:
+                    logger.error(str(ve))
+                    return ResponseHelper.error(result_description= str(ve))
+# -----------------------------------------------------------------------
+#                 s = Offer.get_all_offers()
 
-            offers = [
-                {
-                    "offerId": "SAL90",
-                    "productId": "2030",
-                    "minAmount": 5000,
-                    "maxAmount": 100000,
-                    "tenor": 30
-                },
-                {
-                    "offerId": "SAL30",
-                    "productId": "2090",
-                    "minAmount": 3000,
-                    "maxAmount": 500000,
-                    "tenor": 90
-                }
-            ]
+                # eligible_offers = []
 
-            # Simulate processing
-            response_data = {
-                "customerId": customer_id,
-                "transactionId": transactionId,
-                "countryCode": "NG",
-                "msisdn": msisdn,
-                "eligibleOffers": offers,
-                "resultDescription": "Successful",
-                "resultCode": "00",
-                "accountId": account_id
-                }
+                # for offer in offers:
+                #     # Determine an approved amount
+                #     random_float = random.random() # temporary to play data
+                #     approved_amount = min(offer.max_amount, offer.max_amount * random_float) #temporary for now
+                #     approved_amount = round(approved_amount, 2)
+                #
+                #     transaction_offer = TransactionOffer.create_transaction_offer(
+                #         customer_id = customer.id,
+                #         transaction_id = transaction.transaction_id,
+                #         offer_id = offer.id,
+                #         min_amount = offer.min_amount,
+                #         max_amount = offer.max_amount,
+                #         eligible_amount = approved_amount,
+                #         product_id = offer.product_id,
+                #         tenor = offer.tenor
+                #     )
+                #
+                #     # Visible offer ID: offer_id + padded(transaction_offer.id)
+                #     padded_id = str(transaction_offer.id).zfill(6)
+                #     public_offer_id = f"{offer.id}{padded_id}"
+                #
+                #     eligible_offers.append({
+                #         "offerId": public_offer_id,
+                #         "product_id": offer.product_id,
+                #         "min_amount": offer.min_amount,
+                #         "max_amount": approved_amount,
+                #         "tenor": offer.tenor
+                #     })
 
-            return response_data
+                # Simulate processing
+                response_data = {
+                    "customerId": customer_id,
+                    "transactionId": transactionId,
+                    "countryCode": "NG",
+                    "msisdn": msisdn,
+                    "eligibleOffers": eligible_offers,
+                    "accountId": account_id
+                    }
+
+                return ResponseHelper.success(data=response_data)
+        
         except ValidationError as err:
 
             logger.error(f"Validation Error: {getattr(err, 'messages', str(err))}")
-
-            return jsonify({
-                "message": "Validation exception"
-                }) , 422
+            db.session.rollback()
+            return ResponseHelper.unprocessable_entity(result_description="Validation exception")
         
         except  ValueError as err:
             logger.error(f"{getattr(err, 'messages', str(err))}")
-
-            return jsonify({
-                "message": str(err)
-                }) , 400
+            db.session.rollback()
+            return ResponseHelper.error(result_description=str(err))
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return jsonify({
-                "message": "Internal Server Error"
-                }) , 500
+            db.session.rollback()
+            return ResponseHelper.internal_server_error()

app/api/services/loan_status.py

@@ -1,9 +1,13 @@
 from flask import request, jsonify
 from marshmallow import ValidationError
+from app.api.enums.loan_status import LoanStatus
+from app.models import Customer
 from app.utils.logger import logger
 from app.api.schemas.loan_status import LoanStatusSchema 
 from app.api.services.base_service import BaseService
-from app.api.enums import TransactionType     
+from app.api.enums import TransactionType   
+from app.extensions import db
+from app.api.helpers.response_helper import ResponseHelper
 
 
 class LoanStatusService(BaseService):
@@ -21,68 +25,71 @@ class LoanStatusService(BaseService):
             dict: A standardized response.
         """
         try:
-            validated_data = LoanStatusService.validate_data(data, LoanStatusSchema())
-            customer_id =  validated_data.get('customerId')
-            customer = LoanStatusService.get_or_create_customer(validated_data)
-            account = customer.accounts[0]
+            with db.session.begin():
+                # Validate data
+                validated_data = LoanStatusService.validate_data(data, LoanStatusSchema())
 
-            if (LoanStatusService.validate_account_ownership(account_id = account.id, customer_id = customer_id)):
-                transaction = LoanStatusService.log_transaction(validated_data = validated_data)
 
-                if not transaction:
-                    logger.error(f"Failed to log transaction")
-                    return jsonify({
-                        "message": "Failed to log transaction."
-                    }), 400
-            else: 
-                return jsonify({
-                        "message": "Invalid Customer or Account"
-                    }), 400
-           
+                customer_id =  validated_data.get('customerId')
+                customer = Customer.get_customer(customer_id)
+                transactionId = validated_data.get('transactionId')
+                account_id = validated_data.get('accountId')
 
-            loans = [
-                {
-                    "debtId": "123456789",
-                    "loanDate": "2019-10-18 14:26:21.063",
-                    "dueDate": "2019-11-20 14:26:21.063",
-                    "currentLoanAmount": 8500,
-                    "initialLoanAmount": 10000,
-                    "defaultPenaltyFee": 0,
-                    "continuousFee": 0,
-                    "productId": "101"
+                if(LoanStatusService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
+
+                    # Get loans
+                    loans = [loan.to_dict() for loan in customer.loans if loan.status == LoanStatus.ACTIVE]
+
+                    transaction = LoanStatusService.log_transaction(validated_data = validated_data)
+
+                    if not transaction:
+                        logger.error(f"Failed to log transaction")
+                        return ResponseHelper.error(result_description="Failed to log transaction.")
+                else:  
+                    return ResponseHelper.error(result_description="Invalid Customer or Account")
+        
+
+                # loans = [
+                #     {
+                #         "debtId": "123456789",
+                #         "loanDate": "2019-10-18 14:26:21.063",
+                #         "dueDate": "2019-11-20 14:26:21.063",
+                #         "currentLoanAmount": 8500,
+                #         "initialLoanAmount": 10000,
+                #         "defaultPenaltyFee": 0,
+                #         "continuousFee": 0,
+                #         "productId": "101"
+                #     }
+                # ]
+
+                total_debt_amount = sum(
+                    loan.get("currentLoanAmount") or 0
+                    for loan in loans
+                    )
+
+                # Simulated processing logic
+                response_data = {
+                    "customerId": customer_id,
+                    "transactionId": transactionId,
+                    "loans": loans,
+                    "totalDebtAmount": total_debt_amount,
                 }
-            ]
 
-            # Simulated processing logic
-            response_data = {
-                "customerId": "CN621868",
-                "transactionId": "Tr201712RK9232P115",
-                "loans": loans,
-                "totalDebtAmount": 8500,
-                "resultCode": "00",
-                "resultDescription": "Successful"
-            }
-
-
-            return response_data
+                db.session.commit()
+                return ResponseHelper.success(data=response_data)
 
         except ValidationError as err:
 
             logger.error(f"Validation Error: {getattr(err, 'messages', str(err))}")
-
-            return jsonify({
-                "message": "Validation exception"
-                }) , 422
+            db.session.rollback()
+            return ResponseHelper.unprocessable_entity(result_description="Validation exception")
         
         except  ValueError as err:
             logger.error(f"{getattr(err, 'messages', str(err))}")
-
-            return jsonify({
-                "message": str(err)
-                }) , 400
+            db.session.rollback()
+            return ResponseHelper.error(result_description=str(err))
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return jsonify({
-                "message": "Internal Server Error"
-                }) , 500
+            db.session.rollback()
+            return ResponseHelper.internal_server_error()

app/api/services/notification_callback.py

@@ -3,7 +3,9 @@ from marshmallow import ValidationError
 from app.api.services.base_service import BaseService
 from app.api.enums import TransactionType   
 from app.utils.logger import logger
-from app.api.schemas.notification_callback import NotificationCallbackSchema   
+from app.api.schemas.notification_callback import NotificationCallbackSchema
+from app.extensions import db
+from app.api.helpers.response_helper import ResponseHelper
 
 class NotificationCallbackService(BaseService):
     TRANSACTION_TYPE = TransactionType.NOTIFICATION_CALLBACK 
@@ -26,37 +28,20 @@ class NotificationCallbackService(BaseService):
             schema = NotificationCallbackSchema()
             validated_data = schema.load(data)  # Raises ValidationError if invalid
 
-            # Simulated processing logic
-            response_data = {
-                "resultCode": "00",
-                "resultDescription": "Successful"
-            }
-
-
-            # return ResponseHelper.success(
-            #     data=response_data,
-            #     message="Notification callback processed successfully"
-            # )
-
-            return response_data
+            return ResponseHelper.success()
 
         except ValidationError as err:
 
             logger.error(f"Validation Error: {getattr(err, 'messages', str(err))}")
-
-            return jsonify({
-                "message": "Validation exception"
-                }) , 422
+            db.session.rollback()
+            return ResponseHelper.unprocessable_entity(result_description="Validation exception")
         
         except  ValueError as err:
             logger.error(f"{getattr(err, 'messages', str(err))}")
-
-            return jsonify({
-                "message": str(err)
-                }) , 400
+            db.session.rollback()
+            return ResponseHelper.error(result_description=str(err))
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return jsonify({
-                "message": "Internal Server Error"
-                }) , 500
+            db.session.rollback()
+            return ResponseHelper.internal_server_error()

app/api/services/offer_analysis.py

@@ -0,0 +1,126 @@
+from app.models import Offer, TransactionOffer
+from app.models.loan import Loan
+import random
+import logging
+logger = logging.getLogger(__name__)
+
+class OfferAnalysis:
+
+    @staticmethod
+    def get_offer(transaction_id, rac_response, validated_data):
+        customer_id = validated_data.get("customerId")
+        product_id = validated_data.get("productId")
+        offer_id = validated_data.get("offerId")
+
+        transaction_offer_id =  int(offer_id[5:]) # The last part is int
+
+        logger.info(f"customer_id ==  *************** : {customer_id}")
+        logger.info(f"product_id  ==  *************** : {product_id}")
+        logger.info(f"offer_id    ==  *************** : {offer_id}")
+        logger.info(f"transaction_offer_id    ==  *************** : {transaction_offer_id}")
+
+        transaction_offer =  TransactionOffer.is_valid_transaction_offer(transaction_offer_id, customer_id, product_id)
+
+        if not transaction_offer:
+            raise ValueError("Invalid Transaction Offer.")
+
+        eligible_amount =  transaction_offer.eligible_amount
+        offer = Offer.is_valid_offer( transaction_offer.offer_id)
+
+        if not offer:
+            raise ValueError("Invalid Offer.")
+        original_transaction =  transaction_id
+
+        return transaction_offer, offer, eligible_amount, original_transaction
+
+    @staticmethod
+    def decide_offer(transaction_id, rac_check, validated_data, customer_id):
+        eligible_offers = []
+        # if we have active offers - we have to feed off it
+        logger.info(f"LOOOOOOOOOOOOOOOOOO** {customer_id}")
+
+        # we can now find the origin transactions
+        # Find the last loan - it will have original_transaction
+        last_customer_loan = Loan.get_customer_last_loan(customer_id)
+        # logger.info(f"{last_customer_loan}")
+
+        new_eligible_amount = 0
+
+        if last_customer_loan:
+            original_transaction = last_customer_loan.original_transaction or last_customer_loan.transaction_id
+            logger.info(f"transaction_id |-| original_transaction === > {transaction_id} {original_transaction}")
+            original_loan  = Loan.get_customer_original_loan(customer_id, original_transaction)
+            if original_loan is not None:
+                logger.info(f"original_loan === > {original_loan}")
+                logger.info(f"loan_offer_id === > {original_loan.offer_id}")
+
+                original_offer_id = str(original_loan.offer_id[:5])  # The last part is str
+                transaction_offer_id = int(original_loan.offer_id[5:])  # The last part is int
+                original_transaction_offer = TransactionOffer.is_valid_transaction_offer(transaction_offer_id, customer_id, original_loan.product_id)
+
+                active_loans = Loan.get_active_loans_by_original_transaction(original_transaction)
+                sum_active_loans = sum(loan.current_loan_amount for loan in active_loans)
+                logger.info(f"sum_active_loans === > {sum_active_loans}")
+                real_eligible_amount = original_loan.eligible_amount - sum_active_loans
+
+                transaction_offer = TransactionOffer.create_transaction_offer(
+                    customer_id=customer_id,
+                    transaction_id=transaction_id,
+                    original_transaction=original_transaction,
+                    offer_id=original_offer_id,
+                    min_amount=original_transaction_offer.min_amount,
+                    max_amount=original_transaction_offer.max_amount,
+                    eligible_amount=real_eligible_amount,
+                    product_id=original_loan.product_id,
+                    tenor=original_loan.tenor
+                )
+
+                # Visible offer ID: offer_id + padded(transaction_offer.id)
+                padded_id = str(transaction_offer.id).zfill(6)
+                public_offer_id = f"{original_offer_id}{padded_id}"
+
+                eligible_offers.append({
+                    "offerId": public_offer_id,
+                    "product_id": original_transaction_offer.product_id,
+                    "min_amount": original_transaction_offer.min_amount,
+                    "max_amount": round(real_eligible_amount, 2),
+                    "tenor": original_loan.tenor
+                })
+                return eligible_offers
+
+
+        offers = Offer.get_all_offers()
+
+
+        for offer in offers:
+            # Get approved amount
+            random_float = random.random()  # temporary to play data
+
+            approved_amount = new_eligible_amount if new_eligible_amount > 0 else min(offer.max_amount, offer.max_amount * random_float) 
+            approved_amount = round(approved_amount, 2)
+
+            transaction_offer = TransactionOffer.create_transaction_offer(
+                customer_id=customer_id,
+                transaction_id=transaction_id,
+                original_transaction=transaction_id,
+                offer_id=offer.id,
+                min_amount=offer.min_amount,
+                max_amount=offer.max_amount,
+                eligible_amount=approved_amount,
+                product_id=offer.product_id,
+                tenor=offer.tenor
+            )
+
+            # Visible offer ID: offer_id + padded(transaction_offer.id)
+            padded_id = str(transaction_offer.id).zfill(6)
+            public_offer_id = f"{offer.id}{padded_id}"
+
+            eligible_offers.append({
+                "offerId": public_offer_id,
+                "product_id": offer.product_id,
+                "min_amount": offer.min_amount,
+                "max_amount": approved_amount,
+                "tenor": offer.tenor
+            })
+
+        return eligible_offers

app/api/services/provide_loan.py

@@ -3,12 +3,19 @@ from marshmallow import ValidationError
 from app.api.integrations.kafka import KafkaIntegration
 from app.api.services.base_service import BaseService
 from app.api.enums import TransactionType   
+from app.models.customer import Customer
+from app.models.loan_charge import LoanCharge
 from app.utils.logger import logger
 from app.api.schemas.provide_loan import ProvideLoanSchema
-from app.api.integrations import KafkaIntegration
 from threading import Thread
-from app.models.loan import Loan
-
+from app.models import Loan, Offer, Charge , TransactionOffer, RACCheck
+from app.api.enums import LoanStatus
+from app.extensions import db
+from datetime import datetime, timezone
+from dateutil.relativedelta import relativedelta
+from app.models import LoanRepaymentSchedule 
+from app.api.services.offer_analysis import OfferAnalysis
+from app.api.helpers.response_helper import ResponseHelper
 
 class ProvideLoanService(BaseService):
     TRANSACTION_TYPE = TransactionType.PROVIDE_LOAN 
@@ -26,87 +33,153 @@ class ProvideLoanService(BaseService):
             dict: A standardized response.
         """
         try:
-            validated_data = ProvideLoanService.validate_data(data, ProvideLoanSchema())
-            account_id = validated_data.get('accountId')
-            customer_id =  validated_data.get('customerId')
-            request_id =  validated_data.get('requestId')
-            transaction_id = validated_data.get('transactionId')
+            with db.session.begin():
+                validated_data = ProvideLoanService.validate_data(data, ProvideLoanSchema())
+                account_id = validated_data.get('accountId')
+                customer_id =  validated_data.get('customerId')
+                request_id =  validated_data.get('requestId')
+                collection_type =  validated_data.get('collectionType')
+                transaction_id = validated_data.get('transactionId')
+                offer_id = validated_data.get('offerId')
+                amount = validated_data.get("requestedAmount")
+                product_id = validated_data.get("productId")
+                channel = validated_data.get('channel')
 
-            if (ProvideLoanService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
+                customer = Customer.is_valid_customer(customer_id)
 
-                transaction = ProvideLoanService.log_transaction(validated_data = validated_data)
+                if (ProvideLoanService.validate_account_ownership(account_id = account_id, customer_id = customer_id)): 
 
-                if not transaction:
-                    logger.error(f"Failed to log transaction")
-                    return jsonify({
-                        "message": "Failed to log transaction."
-                    }), 400
+                    rac_response = RACCheck.get_rac_check(customer_id = customer_id, account_id = account_id)
 
-                # Save the loan details
-                loan_id = f"loan_{transaction_id}"
-                
-                loan = Loan.create_loan(
-                    customer_id=customer_id,
-                    account_id=account_id,
-                    offer_id=validated_data.get('offerId'),
-                    principal_amount=validated_data.get('requestedAmount'),
-                    status="active"
-                )
+                    try:
+                      transaction_offer, offer, eligible_amount, original_transaction = OfferAnalysis.get_offer(
+                            transaction_id=transaction_id,
+                            rac_response=rac_response,  
+                            validated_data=validated_data
+                        )
+                    except ValueError as ve:
+                        logger.error(str(ve))
+                        return ResponseHelper.error(result_description=str(ve))
+                    
+                    # transaction_offer_id =  int(offer_id[5:]) # The last part is int
 
-                if not loan:
-                    logger.error(f"Failed to save loan details")
-                    return jsonify({
-                        "message": "Failed to save loan details."
-                    }), 400
+                    # transaction_offer =  TransactionOffer.is_valid_transaction_offer(transaction_offer_id)
+                    
+                    # if not transaction_offer:
+                    #     logger.error(f"Invalid Transaction Offer")
+                    #     return jsonify({
+                    #         "message": "Invalid Transaction Offer."
+                    #     }), 400
+
+                    # eligible_amount =  transaction_offer.eligible_amount
+                    # offer = Offer.is_valid_offer( transaction_offer.offer_id)
+
+                    # if not offer:
+                    #     logger.error(f"Invalid Offer")
+                    #     return jsonify({
+                    #         "message": "Invalid Offer."
+                    #     }), 400
+                    
+                    
+                    # Log Transaction
+                    transaction = ProvideLoanService.log_transaction(validated_data=validated_data)
+
+                    if not transaction:
+                        logger.error(f"Failed to log transaction")
+                        return ResponseHelper.error(result_description="Failed to log transaction.")
+                    
+
+                    db.session.flush()
+
+                    charges = ProvideLoanService.calculate_charges(offer, amount)
+                    upfront_fee = charges["upfront_payment"]
+                    repayment_amount = charges["repayment_amount"]
+                    #installment_amount = charges["installment_amount"]
+                    num_schedules = offer.schedule
+
+                    upfront_payment = charges["upfront_payment"]
+                    total_amount = charges["total_amount"]
+                    installment_amount = charges["installment_amount"]
+                    interest = charges["interest"]
+                    management = charges["management"]
+                    insurance = charges["insurance"]
+                    vat = charges["vat"]
+                    
+
+                    # Save the loan details
+                    loan = Loan.create_loan(
+                        customer_id = customer_id,
+                        account_id = account_id,
+                        offer_id = offer_id,
+                        product_id = offer.product_id,
+                        collection_type = collection_type,
+                        transaction_id = validated_data.get('transactionId'),
+                        original_transaction = transaction_offer.original_transaction,
+                        initial_loan_amount = validated_data.get('requestedAmount'),
+                        upfront_fee = upfront_fee,
+                        repayment_amount = repayment_amount,
+                        installment_amount = installment_amount,
+                        eligible_amount=eligible_amount,
+                        status = LoanStatus.ACTIVE,
+                        tenor = offer.tenor,
+                    )
+
+                    if not loan:
+                        logger.error(f"Failed to save loan details")
+                        
+                        return ResponseHelper.error(result_description="Failed to save loan details.")
+
+                    db.session.flush()
+                    current_product_id = offer.product_id
+                    schedule = LoanRepaymentSchedule.add_repayment_schedule(loan = loan, num_schedules = num_schedules, transaction_id = transaction_id)
+
+
+                    if not schedule:
+                        logger.error(f"Failed to create repayment schedule for loan ID {loan.id}")
+                        return ResponseHelper.error(result_description="Failed to generate loan repayment schedule.")
+
+                    # charges = Charge.get_offer_charges(offer.id)
+
+                    # logger.info(f"{charges}")
+                    
+                    loan_id = loan.id
+
+                    loan_charges = LoanCharge.create_charges_for_loan(loan_id = loan_id, transaction_id = transaction_id, referenced_amount = 800, charges = charges)
+
+
+                    
+                else: 
+                    return ResponseHelper.error(result_description="Invalid Customer or Account")
             
-                
-            else: 
-                return jsonify({
-                        "message": "Invalid Customer or Account"
-                    }), 400
-           
-           
-            response_data = {
-                "requestId": request_id,
-                "transactionId": transaction_id,
-                "customerId": customer_id,
-                "accountId": account_id,
-                "msisdn": "3451342",
-                "resultCode": "00",
-                "resultDescription": "Successful"
-                }
+            
+                response_data = {
+                    "requestId": request_id,
+                    "transactionId": transaction_id,
+                    "customerId": customer_id,
+                    "accountId": account_id,
+                    "msisdn": customer.msisdn
+                    }
 
+                # KafkaIntegration.send_loan_request(loan_data = response_data, request_id = request_id)
+                # Call Kafka in a background thread
+                thread = Thread(target=ProvideLoanService.async_send_to_kafka, args=(response_data, request_id, "PROCESS_PAYMENT"))
+                thread.start()
 
-            # KafkaIntegration.send_loan_request(loan_data = response_data, request_id = request_id)
-            # Call Kafka in a background thread
-            thread = Thread(target=ProvideLoanService.async_send_to_kafka, args=(response_data, request_id))
-            thread.start()
-
-            return response_data
+                db.session.commit()
+                return ResponseHelper.success(data=response_data)
 
         except ValidationError as err:
 
             logger.error(f"Validation Error: {getattr(err, 'messages', str(err))}")
-
-            return jsonify({
-                "message": "Validation exception"
-                }) , 422
+            db.session.rollback()
+            return ResponseHelper.unprocessable_entity(result_description="Validation exception")
         
         except  ValueError as err:
             logger.error(f"{getattr(err, 'messages', str(err))}")
-
-            return jsonify({
-                "message": str(err)
-                }) , 400
+            db.session.rollback()
+            return ResponseHelper.error(result_description=str(err))
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return jsonify({
-                "message": "Internal Server Error"
-                }) , 500
-        
-    
-    def async_send_to_kafka(loan_data, request_id):
-        KafkaIntegration.send_loan_request(loan_data = loan_data, request_id = request_id)
-        KafkaIntegration.flush()
-
+            db.session.rollback()
+            return ResponseHelper.internal_server_error()

app/api/services/repayment.py

@@ -1,9 +1,16 @@
 from flask import request, jsonify
 from marshmallow import ValidationError
+from app.api.enums.loan_status import LoanStatus
+from app.api.helpers.response_helper import ResponseHelper
+from app.models import Repayment
+from app.models.customer import Customer
+from app.models.loan import Loan
 from app.utils.logger import logger
 from app.api.schemas.repayment import RepaymentSchema
 from app.api.services.base_service import BaseService
-from app.api.enums import TransactionType      
+from app.api.enums import TransactionType 
+from threading import Thread
+from app.extensions import db
 
 class RepaymentService(BaseService):
     TRANSACTION_TYPE = TransactionType.REPAYMENT 
@@ -20,59 +27,72 @@ class RepaymentService(BaseService):
             dict: A standardized response.
         """
         try:
-            validated_data = RepaymentService.validate_data(data, RepaymentSchema())
-            customer_id =  validated_data.get('customerId')
-            customer = RepaymentService.get_or_create_customer(validated_data)
-            account = customer.accounts[0]
-            validated_data['accountId'] = account.id
+            with db.session.begin():
+                validated_data = RepaymentService.validate_data(data, RepaymentSchema())
+                customer_id =  validated_data.get('customerId')
+                request_id =  validated_data.get('requestId')
+                loan_id = validated_data.get('debtId')
+                product_id = validated_data.get('productId')
+                account_id = validated_data.get('accountId')
+                customer = Customer.get_customer(customer_id)
+                transaction_id  = validated_data.get('transactionId')
+        
+                if(RepaymentService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
+
+                    # Save the repayment details  
+                    repayment = Repayment.create_repayment(
+                        customer_id = customer_id,
+                        loan_id = loan_id,
+                        product_id = product_id,
+                        transaction_id=transaction_id
+
+                    )
+
+                    if not repayment:
+                        logger.error(f"Failed to save repayment details")
+                        return ResponseHelper.error(result_description="Failed to save repayment details.")
+                
+                    
+                    #Update Loan status
+                    Loan.update_status(loan_id = loan_id, status = LoanStatus.REPAID)
+                    
+                    transaction = RepaymentService.log_transaction(validated_data = validated_data)
+
+                    if not transaction:
+                        logger.error(f"Failed to log transaction")
+                        return ResponseHelper.error(result_description="Failed to log transaction.") 
+                else: 
+                    return ResponseHelper.error(result_description="Invalid Customer or Account")
+        
 
 
-            if (RepaymentService.validate_account_ownership(account_id = account.id, customer_id = customer_id)):
-                transaction = RepaymentService.log_transaction(validated_data = validated_data)
+                # Simulated processing logic
+                response_data = {
+                    "transactionId": transaction_id,
+                    "customerId": customer_id,
+                    "productId": product_id,
+                    "debtId": loan_id
+                }
 
-                if not transaction:
-                    logger.error(f"Failed to log transaction")
-                    return jsonify({
-                        "message": "Failed to log transaction."
-                    }), 400
-            else: 
-                return jsonify({
-                        "message": "Invalid Customer or Account"
-                    }), 400
+                # Call Kafka in a background thread
+                thread = Thread(target=RepaymentService.async_send_to_kafka, args=(response_data, request_id, "LOAN_REPAYMENT"))
+                thread.start()
 
-            # Simulated processing logic
-            response_data = {
-                "customerId": "CN621868",
-                "productId": "101",
-                "debtId": "273194670",
-                "resultCode": "00",
-                "resultDescription": "Successful"
-            }
-
-            # return ResponseHelper.success(
-            #     data=response_data,
-            #     message="Repayment processed successfully"
-            # )
-
-            return response_data
+                db.session.commit()
+                return ResponseHelper.success(data=response_data)
 
         except ValidationError as err:
 
             logger.error(f"Validation Error: {getattr(err, 'messages', str(err))}")
-
-            return jsonify({
-                "message": "Validation exception"
-                }) , 422
+            db.session.rollback()
+            return ResponseHelper.unprocessable_entity(result_description="Validation exception")
         
         except  ValueError as err:
             logger.error(f"{getattr(err, 'messages', str(err))}")
-
-            return jsonify({
-                "message": str(err)
-                }) , 400
+            db.session.rollback()
+            return ResponseHelper.error(result_description=str(err))
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return jsonify({
-                "message": "Internal Server Error"
-                }) , 500
+            db.session.rollback()
+            return ResponseHelper.internal_server_error()

app/api/services/select_offer.py

@@ -1,12 +1,17 @@
 from flask import request, jsonify
 from marshmallow import ValidationError
+from app.api.helpers.response_helper import ResponseHelper
 from app.api.services.base_service import BaseService
-from app.api.enums import TransactionType   
+from app.api.enums import TransactionType
 from app.utils.logger import logger
 from app.api.schemas.select_offer import SelectOfferSchema
+from app.extensions import db
+from app.models import Offer
+from datetime import date
+from dateutil.relativedelta import relativedelta
 
 class SelectOfferService(BaseService):
-    TRANSACTION_TYPE = TransactionType.SELECT_OFFER 
+    TRANSACTION_TYPE = TransactionType.SELECT_OFFER
 
     @staticmethod
     def process_request(data):
@@ -20,74 +25,128 @@ class SelectOfferService(BaseService):
             dict: A standardized response.
         """
         try:
-            validated_data = SelectOfferService.validate_data(data, SelectOfferSchema())
-            account_id = validated_data.get('accountId')
-            customer_id =  validated_data.get('customerId')
+            with db.session.begin():
+                validated_data = SelectOfferService.validate_data(
+                    data, SelectOfferSchema()
+                )
+                account_id = validated_data.get("accountId")
+                customer_id = validated_data.get("customerId")
+                amount = validated_data.get("requestedAmount")
+                product_id = validated_data.get("productId")
+                transaction_offer_id = validated_data.get("offerId")
+                transaction_id = validated_data.get("transactionId")
+                request_id = validated_data.get("requestId")
 
-            if (SelectOfferService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
-                transaction = SelectOfferService.log_transaction(validated_data = validated_data)
+                offer_id = int(transaction_offer_id[5:])  # The last part is int
 
-                if not transaction:
-                    logger.error(f"Failed to log transaction")
-                    return jsonify({
-                        "message": "Failed to log transaction."
-                    }), 400
-            else: 
-                return jsonify({
-                        "message": "Invalid Customer or Account"
-                    }), 400
-         
-            offers = [
+                #"offerId": "SAL30001129",
+
+                if SelectOfferService.validate_account_ownership(
+                    account_id=account_id, customer_id=customer_id
+                ):
+                    transaction = SelectOfferService.log_transaction(
+                        validated_data=validated_data
+                    )
+
+                    if not transaction:
+                        logger.error(f"Failed to log transaction")
+                        return ResponseHelper.error(result_description="Failed to log transaction.")
+                else:  
+                    return ResponseHelper.error(result_description="Invalid Customer or Account")
+
+                # Get the offer by product ID
+                offer = Offer.get_offer_by_product_id(product_id)
+
+                db.session.flush()
+
+                charges = SelectOfferService.calculate_charges(offer, amount)
+                upfront_payment = charges["upfront_payment"]
+                total_amount = charges["total_amount"]
+                installment_amount = charges["installment_amount"]
+                interest = charges["interest"]
+                management = charges["management"]
+                insurance = charges["insurance"]
+                vat = charges["vat"]
+                repayment_amount = charges["repayment_amount"]
+                interest_amount = charges["interest_amount"]
+
+
+                # Calculate the repayment dates
+                tenor = offer.tenor
+                start_date = date.today()
+
+                # Convert tenor to months
+                months = offer.schedule # tenor  // 30
+
+                recommended_repayment_dates = [
+                    (start_date + relativedelta(months=i + 1)).isoformat()
+                    for i in range(months)
+                ]
+
+            
+
+                offers = [
                     {
-                    "offerId": "14451",
-                    "productId": "2030",
-                    "amount": 10000.0,
-                    "upfrontPayment": 1000.0,
-                    "interestRate": 3.0,
-                    "managementRate": 1.0,
-                    "managementFee": 1.0,
-                    "insuranceRate": 1.0,
-                    "insuranceFee": 100.0,
-                    "VATRate": 7.5,
-                    "VATAmount": 100.0,
-                    "recommendedRepaymentDates": ["2022-11-30"],
-                    "installmentAmount": 11000.0,
-                    "totalRepaymentAmount": 11000.0
+                        "offerId": transaction_offer_id,
+                        "productId": product_id,
+                        "amount": amount,
+                        "upfrontPayment": upfront_payment,
+                        "interestRate": offer.interest_rate,
+                        "interestFee": interest_amount,
+                        "managementRate": offer.management_rate,
+                        "managementFee": management["fee"],
+                        "insuranceRate": offer.insurance_rate,
+                        "insuranceFee": insurance["fee"],
+                        "VATRate": offer.vat_rate,
+                        "VATAmount": vat["fee"],
+                        "recommendedRepaymentDates": recommended_repayment_dates,
+                        "repaymentAmount": repayment_amount,
+                        "installmentAmount": installment_amount,
+                        "totalRepaymentAmount": total_amount,
                     }
                 ]
 
-            # Business logic - selecting an offer
-            response_data = {
-                "outstandingDebtAmount": 0,
-                "requestId": "202111170001371256908",
-                "transactionId": transaction.id,
-                "customerId": customer_id,
-                "accountId": account_id,
-                "loan": offers,
-                "resultCode": "00",
-                "resultDescription": "Successful"
+                # "offerId": offer.id,
+                # "productId": product_id,
+                # "amount": amount,
+                # "upfrontPayment": upfront_payment,
+                # "interestRate": interest["rate"],
+                # "managementRate": management["rate"],
+                # "managementFee": management["fee"],
+                # "insuranceRate": insurance["rate"],
+                # "insuranceFee": insurance["fee"],
+                # "VATRate": vat["rate"],
+                # "VATAmount": vat["fee"],
+                # "recommendedRepaymentDates": recommended_repayment_dates,
+                # "installmentAmount": installment_amount,
+                # "totalRepaymentAmount": total_amount,
+                #
+                # Business logic - selecting an offer
+                response_data = {
+                    "outstandingDebtAmount": 0,
+                    "requestId": request_id,
+                    "transactionId": transaction_id,
+                    "customerId": customer_id,
+                    "accountId": account_id,
+                    "loan": offers,
                 }
 
-
-            return response_data
+                db.session.commit()
+                return ResponseHelper.success(data=response_data)
 
         except ValidationError as err:
 
             logger.error(f"Validation Error: {getattr(err, 'messages', str(err))}")
-
-            return jsonify({
-                "message": "Validation exception"
-                }) , 422
+            db.session.rollback()
+            return ResponseHelper.unprocessable_entity(result_description="Validation exception")
         
         except  ValueError as err:
             logger.error(f"{getattr(err, 'messages', str(err))}")
-
-            return jsonify({
-                "message": str(err)
-                }) , 400
+            db.session.rollback()
+            return ResponseHelper.error(result_description=str(err))
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return jsonify({
-                "message": "Internal Server Error"
-                }) , 500
+            db.session.rollback()
+            return ResponseHelper.internal_server_error()
+        

app/config.py

@@ -31,8 +31,8 @@ class Config:
         "JWT_REFRESH_TOKEN_EXPIRES", timedelta(days=30)
     )
 
-    KAFKA_BROKER = 'dev-events.simbrellang.net:9085'
-    KAFKA_PAYMENT_TOPIC = 'PROCESS_PAYMENT'
+    # KAFKA_BROKER = 'dev-events.simbrellang.net:9085'
+    KAFKA_BROKER = os.getenv("KAFKA_BROKER", "dev-events.simbrellang.net:9085")
 
 
 settings = Config()

app/errors/handlers.py

@@ -5,20 +5,20 @@ from app.api.helpers.response_helper import ResponseHelper
 def register_error_handlers(app):
     @app.errorhandler(HTTPException)
     def handle_http_exception(e):
-        return jsonify({'error': e.description}), e.code
+        return ResponseHelper.error(result_description=e.description, result_code=e.code )
     
     @app.errorhandler(405)
     def method_not_allowed(error):
-        return jsonify({"message": "Method Not Allowed"}), 405
+        return ResponseHelper.method_not_allowed()
 
     @app.errorhandler(404)
     def not_found(error):
-        return jsonify({"message": "Resource not found"}), 404
+        return ResponseHelper.not_found()
 
     @app.errorhandler(400)
     def bad_request(error):
-        return jsonify({"message": "Bad Request"}), 400
+        return ResponseHelper.bad_request()
 
     @app.errorhandler(415)
     def unsupported_media_type(error):
-        return jsonify({"message": "Unsupported Media Type"}), 415
+        return ResponseHelper.error(result_description="Unsupported Media Type", result_code="415")

app/models/__init__.py

@@ -2,5 +2,13 @@ from .customer import Customer
 from .account import Account
 from .loan import Loan
 from .transaction import Transaction
+from .repayment import Repayment
+from .loan_charge import LoanCharge
+from .offer import Offer
+from .charge import Charge
+from .rac_checks import RACCheck
+from .loan_repayment_schedule import LoanRepaymentSchedule
+from .transaction_offers import TransactionOffer
 
-__all__ = ['Customer', 'Account', 'Loan', 'Transaction']
+
+__all__ = ['Customer', 'Account', 'Loan', 'Transaction', 'Repayment', 'LoanCharge', 'Offer', 'Charge', 'RACCheck', 'LoanRepaymentSchedule', 'TransactionOffer']

app/models/account.py

@@ -1,6 +1,8 @@
 from datetime import datetime, timezone
 from sqlalchemy.orm import relationship
 from app.extensions import db
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.sql import func
 
 class Account(db.Model):
     __tablename__ = 'accounts'
@@ -10,8 +12,8 @@ class Account(db.Model):
     account_type = db.Column(db.String(50))
     status = db.Column(db.String(20), default='active')
     lien_amount = db.Column(db.Float, default=0.0)
-    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))
+    created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
+    updated_at = db.Column(db.DateTime(timezone=True), onupdate=func.now())
 
     customer = relationship(
         "Customer",
@@ -27,8 +29,11 @@ class Account(db.Model):
             customer_id=customer_id,
             account_type=account_type
         )
-        db.session.add(account)
-        db.session.commit()
+
+        try:
+            db.session.add(account)
+        except IntegrityError as err:
+            raise ValueError(f"Database integrity error: {err}")
         return account
 
     @classmethod
@@ -38,7 +43,7 @@ class Account(db.Model):
             return False
         if account.lien_amount > 0:
             return False
-        return True
+        return account
 
     def __repr__(self):
         return f'<Account {self.id}>'

app/models/charge.py

@@ -0,0 +1,95 @@
+from datetime import datetime, timezone, timedelta
+from app.extensions import db
+from sqlalchemy.orm import relationship
+from sqlalchemy.sql import func
+
+
+class Charge(db.Model):
+    __tablename__ = 'charges'
+
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    offer_id = db.Column(db.String(50), nullable=False)
+    code = db.Column(db.String(50), nullable=False)
+    percent = db.Column(db.Float, default=0.0)
+    description = db.Column(db.Text, nullable=True)
+    due = db.Column(db.Integer, nullable=False)
+    created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
+    updated_at = db.Column(db.DateTime(timezone=True), onupdate=func.now())
+    offer = relationship(
+        "Offer",
+        primaryjoin="Charge.offer_id == Offer.id",
+        foreign_keys=[offer_id],
+        back_populates="charges",
+    )
+
+    @classmethod
+    def add_charges(cls, offer_id, charges):
+        """
+        Add charges to an offer.
+
+        Args:
+            offer_id (int): ID of the offer to associate charges with.
+            charges (list): A list of dictionaries with keys:
+            code (str), amount (float), percent (float), description (str), due (int)
+        """
+        if not charges or not isinstance(charges, list):
+            raise ValueError("Charges must be a non-empty list of dictionaries")
+
+        if offer_id is None:
+            raise ValueError("offer_id cannot be None")
+
+        offer_charges = []
+       
+
+        for charge in charges:
+            code = charge.get("code")
+            percent = charge.get("percent", 0.0)
+            description = charge.get("description", "")
+            due_days = charge.get("due", 0)
+
+            existing = cls.query.filter_by(offer_id=offer_id, code=code).first()
+
+            if existing:
+                continue
+
+            charge_obj = cls(
+                offer_id = offer_id,
+                code = code,
+                percent = percent,
+                description = description,
+                due = due_days
+            )
+
+            db.session.add(charge_obj)
+            offer_charges.append(charge_obj)
+
+        return offer_charges
+    
+    @classmethod
+    def get_offer_charges(cls, offer_id):
+        """
+        Get all charges for a particular offer as a dictionary
+
+        Args:
+            offer_id (str): The offer ID.
+        """
+        if not offer_id:
+            raise ValueError("offer_id not found")
+
+        charges = cls.query.filter_by(offer_id=offer_id).all()
+        
+        return charges
+
+
+    def to_dict(self):
+        return {
+            'id': self.id,
+            'offerId': self.offer_id,
+            'code': self.code,
+            'percent': self.percent,
+            'description': self.description,
+            'due': self.due
+        }
+
+    def __repr__(self):
+        return f"<Charge {self.id} - Offer {self.offer_id} - {self.code}>"

app/models/customer.py

@@ -2,6 +2,8 @@ from datetime import datetime, timezone
 from sqlalchemy.orm import relationship
 from app.extensions import db
 from app.models.account import Account
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.sql import func
 
 class Customer(db.Model):
     __tablename__ = 'customers'
@@ -9,9 +11,8 @@ class Customer(db.Model):
     id = db.Column(db.String(50), primary_key=True) 
     msisdn = db.Column(db.String(20), unique=True, nullable=False)
     country_code = db.Column(db.String(3), nullable=False)
-    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))
-
+    created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
+    updated_at = db.Column(db.DateTime(timezone=True), onupdate=func.now())
     accounts = relationship(
         "Account",
         primaryjoin="Customer.id == Account.customer_id",
@@ -19,12 +20,26 @@ class Customer(db.Model):
         back_populates="customer",
     )
 
+    loans = relationship(
+        "Loan",
+        primaryjoin="Customer.id == Loan.customer_id",
+        foreign_keys="Loan.customer_id", 
+        back_populates="customer",
+    )
+
+    transaction_offers = relationship(
+        "TransactionOffer",
+        primaryjoin="Customer.id == TransactionOffer.customer_id",
+        foreign_keys="TransactionOffer.customer_id",
+        back_populates="customer",
+    )
+
     @classmethod
     def is_valid_customer(cls, customer_id):
         customer = cls.query.filter_by(id=customer_id).first()
         if not customer:
             return False
-        return True
+        return customer
 
     @classmethod
     def create_customer(cls, id, msisdn, country_code, account_id, account_type='savings'):
@@ -33,16 +48,29 @@ class Customer(db.Model):
         
         # Create the customer
         customer = cls(id=id, msisdn=msisdn, country_code=country_code)
-        db.session.add(customer)
-        
-        # Create an associated account
-        account = Account.create_account(
-            id=account_id,
-            customer_id=id,
-            account_type=account_type
-        )
-        
-        db.session.commit()
+        try: 
+            db.session.add(customer)
+            
+            # Create an associated account
+            account = Account.create_account(
+                id=account_id,
+                customer_id=id,
+                account_type=account_type
+            )
+            
+        except IntegrityError as err:
+            raise ValueError(f"Database integrity error: {err}")
+        return customer
+    
+    @classmethod
+    def get_customer(cls, customer_id):
+        """
+        Get customer by  ID.
+        """
+        customer = cls.query.filter_by(id=customer_id).first()
+
+        if not customer:
+            raise ValueError(f"Customer does not exist")        
         return customer
 
     def __repr__(self):

app/models/loan.py

@@ -2,6 +2,15 @@ from datetime import datetime, timezone
 from app.extensions import db
 from app.models.customer import Customer
 from app.models.account import Account
+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_
+from sqlalchemy.sql import func
+
+logger = logging.getLogger(__name__)
 
 
 class Loan(db.Model):
@@ -13,42 +22,102 @@ class Loan(db.Model):
         autoincrement=True,
     )
     customer_id = db.Column(db.String(50), nullable=False)
+    transaction_id = db.Column(db.String(50), nullable=True)
+    original_transaction = db.Column(db.String(50), nullable=True)
     account_id = db.Column(db.String(50), nullable=False)
     offer_id = db.Column(db.String(20), nullable=False)
-    principal_amount = db.Column(db.Float, nullable=False)
+    product_id = db.Column(db.String(20), nullable=True)
+    collection_type = db.Column(db.String(20), nullable=True) 
+    current_loan_amount = db.Column(db.Float, nullable=True)  
+    initial_loan_amount = db.Column(db.Float, nullable=False) 
+    default_penalty_fee = db.Column(db.Float, default=0)  
+    continuous_fee = db.Column(db.Float, default=0)
+    upfront_fee = db.Column(db.Float, nullable=True, default=0.0)
+    repayment_amount = db.Column(db.Float, nullable=True, default=0.0)
+    installment_amount = db.Column(db.Float, nullable=True, default=0.0)
     status = db.Column(db.String(20), default='pending')
-    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))
+    tenor = db.Column(db.Integer, nullable=True)
+    due_date = db.Column(db.DateTime, nullable=True) 
+    created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
+    updated_at = db.Column(db.DateTime(timezone=True), onupdate=func.now())
+    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",
+        primaryjoin="Customer.id == Loan.customer_id",
+        foreign_keys=[customer_id],
+        back_populates="loans",
+    )
+
+    loan_charges = relationship(
+        "LoanCharge",
+        primaryjoin="LoanCharge.loan_id == Loan.id",
+        foreign_keys="LoanCharge.loan_id",
+        back_populates="loan",
+    )
+
+    loan_repayment_schedules = relationship(
+        "LoanRepaymentSchedule",
+        primaryjoin="LoanRepaymentSchedule.loan_id == Loan.id",
+        foreign_keys="LoanRepaymentSchedule.loan_id",
+        back_populates="loan",
+    )
 
 
     @classmethod
-    def create_loan(cls, customer_id, account_id, offer_id, principal_amount, status='pending'):
-
+    def create_loan(
+        cls,
+        customer_id,
+        account_id,
+        offer_id,
+        product_id,
+        initial_loan_amount,
+        collection_type,
+        transaction_id,
+        original_transaction,
+        upfront_fee,
+        repayment_amount,
+        installment_amount,
+        tenor,
+        eligible_amount,
+        status = "pending",
+    ):
         # Check if customer exists
-        is_valid = Customer.is_valid_customer(customer_id)
-        if not is_valid:
+        customer = Customer.is_valid_customer(customer_id)
+        if not customer:
             raise ValueError("Customer does not exist")
-        
-        # # Check for active loans
-        # has_active_loans = cls.has_active_loans(customer_id)
-        # if has_active_loans:
-        #     raise ValueError("Customer has active loans")
 
+        now = datetime.now(timezone.utc)
+        due_date = now + timedelta(days=tenor)
 
         # Create and save the loan
         loan = cls(
-            customer_id=customer_id,
-            account_id=account_id,
-            offer_id=offer_id,
-            principal_amount=principal_amount,
-            status=status
+            customer_id = customer_id,
+            account_id = account_id,
+            offer_id = offer_id,
+            product_id = product_id,
+            collection_type = collection_type,
+            transaction_id = transaction_id,
+            original_transaction = original_transaction,
+            initial_loan_amount = initial_loan_amount,
+            current_loan_amount = initial_loan_amount,
+            upfront_fee = upfront_fee,
+            repayment_amount = repayment_amount,
+            installment_amount = installment_amount,
+            due_date=due_date,
+            tenor = tenor,
+            status = status,
+            eligible_amount =eligible_amount
         )
-
-        db.session.add(loan)
-        db.session.commit()
+        
+        try:
+            db.session.add(loan)
+        except IntegrityError as err:
+            raise ValueError(f"Database integrity error: {err}")
         return loan
 
-
     @classmethod
     def has_active_loans(cls, customer_id):
         active_loans = cls.query.filter_by(
@@ -60,6 +129,100 @@ class Loan(db.Model):
             return False
         return True
     
+
+    @classmethod
+    def get_customer_loan(cls, loan_id, customer_id):
+        """
+        Get customer's active loans by loan_id.
+        """
+        loan = cls.query.filter_by(id = loan_id, customer_id = customer_id).first()
+        if not loan:
+            raise ValueError(f"Loan with ID {loan_id} does not exist or does not belong to customer {customer_id}.")        
+        return loan
+
+    @classmethod
+    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.
+        """
+        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:
+            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):
+        """
+        Update the status 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.")
+        
+        if loan.status == status:
+            return
+        
+        # Update loan status and the updated_at timestamp
+        loan.status = status
+
+    def to_dict(self):
+        """
+        Convert the Loan object to a dictionary format for JSON serialization.
+        """
+        return {
+            'debtId': self.id,
+            'initialLoanAmount': self.initial_loan_amount,
+            'currentLoanAmount': self.current_loan_amount,
+            'defaultPenaltyFee': self.default_penalty_fee,
+            'continuousFee': self.continuous_fee,
+            'collectionType': self.collection_type,
+            'upfrontFee': self.upfront_fee,
+            'repaymentAmount': self.repayment_amount,
+            'installmentAmount': self.installment_amount,
+            'status': self.status,
+            'dueDate': self.due_date.isoformat() if self.due_date else None,
+            'loanDate': self.created_at.isoformat() if self.created_at else None,
+        }
     
     def __repr__(self):
         return f'<Loan {self.id}>'

app/models/loan_charge.py

@@ -0,0 +1,89 @@
+from datetime import datetime, timezone, timedelta
+from app.extensions import db
+from sqlalchemy.orm import relationship
+from app.utils.logger import logger
+from sqlalchemy.sql import func
+
+
+class LoanCharge(db.Model):
+    __tablename__ = 'loan_charges'
+
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    loan_id = db.Column(db.Integer, nullable=False)
+    transaction_id = db.Column(db.String(50), nullable=True)
+    code = db.Column(db.String(50), nullable=False) 
+    amount = db.Column(db.Float, default=0.0)
+    percent = db.Column(db.Float, default=0.0)
+    description = db.Column(db.Text, nullable=True)
+    due = db.Column(db.Integer, nullable=False)
+    due_date = db.Column(db.DateTime, nullable=True)
+    created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
+    updated_at = db.Column(db.DateTime(timezone=True), onupdate=func.now())
+    loan = relationship(
+        "Loan",
+        primaryjoin="LoanCharge.loan_id == Loan.id",
+        foreign_keys=[loan_id],
+        back_populates="loan_charges",
+    )
+
+    @classmethod
+    def create_charges_for_loan(cls, loan_id, transaction_id, charges, referenced_amount = 0.0):
+        """
+        Create loan charges for a given loan.
+
+        Args:
+            loan_id (int): ID of the loan to associate charges with.
+            charges (list): A list of dictionaries with keys: 
+            code (str), amount (float), percent (float), description (str), due (int)
+        """
+        # if not charges or not isinstance(charges, list):
+        #     raise ValueError("Charges must be a non-empty list of dictionaries")
+        
+        if loan_id is None:
+            raise ValueError("loan_id cannot be None")
+
+        loan_charges = []
+        now = datetime.now(timezone.utc)
+
+
+        subset_keys = ['interest', 'management', 'insurance', 'vat']
+        for item in subset_keys:
+            charge =  charges[item]
+            due_days = charge['due_days'] #  getattr(charge, "due_days", 0)
+            amount =  charge['fee'] # getattr(charge, "fee", 0.0)
+            percent =  charge['rate'] # getattr(charge, "rate", 0.0)
+            code =  charge['code'] # getattr(charge, "code","")
+            description =  charge['description'] # getattr(charge, "description", "")
+
+            charge_obj = cls(
+                loan_id = loan_id,
+                transaction_id = transaction_id,
+                code = code,
+                amount = round(amount, 2),
+                percent = percent,
+                description = description,
+                due = due_days,
+                due_date = now + timedelta(days=due_days)
+            )
+
+            db.session.add(charge_obj)
+            loan_charges.append(charge_obj)
+
+        return loan_charges
+
+    
+
+    def to_dict(self):
+        return {
+            'id': self.id,
+            'loanId': self.loan_id,
+            'transactionId': self.transaction_id,
+            'code': self.code,
+            'amount': self.amount,
+            'percent': self.percent,
+            'description': self.description,
+            'due': self.due,
+        }
+
+    def __repr__(self):
+        return f"<LoanCharge {self.id} - Loan {self.loan_id} - {self.code}>"

app/models/loan_repayment_schedule.py

@@ -0,0 +1,70 @@
+from datetime import datetime, timezone
+from app.extensions import db
+from sqlalchemy.orm import relationship
+from dateutil.relativedelta import relativedelta
+from sqlalchemy.sql import func
+
+class LoanRepaymentSchedule(db.Model):
+    __tablename__ = 'loan_repayment_schedules'
+
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    loan_id = db.Column(db.Integer, nullable=False)
+    transaction_id = db.Column(db.String(50), nullable=True)
+    product_id = db.Column(db.String(20), nullable=True)
+    installment_number = db.Column(db.Integer, nullable=False)
+    due_date = db.Column(db.DateTime, nullable=False)
+    installment_amount= db.Column(db.Float, default=0.0)
+    total_repayment_amount = db.Column(db.Float, default=0.0)
+    paid = db.Column(db.Boolean, default=False)
+    paid_at = db.Column(db.DateTime, nullable=True)
+
+    created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
+    updated_at = db.Column(db.DateTime(timezone=True), onupdate=func.now())
+    loan = relationship(
+        "Loan",
+        primaryjoin="LoanRepaymentSchedule.loan_id == Loan.id",
+        foreign_keys=[loan_id],
+        back_populates="loan_repayment_schedules",
+    )
+
+
+    @classmethod
+    def add_repayment_schedule(cls, loan, num_schedules, transaction_id):
+        """
+        Add repayment schedules for a given loan.
+        """
+        now = datetime.now(timezone.utc)
+        schedules = []
+
+        for i in range(num_schedules):
+            due_date = now + relativedelta(months=i + 1)
+            schedule = LoanRepaymentSchedule(
+                loan_id=loan.id,
+                installment_number=i + 1,
+                due_date=due_date,
+                total_repayment_amount = round(loan.repayment_amount, 2),
+                installment_amount=round(loan.installment_amount, 2),
+                product_id = loan.product_id,
+                transaction_id = transaction_id
+            )
+            
+            db.session.add(schedule)
+            schedules.append(schedule)
+
+        return schedules
+
+    def to_dict(self):
+        return {
+            'id': self.id,
+            'loanId': self.loan_id,
+            'installmentNumber': self.installment_number,
+            'dueDate': self.due_date.isoformat(),
+            'principalAmount': self.principal_amount,
+            'interestAmount': self.interest_amount,
+            'totalInstallment': self.total_installment,
+            'paid': self.paid,
+            'paidAt': self.paid_at.isoformat() if self.paid_at else None
+        }
+
+    def __repr__(self):
+        return f'<LoanRepaymentSchedule Loan:{self.loan_id} Installment:{self.installment_number}>'

app/models/offer.py

@@ -1,16 +1,86 @@
 from datetime import datetime, timezone
 from app.extensions import db
+from app.models.charge import Charge
+from sqlalchemy.orm import relationship
+from sqlalchemy.sql import func
 
 class Offer(db.Model):
     __tablename__ = 'offers'
 
-    id = db.Column(db.Integer, primary_key=True)
+    id = db.Column(db.String, primary_key=True)
     product_id = db.Column(db.String, nullable=False)
     min_amount = db.Column(db.Float, nullable=False)
     max_amount = db.Column(db.Float, nullable=False)
     tenor = db.Column(db.Integer, nullable=False)
-    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))
+    schedule = db.Column(db.Integer, nullable=True)
+    interest_rate = db.Column(db.Float, default=3.0)
+    management_rate = db.Column(db.Float, default=1.0)
+    insurance_rate = db.Column(db.Float, default=1.0)
+    vat_rate = db.Column(db.Float, default=7.5)
+    list_order = db.Column(db.Integer, nullable=True)
+    created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
+    updated_at = db.Column(db.DateTime(timezone=True), onupdate=func.now())
+    charges = relationship(
+        "Charge",
+        primaryjoin="Offer.id == Charge.offer_id",
+        foreign_keys="Charge.offer_id",
+        back_populates="offer",
+    )
 
+    @classmethod
+    def get_all_offers(cls):
+        """
+        Return all offers in dictionary format.
+        """
+        offers = cls.query.all()
+
+        if not offers:
+            raise ValueError(f"No available offers")        
+        return offers
+    
+    @classmethod
+    def is_valid_offer(cls, offer_id):
+        offer = cls.query.filter_by(id=str(offer_id)).first()
+
+
+        if not offer:
+            return False
+        return offer
+
+    @classmethod
+    def get_offer_by_id(cls, offer_id):
+        """
+        Return an offer by its ID.
+        """
+        offer = cls.query.filter_by(id=str(offer_id)).first()
+
+        if not offer:
+            raise ValueError(f"Offer with ID {offer_id} not found")
+        return offer
+
+    @classmethod
+    def get_offer_by_product_id(cls, product_id):
+        """
+        Return an offer by its product ID.
+        """
+        offer = cls.query.filter_by(product_id=str(product_id)).first()
+
+        if not offer:
+            raise ValueError(f"Offer with Product ID {product_id} not found")
+        return offer
+    
+    def to_dict(self):
+        return {
+            "offerId": self.id,
+            "productId": self.product_id,
+            "minAmount": self.min_amount,
+            "maxAmount": self.max_amount,
+            "tenor": self.tenor,
+            "interest_rate": self.interest_rate,
+            "management_rate": self.management_rate,
+            "insurance_rate": self.insurance_rate,
+            "vat_rate": self.vat_rate
+        }
+    
     def __repr__(self):
         return f'<LoanOffer {self.id}>'

app/models/rac_checks.py

@@ -0,0 +1,73 @@
+from datetime import datetime, timezone
+from app.extensions import db
+from sqlalchemy.orm import relationship
+from sqlalchemy.exc import IntegrityError
+from uuid import uuid4
+from sqlalchemy.types import JSON
+from sqlalchemy.sql import func
+
+class RACCheck(db.Model):
+    __tablename__ = 'rac_checks'
+
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    transaction_id = db.Column(db.String(50), nullable=False)
+    customer_id = db.Column(db.String, nullable=False)
+    account_id = db.Column(db.String, nullable=False)
+    rac_response = db.Column(db.JSON, nullable=False)
+    created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
+    updated_at = db.Column(db.DateTime(timezone=True), onupdate=func.now())
+    @classmethod
+    def add_rac_check(cls, customer_id, account_id, transaction_id, data = None):
+    
+
+        # Save the response
+        rac_check = cls(
+            customer_id = customer_id,
+            account_id = account_id,
+            transaction_id = transaction_id,
+            rac_response = data
+        )
+        
+        try:
+            db.session.add(rac_check)
+        except IntegrityError as err:
+            raise ValueError(f"Database integrity error: {err}")
+        return rac_check
+
+
+    @classmethod
+    def get_all_rac_checks(cls):
+        """
+        Return all RAC checks in dictionary format.
+        """
+        rac_checks = cls.query.all()
+
+        if not rac_checks:
+            return None
+        return rac_checks
+    
+    @classmethod
+    def get_rac_check(cls, customer_id, account_id):
+        """
+        Return a RAC check by its ID.
+        """
+        rac_check = cls.query.filter_by( customer_id = customer_id,
+                    account_id = account_id,).first()
+
+        if not rac_check:
+            raise ValueError(f"RAC Check for customer not found")
+        return rac_check
+
+    def to_dict(self):
+        return {
+            "id": str(self.id),
+            "transactionId": str(self.transaction_id),
+            "customerId": self.customer_id,
+            "accountId": self.account_id,
+            "racResponse": self.rac_response,
+            "createdAt": self.created_at.isoformat(),
+            "updatedAt": self.updated_at.isoformat() if self.updated_at else None
+        }
+
+    def __repr__(self):
+        return f'<RACCheck {self.id}>'

app/models/repayment.py

@@ -0,0 +1,56 @@
+from datetime import datetime, timezone
+from app.api.enums.loan_status import LoanStatus
+from app.extensions import db
+from app.models.customer import Customer
+from app.models.loan import Loan
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.sql import func
+
+
+class Repayment(db.Model):
+    __tablename__ = 'repayments'
+
+    id = db.Column(
+        db.Integer,
+        primary_key=True,
+        autoincrement=True,
+    )
+    loan_id = db.Column(db.String(50), nullable=False)
+    customer_id = db.Column(db.String(50), nullable=False)
+    product_id = db.Column(db.String(20), nullable=True)
+    created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
+    updated_at = db.Column(db.DateTime(timezone=True), onupdate=func.now())
+    transaction_id = db.Column(db.String(50), nullable=True)
+
+    @classmethod
+    def create_repayment(cls, customer_id, loan_id, product_id, transaction_id):
+
+
+        # Check customer exists
+        if not Customer.is_valid_customer(customer_id):
+            raise ValueError("Invalid customer")
+
+        # Check loan exists
+        loan = Loan.get_customer_loan(loan_id = loan_id, customer_id = customer_id)
+        
+        # Check that the loan is active
+        if loan.status != LoanStatus.ACTIVE:
+            raise ValueError(f"Repayment cannot be processed. Loan status: ({loan.status})")
+        
+
+        repayment = cls(
+            customer_id=customer_id,
+            loan_id=loan_id,
+            product_id=product_id,
+            transaction_id = transaction_id
+        )
+
+        try:
+            db.session.add(repayment)
+        except IntegrityError as err:
+            raise ValueError(f"Database integrity error: {err}")
+
+        return repayment
+
+    def __repr__(self):
+        return f'<Repayment {self.id}>'

app/models/transaction.py

@@ -1,7 +1,9 @@
 from datetime import datetime, timezone
 from app.extensions import db
+from app.models import account
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy import and_, or_, not_
+from sqlalchemy.sql import func
 
 class Transaction(db.Model):
     __tablename__ = 'transactions'
@@ -10,19 +12,18 @@ class Transaction(db.Model):
         primary_key=True,
         autoincrement=True,
     )
-    #id = db.Column(db.Int, primary_key=True)
     transaction_id = db.Column(db.String(50), nullable=False)
-    account_id = db.Column(db.String(50), nullable=False)
+    account_id = db.Column(db.String(50), nullable=True)
+    customer_id = db.Column(db.String(50), nullable=True)
     type = db.Column(db.String(50), nullable=False)
     channel = db.Column(db.String(50), nullable=False)
-    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))
-
+    created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
+    updated_at = db.Column(db.DateTime(timezone=True), onupdate=func.now())
     def __repr__(self):
         return f'<Transaction {self.id}>'
 
     @classmethod
-    def create_transaction(cls, transaction_id, account_id, type, channel):
+    def create_transaction(cls, transaction_id, account_id, customer_id, type, channel):
 
         # if cls.query.filter_by(transaction_id=transaction_id).first():
         #     raise ValueError("Duplicate Transaction")
@@ -33,17 +34,16 @@ class Transaction(db.Model):
 
 
         transaction = cls(
-            transaction_id=transaction_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
         )
 
         try:
             db.session.add(transaction)
-            db.session.commit()
         except IntegrityError as err:
-            db.session.rollback()
             raise ValueError(f"Database integrity error: {err}")
 
         return transaction

app/models/transaction_offers.py

@@ -0,0 +1,86 @@
+from datetime import datetime, timezone
+from app.extensions import db
+from sqlalchemy.orm import relationship
+from sqlalchemy.sql import func
+import logging
+logger = logging.getLogger(__name__)
+
+
+
+class TransactionOffer(db.Model):
+    __tablename__ = 'transaction_offers'
+
+    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)
+    max_amount = db.Column(db.Float, nullable=False)
+    eligible_amount = db.Column(db.Float, nullable=True)
+    tenor = db.Column(db.Integer, nullable=True)  # tenor in months, typically
+
+    created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
+    updated_at = db.Column(db.DateTime(timezone=True), onupdate=func.now())
+    customer = relationship(
+        "Customer",
+        primaryjoin="Customer.id == TransactionOffer.customer_id",
+        foreign_keys=[customer_id],
+        back_populates="transaction_offers",
+    )
+
+    @classmethod
+
+    def is_valid_transaction_offer(cls, transaction_offer, customer_id, product_id):
+        transaction_offer = cls.query.filter_by(
+            id = transaction_offer,
+            customer_id = customer_id,
+            product_id = product_id
+            # transaction_id = transaction_id,
+            ).first()
+
+
+        if not transaction_offer:
+            return False
+        return transaction_offer
+
+    @classmethod
+    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,
+            eligible_amount=eligible_amount,
+            product_id=product_id,
+            tenor=tenor
+        )
+
+        db.session.add(transaction_offer)
+        db.session.flush()
+
+        return transaction_offer
+    
+    def to_dict(self):
+        return {
+            'id': self.id,
+            'customerId': self.customer_id,
+            'transactionId': self.transaction_id,
+            'offerId': self.offer_id,
+            'productId': self.product_id,
+            'minAmount': self.min_amount,
+            'maxAmount': self.max_amount,
+            'eligibleAmount': self.eligible_amount,
+            'tenor': self.tenor,
+            'createdAt': self.created_at.isoformat() if self.created_at else None,
+            'updatedAt': self.updated_at.isoformat() if self.updated_at else None,
+        }
+
+    def __repr__(self):
+        return f'<TransactionOffer {self.id}>'

app/swagger/schemas/LoanStatusRequest.json

@@ -16,6 +16,10 @@
         "channel": {
             "type": "string",
             "example": "USSD"
+        },
+        "accountId": {
+            "type": "string",
+            "example": "ACN8263457"
         }
     },
     "xml": {

app/swagger/schemas/LoanStatusResponse.json

@@ -47,13 +47,26 @@
                     "productId": {
                         "type": "string",
                         "example": "101"
+                    },
+                    "installment": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "amount": {
+                        "type": "number",
+                        "format": "float",
+                        "example": 10000.0
+                    },
+                    "repaymentDate": {
+                        "type": "string",
+                        "example": "2025-04-24 10:31:"
                     }
                 }
             }
-        },
-        "totalDebtAmount": {
-            "type": "integer",
-            "example": 8500
+        }
+                }
+            }
         },
         "resultCode": {
             "type": "string",

app/swagger/schemas/ProvideLoanResponse.json

@@ -9,6 +9,10 @@
             "type": "string",
             "example": "Tr201712RK9232P115"
         },
+        "loanRef": {
+            "type": "string",
+            "example": "1620029887USSDAMPC"
+        },
         "customerId": {
             "type": "string",
             "example": "CN621868"

app/swagger/schemas/RepaymentRequest.json

@@ -7,7 +7,7 @@
         },
         "debtId": {
             "type": "string",
-            "example": "273194670"
+            "example": "10"
         },
         "productId": {
             "type": "string",
@@ -19,11 +19,15 @@
         },
         "customerId": {
             "type": "string",
-            "example": "CN621868"
+            "example": "CID0000025585"
         },
         "channel": {
             "type": "string",
             "example": "USSD"
+        },
+        "accountId": {
+            "type": "string",
+            "example": "ACN8263457"
         }
     },
     "xml": {

app/swagger/schemas/SelectOfferRequest.json

@@ -27,6 +27,10 @@
             "example": "ACN8263457"
         },
         "productId": {
+            "type": "string",
+            "example": "3MPC"
+        },
+        "offerId": {
             "type": "string",
             "example": "101"
         },

app/swagger/schemas/SelectOfferResponse.json

@@ -28,13 +28,17 @@
                     },
                     "productId": {
                         "type": "string",
-                        "example": "2030"
+                        "example": "3MPC"
                     },
                     "amount": {
                         "type": "number",
                         "format": "float",
                         "example": 10000.0
                     },
+                    "dueDate": {
+                        "type": "string",
+                        "example": "2025-04-24 10:31:"
+                    },
                     "upfrontPayment": {
                         "type": "number",
                         "format": "float",
@@ -45,6 +49,11 @@
                         "format": "float",
                         "example": 3.0
                     },
+                    "interestFee": {
+                        "type": "number",
+                        "format": "float",
+                        "example": 3000.00
+                    },
                     "ManagementRate": {
                         "type": "number",
                         "format": "float",
@@ -75,7 +84,7 @@
                         "format": "float",
                         "example": 100.0
                     },
-                    "recommendedRepaymentDates": {
+                    "installmentRepaymentDates": {
                         "type": "array",
                         "items": {
                             "type": "string"

migrations/versions/1340e7e578b9_migration_on_thu_apr_10_21_50_01_utc_.py

@@ -0,0 +1,32 @@
+"""Migration on Thu Apr 10 21:50:01 UTC 2025
+
+Revision ID: 1340e7e578b9
+Revises: b8f6fd76ead8
+Create Date: 2025-04-10 21:50:32.113149
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '1340e7e578b9'
+down_revision = 'b8f6fd76ead8'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('transactions', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('ref_model', sa.String(length=50), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('transactions', schema=None) as batch_op:
+        batch_op.drop_column('ref_model')
+
+    # ### end Alembic commands ###

migrations/versions/173ea45db189_migration_on_sat_may_10_09_54_34_utc_.py

@@ -0,0 +1,32 @@
+"""Migration on Sat May 10 09:54:34 UTC 2025
+
+Revision ID: 173ea45db189
+Revises: 3105abd795d4
+Create Date: 2025-05-10 09:54:39.380499
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '173ea45db189'
+down_revision = '3105abd795d4'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('transaction_offers', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('original_transaction', sa.String(length=50), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('transaction_offers', schema=None) as batch_op:
+        batch_op.drop_column('original_transaction')
+
+    # ### end Alembic commands ###

migrations/versions/1b2339f43824_migration_on_thu_apr_24_17_42_25_utc_.py

@@ -0,0 +1,53 @@
+"""Migration on Thu Apr 24 17:42:25 UTC 2025
+
+Revision ID: 1b2339f43824
+Revises: de9ad96ba34e
+Create Date: 2025-04-24 17:43:09.589626
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '1b2339f43824'
+down_revision = 'de9ad96ba34e'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('rac_checks',
+    sa.Column('id', sa.String(), nullable=False),
+    sa.Column('transaction_id', sa.String(length=50), nullable=False),
+    sa.Column('customer_id', sa.String(), nullable=False),
+    sa.Column('account_id', sa.String(), nullable=False),
+    sa.Column('rac_response', sa.JSON(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    with op.batch_alter_table('loan_charges', schema=None) as batch_op:
+        batch_op.alter_column('amount',
+               existing_type=sa.NUMERIC(precision=10, scale=2),
+               type_=sa.Float(),
+               existing_nullable=True)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.drop_column('installment_amount')
+        batch_op.drop_column('repayment_amount')
+        batch_op.drop_column('upfront_fee')
+
+    with op.batch_alter_table('loan_charges', schema=None) as batch_op:
+        batch_op.alter_column('amount',
+               existing_type=sa.Float(),
+               type_=sa.NUMERIC(precision=10, scale=2),
+               existing_nullable=True)
+
+    op.drop_table('rac_checks')
+    # ### end Alembic commands ###

migrations/versions/287ecb02d3d7_migration_on_wed_apr_16_18_35_18_utc_.py

@@ -0,0 +1,32 @@
+"""Migration on Wed Apr 16 18:35:18 UTC 2025
+
+Revision ID: 287ecb02d3d7
+Revises: a4847b997191
+Create Date: 2025-04-16 18:36:04.632791
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '287ecb02d3d7'
+down_revision = 'a4847b997191'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loan_charges', schema=None) as batch_op:
+        batch_op.drop_column('transaction_id')
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loan_charges', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('transaction_id', sa.VARCHAR(length=50), autoincrement=False, nullable=True))
+
+    # ### end Alembic commands ###

migrations/versions/2a45dd99c9cb_migration_on_fri_apr_25_15_01_00_utc_.py

@@ -0,0 +1,42 @@
+"""Migration on Fri Apr 25 15:01:00 UTC 2025
+
+Revision ID: 2a45dd99c9cb
+Revises: 2cf0c177ca02
+Create Date: 2025-04-25 15:01:51.129681
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '2a45dd99c9cb'
+down_revision = '2cf0c177ca02'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loan_repayment_schedules', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('product_id', sa.String(length=20), nullable=True))
+        batch_op.add_column(sa.Column('installment_amount', sa.Float(), nullable=True))
+        batch_op.add_column(sa.Column('total_repayment_amount', sa.Float(), nullable=True))
+        batch_op.drop_column('principal_amount')
+        batch_op.drop_column('interest_amount')
+        batch_op.drop_column('total_installment')
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loan_repayment_schedules', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('total_installment', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=True))
+        batch_op.add_column(sa.Column('interest_amount', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=True))
+        batch_op.add_column(sa.Column('principal_amount', sa.DOUBLE_PRECISION(precision=53), autoincrement=False, nullable=True))
+        batch_op.drop_column('total_repayment_amount')
+        batch_op.drop_column('installment_amount')
+        batch_op.drop_column('product_id')
+
+    # ### end Alembic commands ###

migrations/versions/2cf0c177ca02_migration_on_fri_apr_25_14_02_01_utc_.py

@@ -0,0 +1,41 @@
+"""Migration on Fri Apr 25 14:02:01 UTC 2025
+
+Revision ID: 2cf0c177ca02
+Revises: 1b2339f43824
+Create Date: 2025-04-25 14:02:42.244146
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '2cf0c177ca02'
+down_revision = '1b2339f43824'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('loan_repayment_schedules',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('loan_id', sa.Integer(), nullable=False),
+    sa.Column('installment_number', sa.Integer(), nullable=False),
+    sa.Column('due_date', sa.DateTime(), nullable=False),
+    sa.Column('principal_amount', sa.Float(), nullable=True),
+    sa.Column('interest_amount', sa.Float(), nullable=True),
+    sa.Column('total_installment', sa.Float(), nullable=True),
+    sa.Column('paid', sa.Boolean(), nullable=True),
+    sa.Column('paid_at', sa.DateTime(), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('loan_repayment_schedules')
+    # ### end Alembic commands ###

migrations/versions/2eee4157505f_.py

@@ -0,0 +1,250 @@
+"""empty message
+
+Revision ID: 2eee4157505f
+Revises: 565bc3d0ba6e
+Create Date: 2025-05-16 13:24:41.914400
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '2eee4157505f'
+down_revision = '565bc3d0ba6e'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('accounts', schema=None) as batch_op:
+        batch_op.alter_column('created_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+        batch_op.alter_column('updated_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+
+    with op.batch_alter_table('charges', schema=None) as batch_op:
+        batch_op.alter_column('created_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+        batch_op.alter_column('updated_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+
+    with op.batch_alter_table('customers', schema=None) as batch_op:
+        batch_op.alter_column('created_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+        batch_op.alter_column('updated_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+
+    with op.batch_alter_table('loan_charges', schema=None) as batch_op:
+        batch_op.alter_column('created_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+        batch_op.alter_column('updated_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+
+    with op.batch_alter_table('loan_repayment_schedules', schema=None) as batch_op:
+        batch_op.alter_column('created_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+        batch_op.alter_column('updated_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.alter_column('created_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+        batch_op.alter_column('updated_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+
+    with op.batch_alter_table('offers', schema=None) as batch_op:
+        batch_op.alter_column('created_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+        batch_op.alter_column('updated_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+
+    with op.batch_alter_table('rac_checks', schema=None) as batch_op:
+        batch_op.alter_column('created_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+        batch_op.alter_column('updated_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+
+    with op.batch_alter_table('repayments', schema=None) as batch_op:
+        batch_op.alter_column('created_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+        batch_op.alter_column('updated_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+
+    with op.batch_alter_table('transaction_offers', schema=None) as batch_op:
+        batch_op.alter_column('created_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+        batch_op.alter_column('updated_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True)
+
+    with op.batch_alter_table('transactions', schema=None) as batch_op:
+        batch_op.alter_column('created_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True,
+               existing_server_default=sa.text('now()'))
+        batch_op.alter_column('updated_at',
+               existing_type=postgresql.TIMESTAMP(),
+               type_=sa.DateTime(timezone=True),
+               existing_nullable=True,
+               existing_server_default=sa.text('now()'))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('transactions', schema=None) as batch_op:
+        batch_op.alter_column('updated_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True,
+               existing_server_default=sa.text('now()'))
+        batch_op.alter_column('created_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True,
+               existing_server_default=sa.text('now()'))
+
+    with op.batch_alter_table('transaction_offers', schema=None) as batch_op:
+        batch_op.alter_column('updated_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+        batch_op.alter_column('created_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+
+    with op.batch_alter_table('repayments', schema=None) as batch_op:
+        batch_op.alter_column('updated_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+        batch_op.alter_column('created_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+
+    with op.batch_alter_table('rac_checks', schema=None) as batch_op:
+        batch_op.alter_column('updated_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+        batch_op.alter_column('created_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+
+    with op.batch_alter_table('offers', schema=None) as batch_op:
+        batch_op.alter_column('updated_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+        batch_op.alter_column('created_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.alter_column('updated_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+        batch_op.alter_column('created_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+
+    with op.batch_alter_table('loan_repayment_schedules', schema=None) as batch_op:
+        batch_op.alter_column('updated_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+        batch_op.alter_column('created_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+
+    with op.batch_alter_table('loan_charges', schema=None) as batch_op:
+        batch_op.alter_column('updated_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+        batch_op.alter_column('created_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+
+    with op.batch_alter_table('customers', schema=None) as batch_op:
+        batch_op.alter_column('updated_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+        batch_op.alter_column('created_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+
+    with op.batch_alter_table('charges', schema=None) as batch_op:
+        batch_op.alter_column('updated_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+        batch_op.alter_column('created_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+
+    with op.batch_alter_table('accounts', schema=None) as batch_op:
+        batch_op.alter_column('updated_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+        batch_op.alter_column('created_at',
+               existing_type=sa.DateTime(timezone=True),
+               type_=postgresql.TIMESTAMP(),
+               existing_nullable=True)
+
+    # ### end Alembic commands ###

migrations/versions/3105abd795d4_.py

@@ -0,0 +1,52 @@
+"""empty message
+
+Revision ID: 3105abd795d4
+Revises: 95a52be203c4
+Create Date: 2025-05-07 11:44:18.483694
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '3105abd795d4'
+down_revision = '95a52be203c4'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('rac_checks', schema=None) as batch_op:
+        # Step 1: Drop the default value
+        batch_op.alter_column('id',
+            server_default=None,
+            existing_type=sa.VARCHAR(),
+            existing_nullable=False
+        )
+
+    with op.batch_alter_table('rac_checks', schema=None) as batch_op:
+        # Step 2: Change the column type
+        batch_op.alter_column('id',
+            existing_type=sa.VARCHAR(),
+            type_=sa.Integer(),
+            existing_nullable=False,
+            autoincrement=True,
+            postgresql_using='id::integer'
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('rac_checks', schema=None) as batch_op:
+        batch_op.alter_column('id',
+               existing_type=sa.Integer(),
+               type_=sa.VARCHAR(),
+               existing_nullable=False,
+               autoincrement=True,
+               existing_server_default=sa.text("''::character varying"))
+
+    # ### end Alembic commands ###

migrations/versions/38acee611d55_migration_for_mloan_table.py

@@ -0,0 +1,32 @@
+"""Migration for mloan table
+
+Revision ID: 38acee611d55
+Revises: f1e83a993034
+Create Date: 2025-04-30 09:55:30.552838
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '38acee611d55'
+down_revision = 'f1e83a993034'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('tenor', sa.Integer(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.drop_column('tenor')
+
+    # ### end Alembic commands ###

migrations/versions/565bc3d0ba6e_migration_on_sat_may_10_12_54_52_utc_.py

@@ -0,0 +1,34 @@
+"""Migration on Sat May 10 12:54:52 UTC 2025
+
+Revision ID: 565bc3d0ba6e
+Revises: 173ea45db189
+Create Date: 2025-05-10 12:54:56.683215
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '565bc3d0ba6e'
+down_revision = '173ea45db189'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('disburse_date', sa.DateTime(), nullable=True))
+        batch_op.add_column(sa.Column('disburse_verify', sa.DateTime(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.drop_column('disburse_verify')
+        batch_op.drop_column('disburse_date')
+
+    # ### end Alembic commands ###

migrations/versions/610b7e9d15a6_migration_on_fri_apr_11_14_15_19_utc_.py

@@ -0,0 +1,32 @@
+"""Migration on Fri Apr 11 14:15:19 UTC 2025
+
+Revision ID: 610b7e9d15a6
+Revises: 9bb0367eb486
+Create Date: 2025-04-11 14:16:12.533227
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '610b7e9d15a6'
+down_revision = '9bb0367eb486'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('transaction_id', sa.String(length=50), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.drop_column('transaction_id')
+
+    # ### end Alembic commands ###

migrations/versions/783a023a477f_migration_on_mon_apr_14_15_15_05_utc_.py

@@ -0,0 +1,32 @@
+"""Migration on Mon Apr 14 15:15:05 UTC 2025
+
+Revision ID: 783a023a477f
+Revises: f6cd1bfc8832
+Create Date: 2025-04-14 15:15:36.991148
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '783a023a477f'
+down_revision = 'f6cd1bfc8832'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('transactions', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('customer_id', sa.String(length=50), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('transactions', schema=None) as batch_op:
+        batch_op.drop_column('customer_id')
+
+    # ### end Alembic commands ###

migrations/versions/86e701febdda_.py

@@ -0,0 +1,41 @@
+"""empty message
+
+Revision ID: 86e701febdda
+Revises: eb99c7fb9e09
+Create Date: 2025-04-29 07:59:33.305967
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '86e701febdda'
+down_revision = 'eb99c7fb9e09'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('transaction_offers',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('customer_id', sa.String(length=50), nullable=False),
+    sa.Column('transaction_id', sa.String(length=50), nullable=False),
+    sa.Column('offer_id', sa.String(length=20), nullable=False),
+    sa.Column('product_id', sa.String(length=20), nullable=True),
+    sa.Column('min_amount', sa.Float(), nullable=False),
+    sa.Column('max_amount', sa.Float(), nullable=False),
+    sa.Column('eligible_amount', sa.Float(), nullable=True),
+    sa.Column('tenor', sa.Integer(), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('transaction_offers')
+    # ### end Alembic commands ###

migrations/versions/89759cebb9c6_migration_on_sat_apr_26_12_50_46_utc_.py

@@ -0,0 +1,38 @@
+"""Migration on Sat Apr 26 12:50:46 UTC 2025
+
+Revision ID: 89759cebb9c6
+Revises: 2a45dd99c9cb
+Create Date: 2025-04-26 12:50:49.771355
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '89759cebb9c6'
+down_revision = '2a45dd99c9cb'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('offers', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('interest_rate', sa.Float(), nullable=True))
+        batch_op.add_column(sa.Column('management_rate', sa.Float(), nullable=True))
+        batch_op.add_column(sa.Column('insurance_rate', sa.Float(), nullable=True))
+        batch_op.add_column(sa.Column('vat_rate', sa.Float(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('offers', schema=None) as batch_op:
+        batch_op.drop_column('vat_rate')
+        batch_op.drop_column('insurance_rate')
+        batch_op.drop_column('management_rate')
+        batch_op.drop_column('interest_rate')
+
+    # ### end Alembic commands ###

migrations/versions/95a52be203c4_migration_on_sat_may_3_21_53_29_utc_2025.py

@@ -0,0 +1,32 @@
+"""Migration on Sat May  3 21:53:29 UTC 2025
+
+Revision ID: 95a52be203c4
+Revises: 38acee611d55
+Create Date: 2025-05-03 21:53:32.154029
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '95a52be203c4'
+down_revision = '38acee611d55'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('eligible_amount', sa.Float(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.drop_column('eligible_amount')
+
+    # ### end Alembic commands ###

migrations/versions/9bb0367eb486_migration_on_fri_apr_11_12_48_01_utc_.py

@@ -0,0 +1,40 @@
+"""Migration on Fri Apr 11 12:48:01 UTC 2025
+
+Revision ID: 9bb0367eb486
+Revises: fd447d78b161
+Create Date: 2025-04-11 12:48:36.145311
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '9bb0367eb486'
+down_revision = 'fd447d78b161'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('product_id', sa.String(length=20), nullable=True))
+        batch_op.add_column(sa.Column('current_loan_amount', sa.Float(), nullable=True))
+        batch_op.add_column(sa.Column('default_penalty_fee', sa.Float(), nullable=True))
+        batch_op.add_column(sa.Column('continuous_fee', sa.Float(), nullable=True))
+        batch_op.add_column(sa.Column('due_date', sa.DateTime(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.drop_column('due_date')
+        batch_op.drop_column('continuous_fee')
+        batch_op.drop_column('default_penalty_fee')
+        batch_op.drop_column('current_loan_amount')
+        batch_op.drop_column('product_id')
+
+    # ### end Alembic commands ###

migrations/versions/a4847b997191_migration_on_wed_apr_16_17_42_49_utc_.py

@@ -0,0 +1,57 @@
+"""Migration on Wed Apr 16 17:42:49 UTC 2025
+
+Revision ID: a4847b997191
+Revises: 783a023a477f
+Create Date: 2025-04-16 17:43:22.509659
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'a4847b997191'
+down_revision = '783a023a477f'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('loan_charges',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('loan_id', sa.Integer(), nullable=False),
+    sa.Column('transaction_id', sa.String(length=50), nullable=True),
+    sa.Column('code', sa.String(length=50), nullable=False),
+    sa.Column('amount', sa.Float(), nullable=True),
+    sa.Column('percent', sa.Float(), nullable=True),
+    sa.Column('description', sa.Text(), nullable=True),
+    sa.Column('due', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('offers',
+    sa.Column('id', sa.String(), nullable=False),
+    sa.Column('product_id', sa.String(), nullable=False),
+    sa.Column('min_amount', sa.Float(), nullable=False),
+    sa.Column('max_amount', sa.Float(), nullable=False),
+    sa.Column('tenor', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('product_id', sa.String(length=20), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.drop_column('product_id')
+
+    op.drop_table('offers')
+    op.drop_table('loan_charges')
+    # ### end Alembic commands ###

migrations/versions/b8f6fd76ead8_migration_on_thu_apr_10_16_21_45_utc_.py

@@ -0,0 +1,86 @@
+"""Migration on Thu Apr 10 16:21:45 UTC 2025
+
+Revision ID: b8f6fd76ead8
+Revises: 
+Create Date: 2025-04-10 16:22:15.946157
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = 'b8f6fd76ead8'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('repayments',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('loan_id', sa.String(length=50), nullable=False),
+    sa.Column('customer_id', sa.String(length=50), nullable=False),
+    sa.Column('product_id', sa.String(length=20), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.alter_column('id',
+               existing_type=sa.VARCHAR(length=50),
+               type_=sa.Integer(),
+               existing_nullable=False,
+               autoincrement=True,
+               existing_server_default=sa.text("nextval('loan_id_seq'::regclass)"))
+
+    with op.batch_alter_table('transactions', schema=None) as batch_op:
+        batch_op.alter_column('channel',
+               existing_type=sa.VARCHAR(length=8),
+               type_=sa.String(length=50),
+               existing_nullable=False)
+        batch_op.alter_column('created_at',
+               existing_type=postgresql.TIMESTAMP(timezone=True),
+               type_=sa.DateTime(),
+               existing_nullable=True,
+               existing_server_default=sa.text('now()'))
+        batch_op.alter_column('updated_at',
+               existing_type=postgresql.TIMESTAMP(timezone=True),
+               type_=sa.DateTime(),
+               existing_nullable=True,
+               existing_server_default=sa.text('now()'))
+        batch_op.drop_constraint('transactions_id_key', type_='unique')
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('transactions', schema=None) as batch_op:
+        batch_op.create_unique_constraint('transactions_id_key', ['id'])
+        batch_op.alter_column('updated_at',
+               existing_type=sa.DateTime(),
+               type_=postgresql.TIMESTAMP(timezone=True),
+               existing_nullable=True,
+               existing_server_default=sa.text('now()'))
+        batch_op.alter_column('created_at',
+               existing_type=sa.DateTime(),
+               type_=postgresql.TIMESTAMP(timezone=True),
+               existing_nullable=True,
+               existing_server_default=sa.text('now()'))
+        batch_op.alter_column('channel',
+               existing_type=sa.String(length=50),
+               type_=sa.VARCHAR(length=8),
+               existing_nullable=False)
+
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.alter_column('id',
+               existing_type=sa.Integer(),
+               type_=sa.VARCHAR(length=50),
+               existing_nullable=False,
+               autoincrement=True,
+               existing_server_default=sa.text("nextval('loan_id_seq'::regclass)"))
+
+    op.drop_table('repayments')
+    # ### end Alembic commands ###

migrations/versions/de9ad96ba34e_migration_on_thu_apr_17_14_15_36_utc_.py

@@ -0,0 +1,38 @@
+"""Migration on Thu Apr 17 14:15:36 UTC 2025
+
+Revision ID: de9ad96ba34e
+Revises: ec8d97f9b584
+Create Date: 2025-04-17 14:16:16.537466
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'de9ad96ba34e'
+down_revision = 'ec8d97f9b584'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('charges',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('offer_id', sa.String(length=50), nullable=False),
+    sa.Column('code', sa.String(length=50), nullable=False),
+    sa.Column('percent', sa.Float(), nullable=True),
+    sa.Column('description', sa.Text(), nullable=True),
+    sa.Column('due', sa.Integer(), nullable=False),
+    sa.Column('created_at', sa.DateTime(), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('charges')
+    # ### end Alembic commands ###

migrations/versions/eb99c7fb9e09_migration_on_sat_apr_26_19_02_17_utc_.py

@@ -0,0 +1,32 @@
+"""Migration on Sat Apr 26 19:02:17 UTC 2025
+
+Revision ID: eb99c7fb9e09
+Revises: 89759cebb9c6
+Create Date: 2025-04-26 19:02:20.443678
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'eb99c7fb9e09'
+down_revision = '89759cebb9c6'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('original_transaction', sa.String(length=50), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.drop_column('original_transaction')
+
+    # ### end Alembic commands ###

migrations/versions/ec8d97f9b584_migration_on_thu_apr_17_10_40_05_utc_.py

@@ -0,0 +1,34 @@
+"""Migration on Thu Apr 17 10:40:05 UTC 2025
+
+Revision ID: ec8d97f9b584
+Revises: 287ecb02d3d7
+Create Date: 2025-04-17 10:40:34.751272
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'ec8d97f9b584'
+down_revision = '287ecb02d3d7'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loan_charges', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('transaction_id', sa.String(length=50), nullable=True))
+        batch_op.add_column(sa.Column('due_date', sa.DateTime(), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loan_charges', schema=None) as batch_op:
+        batch_op.drop_column('due_date')
+        batch_op.drop_column('transaction_id')
+
+    # ### end Alembic commands ###

migrations/versions/f1e83a993034_migration_on_tue_apr_29_20_43_35_utc_.py

@@ -0,0 +1,32 @@
+"""Migration on Tue Apr 29 20:43:35 UTC 2025
+
+Revision ID: f1e83a993034
+Revises: 86e701febdda
+Create Date: 2025-04-29 20:43:38.595543
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'f1e83a993034'
+down_revision = '86e701febdda'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loan_repayment_schedules', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('transaction_id', sa.String(length=50), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loan_repayment_schedules', schema=None) as batch_op:
+        batch_op.drop_column('transaction_id')
+
+    # ### end Alembic commands ###

migrations/versions/f6cd1bfc8832_migration_on_fri_apr_11_14_34_36_utc_.py

@@ -0,0 +1,34 @@
+"""Migration on Fri Apr 11 14:34:36 UTC 2025
+
+Revision ID: f6cd1bfc8832
+Revises: 610b7e9d15a6
+Create Date: 2025-04-11 14:35:07.093967
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'f6cd1bfc8832'
+down_revision = '610b7e9d15a6'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('collection_type', sa.String(length=20), nullable=True))
+        batch_op.drop_column('product_id')
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('product_id', sa.VARCHAR(length=20), autoincrement=False, nullable=True))
+        batch_op.drop_column('collection_type')
+
+    # ### end Alembic commands ###

migrations/versions/fd447d78b161_migration_on_fri_apr_11_12_02_45_utc_.py

@@ -0,0 +1,38 @@
+"""Migration on Fri Apr 11 12:02:45 UTC 2025
+
+Revision ID: fd447d78b161
+Revises: 1340e7e578b9
+Create Date: 2025-04-11 12:03:28.346671
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'fd447d78b161'
+down_revision = '1340e7e578b9'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('transactions', schema=None) as batch_op:
+        batch_op.alter_column('account_id',
+               existing_type=sa.VARCHAR(length=50),
+               nullable=True)
+        batch_op.drop_column('ref_model')
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('transactions', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('ref_model', sa.VARCHAR(length=50), autoincrement=False, nullable=True))
+        batch_op.alter_column('account_id',
+               existing_type=sa.VARCHAR(length=50),
+               nullable=False)
+
+    # ### end Alembic commands ###

requirements.txt

@@ -25,7 +25,8 @@ flask-swagger-ui
 python-dotenv
 
 # Requests
-requests
+httpx
+
 
 # JWT
 flask-jwt-extended
@@ -34,3 +35,7 @@ flask-jwt-extended
 # Kafka 
 confluent-kafka==1.9.2
 
+
+
+python-dateutil
+

scripts/entrypoint.sh

@@ -1,7 +1,8 @@
 #!/bin/sh
 
-echo "Running DB migrations..."
-flask db upgrade
+# echo "Running DB migrations..."
+# flask db migrate -m "Migration on $(date)"
+# flask db upgrade
 
 echo "Starting Gunicorn server..."
 exec gunicorn -w 4 -b 0.0.0.0:5000 wsgi:wsgi_app

tests/jmeter/digifi-BankToProductCore.jmx

@@ -0,0 +1,651 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jmeterTestPlan version="1.2" properties="5.0" jmeter="5.6.3">
+  <hashTree>
+    <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Simbrella FirstAdvance API Test">
+      <boolProp name="TestPlan.tearDown_on_shutdown">true</boolProp>
+      <elementProp name="TestPlan.user_defined_variables" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables">
+        <collectionProp name="Arguments.arguments">
+          <elementProp name="baseUrl" elementType="Argument">
+            <stringProp name="Argument.name">baseUrl</stringProp>
+            <stringProp name="Argument.value">http://localhost:4500</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="username" elementType="Argument">
+            <stringProp name="Argument.name">username</stringProp>
+            <stringProp name="Argument.value">user</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+          <elementProp name="password" elementType="Argument">
+            <stringProp name="Argument.name">password</stringProp>
+            <stringProp name="Argument.value">password</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
+        </collectionProp>
+      </elementProp>
+      <boolProp name="TestPlan.functional_mode">false</boolProp>
+      <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+    </TestPlan>
+    <hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="Authorizaton Thread Group">
+        <intProp name="ThreadGroup.num_threads">1</intProp>
+        <intProp name="ThreadGroup.ramp_time">1</intProp>
+        <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp>
+        <stringProp name="ThreadGroup.on_sample_error">stopthread</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller">
+          <stringProp name="LoopController.loops">1</stringProp>
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+        </elementProp>
+      </ThreadGroup>
+      <hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="1. Authorize" enabled="true">
+          <stringProp name="HTTPSampler.domain">localhost</stringProp>
+          <stringProp name="HTTPSampler.port">4500</stringProp>
+          <stringProp name="HTTPSampler.protocol">http</stringProp>
+          <stringProp name="HTTPSampler.path">/Authorize</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">{&#xd;
+	&quot;username&quot;:&quot;${username}&quot;,&#xd;
+	&quot;password&quot;:&quot;${password}&quot;&#xd;
+}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <JSONPostProcessor guiclass="JSONPostProcessorGui" testclass="JSONPostProcessor" testname="JSON Extractor - Auth Token" enabled="true">
+            <stringProp name="JSONPostProcessor.referenceNames">access_token</stringProp>
+            <stringProp name="JSONPostProcessor.jsonPathExprs">$.data.access_token</stringProp>
+            <stringProp name="JSONPostProcessor.match_numbers">1</stringProp>
+            <stringProp name="JSONPostProcessor.defaultValues">NOT_FOUND</stringProp>
+            <stringProp name="JSONPostProcessor.scope">variable</stringProp>
+            <stringProp name="Scope.variable"></stringProp>
+            <stringProp name="Sample.scope">all</stringProp>
+          </JSONPostProcessor>
+          <hashTree/>
+          <JSONPostProcessor guiclass="JSONPostProcessorGui" testclass="JSONPostProcessor" testname="JSON Extractor - Auth Refresh Token" enabled="true">
+            <stringProp name="JSONPostProcessor.referenceNames">refresh_token</stringProp>
+            <stringProp name="JSONPostProcessor.jsonPathExprs">$.data.refresh_token</stringProp>
+            <stringProp name="JSONPostProcessor.match_numbers">1</stringProp>
+            <stringProp name="JSONPostProcessor.defaultValues">NOT_FOUND</stringProp>
+            <stringProp name="JSONPostProcessor.scope">variable</stringProp>
+            <stringProp name="Scope.variable"></stringProp>
+            <stringProp name="Sample.scope">all</stringProp>
+          </JSONPostProcessor>
+          <hashTree/>
+          <JSR223PostProcessor guiclass="TestBeanGUI" testclass="JSR223PostProcessor" testname="JSR223 PostProcessor" enabled="true">
+            <stringProp name="cacheKey">true</stringProp>
+            <stringProp name="filename"></stringProp>
+            <stringProp name="parameters"></stringProp>
+            <stringProp name="script">props.put(&quot;GLOBAL_ACCESS_TOKEN&quot;, vars.get(&quot;access_token&quot;));
+props.put(&quot;GLOBAL_REFRESH_TOKEN&quot;, vars.get(&quot;refresh_token&quot;));</stringProp>
+            <stringProp name="scriptLanguage">groovy</stringProp>
+          </JSR223PostProcessor>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <collectionProp name="Asserter.test_strings">
+              <stringProp name="49586">200</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">16</intProp>
+            <stringProp name="Assertion.custom_message"></stringProp>
+          </ResponseAssertion>
+          <hashTree/>
+        </hashTree>
+        <DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler" enabled="true">
+          <boolProp name="displayJMeterProperties">false</boolProp>
+          <boolProp name="displayJMeterVariables">true</boolProp>
+          <boolProp name="displaySystemProperties">false</boolProp>
+        </DebugSampler>
+        <hashTree/>
+        <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
+          <boolProp name="ResultCollector.error_logging">false</boolProp>
+          <objProp>
+            <name>saveConfig</name>
+            <value class="SampleSaveConfiguration">
+              <time>true</time>
+              <latency>true</latency>
+              <timestamp>true</timestamp>
+              <success>true</success>
+              <label>true</label>
+              <code>true</code>
+              <message>true</message>
+              <threadName>true</threadName>
+              <dataType>true</dataType>
+              <encoding>false</encoding>
+              <assertions>true</assertions>
+              <subresults>true</subresults>
+              <responseData>false</responseData>
+              <samplerData>false</samplerData>
+              <xml>false</xml>
+              <fieldNames>true</fieldNames>
+              <responseHeaders>false</responseHeaders>
+              <requestHeaders>false</requestHeaders>
+              <responseDataOnError>false</responseDataOnError>
+              <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+              <assertionsResultsToSave>0</assertionsResultsToSave>
+              <bytes>true</bytes>
+              <sentBytes>true</sentBytes>
+              <url>true</url>
+              <threadCounts>true</threadCounts>
+              <idleTime>true</idleTime>
+              <connectTime>true</connectTime>
+            </value>
+          </objProp>
+          <stringProp name="filename"></stringProp>
+        </ResultCollector>
+        <hashTree/>
+      </hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="API Test Thread Group">
+        <intProp name="ThreadGroup.num_threads">1</intProp>
+        <intProp name="ThreadGroup.ramp_time">1</intProp>
+        <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller">
+          <stringProp name="LoopController.loops">1</stringProp>
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+        </elementProp>
+      </ThreadGroup>
+      <hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="2. Authorize Refresh" enabled="true">
+          <stringProp name="HTTPSampler.domain">localhost</stringProp>
+          <stringProp name="HTTPSampler.port">4500</stringProp>
+          <stringProp name="HTTPSampler.protocol">http</stringProp>
+          <stringProp name="HTTPSampler.path">/AuthorizeRefresh</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">{&#xd;
+&#xd;
+}&#xd;
+</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Authorization</stringProp>
+                <stringProp name="Header.value">Bearer ${__P(GLOBAL_REFRESH_TOKEN)}</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <collectionProp name="Asserter.test_strings">
+              <stringProp name="49586">200</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">16</intProp>
+            <stringProp name="Assertion.custom_message"></stringProp>
+          </ResponseAssertion>
+          <hashTree/>
+          <JSR223PreProcessor guiclass="TestBeanGUI" testclass="JSR223PreProcessor" testname="JSR223 PreProcessor" enabled="true">
+            <stringProp name="scriptLanguage">groovy</stringProp>
+            <stringProp name="parameters"></stringProp>
+            <stringProp name="filename"></stringProp>
+            <stringProp name="cacheKey">true</stringProp>
+            <stringProp name="script">// Generate random IDs and store them in JMeter variables
+def transactionId = &quot;TR&quot; + org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric(12)
+def customerId = &quot;CN&quot; + org.apache.commons.lang3.RandomUtils.nextInt(1000000, 9999999)
+def accountId = &quot;ACN&quot; + org.apache.commons.lang3.RandomUtils.nextInt(1000000, 9999999)
+def msisdn = &quot;809&quot; + org.apache.commons.lang3.RandomUtils.nextInt(1000000, 9999999)
+
+// Generate requestId: current timestamp + 6-digit random number
+def timestamp = new Date().format(&quot;yyyyMMddHHmmssSSS&quot;) // e.g., 20250414161243123
+def randomSuffix = org.apache.commons.lang3.RandomStringUtils.randomNumeric(6)
+def requestId = timestamp + randomSuffix
+
+vars.put(&quot;transactionId&quot;, transactionId)
+vars.put(&quot;customerId&quot;, customerId.toString())
+vars.put(&quot;accountId&quot;, accountId.toString())
+vars.put(&quot;msisdn&quot;, msisdn.toString())
+vars.put(&quot;requestId&quot;, requestId)
+</stringProp>
+          </JSR223PreProcessor>
+          <hashTree/>
+        </hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="3. Eligibility Check">
+          <stringProp name="HTTPSampler.domain">localhost</stringProp>
+          <stringProp name="HTTPSampler.port">4500</stringProp>
+          <stringProp name="HTTPSampler.protocol">http</stringProp>
+          <stringProp name="HTTPSampler.path">/EligibilityCheck</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">{&#xd;
+	&quot;transactionId&quot;:&quot;${transactionId}&quot;,&#xd;
+	&quot;countryCode&quot;:&quot;NGR&quot;,&#xd;
+	&quot;customerId&quot;:&quot;${customerId}&quot;,&#xd;
+	&quot;msisdn&quot;:&quot;${msisdn}&quot;,&#xd;
+	&quot;channel&quot;:&quot;100&quot;,&#xd;
+	&quot;accountId&quot;:&quot;${accountId}&quot;&#xd;
+}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Authorization</stringProp>
+                <stringProp name="Header.value">Bearer ${__P(GLOBAL_ACCESS_TOKEN)}</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <JSONPostProcessor guiclass="JSONPostProcessorGui" testclass="JSONPostProcessor" testname="JSON Extractor - Product  ID">
+            <stringProp name="JSONPostProcessor.referenceNames">productId</stringProp>
+            <stringProp name="JSONPostProcessor.jsonPathExprs">$.eligibleOffers[0].productId</stringProp>
+            <stringProp name="JSONPostProcessor.match_numbers">0</stringProp>
+            <stringProp name="JSONPostProcessor.defaultValues">NOT_FOUND</stringProp>
+            <stringProp name="JSONPostProcessor.scope">variable</stringProp>
+          </JSONPostProcessor>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <collectionProp name="Asserter.test_strings">
+              <stringProp name="49586">200</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">16</intProp>
+            <stringProp name="Assertion.custom_message"></stringProp>
+          </ResponseAssertion>
+          <hashTree/>
+        </hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="4. Select Offer">
+          <stringProp name="HTTPSampler.domain">localhost</stringProp>
+          <stringProp name="HTTPSampler.port">4500</stringProp>
+          <stringProp name="HTTPSampler.protocol">http</stringProp>
+          <stringProp name="HTTPSampler.path">/SelectOffer</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">{&#xd;
+  &quot;requestId&quot;: &quot;${requestId}&quot;,&#xd;
+  &quot;transactionId&quot;: &quot;${transactionId}&quot;,&#xd;
+  &quot;customerId&quot;:&quot;${customerId}&quot;,&#xd;
+  &quot;msisdn&quot;: &quot;${msisdn}&quot;,&#xd;
+  &quot;requestedAmount&quot;: ${__Random(500000,1000000,)}.00,&#xd;
+  &quot;accountId&quot;:&quot;${accountId}&quot;,&#xd;
+  &quot;productId&quot;: &quot;${productId}&quot;,&#xd;
+  &quot;channel&quot;: &quot;100&quot;&#xd;
+}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Authorization</stringProp>
+                <stringProp name="Header.value">Bearer ${__P(GLOBAL_ACCESS_TOKEN)}</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <JSONPostProcessor guiclass="JSONPostProcessorGui" testclass="JSONPostProcessor" testname="JSON Extractor - Offer  ID">
+            <stringProp name="JSONPostProcessor.referenceNames">offerId</stringProp>
+            <stringProp name="JSONPostProcessor.jsonPathExprs">$.loan[0].offerId</stringProp>
+            <stringProp name="JSONPostProcessor.match_numbers">0</stringProp>
+            <stringProp name="JSONPostProcessor.scope">variable</stringProp>
+            <stringProp name="JSONPostProcessor.defaultValues">NOT_FOUND</stringProp>
+            <stringProp name="Sample.scope">all</stringProp>
+          </JSONPostProcessor>
+          <hashTree/>
+          <JSONPostProcessor guiclass="JSONPostProcessorGui" testclass="JSONPostProcessor" testname="JSON Extractor -  Requested Amount" enabled="true">
+            <stringProp name="JSONPostProcessor.referenceNames">amount</stringProp>
+            <stringProp name="JSONPostProcessor.jsonPathExprs">$.loan[0].amount</stringProp>
+            <stringProp name="JSONPostProcessor.match_numbers">0</stringProp>
+            <stringProp name="JSONPostProcessor.defaultValues">800</stringProp>
+            <stringProp name="JSONPostProcessor.scope">variable</stringProp>
+            <stringProp name="Sample.scope">all</stringProp>
+          </JSONPostProcessor>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <collectionProp name="Asserter.test_strings">
+              <stringProp name="49586">200</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">16</intProp>
+            <stringProp name="Assertion.custom_message"></stringProp>
+          </ResponseAssertion>
+          <hashTree/>
+        </hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="5. Provide Loan">
+          <stringProp name="HTTPSampler.domain">localhost</stringProp>
+          <stringProp name="HTTPSampler.port">4500</stringProp>
+          <stringProp name="HTTPSampler.protocol">http</stringProp>
+          <stringProp name="HTTPSampler.path">/ProvideLoan</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">{&#xd;
+	&quot;requestId&quot;:&quot;${requestId}&quot;,&#xd;
+	&quot;transactionId&quot;:&quot;${transactionId}&quot;,&#xd;
+	&quot;customerId&quot;:&quot;${customerId}&quot;,&#xd;
+	&quot;accountId&quot;:&quot;${accountId}&quot;,&#xd;
+	&quot;msisdn&quot;:&quot;${msisdn}&quot;,&#xd;
+	&quot;requestedAmount&quot;:${amount},&#xd;
+	&quot;collectionType&quot;:1,&#xd;
+	&quot;offerId&quot;:&quot;${offerId}&quot;,&#xd;
+	&quot;channel&quot;:&quot;100&quot;&#xd;
+}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Authorization</stringProp>
+                <stringProp name="Header.value">Bearer ${__P(GLOBAL_ACCESS_TOKEN)}</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <collectionProp name="Asserter.test_strings">
+              <stringProp name="49586">200</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">16</intProp>
+            <stringProp name="Assertion.custom_message"></stringProp>
+          </ResponseAssertion>
+          <hashTree/>
+        </hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="6. Loan Status" enabled="true">
+          <stringProp name="HTTPSampler.domain">localhost</stringProp>
+          <stringProp name="HTTPSampler.port">4500</stringProp>
+          <stringProp name="HTTPSampler.protocol">http</stringProp>
+          <stringProp name="HTTPSampler.path">/LoanStatus</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">{&#xd;
+	&quot;transactionId&quot;:&quot;${transactionId}&quot;,&#xd;
+	&quot;customerId&quot;:&quot;${customerId}&quot;,&#xd;
+	&quot;msisdn&quot;:&quot;${msisdn}&quot;,&#xd;
+	&quot;channel&quot;:&quot;100&quot;,&#xd;
+	&quot;accountId&quot;:&quot;${accountId}&quot;&#xd;
+}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Authorization</stringProp>
+                <stringProp name="Header.value">Bearer ${__P(GLOBAL_ACCESS_TOKEN)}</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <JSONPostProcessor guiclass="JSONPostProcessorGui" testclass="JSONPostProcessor" testname="JSON Extractor -  Debt Id" enabled="true">
+            <stringProp name="JSONPostProcessor.referenceNames">debtId</stringProp>
+            <stringProp name="JSONPostProcessor.jsonPathExprs">$.loans[0].debtId</stringProp>
+            <stringProp name="JSONPostProcessor.match_numbers">0</stringProp>
+            <stringProp name="JSONPostProcessor.defaultValues">800</stringProp>
+            <stringProp name="JSONPostProcessor.scope">variable</stringProp>
+            <stringProp name="Sample.scope">all</stringProp>
+          </JSONPostProcessor>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <collectionProp name="Asserter.test_strings">
+              <stringProp name="49586">200</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">16</intProp>
+            <stringProp name="Assertion.custom_message"></stringProp>
+          </ResponseAssertion>
+          <hashTree/>
+        </hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="7. Repayment" enabled="true">
+          <stringProp name="HTTPSampler.domain">localhost</stringProp>
+          <stringProp name="HTTPSampler.port">4500</stringProp>
+          <stringProp name="HTTPSampler.protocol">http</stringProp>
+          <stringProp name="HTTPSampler.path">/Repayment</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+          <stringProp name="HTTPSampler.method">POST</stringProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.postBodyRaw">true</boolProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments">
+            <collectionProp name="Arguments.arguments">
+              <elementProp name="" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">{&#xd;
+	&quot;debtId&quot;:&quot;${debtId}&quot;,&#xd;
+	&quot;transactionId&quot;:&quot;${transactionId}&quot;,&#xd;
+	&quot;customerId&quot;:&quot;${customerId}&quot;,&#xd;
+	&quot;msisdn&quot;:&quot;${msisdn}&quot;,&#xd;
+	&quot;channel&quot;:&quot;100&quot;,&#xd;
+	&quot;accountId&quot;:&quot;${accountId}&quot;,&#xd;
+  	&quot;productId&quot;: &quot;${productId}&quot;&#xd;
+}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+              </elementProp>
+            </collectionProp>
+          </elementProp>
+        </HTTPSamplerProxy>
+        <hashTree>
+          <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
+            <collectionProp name="HeaderManager.headers">
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Content-Type</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Accept</stringProp>
+                <stringProp name="Header.value">application/json</stringProp>
+              </elementProp>
+              <elementProp name="" elementType="Header">
+                <stringProp name="Header.name">Authorization</stringProp>
+                <stringProp name="Header.value">Bearer ${__P(GLOBAL_ACCESS_TOKEN)}</stringProp>
+              </elementProp>
+            </collectionProp>
+          </HeaderManager>
+          <hashTree/>
+          <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
+            <collectionProp name="Asserion.test_strings"/>
+            <collectionProp name="Asserter.test_strings">
+              <stringProp name="49586">200</stringProp>
+            </collectionProp>
+            <stringProp name="Assertion.test_field">Assertion.response_code</stringProp>
+            <boolProp name="Assertion.assume_success">false</boolProp>
+            <intProp name="Assertion.test_type">16</intProp>
+            <stringProp name="Assertion.custom_message"></stringProp>
+          </ResponseAssertion>
+          <hashTree/>
+        </hashTree>
+        <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree" enabled="true">
+          <boolProp name="ResultCollector.error_logging">false</boolProp>
+          <objProp>
+            <name>saveConfig</name>
+            <value class="SampleSaveConfiguration">
+              <time>true</time>
+              <latency>true</latency>
+              <timestamp>true</timestamp>
+              <success>true</success>
+              <label>true</label>
+              <code>true</code>
+              <message>true</message>
+              <threadName>true</threadName>
+              <dataType>true</dataType>
+              <encoding>false</encoding>
+              <assertions>true</assertions>
+              <subresults>true</subresults>
+              <responseData>false</responseData>
+              <samplerData>false</samplerData>
+              <xml>false</xml>
+              <fieldNames>true</fieldNames>
+              <responseHeaders>false</responseHeaders>
+              <requestHeaders>false</requestHeaders>
+              <responseDataOnError>false</responseDataOnError>
+              <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+              <assertionsResultsToSave>0</assertionsResultsToSave>
+              <bytes>true</bytes>
+              <sentBytes>true</sentBytes>
+              <url>true</url>
+              <threadCounts>true</threadCounts>
+              <idleTime>true</idleTime>
+              <connectTime>true</connectTime>
+            </value>
+          </objProp>
+          <stringProp name="filename"></stringProp>
+        </ResultCollector>
+        <hashTree/>
+        <DebugSampler guiclass="TestBeanGUI" testclass="DebugSampler" testname="Debug Sampler" enabled="true">
+          <boolProp name="displayJMeterProperties">false</boolProp>
+          <boolProp name="displayJMeterVariables">true</boolProp>
+          <boolProp name="displaySystemProperties">false</boolProp>
+        </DebugSampler>
+        <hashTree/>
+      </hashTree>
+      <ResultCollector guiclass="ViewResultsFullVisualizer" testclass="ResultCollector" testname="View Results Tree">
+        <boolProp name="ResultCollector.error_logging">false</boolProp>
+        <objProp>
+          <name>saveConfig</name>
+          <value class="SampleSaveConfiguration">
+            <time>true</time>
+            <latency>true</latency>
+            <timestamp>true</timestamp>
+            <success>true</success>
+            <label>true</label>
+            <code>true</code>
+            <message>true</message>
+            <threadName>true</threadName>
+            <dataType>true</dataType>
+            <encoding>false</encoding>
+            <assertions>true</assertions>
+            <subresults>true</subresults>
+            <responseData>false</responseData>
+            <samplerData>false</samplerData>
+            <xml>false</xml>
+            <fieldNames>true</fieldNames>
+            <responseHeaders>false</responseHeaders>
+            <requestHeaders>false</requestHeaders>
+            <responseDataOnError>false</responseDataOnError>
+            <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+            <assertionsResultsToSave>0</assertionsResultsToSave>
+            <bytes>true</bytes>
+            <sentBytes>true</sentBytes>
+            <url>true</url>
+            <threadCounts>true</threadCounts>
+            <idleTime>true</idleTime>
+            <connectTime>true</connectTime>
+          </value>
+        </objProp>
+        <stringProp name="filename"></stringProp>
+      </ResultCollector>
+      <hashTree/>
+    </hashTree>
+  </hashTree>
+</jmeterTestPlan>