added loan_repayment_schedule

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

@@ -51,6 +51,13 @@ class EligibilityCheckService(BaseService):
                 
                 db.session.flush()
 
+                # Determine if there is any loan of 3MPC active
+                current_loan  =  EligibilityCheckService.get_current_active_loans_by_account_id(account_id = account_id)
+                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")
+
                 # Determine Loan count
                 is_eligible = EligibilityCheckService.check_loan_limits(customer_id)
 
@@ -167,7 +174,12 @@ class EligibilityCheckService(BaseService):
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
             db.session.rollback()
             return ResponseHelper.internal_server_error()
-        
+
+    @staticmethod
+    def get_current_active_loans_by_account_id(account_id):
+        current_loan  = Loan.get_current_active_loans_by_account_id(account_id)
+        return current_loan
+
 
     @staticmethod
     def check_loan_limits(customer_id):

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,8 +57,10 @@ 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 bu user
+                    Loan.update_status(loan_id = loan_id, status = LoanStatus.START_REPAY) # repay started by user
                     transaction = RepaymentService.log_transaction(validated_data = validated_data)
 
                     if not transaction:
@@ -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.py

@@ -1,5 +1,6 @@
 from datetime import datetime, timezone, timedelta
 from itertools import product
+from app.api.enums.loan_status import LoanStatus
 from app.extensions import db
 from app.models.customer import Customer
 from app.models.account import Account
@@ -192,13 +193,32 @@ class Loan(db.Model):
         Get all active loans with the same original_transaction ID.
         """
 
-        active_loans = cls.query.filter_by(
-        original_transaction=original_transaction_id,
-        # status='active'
+        active_loans = cls.query.filter(
+        cls.original_transaction == original_transaction_id,
+        or_(
+            cls.status == LoanStatus.ACTIVE.value,
+            cls.status == LoanStatus.START_REPAY.value,
+            cls.status == LoanStatus.ACTIVE_PARTIAL.value,
+        )
         ).all()
 
         return active_loans
 
+    @classmethod
+    def get_current_active_loans_by_account_id(cls, account_id):
+        """
+        Get the first active loan based on the accountID.
+        """
+        first_active_loan = cls.query.filter(
+        cls.account_id == account_id,
+        or_(
+            cls.status == LoanStatus.ACTIVE.value,
+            cls.status == LoanStatus.START_REPAY.value,
+            cls.status == LoanStatus.ACTIVE_PARTIAL.value,
+        )
+        ).order_by(cls.id.desc()).first()
+
+        return first_active_loan
 
     @classmethod
     def update_status(cls, loan_id, status):

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
         }
 

app/models/repayment.py

@@ -36,9 +36,8 @@ class Repayment(db.Model):
     def create_repayment(cls, customer_id, loan, transaction_id):
         
         # Check that the loan is active
-        if loan.status not in [LoanStatus.ACTIVE, LoanStatus.START_REPAY]:
+        if loan.status not in [LoanStatus.ACTIVE, LoanStatus.START_REPAY, LoanStatus.ACTIVE_PARTIAL]:
             raise ValueError(f"Repayment cannot be processed. Loan status: ({loan.status})")
-        
 
         repayment = cls(
             customer_id=customer_id,

app/models/transaction.py

@@ -4,6 +4,12 @@ from app.models import account
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy import and_, or_, not_
 from sqlalchemy.sql import func
+from app.api.enums import TransactionType
+
+import logging
+logger = logging.getLogger(__name__)
+
+
 
 class Transaction(db.Model):
     __tablename__ = 'transactions'
@@ -20,7 +26,7 @@ class Transaction(db.Model):
     phone_number = db.Column(db.String(50), nullable=True)
     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())
-    
+
     def __repr__(self):
         return f'<Transaction {self.id}>'
 
@@ -30,17 +36,21 @@ class Transaction(db.Model):
         # if cls.query.filter_by(transaction_id=transaction_id).first():
         #     raise ValueError("Duplicate Transaction")
 
-        if cls.query.filter( and_( cls.transaction_id ==transaction_id, cls.type==type) ).first():
-            raise ValueError("Duplicate Transaction")
-
-
+        if cls.query.filter(and_(cls.transaction_id == transaction_id, cls.type == type)).first():
+            if type == TransactionType.REPAYMENT:
+                logger.info('Repayment transaction already exists :::: But we like to continue.')
+                now = datetime.now()
+                type = TransactionType.REPAYMENT + '.'+ now.strftime("%Y%m%d%H%M%S")
+                logger.info('Modify Type  :::: {0}'.format(type))
+            else:
+                raise ValueError("Duplicate Transaction")
 
         transaction = cls(
-            transaction_id = transaction_id,
-            customer_id = customer_id,
-            account_id = account_id,
-            type = type,
-            channel = channel,
+            transaction_id=transaction_id,
+            customer_id=customer_id,
+            account_id=account_id,
+            type=type,
+            channel=channel,
             created_at=datetime.now(timezone.utc),
             updated_at=datetime.now(timezone.utc)
         )
@@ -54,4 +64,4 @@ class Transaction(db.Model):
 
     @classmethod
     def get_transaction_by_id(cls, transaction_id):
-        return cls.query.get(transaction_id)
+        return cls.query.get(transaction_id)