added loan_repayment_schedule

.example.env

@@ -1,26 +0,0 @@
-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/entrypoint.sh
+RUN chmod +x scripts/entry.sh
 
-ENTRYPOINT ["scripts/entrypoint.sh"]
+ENTRYPOINT ["scripts/entry.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/integrations/simbrella.py

@@ -10,7 +10,6 @@ class SimbrellaIntegration:
     ENDPOINT_RAC_CHECKS = settings.SIMBRELLA_ENDPOINT_RAC_CHECKS
     HEALTH_ENDPOINT = settings.SIMBRELLA_HEALTH
     AUTH_ENDPOINT =  settings.BANK_CALL_AUTH_ENDPOINT
-    SIMBRELLA_VERIFY_BALANCE_ENDPOINT = settings.SIMBRELLA_VERIFY_BALANCE_ENDPOINT
 
     _access_token = None  # cache token in memory
     _token_expiry = 0 
@@ -95,58 +94,6 @@ class SimbrellaIntegration:
         except Exception as e:
             logger.error(f"RACCheck API call failed: {str(e)}", exc_info=True)
             raise Exception(f"RACCheck API call failed: {str(e)}")
-
-
-    @staticmethod
-    def verify_account_balance(account_id: str, amount: float, request_id: str):
-        """
-        Calls the Verify Account Balance endpoint
-        """
-        url = f"{SimbrellaIntegration.BASE_URL}/{SimbrellaIntegration.SIMBRELLA_VERIFY_BALANCE_ENDPOINT}"
-        logger.info(f"Contacting Verify Account Balance Endpoint: {url}")
-
-        payload = {
-            "accountId": account_id,
-            "amount": amount,
-            "requestId": str(request_id),
-        }
-
-        try:
-            access_token = SimbrellaIntegration._get_token()
-            headers = {
-                "Content-Type": "application/json",
-                "Authorization": f"Bearer {access_token}",
-            }
-
-            response = httpx.post(
-                url,
-                json=payload,
-                headers=headers,
-                timeout=10.0,
-            )
-
-            logger.info(
-                f"Verify Account Balance Response: "
-                f"status={response.status_code}, body={response.text}"
-            )
-
-            response.raise_for_status()
-            return response
-
-        except httpx.HTTPStatusError as e:
-            logger.error(
-                f"Verify Account Balance failed with status "
-                f"{e.response.status_code}: {e.response.text}",
-                exc_info=True,
-            )
-            raise Exception("Verify Account Balance API returned an error")
-
-        except Exception as e:
-            logger.error(
-                f"Verify Account Balance API call failed: {str(e)}",
-                exc_info=True,
-            )
-            raise Exception(f"Verify Account Balance API call failed: {str(e)}")
         
     @staticmethod
     def health_check():

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="CUSTOMER HAS EXCEEDED THE NUMBER OF DISBURSALS: Disbursal Count 1")
+                        return ResponseHelper.error(result_description="Max loan count for 3MPC reached")
 
                 # Determine Loan count
-                is_eligible, count = EligibilityCheckService.check_loan_limits(customer_id)
+                is_eligible = EligibilityCheckService.check_loan_limits(customer_id)
 
                 if not is_eligible:
-                    return ResponseHelper.error(result_description=f"CUSTOMER HAS EXCEEDED THE NUMBER OF DISBURSALS FOR THE DAY: Disbursal Count Today {count}")
+                    return ResponseHelper.error(result_description="Max loan count reached")
                 
                 # 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, 0
+            return True
         
         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, 0
+            return False
 
         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, daily_count
+            return False
         
 
-        return True, daily_count
+        return True

app/api/services/repayment.py

@@ -1,4 +1,3 @@
-from app.api.integrations.simbrella import SimbrellaIntegration
 from flask import request, jsonify
 from marshmallow import ValidationError
 from app.api.enums.loan_status import LoanStatus
@@ -13,11 +12,9 @@ from app.api.enums import TransactionType
 from threading import Thread
 from app.extensions import db
 from app.api.integrations import EventServiceIntegration
-from app.config import settings
 
 class RepaymentService(BaseService):
     TRANSACTION_TYPE = TransactionType.REPAYMENT 
-    ENABLE_ACCOUNT_BALANCE_CHECK = settings.ENABLE_ACCOUNT_BALANCE_CHECK
 
     @staticmethod
     def process_request(data):
@@ -49,38 +46,6 @@ class RepaymentService(BaseService):
                     # Check loan exists
                     load_loan = Loan.get_customer_loan(loan_id = loan_id, customer_id = customer_id)
 
-
-                    # Check Customer Account Balance if enabled
-                    if RepaymentService.ENABLE_ACCOUNT_BALANCE_CHECK:
-                        response = SimbrellaIntegration.verify_account_balance(
-                            account_id = account_id,
-                            amount = load_loan.balance,
-                            request_id = request_id,
-                        )
-
-                        # this check for error is not valid
-                        if response.status_code != 200:
-                            return ResponseHelper.error(result_description="Balance Check failed")
-                        
-                        response = response.json()
-
-                        logger.info(f"This is Response (Balance 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"Balance Check failed")
-
-                        verify_account_balance_response = response['isSufficient']
-
-                        if not verify_account_balance_response or verify_account_balance_response in [False, "false"]:
-                            logger.error(f"Balance Check failed: Insufficient Account Balance")
-                            return ResponseHelper.error(result_description=f"Insufficient Account Balance")
-
-
                     # Save the repayment details  
                     repayment = Repayment.create_repayment(
                         customer_id = customer_id,

app/config.py

@@ -46,8 +46,6 @@ class Config:
     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")
-    SIMBRELLA_VERIFY_BALANCE_ENDPOINT = os.getenv("SIMBRELLA_VERIFY_BALANCE_ENDPOINT", "api/VerifyAccountBalance")
-    ENABLE_ACCOUNT_BALANCE_CHECK = os.getenv("ENABLE_ACCOUNT_BALANCE_CHECK", True)
     SIMBRELLA_HEALTH =  os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS","api/system-health-check")
     BANK_CALL_AUTH_ENDPOINT = os.getenv("BANK_CALL_AUTH_ENDPOINT", "/api/Auth/generate-token")
     BANK_CALL_USERNAME = os.getenv("BANK_CALL_USERNAME", "simbrella")

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
         }