Update offer_analysis.py

app/api/integrations/simbrella.py

@@ -35,7 +35,7 @@ class SimbrellaIntegration:
             ],
         }
 
-        logger.error(f"This is PayLoad: {str(payload)}", exc_info=True)
+        logger.info(f"This is PayLoad: {str(payload)}", exc_info=True)
 
         headers = {
             "Content-Type": "application/json",
@@ -46,7 +46,7 @@ class SimbrellaIntegration:
         try:
             response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
 
-            logger.error(f"This is Response: {str(response)}", exc_info=True)
+            logger.info(f"This is Response: {str(response)}", exc_info=True)
 
             return response
            

app/api/schemas/select_offer.py

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

app/api/services/__init__.py

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

app/api/services/base_service.py

@@ -123,6 +123,7 @@ class BaseService:
 
         return {
             "interest": interest,
+            "interest_amount": interest_amount,
             "management": management,
             "insurance": insurance,
             "vat": vat,

app/api/services/eligibility_check.py

@@ -7,7 +7,11 @@ from marshmallow import ValidationError
 from app.api.enums import TransactionType
 from app.api.integrations import SimbrellaIntegration
 from app.extensions import db
-from app.models import Offer
+from app.models import Offer, RACCheck
+from app.api.services.offer_analysis import OfferAnalysis
+
+import random
+
 
 class EligibilityCheckService(BaseService):
     TRANSACTION_TYPE = TransactionType.ELIGIBILITY_CHECK 
@@ -55,43 +59,74 @@ class EligibilityCheckService(BaseService):
                 response = SimbrellaIntegration.rac_check(
                     customer_id = customer_id,
                     account_id = account_id,
-                    transaction_id = transaction.id,
+                    transaction_id = transaction.transaction_id,
                 )
 
                 # this chck for error is not valid
                 if response.status_code != 200:
                    return jsonify({"message": "RACCheck failed"}), 400
-
-                offers = Offer.get_all_offers()
-
-                eligible_offers = []
-
-                for offer in offers:
-                    # Determine an approved amount
-                    approved_amount = min(offer.max_amount, 5000)
-
-                    transaction_offer = TransactionOffer.create_transaction_offer(
-                        customer_id = customer.id,
-                        transaction_id = transaction.transaction_id,
-                        offer_id = offer.id,
-                        min_amount = offer.min_amount,
-                        max_amount = offer.max_amount,
-                        eligible_amount = approved_amount,
-                        product_id = offer.product_id,
-                        tenor = offer.tenor
+                
+                response = response.json()
+                
+                rac_check = RACCheck.add_rac_check(
+                    customer_id = customer_id,
+                    account_id = account_id,
+                    transaction_id = transaction.transaction_id,
+                    data = response['RACResponse']
                     )
+                
+                if not rac_check:
+                        logger.error(f"Failed to save RACCheck")
+                        return jsonify({
+                            "message": "Failed to save RACCheck."
+                        }), 400
+# -----------------TIME FOR ANALYSIS TO REGISTER OFFER ----------------------
+                # eligible_offers = []
+                try:
+                  eligible_offers = OfferAnalysis.decide_offer(
+                        transaction_id=transactionId,
+                        rac_check=rac_check,
+                        validated_data=validated_data,
+                        customer=customer
+                    )
+                except ValueError as ve:
+                    logger.error(str(ve))
+                    return jsonify({
+                        "message": str(ve)
+                    }), 400
+# -----------------------------------------------------------------------
+#                 s = Offer.get_all_offers()
 
-                    # Visible offer ID: offer_id + padded(transaction_offer.id)
-                    padded_id = str(transaction_offer.id).zfill(6) 
-                    public_offer_id = f"{offer.id}{padded_id}"
+                # eligible_offers = []
 
-                    eligible_offers.append({
-                        "offerId": public_offer_id,
-                        "product_id": offer.product_id,
-                        "min_amount": offer.min_amount,
-                        "max_amount": approved_amount,
-                        "tenor": offer.tenor
-                    })
+                # for offer in offers:
+                #     # Determine an approved amount
+                #     random_float = random.random() # temporary to play data
+                #     approved_amount = min(offer.max_amount, offer.max_amount * random_float) #temporary for now
+                #     approved_amount = round(approved_amount, 2)
+                #
+                #     transaction_offer = TransactionOffer.create_transaction_offer(
+                #         customer_id = customer.id,
+                #         transaction_id = transaction.transaction_id,
+                #         offer_id = offer.id,
+                #         min_amount = offer.min_amount,
+                #         max_amount = offer.max_amount,
+                #         eligible_amount = approved_amount,
+                #         product_id = offer.product_id,
+                #         tenor = offer.tenor
+                #     )
+                #
+                #     # Visible offer ID: offer_id + padded(transaction_offer.id)
+                #     padded_id = str(transaction_offer.id).zfill(6)
+                #     public_offer_id = f"{offer.id}{padded_id}"
+                #
+                #     eligible_offers.append({
+                #         "offerId": public_offer_id,
+                #         "product_id": offer.product_id,
+                #         "min_amount": offer.min_amount,
+                #         "max_amount": approved_amount,
+                #         "tenor": offer.tenor
+                #     })
 
                 # Simulate processing
                 response_data = {

app/api/services/offer_analysis.py

@@ -0,0 +1,97 @@
+from app.models import Offer, TransactionOffer
+from app.models.loan import Loan
+import random
+import logging
+logger = logging.getLogger(__name__)
+
+class OfferAnalysis:
+
+    @staticmethod
+    def get_offer(transaction_id, rac_response, validated_data):
+        customer_id = validated_data.get("customerId")
+        product_id = validated_data.get("productId")
+        offer_id = validated_data.get("offerId")
+
+        transaction_offer_id =  int(offer_id[5:]) # The last part is int
+
+        logger.info(f"customer_id ==  *************** : {customer_id}")
+        logger.info(f"product_id  ==  *************** : {product_id}")
+        logger.info(f"offer_id    ==  *************** : {offer_id}")
+        logger.info(f"transaction_offer_id    ==  *************** : {transaction_offer_id}")
+
+        transaction_offer =  TransactionOffer.is_valid_transaction_offer(transaction_offer_id, customer_id, product_id)
+
+        if not transaction_offer:
+            raise ValueError("Invalid Transaction Offer.")
+
+        eligible_amount =  transaction_offer.eligible_amount
+        offer = Offer.is_valid_offer( transaction_offer.offer_id)
+
+        if not offer:
+            raise ValueError("Invalid Offer.")
+        original_transaction =  transaction_id
+
+        return transaction_offer, offer, eligible_amount, original_transaction
+
+    @staticmethod
+    def decide_offer(transaction_id, rac_check, validated_data, customer):
+
+        # if we have active offers - we have to feed off it
+
+        # 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
+
+        #     real_eligible_amount = last_customer_loan.eligible_amount
+
+        #     active_loans = Loan.get_active_loans_by_original_transaction(original_transaction)
+
+        #     sum_active_loans = sum(loan.current_loan_amount for loan in active_loans)
+            
+        #     new_eligible_amount = max(real_eligible_amount - sum_active_loans, 0)
+
+        #     logger.info(f"Real eligible: {real_eligible_amount}, Sum of active: {sum_active_loans}, New eligible: {new_eligible_amount}")
+
+        # Construct eligible_offers
+
+        offers = Offer.get_all_offers()
+        eligible_offers = []
+
+        for offer in offers:
+            # Get approved amount
+            random_float = random.random()  # temporary to play data
+
+            approved_amount = new_eligible_amount if new_eligible_amount > 0 else min(offer.max_amount, offer.max_amount * random_float) 
+            approved_amount = round(approved_amount, 2)
+
+            transaction_offer = TransactionOffer.create_transaction_offer(
+                customer_id=customer.id,
+                transaction_id=transaction_id,
+                original_transaction=transaction_id,
+                offer_id=offer.id,
+                min_amount=offer.min_amount,
+                max_amount=offer.max_amount,
+                eligible_amount=approved_amount,
+                product_id=offer.product_id,
+                tenor=offer.tenor
+            )
+
+            # Visible offer ID: offer_id + padded(transaction_offer.id)
+            padded_id = str(transaction_offer.id).zfill(6)
+            public_offer_id = f"{offer.id}{padded_id}"
+
+            eligible_offers.append({
+                "offerId": public_offer_id,
+                "product_id": offer.product_id,
+                "min_amount": offer.min_amount,
+                "max_amount": approved_amount,
+                "tenor": offer.tenor
+            })
+
+        return eligible_offers

app/api/services/provide_loan.py

@@ -8,13 +8,13 @@ from app.models.loan_charge import LoanCharge
 from app.utils.logger import logger
 from app.api.schemas.provide_loan import ProvideLoanSchema
 from threading import Thread
-from app.models import Loan, Offer, Charge
+from app.models import Loan, Offer, Charge , TransactionOffer, RACCheck
 from app.api.enums import LoanStatus
 from app.extensions import db
 from datetime import datetime, timezone
 from dateutil.relativedelta import relativedelta
 from app.models import LoanRepaymentSchedule 
-
+from app.api.services.offer_analysis import OfferAnalysis
 
 class ProvideLoanService(BaseService):
     TRANSACTION_TYPE = TransactionType.PROVIDE_LOAN 
@@ -45,16 +45,41 @@ class ProvideLoanService(BaseService):
 
                 customer = Customer.is_valid_customer(customer_id)
 
-                if (ProvideLoanService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
+                if (ProvideLoanService.validate_account_ownership(account_id = account_id, customer_id = customer_id)): 
 
-                    offer = Offer.is_valid_offer(offer_id)
+                    rac_response = RACCheck.get_rac_check(customer_id = customer_id, account_id = account_id)
 
-                    if not offer:
-                        logger.error(f"Invalid Offer")
+                    try:
+                      transaction_offer, offer, eligible_amount, original_transaction = OfferAnalysis.get_offer(
+                            transaction_id=transaction_id,
+                            rac_response=rac_response,  
+                            validated_data=validated_data
+                        )
+                    except ValueError as ve:
+                        logger.error(str(ve))
                         return jsonify({
-                            "message": "Invalid Offer."
+                            "message": str(ve)
                         }), 400
                     
+                    # transaction_offer_id =  int(offer_id[5:]) # The last part is int
+
+                    # transaction_offer =  TransactionOffer.is_valid_transaction_offer(transaction_offer_id)
+                    
+                    # if not transaction_offer:
+                    #     logger.error(f"Invalid Transaction Offer")
+                    #     return jsonify({
+                    #         "message": "Invalid Transaction Offer."
+                    #     }), 400
+
+                    # eligible_amount =  transaction_offer.eligible_amount
+                    # offer = Offer.is_valid_offer( transaction_offer.offer_id)
+
+                    # if not offer:
+                    #     logger.error(f"Invalid Offer")
+                    #     return jsonify({
+                    #         "message": "Invalid Offer."
+                    #     }), 400
+                    
                     # Log Transaction
                     transaction = ProvideLoanService.log_transaction(validated_data=validated_data)
 
@@ -71,7 +96,7 @@ class ProvideLoanService(BaseService):
                     upfront_fee = charges["upfront_payment"]
                     repayment_amount = charges["repayment_amount"]
                     #installment_amount = charges["installment_amount"]
-                    tenor = offer.tenor // 30 # Convert to months
+                    num_schedules = offer.schedule
 
                     upfront_payment = charges["upfront_payment"]
                     total_amount = charges["total_amount"]
@@ -82,7 +107,6 @@ class ProvideLoanService(BaseService):
                     vat = charges["vat"]
                     
 
-
                     # Save the loan details
                     loan = Loan.create_loan(
                         customer_id = customer_id,
@@ -91,11 +115,14 @@ class ProvideLoanService(BaseService):
                         product_id = offer.product_id,
                         collection_type = collection_type,
                         transaction_id = validated_data.get('transactionId'),
+                        original_transaction = transaction_offer.original_transaction,
                         initial_loan_amount = validated_data.get('requestedAmount'),
                         upfront_fee = upfront_fee,
                         repayment_amount = repayment_amount,
                         installment_amount = installment_amount,
-                        status= LoanStatus.ACTIVE
+                        eligible_amount=eligible_amount,
+                        status = LoanStatus.ACTIVE,
+                        tenor = offer.tenor,
                     )
 
                     if not loan:
@@ -106,7 +133,7 @@ class ProvideLoanService(BaseService):
 
                     db.session.flush()
 
-                    schedule = LoanRepaymentSchedule.add_repayment_schedule(loan = loan, tenor = tenor)
+                    schedule = LoanRepaymentSchedule.add_repayment_schedule(loan = loan, num_schedules = num_schedules, transaction_id = transaction_id)
 
 
                     if not schedule:
@@ -117,7 +144,7 @@ class ProvideLoanService(BaseService):
 
                     # charges = Charge.get_offer_charges(offer.id)
 
-                    logger.error(f"{charges}")
+                    # logger.info(f"{charges}")
                     
                     loan_id = loan.id
 

app/api/services/select_offer.py

@@ -32,9 +32,14 @@ class SelectOfferService(BaseService):
                 customer_id = validated_data.get("customerId")
                 amount = validated_data.get("requestedAmount")
                 product_id = validated_data.get("productId")
+                transaction_offer_id = validated_data.get("offerId")
                 transaction_id = validated_data.get("transactionId")
                 request_id = validated_data.get("requestId")
 
+                offer_id = int(transaction_offer_id[5:])  # The last part is int
+
+                #"offerId": "SAL30001129",
+
                 if SelectOfferService.validate_account_ownership(
                     account_id=account_id, customer_id=customer_id
                 ):
@@ -62,6 +67,7 @@ class SelectOfferService(BaseService):
                 insurance = charges["insurance"]
                 vat = charges["vat"]
                 repayment_amount = charges["repayment_amount"]
+                interest_amount = charges["interest_amount"]
 
 
                 # Calculate the repayment dates
@@ -80,11 +86,12 @@ class SelectOfferService(BaseService):
 
                 offers = [
                     {
-                        "offerId": offer.id,
+                        "offerId": transaction_offer_id,
                         "productId": product_id,
                         "amount": amount,
                         "upfrontPayment": upfront_payment,
                         "interestRate": offer.interest_rate,
+                        "interestAmount": interest_amount,
                         "managementRate": offer.management_rate,
                         "managementFee": management["fee"],
                         "insuranceRate": offer.insurance_rate,

app/models/loan.py

@@ -5,6 +5,9 @@ from app.models.account import Account
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import relationship
 from dateutil.relativedelta import relativedelta 
+from datetime import timedelta
+import logging
+logger = logging.getLogger(__name__)
 
 
 class Loan(db.Model):
@@ -30,9 +33,13 @@ class Loan(db.Model):
     repayment_amount = db.Column(db.Float, nullable=True, default=0.0)
     installment_amount = db.Column(db.Float, nullable=True, default=0.0)
     status = db.Column(db.String(20), default='pending')
+    tenor = db.Column(db.Integer, nullable=True)
     due_date = db.Column(db.DateTime, nullable=True) 
     created_at = db.Column(db.DateTime, default=datetime.now(timezone.utc))
     updated_at = db.Column(db.DateTime, default=datetime.now(timezone.utc), onupdate=datetime.now(timezone.utc))
+    eligible_amount = db.Column(db.Float, nullable=True, default=0.0)
+    disburse_date = db.Column(db.DateTime, nullable=True)
+    disburse_verify = db.Column(db.DateTime, nullable=True)
 
     customer = relationship(
         "Customer",
@@ -66,10 +73,13 @@ class Loan(db.Model):
         initial_loan_amount,
         collection_type,
         transaction_id,
+        original_transaction,
         upfront_fee,
         repayment_amount,
         installment_amount,
-        status="pending",
+        tenor,
+        eligible_amount,
+        status = "pending",
     ):
         # Check if customer exists
         customer = Customer.is_valid_customer(customer_id)
@@ -77,6 +87,7 @@ class Loan(db.Model):
             raise ValueError("Customer does not exist")
 
         now = datetime.now(timezone.utc)
+        due_date = now + timedelta(days=tenor)
 
         # Create and save the loan
         loan = cls(
@@ -86,14 +97,16 @@ class Loan(db.Model):
             product_id = product_id,
             collection_type = collection_type,
             transaction_id = transaction_id,
-            original_transaction = transaction_id,
+            original_transaction = original_transaction,
             initial_loan_amount = initial_loan_amount,
             current_loan_amount = initial_loan_amount,
             upfront_fee = upfront_fee,
             repayment_amount = repayment_amount,
             installment_amount = installment_amount,
-            due_date=now, 
-            status = status
+            due_date=due_date,
+            tenor = tenor,
+            status = status,
+            eligible_amount =eligible_amount
         )
         
         try:
@@ -117,13 +130,50 @@ class Loan(db.Model):
     @classmethod
     def get_customer_loan(cls, loan_id, customer_id):
         """
-        Get customer's active loans.
+        Get customer's active loans by loan_id.
         """
         loan = cls.query.filter_by(id = loan_id, customer_id = customer_id).first()
         if not loan:
             raise ValueError(f"Loan with ID {loan_id} does not exist or does not belong to customer {customer_id}.")        
         return loan
-    
+
+    @classmethod
+    def get_customer_last_loan(cls, customer_id):
+        """
+        Get customer's active loans.
+        """
+        logger.info(f"Find last loan for [customer_id] ==>>>>  {customer_id}")
+        loan = cls.query.filter_by( customer_id = customer_id).first()
+        logger.info(f" Active Loan ==>>>> RESULT************************ AMEYE")
+        if not loan:
+            return None
+
+            loan = {
+                "eligible_amount": 0,
+                "loan_amount": 0,
+                "customer_id": customer_id,
+                "transaction_id": "",
+                "resultDescription": "No Active Loan"
+            }
+        logger.info(f" Active Loan ==>>>> RESULT*********************")
+        logger.info(f" Active Loan ==>>>>  {loan}")
+
+        return loan
+
+    @classmethod
+    def get_active_loans_by_original_transaction(cls, original_transaction_id):
+        """
+        Get all active loans with the same original_transaction ID.
+        """
+        
+        active_loans = cls.query.filter_by(
+            original_transaction=original_transaction_id,
+            # status='active'
+        ).all()
+
+        return active_loans
+
+
     @classmethod
     def update_status(cls, loan_id, status):
         """

app/models/loan_repayment_schedule.py

@@ -8,6 +8,7 @@ class LoanRepaymentSchedule(db.Model):
 
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     loan_id = db.Column(db.Integer, nullable=False)
+    transaction_id = db.Column(db.String(50), nullable=True)
     product_id = db.Column(db.String(20), nullable=True)
     installment_number = db.Column(db.Integer, nullable=False)
     due_date = db.Column(db.DateTime, nullable=False)
@@ -28,14 +29,14 @@ class LoanRepaymentSchedule(db.Model):
 
 
     @classmethod
-    def add_repayment_schedule(cls, loan, tenor):
+    def add_repayment_schedule(cls, loan, num_schedules, transaction_id):
         """
         Add repayment schedules for a given loan.
         """
         now = datetime.now(timezone.utc)
         schedules = []
 
-        for i in range(tenor):
+        for i in range(num_schedules):
             due_date = now + relativedelta(months=i + 1)
             schedule = LoanRepaymentSchedule(
                 loan_id=loan.id,
@@ -43,7 +44,8 @@ class LoanRepaymentSchedule(db.Model):
                 due_date=due_date,
                 total_repayment_amount = round(loan.repayment_amount, 2),
                 installment_amount=round(loan.installment_amount, 2),
-                product_id = loan.product_id
+                product_id = loan.product_id,
+                transaction_id = transaction_id
             )
             
             db.session.add(schedule)

app/models/rac_checks.py

@@ -1,14 +1,14 @@
 from datetime import datetime, timezone
 from app.extensions import db
 from sqlalchemy.orm import relationship
-from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.exc import IntegrityError
 from uuid import uuid4
 from sqlalchemy.types import JSON
 
 class RACCheck(db.Model):
     __tablename__ = 'rac_checks'
 
-    id = db.Column(db.String, primary_key=True)
+    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)
@@ -16,6 +16,25 @@ class RACCheck(db.Model):
     created_at = db.Column(db.DateTime, default=datetime.now(timezone.utc))
     updated_at = db.Column(db.DateTime, default=datetime.now(timezone.utc), onupdate=datetime.now(timezone.utc))
 
+    @classmethod
+    def add_rac_check(cls, customer_id, account_id, transaction_id, data = None):
+    
+
+        # Save the response
+        rac_check = cls(
+            customer_id = customer_id,
+            account_id = account_id,
+            transaction_id = transaction_id,
+            rac_response = data
+        )
+        
+        try:
+            db.session.add(rac_check)
+        except IntegrityError as err:
+            raise ValueError(f"Database integrity error: {err}")
+        return rac_check
+
+
     @classmethod
     def get_all_rac_checks(cls):
         """
@@ -24,18 +43,19 @@ class RACCheck(db.Model):
         rac_checks = cls.query.all()
 
         if not rac_checks:
-            raise ValueError("No available RAC checks")
+            return None
         return rac_checks
     
     @classmethod
-    def get_rac_check_by_id(cls, check_id):
+    def get_rac_check(cls, customer_id, account_id):
         """
         Return a RAC check by its ID.
         """
-        rac_check = cls.query.filter_by(id=check_id).first()
+        rac_check = cls.query.filter_by( customer_id = customer_id,
+                    account_id = account_id,).first()
 
         if not rac_check:
-            raise ValueError(f"RAC Check with ID {check_id} not found")
+            raise ValueError(f"RAC Check for customer not found")
         return rac_check
 
     def to_dict(self):

app/models/transaction_offers.py

@@ -8,6 +8,7 @@ class TransactionOffer(db.Model):
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     customer_id = db.Column(db.String(50), nullable=False)
     transaction_id = db.Column(db.String(50), nullable=False)
+    original_transaction = db.Column(db.String(50), nullable=True)
     offer_id = db.Column(db.String(20), nullable=False)
     product_id = db.Column(db.String(20), nullable=True)
     min_amount = db.Column(db.Float, nullable=False)
@@ -25,15 +26,28 @@ class TransactionOffer(db.Model):
         back_populates="transaction_offers",
     )
 
+    @classmethod
+    def is_valid_transaction_offer(cls, offer_id, customer_id, product_id):
+        transaction_offer = cls.query.filter_by(
+            id = str(offer_id),
+            customer_id = customer_id,
+            # product_id = product_id
+            # transaction_id = transaction_id,
+            ).first()
+
+        if not transaction_offer:
+            return False
+        return transaction_offer
 
     @classmethod
-    def create_transaction_offer(cls, customer_id, transaction_id, offer_id, min_amount, max_amount, eligible_amount=None, product_id=None, tenor=None):
+    def create_transaction_offer(cls, customer_id, transaction_id, original_transaction, offer_id, min_amount, max_amount, eligible_amount=None, product_id=None, tenor=None):
         """
         Class method to create and save a TransactionOffer.
         """
         transaction_offer = cls(
             customer_id=customer_id,
             transaction_id=transaction_id,
+            original_transaction=original_transaction,
             offer_id=offer_id,
             min_amount=min_amount,
             max_amount=max_amount,

app/swagger/schemas/SelectOfferRequest.json

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

app/swagger/schemas/SelectOfferResponse.json

@@ -49,6 +49,11 @@
                         "format": "float",
                         "example": 3.0
                     },
+                    "interestAmount": {
+                        "type": "number",
+                        "format": "float",
+                        "example": 3000.00
+                    },
                     "ManagementRate": {
                         "type": "number",
                         "format": "float",

migrations/versions/173ea45db189_migration_on_sat_may_10_09_54_34_utc_.py

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

migrations/versions/3105abd795d4_.py

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

migrations/versions/38acee611d55_migration_for_mloan_table.py

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

migrations/versions/565bc3d0ba6e_migration_on_sat_may_10_12_54_52_utc_.py

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

migrations/versions/95a52be203c4_migration_on_sat_may_3_21_53_29_utc_2025.py

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

migrations/versions/f1e83a993034_migration_on_tue_apr_29_20_43_35_utc_.py

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