Update config.py

This reverts commit 8bb5ce69e2.

.env.local.example

@@ -12,6 +12,7 @@ DATABASE_PASSWORD=FirstAdvance!
 DATABASE_HOST=dev-data.simbrellang.net
 DATABASE_PORT=10532
 DATABASE_NAME=firstadvancedev
+#SQLALCHEMY_DATABASE_URI_FULL="oracle+oracledb://FIRSTADVSTG:Pchanged_56789@10.2.110.30:1521/?service_name=firstadv"
 
 # DATABASE_HOST=10.20.30.60
 # DATABASE_USER=firstadvance

JUNK/send_report.py

@@ -0,0 +1,15 @@
+from flask import Flask
+from app.extensions import mail
+from app.utils.mail import send_report_email, get_report_data
+from app.config import settings
+
+app = Flask(__name__)
+app.config.from_object(settings)
+
+mail.init_app(app)
+
+with app.app_context():
+    report_data = get_report_data()
+    recipients = ["vdagbue@gmail.com"]
+    result = send_report_email(report_data, recipients)
+    print(result)

app/__init__.py

@@ -1,4 +1,5 @@
 from flask import Flask
+from flask_mail import Mail
 import os
 from flask_swagger_ui import get_swaggerui_blueprint
 from flask_cors import CORS
@@ -7,7 +8,7 @@ from app.api.routes import api
 from app.errors import register_error_handlers
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
-from app.extensions import db, migrate
+from app.extensions import db, migrate, mail
 from flask_jwt_extended import (
     JWTManager,
     jwt_required,
@@ -18,6 +19,10 @@ from flask_jwt_extended import (
 
 def create_app():
     """Factory function to create a Flask app instance"""
+    # import oracledb
+    
+    # oracledb.init_oracle_client(lib_dir=None) 
+
     app = Flask(__name__)
 
     # Load configuration
@@ -43,6 +48,9 @@ def create_app():
 
     from . import models
 
+    # Initialize Flask-Mail
+    mail.init_app(app)
+
     # Database and Migrations
     db.init_app(app)
 

app/api/enums/loan_status.py

@@ -3,5 +3,6 @@ from enum import Enum
 class LoanStatus(str, Enum):
     PENDING = "pending"
     ACTIVE = "active"
+    ACTIVE_PARTIAL = "active_partial"
     START_REPAY = "start_repay"
     REPAID = "repaid"

app/api/integrations/__init__.py

@@ -1,2 +1,3 @@
 from .simbrella import SimbrellaIntegration
-from .kafka import KafkaIntegration
+from .kafka import KafkaIntegration
+from .events_service import EventServiceIntegration

app/api/integrations/events_service.py

@@ -0,0 +1,49 @@
+import httpx
+from app.utils.logger import logger
+from app.config import settings
+
+
+class EventServiceIntegration:
+    BASE_URL = settings.SIMBRELLA_BASE_URL
+    ENDPOINT_DIRECT_LOAN = settings.ENDPOINT_DIRECT_LOAN
+    ENDPOINT_DIRECT_REPAYMENT = settings.ENDPOINT_DIRECT_REPAYMENT
+
+    @staticmethod
+    def direct_loan(transaction_id: str):
+        """
+        Calls the Direct Loan endpoint
+        """
+        url = f"{EventServiceIntegration.BASE_URL}{EventServiceIntegration.ENDPOINT_DIRECT_LOAN}"
+        payload = {"transactionId": str(transaction_id)}
+
+        headers = {
+            "Content-Type": "application/json"
+        }
+
+        try:
+            response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
+            logger.info(f"Loan Response: {response.text}")
+            return response
+        except Exception as e:
+            logger.error(f"Direct Loan API call failed: {str(e)}", exc_info=True)
+            raise
+
+    @staticmethod
+    def direct_repayment(transaction_id: str):
+        """
+        Calls the Direct Repayment endpoint
+        """
+        url = f"{EventServiceIntegration.BASE_URL}{EventServiceIntegration.ENDPOINT_DIRECT_REPAYMENT}"
+        payload = {"transactionId": str(transaction_id)}
+
+        headers = {
+            "Content-Type": "application/json",
+        }
+
+        try:
+            response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
+            logger.info(f"Repayment Response: {response.text}")
+            return response
+        except Exception as e:
+            logger.error(f"Direct Repayment API call failed: {str(e)}", exc_info=True)
+            raise

app/api/integrations/simbrella.py

@@ -17,44 +17,14 @@ class SimbrellaIntegration:
         url = f"{SimbrellaIntegration.BASE_URL}/{SimbrellaIntegration.ENDPOINT_RAC_CHECKS}"
         logger.info(f"Contacting Rack Checks EndPoint: {str(url)}", exc_info=True)
 
-        # {
-        #     "transactionId": "T001",
-        #     "fbnTransactionId": "Tr201712RK9232P115",
-        #     "customerId": "CN621868",
-        #     "accountId": "2017821799",
-        #     "channel": "USSD",
-        #     "countryCode": "NG"
-        # }
-        #
-        payload_old = {
-            "customerId": customer_id,
-            "accountId": account_id,
-            "transactionId": str(transaction_id),
-            "fbnTransactionId": f"FBN{transaction_id}",
-            "RAC_Array": [
-                "SalaryAccount",
-                "BVN",
-                "BVNAttachedtoAccount",
-                "CRC",
-                "CRMS",
-                "AccountStatus",
-                "Lien",
-                "NoBouncedCheck",
-                "Whitelist",
-                "NoPastDueSalaryLoan",
-                "NoPastDueOtherLoan",
-            ],
-        }
-
         payload = {
             "customerId": customer_id,
             "accountId": account_id,
             "transactionId": str(transaction_id),
-            "fbnTransactionId": f"FBN{transaction_id}",
+            "fbnTransactionId": str(transaction_id),
             "countryCode": "NG",
             "channel": "USSD"
         }
-        # logger.info(f"This is PayLoad: {str(payload)}", exc_info=True)
 
         headers = {
             "Content-Type": "application/json",

app/api/routes/routes.py

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

app/api/services/base_service.py

@@ -4,6 +4,7 @@ from flask import jsonify
 from marshmallow import ValidationError
 import logging
 from app.api.integrations import KafkaIntegration
+from app.utils.mail import send_report_email, get_report_data
 
 logger = logging.getLogger(__name__)
 
@@ -48,12 +49,14 @@ class BaseService:
         """
         Create a new transaction.
         """
+        channel = "USSD" if validated_data.get("channel") is None else validated_data.get("channel")
+
         return Transaction.create_transaction(
             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"),
+            channel = channel,
         )
     
     @classmethod
@@ -171,3 +174,6 @@ class BaseService:
        # return {"rate": 0, "fee": 0, "due_days": 0}
 
 
+    @classmethod
+    def send_mail(cls, report_data, recipients):
+            send_report_email(report_data, recipients)

app/api/services/eligibility_check.py

@@ -1,6 +1,5 @@
 from flask import session, jsonify
 from app.models.loan import Loan
-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
@@ -70,20 +69,31 @@ class EligibilityCheckService(BaseService):
                     return ResponseHelper.error(result_description="RACCheck failed")
                 
                 response = response.json()
+
+                logger.info(f"This is Response (from Eligibility Check): {str(response)}", exc_info=True)
+
                 
+                if not response or response['responseCode'] != '00':
+
+                    if response:
+                        logger.error(f"{response['responseMessage']}")
+
+                    return ResponseHelper.error(result_description=f"RACCheck failed")
+
+                rack_checks_response = response['data']['racResponse']
+
                 rac_check = RACCheck.add_rac_check(
                     customer_id = customer_id,
                     account_id = account_id,
                     transaction_id = transaction.transaction_id,
-                    data = response['racResponse']
+                    data = rack_checks_response
                     )
-                
-                if not rac_check:
-                        logger.error(f"Failed to save RACCheck")
-                        return ResponseHelper.error(result_description="Failed to save RACCheck.")
 
-                rack_checks_response = response['racResponse']
-# -----------------TIME FOR ANALYSIS TO REGISTER OFFER ----------------------
+                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(
@@ -176,10 +186,10 @@ class EligibilityCheckService(BaseService):
             logger.error(f"Offer not found for offer_id: {offer_id} (customer_id: {customer_id})")
             return False
 
-        daily_count = TransactionOffer.get_daily_loan_count(customer_id, offer_id)
+        daily_count = Loan.get_daily_loan_count(customer_id, offer.product_id)
         
         
-        logger.error(f"daily_count: {daily_count}, Max: {offer.max_daily_loans}")
+        logger.info(f"daily_count: {daily_count}, Max: {offer.max_daily_loans}")
 
         if offer.max_daily_loans is not None and daily_count >= offer.max_daily_loans:
             return False

app/api/services/loan_status.py

@@ -55,6 +55,7 @@ class LoanStatusService(BaseService):
                 # Simulated processing logic
                 response_data = {
                     "customerId": customer_id,
+                    "accountId": account_id,
                     "transactionId": transactionId,
                     "loans": loans,
                     "totalDebtAmount": total_debt_amount,

app/api/services/offer_analysis.py

@@ -1,7 +1,15 @@
+from decimal import Decimal
 from app.models import Offer, TransactionOffer
 from app.models.loan import Loan
 import random
 import logging
+
+from app.config import Config
+
+RAC_TRUE_CHECK_RULES = Config.rac_true_rules
+RAC_FALSE_CHECK_RULES = Config.rac_false_rules
+RAC_SALARY_PAYMENTS = Config.rac_salary_payments
+
 logger = logging.getLogger(__name__)
 
 class OfferAnalysis:
@@ -32,9 +40,88 @@ class OfferAnalysis:
         original_transaction =  transaction_id
 
         return transaction_offer, offer, eligible_amount, original_transaction
+    
     @staticmethod
-    def _analyze_rack_checks(rack_response):
+    def _analyze_rack_checks(rack_response, offer):
+        logger.info(f"This is PayLoad for ANALYSYS ***** : {str(rack_response)}", exc_info=True)
+        logger.info(f"RACk TRUE RULES    {str(RAC_TRUE_CHECK_RULES)}", exc_info=True)
+        logger.info(f"RACk FALSE RULES   {str(RAC_FALSE_CHECK_RULES)}", exc_info=True)
+        logger.info(f"RACk SALARY PAYMENTS   {str(RAC_SALARY_PAYMENTS)}", exc_info=True)
 
+        if not isinstance(rack_response, dict) or not offer :
+            raise ValueError("Invalid RAC response format.")
+        
+
+        
+        failed_true_rules = []
+        failed_false_rules = []
+        salaries = []
+
+        # Expects true
+        for rule in RAC_TRUE_CHECK_RULES:
+            if not rack_response.get(rule, False):
+                failed_true_rules.append(rule)
+
+        # Expects false
+        for rule in RAC_FALSE_CHECK_RULES:
+            if rack_response.get(rule, True):
+                failed_false_rules.append(rule)
+
+
+        # Salary rules
+        for key in RAC_SALARY_PAYMENTS:
+            value = rack_response.get(key)
+
+           
+            if isinstance(value, Decimal):
+                 # Only use values greater than 0
+                if value > 0:
+                    salaries.append(value)
+            elif isinstance(value, (int, float, str)):
+                try:
+                    value = Decimal(str(value))
+                    if value > 0:
+                        salaries.append(value)
+                except:
+                    logger.warning(f"Could not convert value of {key} to Decimal: {value}")
+
+
+        if failed_true_rules or failed_false_rules or not salaries:
+            logger.warning(f"Failed TRUE rules: {failed_true_rules}")
+            logger.warning(f"Failed FALSE rules: {failed_false_rules}")
+            logger.warning("No salary records found in RAC response.")
+            raise ValueError(f"RAC analysis failed")
+        
+
+
+        logger.info(f"These are the salary amounts ***** : {str(salaries)}", exc_info=True)
+
+        #Least salary in the last 6 months
+        min_salary = min(salaries)
+
+        # Check consistency rule
+        consistent_income = rack_response.get("rule7_consistent_salary_amount", False)
+
+         # Determine percentage based on offer tenor
+        tenor = offer.tenor
+        
+        if tenor == 30 and consistent_income:
+            eligible_amount = min_salary * Decimal("0.5")
+            logger.info("Applying 50% of least salary in 6 months due to 1-month offer tenor with stable income.")
+        elif tenor == 90 and consistent_income:
+            eligible_amount = min_salary * Decimal("0.75")
+            logger.info("Applying 75% of least salary in 6 months due to 3-months offer tenor with stable income.")
+           
+        else:  # Income is not consistent
+            eligible_amount = 0
+            logger.info("Applying no percentage on least salary due unstable income.")
+            
+
+
+        logger.info(f"Calculated eligible amount from RAC: {eligible_amount} based on {'stable' if consistent_income else 'unstable'} income.")
+
+        return eligible_amount.quantize(Decimal("1.00"))  
+    
         # "racResponse": {
         #     "accountStatus": true,
         #     "bvnValidated": true,
@@ -48,6 +135,17 @@ class OfferAnalysis:
         # },
         #
 
+        '''
+        30 days
+        Eligibility amount (monthly SOL) - Adoption of 50% of the least salary inflow in the past 6 months
+        to determine loan eligibility for potential customers.
+
+        3 months
+        Adoption of 75% of the least salary inflow in the past 6 months to determine loan eligibility for
+        potential customers" for customers that have unstable income.   3 months
+        '''
+        # rac_true_rules
+
         return 0
 
     @staticmethod
@@ -56,16 +154,13 @@ class OfferAnalysis:
         # if we have active offers - we have to feed off it
         logger.info(f"**RACK ANALYSIS** {customer_id}")
         # Analyze Rack Checks
-        # _analyze_rack_checks(rack_checks_response)  --> We need detail analysis
-
+        # new_eligible_amount = OfferAnalysis._analyze_rack_checks(rack_checks_response)  #--> We need detail analysis
 
         # 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}")
@@ -117,12 +212,18 @@ class OfferAnalysis:
 
 
         for offer in offers:
-            # Get approved amount
-            random_float = random.random()  # temporary to play data
+           
+            new_eligible_amount = OfferAnalysis._analyze_rack_checks(rack_checks_response, offer)
 
-            approved_amount = new_eligible_amount if new_eligible_amount > 0 else min(offer.max_amount, offer.max_amount * random_float) 
+
+            approved_amount = new_eligible_amount 
             approved_amount = round(approved_amount, 2)
 
+            if approved_amount < offer.min_amount:
+                    logger.error(f"Max eligible amount ({approved_amount}) is less than the minimum offer amount ({offer.min_amount}).")
+                    raise ValueError("You are not eligible for a loan at this time.")
+
+
             transaction_offer = TransactionOffer.create_transaction_offer(
                 customer_id=customer_id,
                 transaction_id=transaction_id,

app/api/services/provide_loan.py

@@ -13,6 +13,7 @@ from app.api.enums import LoanStatus
 from app.extensions import db
 from datetime import datetime, timezone
 from dateutil.relativedelta import relativedelta
+from app.api.integrations import EventServiceIntegration
 from app.models import LoanRepaymentSchedule 
 from app.api.services.offer_analysis import OfferAnalysis
 from app.api.helpers.response_helper import ResponseHelper
@@ -172,11 +173,15 @@ class ProvideLoanService(BaseService):
                     "accountId": account_id,
                     "msisdn": customer.msisdn
                     }
+                
+
+                event_thread = Thread(target=ProvideLoanService.trigger_loan_disbursement, args=(transaction_id,))
+                event_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, "PROCESS_PAYMENT"))
-                thread.start()
+                kafka_thread = Thread(target=ProvideLoanService.async_send_to_kafka, args=(response_data, request_id, "PROCESS_PAYMENT"))
+                kafka_thread.start()
 
                 db.session.commit()
                 return ResponseHelper.success(data=response_data)
@@ -195,4 +200,11 @@ class ProvideLoanService(BaseService):
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
             db.session.rollback()
-            return ResponseHelper.internal_server_error()
+            return ResponseHelper.internal_server_error()
+        
+    @classmethod
+    def trigger_loan_disbursement(cls, transaction_id: str):
+        response = EventServiceIntegration.direct_loan(transaction_id=transaction_id)
+        return response
+    
+    

app/api/services/repayment.py

@@ -11,6 +11,7 @@ from app.api.services.base_service import BaseService
 from app.api.enums import TransactionType 
 from threading import Thread
 from app.extensions import db
+from app.api.integrations import EventServiceIntegration
 
 class RepaymentService(BaseService):
     TRANSACTION_TYPE = TransactionType.REPAYMENT 
@@ -29,6 +30,7 @@ class RepaymentService(BaseService):
         try:
             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')
@@ -37,9 +39,9 @@ class RepaymentService(BaseService):
                 # customer = Customer.get_customer_with_loan_list(customer_id)
                 transaction_id  = validated_data.get('transactionId')
                 initiated_by = validated_data.get('initiatedBy')
-        
+                logger.error(f"HERE 0002a **** ")
                 if(RepaymentService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
-
+                    logger.error(f"HERE 0001a **** ")
                     # Check loan exists
                     loan = Loan.get_customer_loan(loan_id = loan_id, customer_id = customer_id)
 
@@ -61,11 +63,16 @@ class RepaymentService(BaseService):
                     if not transaction:
                         logger.error(f"Failed to log transaction")
                         return ResponseHelper.error(result_description="Failed to log transaction.") 
-                else: 
+                else:
+                    logger.error(f"Invalid Customer or AccountID {account_id} to CustomerID{customer_id} ")
                     return ResponseHelper.error(result_description="Invalid Customer or Account")
 
                 # Simulated processing logic
+                # TODO start using repayment_id instead if id or Id
                 response_data = {
+                    "Id": repayment.id,
+                    "repayment_id": repayment.id,
+                    "initiated_by": repayment.initiated_by,
                     "transactionId": transaction_id,
                     "customerId": customer_id,
                     "productId": loan.product_id,
@@ -73,9 +80,12 @@ class RepaymentService(BaseService):
                     "debtId": loan_id
                 }
 
+                event_thread = Thread(target=RepaymentService.trigger_loan_repayment, args=(transaction_id,))
+                event_thread.start()
+
                 # Call Kafka in a background thread
-                thread = Thread(target=RepaymentService.async_send_to_kafka, args=(response_data, request_id, "LOAN_REPAYMENT"))
-                thread.start()
+                kafka_thread = Thread(target=RepaymentService.async_send_to_kafka, args=(response_data, request_id, "LOAN_REPAYMENT"))
+                kafka_thread.start()
 
                 db.session.commit()
                 return ResponseHelper.success(data=response_data)
@@ -95,3 +105,10 @@ class RepaymentService(BaseService):
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
             db.session.rollback()
             return ResponseHelper.internal_server_error()
+
+
+    @classmethod
+    def trigger_loan_repayment(cls, transaction_id: str):
+        response = EventServiceIntegration.direct_repayment(transaction_id=transaction_id)
+        return response
+    

app/api/services/select_offer.py

@@ -3,6 +3,7 @@ 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.models.transaction_offers import TransactionOffer
 from app.utils.logger import logger
 from app.api.schemas.select_offer import SelectOfferSchema
 from app.extensions import db
@@ -57,12 +58,20 @@ class SelectOfferService(BaseService):
                 # Get the offer by product ID
                 offer = Offer.get_offer_by_product_id(product_id)
 
+                transaction_offer = TransactionOffer.get_transaction_offer(transaction_offer_id=offer_id)
+
+                if not transaction_offer:
+                    logger.error(f"offer {offer_id} not found for customer {customer_id} and transaction {transaction_id}.")
+                    return ResponseHelper.error(result_description="Offer not found.")
+
                 db.session.flush()
 
-                if amount < offer.min_amount:
+                if amount < transaction_offer.min_amount:
+                    logger.error(f"The amount {amount} is less than the minimum allowed offer amount {transaction_offer.min_amount}.")
                     return ResponseHelper.error(result_description="The amount is less than the minimum allowed offer amount.")
-                elif amount > offer.max_amount:
-                    return ResponseHelper.error(result_description="The amount is greater than the maximum allowed offer amount.")
+                elif amount > transaction_offer.eligible_amount:
+                    logger.error(f"The amount {amount} is greater than the eligible offer amount {transaction_offer.eligible_amount}.")
+                    return ResponseHelper.error(result_description="The amount is greater than the eligible offer amount.")
 
                     
 

app/config.py

@@ -16,10 +16,19 @@ class Config:
     DATABASE_PASSWORD = os.environ.get("DATABASE_PASSWORD")
     DATABASE_HOST = os.environ.get("DATABASE_HOST")
     DATABASE_PORT = os.environ.get("DATABASE_PORT", 10532)
-    DATABASE_NAME = os.environ.get("DATABASE_NAME")
+    DATABASE_NAME = os.environ.get("DATABASE_NAME", "firstadvancedev")
+    DATABASE_SID = os.environ.get("DATABASE_SID", "FREE")
+    DNS = f"(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={DATABASE_HOST})(PORT={DATABASE_PORT}))(CONNECT_DATA=(SID={DATABASE_SID})))"
+
 
     # Database Connection
-    SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}"
+    # SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}"
+
+    SQLALCHEMY_DATABASE_URI_INTERNAL = (f"oracle+oracledb://{DATABASE_USER}:{DATABASE_PASSWORD}@{DNS}")
+    SQLALCHEMY_DATABASE_URI = os.getenv("SQLALCHEMY_DATABASE_URI_FULL", SQLALCHEMY_DATABASE_URI_INTERNAL)
+
+    #SQLALCHEMY_DATABASE_URI_FULL = 'oracle+oracledb://FIRSTADVSTG:Pchanged_56789@10.2.110.30:1521/?service_name=firstadv'
+
     SQLALCHEMY_TRACK_MODIFICATIONS = False
 
 
@@ -34,9 +43,13 @@ class Config:
 
    # SIMBRELLA_ENDPOINT_RAC_CHECKS = os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS", "RACCheck")
     VALID_APP_ID = os.getenv("SIMBRELLA_APP_ID", "app1")
-    VALID_API_KEY = os.getenv("SIMBRELLA_API_KEY", "testtest-api-key-12345")
+    VALID_API_KEY = os.getenv("SIMBRELLA_API_KEY", "test-api-key-12345")
     SIMBRELLA_BASE_URL = os.getenv("SIMBRELLA_BASE_URL", "http://127.0.0.1:6337")
     SIMBRELLA_ENDPOINT_RAC_CHECKS = os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS","api/rac-check")
+    EVENTS_SERVICE_BASE_URL = os.getenv("EVENTS_SERVICE_BASE_URL","https://event-core.simbrellang.net")
+    ENDPOINT_DIRECT_LOAN = os.getenv("ENDPOINT_DIRECT_LOAN","/autocall/direct/loan")
+    ENDPOINT_DIRECT_REPAYMENT = os.getenv("ENDPOINT_DIRECT_REPAYMENT","/autocall/direct/repayment")
+
 
     RAC_RESULT_accountStatus = os.environ.get("RAC_RESULT_accountStatus", "true")
     RAC_RESULT_bvnValidated = os.environ.get("RAC_RESULT_bvnValidated", "true")
@@ -48,4 +61,46 @@ class Config:
     RAC_RESULT_isWhitelisted = os.environ.get("RAC_RESULT_isWhitelisted", "true")
     RAC_RESULT_noBouncedCheck = os.environ.get("RAC_RESULT_noBouncedCheck", "true")
 
+    rac_true_rules = [
+        "rule1_45day_sal",
+        "rule2_2m_sal",
+        "rule3_no_bounced_check",
+        "rule4_current_loan_payments",
+        "rule5_no_past_due_fadv_loan",
+        "rule6_no_past_due_other_loan",
+        "rule7_consistent_salary_amount",
+        "rule8_whitelisted",
+        "rule9_regular_account",
+        "rule10_bvn_validation",
+        "rule11_CRC_no_delinquency",
+        "rule12_CRMS_no_delinquency",
+        "rule13_BVN_ignore",
+        "rule14_no_lien",
+        "rule15_null_ignore"
+    ]
+    
+    rac_false_rules = [
+
+    ]
+
+    rac_salary_payments = [
+        "salarypaymenT_1",
+        "salarypaymenT_2",
+        "salarypaymenT_3",
+        "salarypaymenT_4",
+        "salarypaymenT_5",
+        "salarypaymenT_6"
+    ]
+
+    MAIL_SERVER = os.getenv('MAIL_SERVER','smtp.zoho.com')
+    MAIL_PORT = 587
+    MAIL_USERNAME = os.getenv('MAIL_USERNAME', 'firstadvance@dynamikservices.tech')
+    MAIL_PASSWORD = os.getenv('MAIL_PASSWORD')
+    MAIL_USE_TLS = True
+    MAIL_USE_SSL = False
+    MAIL_DEFAULT_SENDER = ('FirstAdvance', 'firstadvance@dynamikservices.tech')
+    MAIL_RECEIVER= os.getenv('MAIL_RECEIVER', 'vdagbue@gmail.com')
+   
+
+
 settings = Config()

app/extensions.py

@@ -1,5 +1,7 @@
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate
+from flask_mail import Mail
 
+mail = Mail()
 db = SQLAlchemy()
 migrate = Migrate()

app/models/__init__.py

@@ -9,6 +9,8 @@ from .charge import Charge
 from .rac_checks import RACCheck
 from .loan_repayment_schedule import LoanRepaymentSchedule
 from .transaction_offers import TransactionOffer
+from .repayments_data import RepaymentsData
+from .salary import Salary
 
 
-__all__ = ['Customer', 'Account', 'Loan', 'Transaction', 'Repayment', 'LoanCharge', 'Offer', 'Charge', 'RACCheck', 'LoanRepaymentSchedule', 'TransactionOffer']
+__all__ = ['Customer', 'Account', 'Loan', 'Transaction', 'Repayment', 'LoanCharge', 'Offer', 'Charge', 'RACCheck', 'LoanRepaymentSchedule', 'TransactionOffer', 'RepaymentsData', 'Salary']

app/models/loan.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import datetime, timezone, timedelta
 from itertools import product
 from app.extensions import db
 from app.models.customer import Customer
@@ -35,6 +35,7 @@ class Loan(db.Model):
     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)
+    balance = 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')
     tenor = db.Column(db.Integer, nullable=True)
@@ -45,6 +46,10 @@ class Loan(db.Model):
     disburse_date = db.Column(db.DateTime, nullable=True)
     disburse_verify = db.Column(db.DateTime, nullable=True)
     reference = db.Column(db.String(50), nullable=True)
+    disburse_result = db.Column(db.String(10), nullable=True)
+    disburse_description = db.Column(db.String(100), nullable=True)
+    verify_result = db.Column(db.String(10), nullable=True)
+    verify_description = db.Column(db.String(100), nullable=True)
 
     customer = relationship(
         "Customer",
@@ -108,6 +113,7 @@ class Loan(db.Model):
             current_loan_amount = initial_loan_amount,
             upfront_fee = upfront_fee,
             repayment_amount = repayment_amount,
+            balance = repayment_amount,
             installment_amount = installment_amount,
             due_date=due_date,
             tenor = tenor,
@@ -211,6 +217,25 @@ class Loan(db.Model):
         # Update loan status and the updated_at timestamp
         loan.status = status
 
+
+    @classmethod
+    def get_daily_loan_count(cls, customer_id, product_id):
+        """
+        Returns the count of loans created today for a customer.
+        """
+
+        start_of_day = datetime.now(timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0)
+        end_of_day = start_of_day + timedelta(days=1)
+
+        return cls.query.filter_by(
+            customer_id=customer_id,
+            product_id=product_id,      
+            ).filter(
+            cls.created_at >= start_of_day,
+            cls.created_at < end_of_day
+        ).count()
+
+
     def to_dict(self):
         """
         Convert the Loan object to a dictionary format for JSON serialization.

app/models/loan_repayment_schedule.py

@@ -17,6 +17,11 @@ class LoanRepaymentSchedule(db.Model):
     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)
+    due_process_date = db.Column(db.DateTime, nullable=True)
+    due_process_count = db.Column(db.Integer, default=0)
+    paid_status = db.Column(db.String(20), nullable=True)
+    repay_description = db.Column(db.String(255), nullable=True)
+    partial_balance = db.Column(db.Float, default=0.0)
 
     created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
     updated_at = db.Column(db.DateTime(timezone=True), server_default=func.now(), onupdate=func.now())

app/models/offer.py

@@ -7,8 +7,8 @@ from sqlalchemy.sql import func
 class Offer(db.Model):
     __tablename__ = 'offers'
 
-    id = db.Column(db.String, primary_key=True)
-    product_id = db.Column(db.String, nullable=False)
+    id = db.Column(db.String(50), primary_key=True)
+    product_id = db.Column(db.String(50), 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)

app/models/rac_checks.py

@@ -3,6 +3,7 @@ from app.extensions import db
 from sqlalchemy.orm import relationship
 from sqlalchemy.exc import IntegrityError
 from uuid import uuid4
+import json
 from sqlalchemy.types import JSON
 from sqlalchemy.sql import func
 
@@ -11,11 +12,22 @@ class RACCheck(db.Model):
 
     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)
+    customer_id = db.Column(db.String(50), nullable=False)
+    account_id = db.Column(db.String(50), nullable=False)
+    rac_response = db.Column(db.Text, nullable=False)
     created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
     updated_at = db.Column(db.DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
+
+
+    @property
+    def rac_response_data(self):
+        return json.loads(self.rac_response)
+
+    @rac_response_data.setter
+    def rac_response_data(self, value):
+        self.rac_response = json.dumps(value)
+
+
     @classmethod
     def add_rac_check(cls, customer_id, account_id, transaction_id, data = None):
     
@@ -25,10 +37,11 @@ class RACCheck(db.Model):
             customer_id = customer_id,
             account_id = account_id,
             transaction_id = transaction_id,
-            rac_response = data,
             created_at=datetime.now(timezone.utc),
             updated_at=datetime.now(timezone.utc)
         )
+
+        rac_check.rac_response_data = data or {}
         
         try:
             db.session.add(rac_check)
@@ -66,7 +79,7 @@ class RACCheck(db.Model):
             "transactionId": str(self.transaction_id),
             "customerId": self.customer_id,
             "accountId": self.account_id,
-            "racResponse": self.rac_response,
+            "racResponse": self.rac_response_data,
             "createdAt": self.created_at.isoformat(),
             "updatedAt": self.updated_at.isoformat() if self.updated_at else None
         }

app/models/repayment.py

@@ -21,6 +21,16 @@ class Repayment(db.Model):
     created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
     updated_at = db.Column(db.DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
     transaction_id = db.Column(db.String(50), nullable=True)
+    # repay_date = db.Column(db.DateTime, default=datetime.now(timezone.utc))
+    repay_date = db.Column(db.DateTime, nullable=True)
+    repay_result = db.Column(db.String(10), nullable=True)
+    repay_description = db.Column(db.String(100), nullable=True)
+    # verify_date = db.Column(db.DateTime, default=datetime.now(timezone.utc))
+    verify_date = db.Column(db.DateTime, nullable=True)
+    verify_result = db.Column(db.String(10), nullable=True)
+    verify_description = db.Column(db.String(100), nullable=True)
+    initiated_by = db.Column(db.String(50), nullable=True)
+    salary_amount = db.Column(db.Float, nullable=True, default=0.0)
 
     @classmethod
     def create_repayment(cls, customer_id, loan, transaction_id):
@@ -36,7 +46,8 @@ class Repayment(db.Model):
             product_id=loan.product_id,
             transaction_id = transaction_id,
             created_at=datetime.now(timezone.utc),
-            updated_at=datetime.now(timezone.utc)
+            updated_at=datetime.now(timezone.utc),
+            initiated_by='USER_INITIATED'
         )
 
         try:
@@ -45,6 +56,25 @@ class Repayment(db.Model):
             raise ValueError(f"Database integrity error: {err}")
 
         return repayment
+    
+    def to_dict(self):
+        return {
+            "id": self.id,
+            "loan_id": self.loan_id,
+            "customer_id": self.customer_id,
+            "product_id": self.product_id,
+            "created_at": self.created_at.isoformat() if self.created_at else None,
+            "updated_at": self.updated_at.isoformat() if self.updated_at else None,
+            "transaction_id": self.transaction_id,
+            "repay_date": self.repay_date.isoformat() if self.repay_date else None,
+            "repay_result": self.repay_result,
+            "repay_description": self.repay_description,
+            "verify_date": self.verify_date.isoformat() if self.verify_date else None,
+            "verify_result": self.verify_result,
+            "verify_description": self.verify_description,
+            "initiated_by": self.initiated_by,
+            "salary_amount": self.salary_amount
+        }
 
     def __repr__(self):
         return f'<Repayment {self.id}>'

app/models/repayments_data.py

@@ -0,0 +1,36 @@
+from datetime import datetime, timezone
+from app.extensions import db
+
+
+class RepaymentsData(db.Model):
+    __tablename__ = "repayments_data"
+
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    transaction_id = db.Column(db.String(50), nullable=False)
+    fbn_transaction_id = db.Column(db.String(50), nullable=True)
+    customer_id = db.Column(db.String(50), nullable=True)
+    account_id = db.Column(db.String(50), nullable=True)
+    repayment_amount = db.Column(db.Float, nullable=True, default=0.0)
+    amount_collected = db.Column(db.Float, nullable=True, default=0.0)
+    added_date = db.Column(db.DateTime(timezone=True), default=datetime.now(timezone.utc), nullable=False)
+    response_code = db.Column(db.String(10), nullable=True)
+    response_descr = db.Column(db.String(255), nullable=True)
+    balance = db.Column(db.Float, nullable=True, default=0.0)
+
+    def to_dict(self):
+        return {
+            "id": self.id,
+            "transaction_id": self.transaction_id,
+            "fbn_transaction_id": self.fbn_transaction_id,
+            "customer_id": self.customer_id,
+            "account_id": self.account_id,
+            "repayment_amount": self.repayment_amount,
+            "amount_collected": self.amount_collected,
+            "added_date": self.added_date.isoformat() if self.added_date else None,
+            "response_code": self.response_code,
+            "response_descr": self.response_descr,
+            "balance": self.balance,
+        }
+
+    def __repr__(self):
+        return f"<RepaymentsData id={self.id}, transaction_id={self.transaction_id}>"

app/models/salary.py

@@ -0,0 +1,31 @@
+from datetime import datetime, timezone
+from app.extensions import db
+from sqlalchemy.sql import func
+
+class Salary(db.Model):
+    __tablename__ = 'salaries'
+
+    id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    customer_id = db.Column(db.String(50), nullable=False)
+    account_id = db.Column(db.String(50), nullable=True)
+    status = db.Column(db.String(20), default='active')
+    amount = db.Column(db.Float, nullable=False, default=0.0)
+    salary_date = db.Column(db.DateTime(timezone=False), server_default=func.now())
+    created_at = db.Column(db.DateTime(timezone=False), server_default=func.now())
+    updated_at = db.Column(db.DateTime(timezone=False), server_default=func.now(), onupdate=func.now())
+
+    def to_dict(self):
+        return {
+            "id": self.id,
+            "customer_id": self.customer_id,
+            "account_id": self.account_id,
+            "status": self.status,
+            "amount": self.amount,
+            "salary_date": self.salary_date.isoformat() if self.salary_date else None,
+            "created_at": self.created_at.isoformat() if self.created_at else None,
+            "updated_at": self.updated_at.isoformat() if self.updated_at else None
+        }
+
+    def __repr__(self):
+        return f'<Salary {self.id} - {self.amount}>'
+    

app/models/transaction.py

@@ -17,8 +17,10 @@ class Transaction(db.Model):
     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)
+    phone_number = db.Column(db.String(50), nullable=True)
     created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
     updated_at = db.Column(db.DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
+    
     def __repr__(self):
         return f'<Transaction {self.id}>'
 

app/models/transaction_offers.py

@@ -76,23 +76,6 @@ class TransactionOffer(db.Model):
         """
         return cls.query.filter_by(customer_id=customer_id).count()
 
-    @classmethod
-    def get_daily_loan_count(cls, customer_id, offer_id):
-        """
-        Returns the count of loans created today for a customer.
-        """
-
-        start_of_day = datetime.now(timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0)
-        end_of_day = start_of_day + timedelta(days=1)
-
-        return cls.query.filter_by(
-            customer_id=customer_id,
-            offer_id=offer_id
-            ).filter(
-            cls.created_at >= start_of_day,
-            cls.created_at < end_of_day
-        ).count()
-
 
     @classmethod
     def get_latest_transaction_offer(cls, customer_id):
@@ -102,6 +85,13 @@ class TransactionOffer(db.Model):
         return cls.query.filter_by(customer_id=customer_id) \
             .order_by(cls.created_at.desc()) \
             .first()
+    
+    @classmethod
+    def get_transaction_offer(cls, transaction_offer_id):
+        """
+        Returns a transaction offer by its ID.
+        """
+        return cls.query.get(transaction_offer_id)
 
 
     

app/swagger/digifi_swagger.json

@@ -20,12 +20,15 @@
     {
       "url": "http://api.dev.simbrellang.net:4500"
     },
-        {
+    {
       "url": "https://api.dev.simbrellang.net"
+    },
+    {
+      "url": "http://10.2.249.133:4500"
     }
   ],
   "tags": [
-      {
+    {
       "name": "Authorize",
       "description": "This feature will be used for authorizing customers.",
       "externalDocs": {
@@ -131,18 +134,6 @@
       "RepaymentResponse": {
         "$ref": "swagger/schemas/RepaymentResponse.json"
       },
-      "CustomerConsentRequest": {
-        "$ref": "swagger/schemas/CustomerConsentRequest.json"
-      },
-      "CustomerConsentResponse": {
-        "$ref": "swagger/schemas/CustomerConsentResponse.json"
-      },
-      "NotificationCallbackRequest": {
-        "$ref": "swagger/schemas/NotificationCallbackRequest.json"
-      },
-      "NotificationCallbackResponse": {
-        "$ref": "swagger/schemas/NotificationCallbackResponse.json"
-      },
       "ApiResponse": {
         "$ref": "swagger/schemas/ApiResponse.json"
       },

app/swagger/paths/CustomerConsent.json

@@ -1,56 +0,0 @@
-{
-    "post": {
-      "tags": [
-        "CustomerConsent"
-      ],
-      "summary": "Customer Consent Request",
-      "description": "Customer Consent Request",
-      "operationId": "CustomerConsent",
-      "requestBody": {
-        "required": true,
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "../schemas/CustomerConsentRequest.json"
-            }
-          },
-          "application/xml": {
-            "schema": {
-              "$ref": "../schemas/CustomerConsentRequest.json"
-            }
-          },
-          "application/x-www-form-urlencoded": {
-            "schema": {
-              "$ref": "../schemas/CustomerConsentRequest.json"
-            }
-          }
-        }
-      },
-      "responses": {
-        "200": {
-          "description": "Successful",
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "../schemas/CustomerConsentResponse.json"
-                }
-            },
-            "application/xml": {
-              "schema": {
-                "$ref": "../schemas/CustomerConsentResponse.json"
-              }
-            }
-          }
-        },
-        "400": {
-          "description": "Invalid request"
-        },
-        "422": {
-          "description": "Validation exception"
-        },
-        "500": {
-          "description": "Internal server error"
-        }
-      }
-    }
-  }

app/swagger/paths/NotificationCallback.json

@@ -1,57 +0,0 @@
-{
-    "post": {
-      "tags": [
-        "NotificationCallback"
-      ],
-      "summary": "Loan Information Request ",
-      "description": "Loan Information Request",
-      "operationId": "NotificationCallback",
-      "requestBody": {
-        "description": "Post JSON to conduct eligibility tests",
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "../schemas/NotificationCallbackRequest.json"
-            }
-          },
-          "application/xml": {
-            "schema": {
-              "$ref": "../schemas/NotificationCallbackRequest.json"
-            }
-          },
-          "application/x-www-form-urlencoded": {
-            "schema": {
-              "$ref": "../schemas/NotificationCallbackRequest.json"
-            }
-          }
-        },
-        "required": true
-      },
-      "responses": {
-        "200": {
-          "description": "Successful operation",
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "../schemas/NotificationCallbackResponse.json"
-              }
-            },
-            "application/xml": {
-              "schema": {
-                "$ref": "../schemas/NotificationCallbackResponse.json"
-              }
-            }
-          }
-        },
-       "400": {
-          "description": "Invalid request"
-        },
-        "422": {
-          "description": "Validation exception"
-        },
-        "500": {
-          "description": "Internal server error"
-        }
-      }
-    }
-  }

app/swagger/schemas/CustomerConsentRequest.json

@@ -1,37 +0,0 @@
-{
-    "type": "object",
-    "properties": {
-        "type": {
-            "type": "string",
-            "example": "CustomerConsentRequest"
-        },
-        "transactionId": {
-            "type": "string",
-            "example": "20171209232177"
-        },
-        "customerId": {
-            "type": "string",
-            "example": "CN621868"
-        },
-        "accountId": {
-            "type": "string",
-            "example": "ACN8263457"
-        },
-        "requestTime": {
-            "type": "string",
-            "format": "date-time",
-            "example": "2019-10-18 14:26:21.063"
-        },
-        "consentType": {
-            "type": "string",
-            "example": "Revoke"
-        },
-        "channel": {
-            "type": "string",
-            "example": "USSD"
-        }
-    },
-    "xml": {
-        "name": "CustomerConsentRequest"
-    }
-}

app/swagger/schemas/CustomerConsentResponse.json

@@ -1,16 +0,0 @@
-{
-    "type": "object",
-    "properties": {
-        "resultCode": {
-            "type": "string",
-            "example": "00"
-        },
-        "resultDescription": {
-            "type": "string",
-            "example": "Request is received"
-        }
-    },
-    "xml": {
-        "name": "CustomerConsentResponse"
-    }
-}

app/swagger/schemas/EligibilityCheckRequest.json

@@ -3,7 +3,7 @@
     "properties": {
         "transactionId": {
             "type": "string",
-            "example": "Tr201712RK9232P115"
+            "example": "TRX201712RK9232P115"
         },
         "countryCode": {
             "type": "string",
@@ -11,19 +11,19 @@
         },
         "customerId": {
             "type": "string",
-            "example": "CN621868"
-        },
-        "msisdn": {
-            "type": "string",
-            "example": "8093451342"
-        },
-        "channel": {
-            "type": "string",
-            "example": "100"
+            "example": "5268548"
         },
         "accountId": {
             "type": "string",
-            "example": "ACN8263457"
+            "example": "4348094226"
+        },
+        "msisdn": {
+            "type": "string",
+            "example": "2348093451342"
+        },
+        "channel": {
+            "type": "string",
+            "example": "USSD"
         }
     },
     "xml": {

app/swagger/schemas/EligibilityCheckResponse.json

@@ -3,19 +3,19 @@
     "properties": {
         "customerId": {
             "type": "string",
-            "example": "CN621868"
+            "example": "5268548"
         },
         "transactionId": {
             "type": "string",
-            "example": "TX12345"
+            "example": "TRX201712RK9232P115"
         },
         "countryCode": {
             "type": "string",
-            "example": "NG"
+            "example": "NGR"
         },
         "msisdn": {
             "type": "string",
-            "example": "3451342"
+            "example": "2348093451342"
         },
         "eligibleOffers": {
             "type": "array",
@@ -24,42 +24,42 @@
                 "properties": {
                     "offerId": {
                         "type": "string",
-                        "example": "Offer1"
+                        "example": "SAL90000204"
                     },
                     "productId": {
                         "type": "string",
-                        "example": "Product1"
+                        "example": "3MPC"
                     },
                     "minAamount": {
                         "type": "number",
                         "format": "decimal",
-                        "example": 100.00
+                        "example": 20000.00
                     },
                     "maxAamount": {
                         "type": "number",
                         "format": "decimal",
-                        "example": 1000.00
+                        "example": 31257.00
                     },
                     "tenor": {
                         "type": "integer",
-                        "example": 12
+                        "example": 90
                     }
                 }
             },
             "example": [
-                {
-                    "offerId": "Offer1",
-                    "productId": "Product1",
-                    "minAamount": 100.00,
-                    "maxAamount": 1000.00,
-                    "tenor": 12
+                 {
+                    "max_amount": "31257.00",
+                    "min_amount": 20000.0,
+                    "offerId": "SAL90000204",
+                    "product_id": "3MPC",
+                    "tenor": 90
                 },
                 {
-                    "offerId": "Offer2",
-                    "productId": "Product2",
-                    "minAamount": 200.00,
-                    "maxAamount": 2000.00,
-                    "tenor": 24
+                    "max_amount": "20838.00",
+                    "min_amount": 5000.0,
+                    "offerId": "SAL30000205",
+                    "product_id": "AMPC",
+                    "tenor": 30
                 }
             ]
         },

app/swagger/schemas/LoanStatusRequest.json

@@ -3,15 +3,15 @@
     "properties": {
         "transactionId": {
             "type": "string",
-            "example": "Tr201712RK9232P115"
+            "example": "TRCVIC73089465966"
         },
         "customerId": {
             "type": "string",
-            "example": "CN621868"
+            "example": "ZX48440946"
         },
         "msisdn": {
             "type": "string",
-            "example": "3451342"
+            "example": "2348093451342"
         },
         "channel": {
             "type": "string",
@@ -19,7 +19,7 @@
         },
         "accountId": {
             "type": "string",
-            "example": "ACN8263457"
+            "example": "361005323"
         }
     },
     "xml": {

app/swagger/schemas/LoanStatusResponse.json

@@ -1,83 +1,110 @@
 {
-    "type": "object",
-    "properties": {
-        "customerId": {
-            "type": "string",
-            "example": "CN621868"
-        },
-        "transactionId": {
-            "type": "string",
-            "example": "Tr201712RK9232P115"
-        },
-        "loans": {
-            "type": "array",
-            "items": {
-                "type": "object",
-                "properties": {
-                    "debtId": {
-                        "type": "string",
-                        "example": "123456789"
-                    },
-                    "loanDate": {
-                        "type": "string",
-                        "format": "date-time",
-                        "example": "2019-10-18 14:26:21.063"
-                    },
-                    "dueDate": {
-                        "type": "string",
-                        "format": "date-time",
-                        "example": "2019-11-20 14:26:21.063"
-                    },
-                    "currentLoanAmount": {
-                        "type": "integer",
-                        "example": 8500
-                    },
-                    "initialLoanAmount": {
-                        "type": "integer",
-                        "example": 10000
-                    },
-                    "defaultPenaltyFee": {
-                        "type": "integer",
-                        "example": 0
-                    },
-                    "continuousFee": {
-                        "type": "integer",
-                        "example": 0
-                    },
-                    "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:"
-                    }
-                }
-            }
-        }
-                }
-            }
-        },
-        "resultCode": {
-            "type": "string",
-            "example": "00"
-        },
-        "resultDescription": {
-            "type": "string",
-            "example": "Successful"
-        }
+  "type": "object",
+  "properties": {
+    "customerId": {
+      "type": "string",
+      "example": "ZX48440946"
     },
-    "xml": {
-        "name": "LoanStatusResponse"
+    "transactionId": {
+      "type": "string",
+      "example": "TRCVIC49381378037"
+    },
+    "accountId": {
+      "type": "string",
+      "example": "361005323"
+    },
+    "loans": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "debtId": {
+            "type": "integer",
+            "example": 80
+          },
+          "loanDate": {
+            "type": "string",
+            "format": "date-time",
+            "example": "2025-09-12T11:58:58"
+          },
+          "dueDate": {
+            "type": "string",
+            "format": "date-time",
+            "example": "2025-12-11T11:58:58"
+          },
+          "currentLoanAmount": {
+            "type": "number",
+            "format": "float",
+            "example": 30000.0
+          },
+          "initialLoanAmount": {
+            "type": "number",
+            "format": "float",
+            "example": 30000.0
+          },
+          "defaultPenaltyFee": {
+            "type": "number",
+            "format": "float",
+            "example": 0.0
+          },
+          "continuousFee": {
+            "type": "number",
+            "format": "float",
+            "example": 0.0
+          },
+          "productId": {
+            "type": "string",
+            "example": "3MPC"
+          },
+          "installmentAmount": {
+            "type": "number",
+            "format": "float",
+            "example": 10900.0
+          },
+          "repaymentAmount": {
+            "type": "number",
+            "format": "float",
+            "example": 32700.0
+          },
+          "loanRef": {
+            "type": "string",
+            "example": "TRCVIC73089465966USSD3MPC"
+          },
+          "status": {
+            "type": "string",
+            "example": "active"
+          },
+          "tenor": {
+            "type": "integer",
+            "example": 90
+          },
+          "transactionId": {
+            "type": "string",
+            "example": "TRCVIC73089465966"
+          },
+          "upfrontFee": {
+            "type": "number",
+            "format": "float",
+            "example": 622.5
+          }
+        }
+      }
+    },
+    "resultCode": {
+      "type": "string",
+      "example": "00"
+    },
+    "resultDescription": {
+      "type": "string",
+      "example": "Successful"
+    },
+    "totalDebtAmount": {
+      "type": "number",
+      "format": "float",
+      "example": 30000.0
     }
-}
+  },
+  "xml": {
+    "name": "LoanStatusResponse"
+  }
+}

app/swagger/schemas/NotificationCallbackRequest.json

@@ -1,50 +0,0 @@
-{
-    "type": "object",
-    "properties": {
-        "fbnTransactionId": {
-            "type": "string",
-            "example": "123456789"
-        },
-        "transactionId": {
-            "type": "string",
-            "example": "123456789"
-        },
-        "customerId": {
-            "type": "string",
-            "example": "CN621868"
-        },
-        "accountId": {
-            "type": "string",
-            "example": "ACN8263457"
-        },
-        "debtId": {
-            "type": "string",
-            "example": "987654321"
-        },
-        "transactionType": {
-            "type": "string",
-            "example": "Disbursement"
-        },
-        "amountProvided": {
-            "type": "number",
-            "format": "float",
-            "example": 1000.00
-        },
-        "amountCollected": {
-            "type": "number",
-            "format": "float",
-            "example": 0.00
-        },
-        "responseCode": {
-            "type": "string",
-            "example": "00"
-        },
-        "responseDescription": {
-            "type": "string",
-            "example": "Successful"
-        }
-    },
-    "xml": {
-        "name": "NotificationCallbackRequest"
-    }
-}

app/swagger/schemas/NotificationCallbackResponse.json

@@ -1,16 +0,0 @@
-{
-    "type": "object",
-    "properties": {
-        "resultCode": {
-            "type": "string",
-            "example": "00"
-        },
-        "resultDescription": {
-            "type": "string",
-            "example": "Successful"
-        }
-    },
-    "xml": {
-        "name": "NotificationCallbackResponse"
-    }
-}

app/swagger/schemas/ProvideLoanRequest.json

@@ -3,40 +3,40 @@
     "properties": {
         "requestId": {
             "type": "string",
-            "example": "202111170001371256908"
+            "example": "RQID11170001371256908"
         },
         "transactionId": {
             "type": "string",
-            "example": "Tr201712RK9232P115"
+            "example": "TRCVIC73089465966"
         },
         "customerId": {
             "type": "string",
-            "example": "CN621868"
+            "example": "ZX48440946"
         },
         "accountId": {
             "type": "string",
-            "example": "ACN8263457"
+            "example": "361005323"
         },
         "msisdn": {
             "type": "string",
-            "example": "3451342"
+            "example": "2348093451342"
         },
         "requestedAmount": {
             "type": "number",
             "format": "decimal",
-            "example": 900
+            "example": 20000
         },
         "collectionType": {
             "type": "integer",
-            "example": 1
+            "example": 0
         },
         "offerId": {
             "type": "integer",
-            "example": 1127
+            "example": "SAL900004543304"
         },
         "channel": {
             "type": "string",
-            "example": "100"
+            "example": "USSD"
         }
     },
     "xml": {

app/swagger/schemas/ProvideLoanResponse.json

@@ -1,40 +1,40 @@
 {
-    "type": "object",
-    "properties": {
-        "requestId": {
-            "type": "string",
-            "example": "202111170001371256908"
-        },
-        "transactionId": {
-            "type": "string",
-            "example": "Tr201712RK9232P115"
-        },
-        "loanRef": {
-            "type": "string",
-            "example": "1620029887USSDAMPC"
-        },
-        "customerId": {
-            "type": "string",
-            "example": "CN621868"
-        },
-        "accountId": {
-            "type": "string",
-            "example": "ACN8263457"
-        },
-        "msisdn": {
-            "type": "string",
-            "example": "3451342"
-        },
-        "resultCode": {
-            "type": "string",
-            "example": "00"
-        },
-        "resultDescription": {
-            "type": "string",
-            "example": "Successful"
-        }
+  "type": "object",
+  "properties": {
+    "requestId": {
+      "type": "string",
+      "example": "81757678335583"
     },
-    "xml": {
-        "name": "ProvideLoanResponse"
+    "transactionId": {
+      "type": "string",
+      "example": "TRCVIC73089465966"
+    },
+    "loanRef": {
+      "type": "string",
+      "example": "TRCVIC73089465966USSD3MPC"
+    },
+    "customerId": {
+      "type": "string",
+      "example": "ZX48440946"
+    },
+    "accountId": {
+      "type": "string",
+      "example": "361005323"
+    },
+    "msisdn": {
+      "type": "string",
+      "example": "98016510058"
+    },
+    "resultCode": {
+      "type": "string",
+      "example": "00"
+    },
+    "resultDescription": {
+      "type": "string",
+      "example": "Successful"
     }
-}
+  },
+  "xml": {
+    "name": "ProvideLoanResponse"
+  }
+}

app/swagger/schemas/RepaymentRequest.json

@@ -3,27 +3,27 @@
     "properties": {
         "msisdn": {
             "type": "string",
-            "example": "3451342"
+            "example": "2348093451342"
         },
         "debtId": {
-            "type": "string",
-            "example": "10"
+            "type": "number",
+            "example": 80
         },
         "transactionId": {
             "type": "string",
-            "example": "20171209232115"
+            "example": "TRCVIC73089465966"
         },
         "customerId": {
             "type": "string",
-            "example": "CID0000025585"
+            "example": "ZX48440946"
         },
         "loanRef": {
             "type": "string",
-            "example": "Trx5847365252USSD3MPC"
+            "example": "TRCVIC73089465966USSD3MPC"
         },
         "accountId": {
             "type": "string",
-            "example": "ACN8263457"
+            "example": "361005323"
         }
     },
     "xml": {

app/swagger/schemas/RepaymentResponse.json

@@ -1,28 +1,48 @@
 {
-    "type": "object",
-    "properties": {
-        "customerId": {
-            "type": "string",
-            "example": "CN621868"
-        },
-        "productId": {
-            "type": "string",
-            "example": "101"
-        },
-        "debtId": {
-            "type": "string",
-            "example": "273194670"
-        },
-        "resultCode": {
-            "type": "string",
-            "example": "00"
-        },
-        "resultDescription": {
-            "type": "string",
-            "example": "Successful"
-        }
+  "type": "object",
+  "properties": {
+    "Id": {
+      "type": "integer",
+      "example": 195
     },
-    "xml": {
-        "name": "RepaymentResponse"
+    "customerId": {
+      "type": "string",
+      "example": "ZX48440946"
+    },
+    "debtId": {
+      "type": "string",
+      "example": "80"
+    },
+    "initiated_by": {
+      "type": "string",
+      "example": "USER_INITIATED"
+    },
+    "loanRef": {
+      "type": "string",
+      "example": "TRCVIC73089465966USSD3MPC"
+    },
+    "productId": {
+      "type": "string",
+      "example": "3MPC"
+    },
+    "repayment_id": {
+      "type": "integer",
+      "example": 195
+    },
+    "transactionId": {
+      "type": "string",
+      "example": "TRCVIC73089465966"
+    },
+    "resultCode": {
+      "type": "string",
+      "example": "00"
+    },
+    "resultDescription": {
+      "type": "string",
+      "example": "Successful"
     }
-}
+  },
+  "xml": {
+    "name": "RepaymentResponse"
+  }
+}

app/swagger/schemas/SelectOfferRequest.json

@@ -3,40 +3,40 @@
     "properties": {
         "requestId": {
             "type": "string",
-            "example": "202111170001371256908"
+            "example": "RQID11170001371256908"
         },
         "transactionId": {
             "type": "string",
-            "example": "1231231321232"
+            "example": "TRX1231231321232"
         },
         "customerId": {
             "type": "string",
-            "example": "CN621868"
-        },
-        "msisdn": {
-            "type": "string",
-            "example": "123456789"
-        },
-        "requestedAmount": {
-            "type": "number",
-            "format": "double",
-            "example": 10000.55
+            "example": "CN6215268548868"
         },
         "accountId": {
             "type": "string",
-            "example": "ACN8263457"
+            "example": "4348094226"
         },
+        "msisdn": {
+            "type": "string",
+            "example": "2348093451342"
+        },
+        "requestedAmount": {
+            "type": "number",
+            "example": 20000
+        },
+       
         "productId": {
             "type": "string",
             "example": "3MPC"
         },
         "offerId": {
             "type": "string",
-            "example": "101"
+            "example": "SAL900004543304"
         },
         "channel": {
             "type": "string",
-            "example": ""
+            "example": "USSD"
         }
     },
     "xml": {

app/swagger/schemas/SelectOfferResponse.json

@@ -1,121 +1,129 @@
 {
-    "type": "object",
-    "properties": {
-        "requestId": {
+  "type": "object",
+  "properties": {
+    "requestId": {
+      "type": "string",
+      "example": "81757678225025"
+    },
+    "transactionId": {
+      "type": "string",
+      "example": "TRCVIC73089465966"
+    },
+    "customerId": {
+      "type": "string",
+      "example": "ZX48440946"
+    },
+    "accountId": {
+      "type": "string",
+      "example": "361005323"
+    },
+    "loan": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "offerId": {
             "type": "string",
-            "example": "202111170001371256908"
-        },
-        "transactionId": {
+            "example": "SAL90000204"
+          },
+          "productId": {
             "type": "string",
-            "example": "1231231321232"
-        },
-        "customerId": {
-            "type": "string",
-            "example": "1256907"
-        },
-        "accountId": {
-            "type": "string",
-            "example": "5948306019"
-        },
-        "loan": {
+            "example": "3MPC"
+          },
+          "amount": {
+            "type": "number",
+            "format": "float",
+            "example": 30000.0
+          },
+          "upfrontPayment": {
+            "type": "number",
+            "format": "float",
+            "example": 622.5
+          },
+          "interestRate": {
+            "type": "number",
+            "format": "float",
+            "example": 3.0
+          },
+          "interestFee": {
+            "type": "number",
+            "format": "float",
+            "example": 2700.0
+          },
+          "managementRate": {
+            "type": "number",
+            "format": "float",
+            "example": 1.0
+          },
+          "managementFee": {
+            "type": "number",
+            "format": "float",
+            "example": 300.0
+          },
+          "insuranceRate": {
+            "type": "number",
+            "format": "float",
+            "example": 1.0
+          },
+          "insuranceFee": {
+            "type": "number",
+            "format": "float",
+            "example": 300.0
+          },
+          "VATRate": {
+            "type": "number",
+            "format": "float",
+            "example": 7.5
+          },
+          "VATAmount": {
+            "type": "number",
+            "format": "float",
+            "example": 22.5
+          },
+          "recommendedRepaymentDates": {
             "type": "array",
             "items": {
-                "type": "object",
-                "properties": {
-                    "offerId": {
-                        "type": "string",
-                        "example": "14451"
-                    },
-                    "productId": {
-                        "type": "string",
-                        "example": "3MPC"
-                    },
-                    "amount": {
-                        "type": "number",
-                        "format": "float",
-                        "example": 10000.0
-                    },
-                    "dueDate": {
-                        "type": "string",
-                        "example": "2025-04-24 10:31:"
-                    },
-                    "upfrontPayment": {
-                        "type": "number",
-                        "format": "float",
-                        "example": 1000.0
-                    },
-                    "interestRate": {
-                        "type": "number",
-                        "format": "float",
-                        "example": 3.0
-                    },
-                    "interestFee": {
-                        "type": "number",
-                        "format": "float",
-                        "example": 3000.00
-                    },
-                    "ManagementRate": {
-                        "type": "number",
-                        "format": "float",
-                        "example": 1.0
-                    },
-                    "ManagementFee": {
-                        "type": "number",
-                        "format": "float",
-                        "example": 1.0
-                    },
-                    "InsuranceRate": {
-                        "type": "number",
-                        "format": "float",
-                        "example": 1.0
-                    },
-                    "InsuranceFee": {
-                        "type": "number",
-                        "format": "float",
-                        "example": 100.0
-                    },
-                    "VATRate": {
-                        "type": "number",
-                        "format": "float",
-                        "example": 7.5
-                    },
-                    "VATamount": {
-                        "type": "number",
-                        "format": "float",
-                        "example": 100.0
-                    },
-                    "installmentRepaymentDates": {
-                        "type": "array",
-                        "items": {
-                            "type": "string"
-                        },
-                        "example": [
-                            "2022-11-30"
-                        ]
-                    },
-                    "installmentAmount": {
-                        "type": "number",
-                        "format": "float",
-                        "example": 11000.0
-                    },
-                    "totalRepaymentAmount": {
-                        "type": "number",
-                        "format": "float",
-                        "example": 11000.0
-                    }
-                }
-            }
-        },
-        "resultCode": {
-            "type": "string",
-            "example": "00"
-        },
-        "resultDescription": {
-            "type": "string",
-            "example": "Successful"
+              "type": "string"
+            },
+            "example": [
+              "2025-10-12",
+              "2025-11-12",
+              "2025-12-12"
+            ]
+          },
+          "installmentAmount": {
+            "type": "number",
+            "format": "float",
+            "example": 10900.0
+          },
+          "repaymentAmount": {
+            "type": "number",
+            "format": "float",
+            "example": 32700.0
+          },
+          "totalRepaymentAmount": {
+            "type": "number",
+            "format": "float",
+            "example": 33322.5
+          }
         }
+      }
     },
-    "xml": {
-        "name": "SelectOffersResponse"
+    "outstandingDebtAmount": {
+      "type": "number",
+      "format": "float",
+      "example": 0
+    },
+    "resultCode": {
+      "type": "string",
+      "example": "00"
+    },
+    "resultDescription": {
+      "type": "string",
+      "example": "Successful"
     }
-}
+  },
+  "xml": {
+    "name": "SelectOffersResponse"
+  }
+}

app/utils/mail.py

@@ -0,0 +1,40 @@
+from flask_mail import Message
+from flask import current_app
+from app.extensions import mail
+import pandas as pd
+from io import BytesIO
+
+def get_report_data():
+    """
+    Fetch and return loan summary data.
+    """
+    return [
+        {"Type": "Disbursement", "Count": 45},
+        {"Type": "Repayment", "Count": 32},
+    ]
+def send_report_email(report_data: list, recipients: list):
+    """
+    Sends an HTML + Excel report to the given email recipients.
+    """
+    df = pd.DataFrame(report_data)
+    output = BytesIO()
+    df.to_excel(output, index=False)
+    output.seek(0)
+
+    html_table = df.to_html(index=False, border=1)
+
+    msg = Message(
+        subject="Loan Report Summary",
+        recipients=recipients,
+        html=f"<h3>Loan Report Summary</h3>{html_table}",
+    )
+    msg.attach(
+        "loan_report.xlsx",
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        output.read()
+    )
+
+    with current_app.app_context():
+        mail.send(msg)
+
+    return "Report email sent"

migrations/versions/05b5494ad406_.py

@@ -0,0 +1,31 @@
+"""empty message
+
+Revision ID: 05b5494ad406
+Revises: 33e09efd85e3
+Create Date: 2025-07-06 09:28:26.264927
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "05b5494ad406"
+down_revision = "33e09efd85e3"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("loans", sa.Column("balance", sa.Float(), nullable=True))
+
+
+# ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("loans", "balance")
+    # ### end Alembic commands ###

migrations/versions/1340e7e578b9_migration_on_thu_apr_10_21_50_01_utc_.py

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

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

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

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

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

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

@@ -1,250 +0,0 @@
-"""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/30b45df851fa_.py

@@ -0,0 +1,45 @@
+"""empty message
+
+Revision ID: 30b45df851fa
+Revises: d59bfb9ead82
+Create Date: 2025-08-26 13:48:27.458593
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '30b45df851fa'
+down_revision = 'd59bfb9ead82'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ### 
+    op.add_column(
+        'loan_repayment_schedules',
+        sa.Column('paid_status', sa.String(length=20), nullable=True),
+    )
+     
+    op.add_column(
+        'loan_repayment_schedules',
+        sa.Column('repay_description', sa.String(length=255), nullable=True),
+    )
+
+     
+    op.add_column(
+        'loan_repayment_schedules',
+        sa.Column('partial_balance', sa.Float(), nullable=True),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('loan_repayment_schedules', 'partial_balance')
+    op.drop_column('loan_repayment_schedules', 'repay_description')
+    op.drop_column('loan_repayment_schedules', 'paid_status')
+
+    # ### end Alembic commands ###

migrations/versions/3105abd795d4_.py

@@ -1,52 +0,0 @@
-"""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/33e09efd85e3_.py

@@ -0,0 +1,280 @@
+"""empty message
+
+Revision ID: 33e09efd85e3
+Revises: 
+Create Date: 2025-07-03 14:07:14.424548
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy import literal_column
+from sqlalchemy import text
+
+
+# revision identifiers, used by Alembic.
+revision = '33e09efd85e3'
+down_revision = None
+branch_labels = None
+depends_on = None
+sequences_and_triggers = [
+    ("transactions", "transactions_seq", "trg_transactions_id"),
+    ("transaction_offers", "transaction_offers_seq", "trg_transaction_offers_id"),
+    ("salaries", "salaries_seq", "trg_salaries_id"),
+    ("repayments_data", "repayments_data_seq", "trg_repayments_data_id"),
+    ("repayments", "repayments_seq", "trg_repayments_id"),
+    ("rac_checks", "rac_checks_seq", "trg_rac_checks_id"),
+    ("loans", "loans_seq", "trg_loans_id"),
+    (
+        "loan_repayment_schedules",
+        "loan_repayment_schedules_seq",
+        "trg_loan_repayment_schedules_id",
+    ),
+    ("loan_charges", "loan_charges_seq", "trg_loan_charges_id"),
+    ("charges", "charges_seq", "trg_charges_id"),
+]
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('accounts',
+    sa.Column('id', sa.String(length=50), nullable=False),
+    sa.Column('customer_id', sa.String(length=50), nullable=False),
+    sa.Column('account_type', sa.String(length=50), nullable=True),
+    sa.Column('status', sa.String(length=20), nullable=True),
+    sa.Column('lien_amount', sa.Float(), nullable=True),
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    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(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('customers',
+    sa.Column('id', sa.String(length=50), nullable=False),
+    sa.Column('msisdn', sa.String(length=20), nullable=False),
+    sa.Column('country_code', sa.String(length=3), nullable=False),
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('msisdn')
+    )
+    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('due_date', sa.DateTime(), nullable=True),
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    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('transaction_id', sa.String(length=50), nullable=True),
+    sa.Column('product_id', sa.String(length=20), nullable=True),
+    sa.Column('installment_number', sa.Integer(), nullable=False),
+    sa.Column('due_date', sa.DateTime(), nullable=False),
+    sa.Column('installment_amount', sa.Float(), nullable=True),
+    sa.Column('total_repayment_amount', 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(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('loans',
+    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=True),
+    sa.Column('original_transaction', sa.String(length=50), nullable=True),
+    sa.Column('account_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('collection_type', sa.String(length=20), nullable=True),
+    sa.Column('current_loan_amount', sa.Float(), nullable=True),
+    sa.Column('initial_loan_amount', sa.Float(), nullable=False),
+    sa.Column('default_penalty_fee', sa.Float(), nullable=True),
+    sa.Column('continuous_fee', sa.Float(), nullable=True),
+    sa.Column('upfront_fee', sa.Float(), nullable=True),
+    sa.Column('repayment_amount', sa.Float(), nullable=True),
+    sa.Column('installment_amount', sa.Float(), nullable=True),
+    sa.Column('status', sa.String(length=20), nullable=True),
+    sa.Column('tenor', sa.Integer(), nullable=True),
+    sa.Column('due_date', sa.DateTime(), nullable=True),
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('eligible_amount', sa.Float(), nullable=True),
+    sa.Column('disburse_date', sa.DateTime(), nullable=True),
+    sa.Column('disburse_verify', sa.DateTime(), nullable=True),
+    sa.Column('reference', sa.String(length=50), nullable=True),
+    sa.Column('disburse_result', sa.String(length=10), nullable=True),
+    sa.Column('disburse_description', sa.String(length=100), nullable=True),
+    sa.Column('verify_result', sa.String(length=10), nullable=True),
+    sa.Column('verify_description', sa.String(length=100), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('offers',
+    sa.Column('id', sa.String(length=50), nullable=False),
+    sa.Column('product_id', sa.String(length=50), 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('schedule', sa.Integer(), nullable=True),
+    sa.Column('interest_rate', sa.Float(), nullable=True),
+    sa.Column('management_rate', sa.Float(), nullable=True),
+    sa.Column('insurance_rate', sa.Float(), nullable=True),
+    sa.Column('vat_rate', sa.Float(), nullable=True),
+    sa.Column('list_order', sa.Integer(), nullable=True),
+    sa.Column('max_daily_loans', sa.Integer(), nullable=True),
+    sa.Column('max_active_loans', sa.Integer(), nullable=True),
+    sa.Column('max_life_loans', sa.Integer(), nullable=True),
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('rac_checks',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('transaction_id', sa.String(length=50), nullable=False),
+    sa.Column('customer_id', sa.String(length=50), nullable=False),
+    sa.Column('account_id', sa.String(length=50), nullable=False),
+    sa.Column('rac_response', sa.Text(), nullable=False),
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    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(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('transaction_id', sa.String(length=50), nullable=True),
+    sa.Column('repay_date', sa.DateTime(), nullable=True),
+    sa.Column('repay_result', sa.String(length=10), nullable=True),
+    sa.Column('repay_description', sa.String(length=100), nullable=True),
+    sa.Column('verify_date', sa.DateTime(), nullable=True),
+    sa.Column('verify_result', sa.String(length=10), nullable=True),
+    sa.Column('verify_description', sa.String(length=100), nullable=True),
+    sa.Column('initiated_by', sa.String(length=50), nullable=True),
+    sa.Column('salary_amount', sa.Float(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('repayments_data',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('transaction_id', sa.String(length=50), nullable=False),
+    sa.Column('fbn_transaction_id', sa.String(length=50), nullable=True),
+    sa.Column('customer_id', sa.String(length=50), nullable=True),
+    sa.Column('account_id', sa.String(length=50), nullable=True),
+    sa.Column('repayment_amount', sa.Float(), nullable=True),
+    sa.Column('amount_collected', sa.Float(), nullable=True),
+    sa.Column('added_date', sa.DateTime(timezone=True), nullable=False),
+    sa.Column('response_code', sa.String(length=10), nullable=True),
+    sa.Column('response_descr', sa.String(length=255), nullable=True),
+    sa.Column('balance', sa.Float(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('salaries',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('customer_id', sa.String(length=50), nullable=False),
+    sa.Column('account_id', sa.String(length=50), nullable=True),
+    sa.Column('status', sa.String(length=20), nullable=True),
+    sa.Column('amount', sa.Float(), nullable=False),
+    sa.Column('salary_date', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('created_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    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('original_transaction', sa.String(length=50), nullable=True),
+    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(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('transactions',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('transaction_id', sa.String(length=50), nullable=False),
+    sa.Column('account_id', sa.String(length=50), nullable=True),
+    sa.Column('customer_id', sa.String(length=50), nullable=True),
+    sa.Column('type', sa.String(length=50), nullable=False),
+    sa.Column('channel', sa.String(length=50), nullable=False),
+    sa.Column('phone_number', sa.String(length=50), nullable=True),
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('CURRENT_TIMESTAMP'), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+
+    for table, seq, trg in sequences_and_triggers:
+        op.execute(
+            text(
+                f"""
+                BEGIN
+                    EXECUTE IMMEDIATE 'CREATE SEQUENCE {seq} START WITH 1 INCREMENT BY 1 NOCACHE NOCYCLE';
+                EXCEPTION
+                    WHEN OTHERS THEN
+                        IF SQLCODE != -955 THEN RAISE; END IF;
+                END;
+                """
+            )
+        )
+
+        op.execute(
+            text(
+                f"""
+                CREATE OR REPLACE TRIGGER {trg}
+                BEFORE INSERT ON {table}
+                FOR EACH ROW
+                BEGIN
+                    IF ||':'||'NEW.id IS NULL THEN
+                        SELECT {seq}.NEXTVAL INTO '||':'||'NEW.id FROM dual;
+                    END IF;
+                END;
+                """
+            )
+        )
+
+
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('transactions')
+    op.drop_table('transaction_offers')
+    op.drop_table('salaries')
+    op.drop_table('repayments_data')
+    op.drop_table('repayments')
+    op.drop_table('rac_checks')
+    op.drop_table('offers')
+    op.drop_table('loans')
+    op.drop_table('loan_repayment_schedules')
+    op.drop_table('loan_charges')
+    op.drop_table('customers')
+    op.drop_table('charges')
+    op.drop_table('accounts')
+    # ### end Alembic commands ###
+
+    for table, seq, trg in sequences_and_triggers:
+        op.execute(text(f"DROP TRIGGER {trg}"))
+        op.execute(text(f"DROP SEQUENCE {seq}"))

migrations/versions/38acee611d55_migration_for_mloan_table.py

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

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

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

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

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

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

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

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

@@ -1,57 +0,0 @@
-"""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/b3a5e10bc77e_.py

@@ -1,32 +0,0 @@
-"""empty message
-
-Revision ID: b3a5e10bc77e
-Revises: e8dd9b841ad7
-Create Date: 2025-05-27 01:52:48.538333
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = 'b3a5e10bc77e'
-down_revision = 'e8dd9b841ad7'
-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('reference', 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('reference')
-
-    # ### end Alembic commands ###

migrations/versions/b8f6fd76ead8_migration_on_thu_apr_10_16_21_45_utc_.py

@@ -1,86 +0,0 @@
-"""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/d59bfb9ead82_.py

@@ -0,0 +1,38 @@
+"""empty message
+
+Revision ID: d59bfb9ead82
+Revises: 05b5494ad406
+Create Date: 2025-08-21 14:22:19.220158
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'd59bfb9ead82'
+down_revision = '05b5494ad406'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    
+    op.add_column(
+        'loan_repayment_schedules',
+        sa.Column('due_process_date', sa.DateTime(), nullable=True)
+    )
+
+    # Add due_process_count column
+    op.add_column(
+        'loan_repayment_schedules',
+        sa.Column('due_process_count', sa.Integer(), nullable=True)
+    )
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('loan_repayment_schedules', 'due_process_date')
+    op.drop_column('loan_repayment_schedules', 'due_process_count')
+    # ### end Alembic commands ###

migrations/versions/de9ad96ba34e_migration_on_thu_apr_17_14_15_36_utc_.py

@@ -1,38 +0,0 @@
-"""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/e8dd9b841ad7_.py

@@ -1,36 +0,0 @@
-"""empty message
-
-Revision ID: e8dd9b841ad7
-Revises: 2eee4157505f
-Create Date: 2025-05-19 11:46:19.204637
-
-"""
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision = 'e8dd9b841ad7'
-down_revision = '2eee4157505f'
-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('max_daily_loans', sa.Integer(), nullable=True))
-        batch_op.add_column(sa.Column('max_active_loans', sa.Integer(), nullable=True))
-        batch_op.add_column(sa.Column('max_life_loans', sa.Integer(), 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('max_life_loans')
-        batch_op.drop_column('max_active_loans')
-        batch_op.drop_column('max_daily_loans')
-
-    # ### end Alembic commands ###

migrations/versions/eb99c7fb9e09_migration_on_sat_apr_26_19_02_17_utc_.py

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

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

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

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

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

@@ -6,6 +6,7 @@ flask-sqlalchemy
 flask-migrate
 psycopg2-binary
 alembic
+oracledb
 
 # Schema for validations
 Flask-Marshmallow==0.15.0
@@ -39,3 +40,6 @@ confluent-kafka==1.9.2
 
 python-dateutil
 
+Flask-Mail==0.10.0
+pandas==2.1.3
+openpyxl==3.1.5