Update offer_analysis.py

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

@@ -48,12 +48,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

app/api/services/eligibility_check.py

@@ -70,20 +70,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(

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:
@@ -33,8 +41,86 @@ class OfferAnalysis:
 
         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 salarie 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 np 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 +134,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 +153,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 +211,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/repayment.py

@@ -29,6 +29,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 +38,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,7 +62,8 @@ 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

app/config.py

@@ -34,7 +34,7 @@ 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")
 
@@ -48,4 +48,38 @@ 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"
+    ]
+
+
+
+
 settings = Config()

app/models/__init__.py

@@ -9,6 +9,7 @@ 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
 
 
-__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']

app/models/loan.py

@@ -45,6 +45,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",

app/models/repayment.py

@@ -21,6 +21,12 @@ 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_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_result = db.Column(db.String(10), nullable=True)
+    verify_description = db.Column(db.String(100), nullable=True)
 
     @classmethod
     def create_repayment(cls, customer_id, loan, transaction_id):

app/models/repayments_data.py

@@ -0,0 +1,24 @@
+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)
+    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)
+
+    def to_dict(self):
+        return {
+            "id": self.id,
+            "transaction_id": self.transaction_id,
+            "added_date": self.added_date.isoformat() if self.added_date else None,
+            "response_code": self.response_code,
+            "response_descr": self.response_descr,
+        }
+
+
+    def __repr__(self):
+        return f"<RepaymentsData id={self.id}, transaction_id={self.transaction_id}>"

migrations/versions/0acd553309a1_migration_on_tue_jun_10_08_41_00_wat_.py

@@ -0,0 +1,35 @@
+"""Migration on Tue Jun 10 08:41:00 WAT 2025
+
+Revision ID: 0acd553309a1
+Revises: 45790fd659fb
+Create Date: 2025-06-10 08:41:45.222513
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0acd553309a1'
+down_revision = '45790fd659fb'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    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('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.PrimaryKeyConstraint('id')
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('repayments_data')
+    # ### end Alembic commands ###

migrations/versions/45790fd659fb_.py

@@ -0,0 +1,54 @@
+"""empty message
+
+Revision ID: 45790fd659fb
+Revises: b3a5e10bc77e
+Create Date: 2025-06-04 12:37:48.180736
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '45790fd659fb'
+down_revision = 'b3a5e10bc77e'
+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_result', sa.String(length=10), nullable=True))
+        batch_op.add_column(sa.Column('disburse_description', sa.String(length=100), nullable=True))
+        batch_op.add_column(sa.Column('verify_result', sa.String(length=10), nullable=True))
+        batch_op.add_column(sa.Column('verify_description', sa.String(length=100), nullable=True))
+
+    with op.batch_alter_table('repayments', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('repay_date', sa.DateTime(), nullable=True))
+        batch_op.add_column(sa.Column('repay_result', sa.String(length=10), nullable=True))
+        batch_op.add_column(sa.Column('repay_description', sa.String(length=100), nullable=True))
+        batch_op.add_column(sa.Column('verify_date', sa.DateTime(), nullable=True))
+        batch_op.add_column(sa.Column('verify_result', sa.String(length=10), nullable=True))
+        batch_op.add_column(sa.Column('verify_description', sa.String(length=100), nullable=True))
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('repayments', schema=None) as batch_op:
+        batch_op.drop_column('verify_description')
+        batch_op.drop_column('verify_result')
+        batch_op.drop_column('verify_date')
+        batch_op.drop_column('repay_description')
+        batch_op.drop_column('repay_result')
+        batch_op.drop_column('repay_date')
+
+    with op.batch_alter_table('loans', schema=None) as batch_op:
+        batch_op.drop_column('verify_description')
+        batch_op.drop_column('verify_result')
+        batch_op.drop_column('disburse_description')
+        batch_op.drop_column('disburse_result')
+
+    # ### end Alembic commands ###