Update eligibility_check.py

app/api/enums/__init__.py

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

app/api/enums/repayment_schedule_status.py

@@ -0,0 +1,6 @@
+from enum import Enum
+
+class RepaymentScheduleStatus(str, Enum):
+    ACTIVE = "active"
+    PARTIALLY_PAID = "partially_paid"
+    REPAID = "repaid"

app/api/routes/routes.py

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

app/api/services/eligibility_check.py

@@ -56,13 +56,13 @@ class EligibilityCheckService(BaseService):
                 if current_loan:
                     logger.info(f"Account {current_loan.account_id} has active loan {current_loan}")
                     if current_loan.product_id =='3MPC':
-                        return ResponseHelper.error(result_description="Max loan count for 3MPC reached")
+                        return ResponseHelper.error(result_description="CUSTOMER HAS EXCEEDED THE NUMBER OF DISBURSALS: Disbursal Count 1")
 
                 # Determine Loan count
-                is_eligible = EligibilityCheckService.check_loan_limits(customer_id)
+                is_eligible, count = EligibilityCheckService.check_loan_limits(customer_id)
 
                 if not is_eligible:
-                    return ResponseHelper.error(result_description="Max loan count reached")
+                    return ResponseHelper.error(result_description=f"CUSTOMER HAS EXCEEDED THE NUMBER OF DISBURSALS FOR THE DAY: Disbursal Count Today {count}")
                 
                 # Call RACCheck
                 response = SimbrellaIntegration.rac_check(
@@ -189,14 +189,14 @@ class EligibilityCheckService(BaseService):
         loan = Loan.get_customer_last_loan(customer_id)
 
         if not loan:
-            return True
+            return True, 0
         
         offer_id = loan.offer_id[:5]
 
         offer = Offer.get_offer_by_id(offer_id)
         if not offer:
             logger.error(f"Offer not found for offer_id: {offer_id} (customer_id: {customer_id})")
-            return False
+            return False, 0
 
         daily_count = Loan.get_daily_loan_count(customer_id, offer.product_id)
         
@@ -204,7 +204,7 @@ class EligibilityCheckService(BaseService):
         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
+            return False, daily_count
         
 
-        return True
+        return True, daily_count

app/api/services/offer_analysis.py

@@ -180,7 +180,7 @@ class OfferAnalysis:
 
                 if real_eligible_amount < original_transaction_offer.min_amount:
                     logger.error(f"Max eligible amount ({real_eligible_amount}) is less than the minimum offer amount ({original_transaction_offer.min_amount}).")
-                    raise ValueError("You are not eligible for a loan at this time.")
+                    raise ValueError("You are not eligible for a loan at this time - Minimum amount not met.")
 
                 # if real_eligible_amount < 100:
                 #     logger.error(f"Max eligible amount ({real_eligible_amount}) is less than the minimum offer amount ({original_transaction_offer.min_amount}).")
@@ -225,7 +225,8 @@ class OfferAnalysis:
 
             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.")
+                    continue
+                    # raise ValueError("You are not eligible for a loan at this time.")
 
             # if approved_amount < 100:
             #         logger.error(f"Max eligible amount ({approved_amount}) is less than the minimum offer amount ({offer.min_amount}).")
@@ -255,4 +256,8 @@ class OfferAnalysis:
                 "tenor": offer.tenor
             })
 
+        if not eligible_offers:
+            logger.error("No eligible offers found for customer: {customer_id} - Minimum amount not met")
+            raise ValueError("You are not eligible for a loan at this time - Minimum amount not met")
+
         return eligible_offers

app/api/services/repayment.py

@@ -39,16 +39,17 @@ 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 **** ")
+                logger.error(f"RepaymentService Received **** {data}")
+
                 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)
+                    load_loan = Loan.get_customer_loan(loan_id = loan_id, customer_id = customer_id)
 
                     # Save the repayment details  
                     repayment = Repayment.create_repayment(
                         customer_id = customer_id,
-                        loan = loan,
+                        loan = load_loan,
                         transaction_id = transaction_id
                     )
 
@@ -56,6 +57,8 @@ class RepaymentService(BaseService):
                         logger.error(f"Failed to save repayment details")
                         return ResponseHelper.error(result_description="Failed to save repayment details.")
 
+                    loan_transaction_id  = load_loan.transaction_id
+
                     #Update Loan status
                     Loan.update_status(loan_id = loan_id, status = LoanStatus.START_REPAY) # repay started by user
                     transaction = RepaymentService.log_transaction(validated_data = validated_data)
@@ -73,14 +76,14 @@ class RepaymentService(BaseService):
                     "Id": repayment.id,
                     "repayment_id": repayment.id,
                     "initiated_by": repayment.initiated_by,
-                    "transactionId": transaction_id,
+                    "transactionId": loan_transaction_id,
                     "customerId": customer_id,
-                    "productId": loan.product_id,
+                    "productId": load_loan.product_id,
                     "loanRef": loan_ref,
                     "debtId": loan_id
                 }
 
-                event_thread = Thread(target=RepaymentService.trigger_loan_repayment, args=(transaction_id,))
+                event_thread = Thread(target=RepaymentService.trigger_loan_repayment, args=(loan_transaction_id,))
                 event_thread.start()
 
                 # Call Kafka in a background thread

app/models/customer.py

@@ -47,11 +47,11 @@ class Customer(db.Model):
     @classmethod
     def create_customer(cls, id, msisdn, country_code, account_id, account_type='savings'):
         if cls.query.filter_by(id=id).first():
-            raise ValueError("Customer already exists")
+            raise ValueError("Customer ID '{id}' already exists.")
         elif Account.query.filter_by(id=account_id).first():
-            raise ValueError("Account already exists")
+            raise ValueError(f"Account ID '{account_id}' already exists.")
         elif cls.query.filter_by(msisdn=msisdn).first():
-            raise ValueError("msisdn already exists")
+            raise ValueError("MSISDN '{msisdn}'  already exists")
         
         # Create the customer
         customer = cls(

app/models/loan_repayment_schedule.py

@@ -3,6 +3,7 @@ from app.extensions import db
 from sqlalchemy.orm import relationship
 from dateutil.relativedelta import relativedelta
 from sqlalchemy.sql import func
+from app.api.enums.repayment_schedule_status import RepaymentScheduleStatus
 
 class LoanRepaymentSchedule(db.Model):
     __tablename__ = 'loan_repayment_schedules'
@@ -51,6 +52,7 @@ class LoanRepaymentSchedule(db.Model):
                 installment_amount=round(loan.installment_amount, 2),
                 product_id = loan.product_id,
                 transaction_id = transaction_id,
+                paid_status = RepaymentScheduleStatus.ACTIVE,
                 created_at=datetime.now(timezone.utc),
                 updated_at=datetime.now(timezone.utc)
             )
@@ -70,6 +72,7 @@ class LoanRepaymentSchedule(db.Model):
             'interestAmount': self.interest_amount,
             'totalInstallment': self.total_installment,
             'paid': self.paid,
+            'paidStatus': self.paid_status,
             'paidAt': self.paid_at.isoformat() if self.paid_at else None
         }