Update provide_loan.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/__init__.py

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

app/api/enums/repayment_schedule_status.py

@@ -1,6 +0,0 @@
-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"Loan Repayment Data: {data} ")
-    logger.info(f"Repayment request received: {data}")
+    logger.error(f"HERE 0000a **** ")
+    # logger.info(f"Repayment request received: {data}")
     response = RepaymentService.process_request(data)
     return response
 

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 - Minimum amount not met.")
+                    raise ValueError("You are not eligible for a loan at this time.")
 
                 # 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,8 +225,7 @@ 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}).")
-                    continue
-                    # raise ValueError("You are not eligible for a loan at this time.")
+                    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}).")
@@ -256,8 +255,4 @@ 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/provide_loan.py

@@ -18,6 +18,7 @@ from app.api.integrations import EventServiceIntegration
 from app.models import LoanRepaymentSchedule 
 from app.api.services.offer_analysis import OfferAnalysis
 from app.api.helpers.response_helper import ResponseHelper
+from datetime import datetime
 
 class ProvideLoanService(BaseService):
     TRANSACTION_TYPE = TransactionType.PROVIDE_LOAN 
@@ -113,9 +114,12 @@ class ProvideLoanService(BaseService):
                     management = charges["management"]
                     insurance = charges["insurance"]
                     vat = charges["vat"]
+
+                    # Generate Loan Reference
+                    loan_ref = f"SIM{datetime.now().strftime('%Y%m%d%H%M%S%f')}"
                     
-                    padded_id = str(transaction_id).zfill(12)
-                    loan_ref = f"{padded_id}{channel}{offer.product_id}"
+                    # padded_id = str(transaction_id).zfill(12)
+                    # loan_ref = f"{padded_id}{channel}{offer.product_id}"
 
 
                     # Save the loan details

app/api/services/repayment.py

@@ -39,17 +39,16 @@ 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"RepaymentService Received **** {data}")
-
+                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
-                    load_loan = Loan.get_customer_loan(loan_id = loan_id, customer_id = customer_id)
+                    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 = load_loan,
+                        loan = loan,
                         transaction_id = transaction_id
                     )
 
@@ -57,8 +56,6 @@ 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)
@@ -76,14 +73,14 @@ class RepaymentService(BaseService):
                     "Id": repayment.id,
                     "repayment_id": repayment.id,
                     "initiated_by": repayment.initiated_by,
-                    "transactionId": loan_transaction_id,
+                    "transactionId": transaction_id,
                     "customerId": customer_id,
-                    "productId": load_loan.product_id,
+                    "productId": loan.product_id,
                     "loanRef": loan_ref,
                     "debtId": loan_id
                 }
 
-                event_thread = Thread(target=RepaymentService.trigger_loan_repayment, args=(loan_transaction_id,))
+                event_thread = Thread(target=RepaymentService.trigger_loan_repayment, args=(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 ID '{id}' already exists.")
+            raise ValueError("Customer already exists")
         elif Account.query.filter_by(id=account_id).first():
-            raise ValueError(f"Account ID '{account_id}' already exists.")
+            raise ValueError("Account already exists")
         elif cls.query.filter_by(msisdn=msisdn).first():
-            raise ValueError("MSISDN '{msisdn}'  already exists")
+            raise ValueError("msisdn already exists")
         
         # Create the customer
         customer = cls(

app/models/loan_repayment_schedule.py

@@ -3,7 +3,6 @@ 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'
@@ -52,7 +51,6 @@ 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,7 +68,6 @@ 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,
             'paidAt': self.paid_at.isoformat() if self.paid_at else None