Update eligibility_check.py

.example.env

@@ -0,0 +1,26 @@
+VALID_APP_ID=**********
+VALID_API_KEY=*************
+BASIC_AUTH_USERNAME=******
+BASIC_AUTH_PASSWORD=******
+
+
+SWAGGER_URL="/documentation"
+API_URL="/swagger.json"
+
+JWT_SECRET_KEY=******
+JWT_ACCESS_TOKEN_EXPIRES=******
+JWT_REFRESH_TOKEN_EXPIRES=******
+
+
+DATABASE_USER=*****
+DATABASE_PASSWORD=*****
+DATABASE_HOST=******
+DATABASE_PORT=******
+DATABASE_NAME=*****
+
+# Flask Configuration
+FLASK_APP=wsgi.py
+FLASK_ENV=development
+APP_PORT=4500
+
+SIMBRELLA_BASE_URL=***************

Dockerfile

@@ -17,6 +17,6 @@ EXPOSE 5000
 ENV FLASK_APP=app.py
 ENV FLASK_RUN_HOST=0.0.0.0
 
-RUN chmod +x scripts/entry.sh
+RUN chmod +x scripts/entrypoint.sh
 
-ENTRYPOINT ["scripts/entry.sh"]
+ENTRYPOINT ["scripts/entrypoint.sh"]

app/api/enums/repayment_schedule_status.py

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

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/models/loan_repayment_schedule.py

@@ -70,9 +70,9 @@ class LoanRepaymentSchedule(db.Model):
             'dueDate': self.due_date.isoformat(),
             'principalAmount': self.principal_amount,
             'interestAmount': self.interest_amount,
-            'paid_status': self.paid_status,
             'totalInstallment': self.total_installment,
             'paid': self.paid,
+            'paidStatus': self.paid_status,
             'paidAt': self.paid_at.isoformat() if self.paid_at else None
         }