Update provide_loan.py

app/api/services/eligibility_check.py

@@ -1,4 +1,5 @@
 from flask import session, jsonify
+from app.models.transaction_offers import TransactionOffer
 from app.utils.logger import logger
 from app.api.services.base_service import BaseService
 from app.api.schemas.eligibility_check import EligibilityCheckSchema
@@ -61,7 +62,36 @@ class EligibilityCheckService(BaseService):
                 if response.status_code != 200:
                    return jsonify({"message": "RACCheck failed"}), 400
 
-                offers = [offer.to_dict() for offer in Offer.get_all_offers()]
+                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
+                    )
+
+                    # 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 = {
@@ -69,7 +99,7 @@ class EligibilityCheckService(BaseService):
                     "transactionId": transactionId,
                     "countryCode": "NG",
                     "msisdn": msisdn,
-                    "eligibleOffers": offers,
+                    "eligibleOffers": eligible_offers,
                     "resultDescription": "Successful",
                     "resultCode": "00",
                     "accountId": account_id

app/api/services/provide_loan.py

@@ -71,7 +71,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"]
@@ -95,7 +95,8 @@ class ProvideLoanService(BaseService):
                         upfront_fee = upfront_fee,
                         repayment_amount = repayment_amount,
                         installment_amount = installment_amount,
-                        status= LoanStatus.ACTIVE
+                        status = LoanStatus.ACTIVE,
+                        tenor = offer.tenor
                     )
 
                     if not loan:
@@ -106,7 +107,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:

app/models/__init__.py

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

app/models/customer.py

@@ -27,6 +27,13 @@ class Customer(db.Model):
         back_populates="customer",
     )
 
+    transaction_offers = relationship(
+        "TransactionOffer",
+        primaryjoin="Customer.id == TransactionOffer.customer_id",
+        foreign_keys="TransactionOffer.customer_id",
+        back_populates="customer",
+    )
+
     @classmethod
     def is_valid_customer(cls, customer_id):
         customer = cls.query.filter_by(id=customer_id).first()

app/models/loan.py

@@ -30,6 +30,7 @@ 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))
@@ -69,7 +70,8 @@ class Loan(db.Model):
         upfront_fee,
         repayment_amount,
         installment_amount,
-        status="pending",
+        tenor,
+        status = "pending",
     ):
         # Check if customer exists
         customer = Customer.is_valid_customer(customer_id)
@@ -92,8 +94,9 @@ class Loan(db.Model):
             upfront_fee = upfront_fee,
             repayment_amount = repayment_amount,
             installment_amount = installment_amount,
-            due_date=now, 
-            status = status
+            due_date=now,
+            tenor = tenor,
+            status = status,
         )
         
         try:

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/transaction_offers.py

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

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/86e701febdda_.py

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

migrations/versions/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 ###