Update .env.remote.example

.env.local.example

@@ -3,8 +3,14 @@ KAFKA_TIMEOUT=1000.0
 KAFKA_BROKER="10.20.30.50:9092"
 KAFKA_TOPICS=PROCESS_PAYMENT,LOAN_REPAYMENT
 
-DATABASE_USER=firstadvance
+# DATABASE_USER=firstadvance
-DATABASE_PASSWORD=FirstAdvance!
+# DATABASE_PASSWORD=FirstAdvance!
-DATABASE_HOST=10.20.30.60
+# DATABASE_HOST=10.20.30.60
-DATABASE_PORT=5432
+# DATABASE_PORT=5432
-DATABASE_NAME=firstadvancedev
+# DATABASE_NAME=firstadvancedev
+
+DATABASE_USER=system
+DATABASE_PASSWORD=FIRSTADV_PASS
+DATABASE_HOST=10.10.33.65
+DATABASE_PORT=1521
+DATABASE_SID=FREE

.env.remote.example

@@ -3,8 +3,14 @@ KAFKA_TIMEOUT=1000.0
 KAFKA_BROKER="dev-events.simbrellang.net:9085"
 KAFKA_TOPICS=PROCESS_PAYMENT,LOAN_REPAYMENT
 
-DATABASE_USER=firstadvance
+# DATABASE_USER=firstadvance
-DATABASE_PASSWORD=FirstAdvance!
+# DATABASE_PASSWORD=FirstAdvance!
-DATABASE_HOST=dev-data.simbrellang.net
+# DATABASE_HOST=dev-data.simbrellang.net
-DATABASE_PORT=10532
+# DATABASE_PORT=10532
-DATABASE_NAME=firstadvancedev
+# DATABASE_NAME=firstadvancedev
+
+DATABASE_USER=system
+DATABASE_PASSWORD=FIRSTADV_PASS
+DATABASE_HOST=10.10.33.65
+DATABASE_PORT=1521
+DATABASE_SID=FREE

Dockerfile

@@ -18,4 +18,4 @@ ENV FLASK_APP=app.py
 ENV FLASK_RUN_HOST=0.0.0.0
 
 # Run the application
-CMD ["gunicorn", "-w", "4", "-b", "0.0.0.0:5000", "wsgi:wsgi_app"]
+CMD ["gunicorn", "-w", "4", "-b", "0.0.0.0:5000", "--timeout", "120", "wsgi:wsgi_app"]

app/config.py

@@ -19,7 +19,7 @@ class Config:
     )
 
     BANK_CALL_APP_ID = os.getenv("BANK_CALL_APP_ID", "app1")
-    BANK_CALL_API_KEY = os.getenv("BANK_CALL_API_KEY", "test-api-key-12345")
+    BANK_CALL_API_KEY = os.getenv("BANK_CALL_API_KEY", "testtest-api-key-12345")
     BANK_CALL_BASIC_AUTH_USERNAME = os.environ.get(
         "BANK_CALL_BASIC_AUTH_USERNAME", "user"
     )
@@ -32,11 +32,18 @@ class Config:
     DATABASE_HOST = os.getenv("DATABASE_HOST")
     DATABASE_NAME = os.getenv("DATABASE_NAME")
     DATABASE_PORT = os.getenv("DATABASE_PORT", 10532)
+    DATABASE_SID = os.environ.get("DATABASE_SID", "FREE")
+    DNS = f"(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={DATABASE_HOST})(PORT={DATABASE_PORT}))(CONNECT_DATA=(SID={DATABASE_SID})))"
 
-    SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}"
+
+    SQLALCHEMY_DATABASE_URI = (f"oracle+oracledb://{DATABASE_USER}:{DATABASE_PASSWORD}@{DNS}")
+
+    # SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}"
     SQLALCHEMY_TRACK_MODIFICATIONS = False
+    # SQLALCHEMY_ECHO = True
 
-    BANK_CALL_BASE_URL = os.getenv("BANK_CALL_BASE_URL", "https://bank-emulator.dev.simbrellang.net")
+
+    BANK_CALL_BASE_URL = os.getenv("BANK_CALL_BASE_URL", "https://bank-emulator.dev.simbrellang.net/api")
     BANK_CALL_SMS_BASE_URL= os.getenv("BANK_CALL_SMS_BASE_URL","https://first-advance-middleware-develop.fbn-devops-dev-asenv.appserviceenvironment.net/SMS")
     BANK_CALL_DISBURSE_LOAN_ENDPOINT = os.getenv("BANK_CALL_DISBURSE_LOAN_ENDPOINT","/DisburseLoan")
     BANK_CALL_COLLECT_LOAN_ENDPOINT = os.getenv("BANK_CALL_COLLECT_LOAN_ENDPOINT","/CollectLoan")

app/enums/__init__.py

@@ -0,0 +1,2 @@
+from .transaction_type import TransactionType
+from .loan_status import LoanStatus

app/enums/loan_status.py

@@ -0,0 +1,8 @@
+from enum import Enum
+
+class LoanStatus(str, Enum):
+    PENDING = "pending"
+    ACTIVE = "active"
+    ACTIVE_PARTIAL = "active_partial"
+    START_REPAY = "start_repay"
+    REPAID = "repaid"

app/enums/transaction_type.py

@@ -0,0 +1,10 @@
+from enum import Enum
+
+class TransactionType(str, Enum):
+    ELIGIBILITY_CHECK = "eligibility_check"
+    CUSTOMER_CONSENT = "customer_consent"
+    LOAN_STATUS = "loan_status"
+    NOTIFICATION_CALLBACK = "notification_callback"
+    PROVIDE_LOAN = "provide_loan"
+    REPAYMENT = "repayment"
+    SELECT_OFFER = "select_offer"

app/integrations/kafka.py

@@ -146,10 +146,11 @@ class KafkaIntegration:
         logger.info(f"Calling collect_loan service with message: {message}")
 
         try:
+            #Calling CollectLoan endpoint with data: {'transactionId': 'TRCVIC85641527829', 'customerId': 'ZX48440946', 'productId': 'AMPC', 'loanRef': 'TRCVIC85641527829USSDAMPC', 'debtId': '014231'}
             response = SimbrellaClient.collect_loan_user_initiated(message)
             logger.info(
                 f"Successfully sent message to collect_loan service: {response}"
             )
         except Exception as e:
-            logger.info(f"Failed to call collect_loan service: {e}")
+            logger.error(f"Failed to call collect_loan service: {e}")
             # raise

app/integrations/simbrella.py

@@ -4,6 +4,9 @@ from app.helpers.response_helper import ResponseHelper
 from app.services.loan import LoanService
 from app.utils.auth import get_headers
 from app.utils.extras import preprocess_loan_charges_data
+import random
+import random
+import string
 from app.utils.logger import logger
 from flask import jsonify, current_app
 from app.services.transactions import TransactionService
@@ -11,6 +14,10 @@ from app.services.repayment import RepaymentService
 from app.extensions import db 
 from app.services.repayments_data import RepaymentsData
 from app.services.salary import SalaryService
+from app.enums.loan_status import LoanStatus
+from decimal import Decimal, ROUND_HALF_UP
+from requests.exceptions import SSLError, RequestException,Timeout
+import sys
 
 
 class SimbrellaClient:
@@ -88,6 +95,9 @@ class SimbrellaClient:
         try:
             logger.info(f"Here is your Disbursement Request data ****** : {disbursement_data}")
             response = requests.post(api_url, json=disbursement_data, timeout=10, headers=get_headers())
+            if response.status_code == 404:
+                logger.error("Received 404 from external service")
+                return ResponseHelper.error("Disbursement Service url not found (404)", status_code=404)
             logger.info(f"Disbursement response: {response.json()}")
             result = response.json()
             LoanService.set_disbursement_result(loan_data['debtId'],result.get('responseCode', ''), result.get('responseMessage', ''))
@@ -152,6 +162,9 @@ class SimbrellaClient:
         try:
             logger.info(f"Here is your TransactionVerify Request data ****** : {verify_data}")
             response = requests.post(api_url, json=verify_data, timeout=10, headers=get_headers())
+            if response.status_code == 404:
+                logger.error("Received 404 from external service")
+                return ResponseHelper.error("Verify Service url not found (404)", status_code=404)
             result = response.json()
             logger.info(f"this is verify result, {result}")
             LoanService.set_disburse_verify_result(loan_data['debtId'],result.get('responseCode', ''), result.get('responseMessage', ''))
@@ -163,6 +176,7 @@ class SimbrellaClient:
             try:
                 sms_response = requests.post(sms_url, json=sms_data, timeout=10, headers=get_headers())
                 sms_response.raise_for_status()  # Raise an exception for 4xx or 5xx status codes
+                
                 result = sms_response.json()
                 logger.info(f"SMS Response JSON: {result}")
                 if result.get('isSuccess'):
@@ -181,79 +195,75 @@ class SimbrellaClient:
     @staticmethod
     def collect_loan_user_initiated(data):
         # InitiatedBy = USER_INITIATED
-        logger.info(f"Calling CollectLoan collect_loan_user_initiated ******* endpoint with data: {data}")
+        try:
-        return SimbrellaClient._collect_loan(data,1)
+            logger.info(f"Calling CollectLoan collect_loan_user_initiated ******* endpoint with data: {data}")
+            return SimbrellaClient._collect_loan(data, "1")
+        except Exception as e:
+            logger.error(f"Error in collect_loan_user_initiated: {e}")
+            # return ResponseHelper.error(
+            #     message="Failed to collect loan for user initiated ",
+            #     status_code=500,
+            #     error=str(e)
+            # )
 
     @staticmethod
     def collect_loan_user_salary_detect(data):
-        #InitiatedBy = SALARY_DETECT
+        try:
-        # logger.info(f"salary data: {data}")
+            return SimbrellaClient._collect_loan(data, "2")
-        # try:
+        except Exception as e:
-        #  salary = SalaryService.add_salary_data(data)
+            logger.error(f"Error in collect_loan_user_salary_detect: {e}")
-        #  if salary:
+            return ResponseHelper.error(
-        #     return ResponseHelper.success(salary.to_dict(), "Successful")
+                message="Failed to collect loan for salary detection",
-        #
+                status_code=500,
-        # except Exception as e:
+                error=str(e)
-        #     logger.info(f"Failed to save salary: {e}")
+            )
-        #     return ResponseHelper.error(message="Failed to call salary endpoint",
-        #     status_code=400,
-        #     error=str(e) )
-        return SimbrellaClient._collect_loan(data,2)
-
             
 
     @staticmethod
     def collect_loan_user_due_payment(data):
         # InitiatedBy = REPAYMENT_DUE
-        return SimbrellaClient._collect_loan(data,3)
+        return SimbrellaClient._collect_loan(data,"3")
 
+   
     @staticmethod
-    def _collect_loan(data, collectionMethod: int):
+    def _collect_loan(data, collectionMethod: str):
         api_url = f"{SimbrellaClient.BANK_CALL_BASE_URL}{SimbrellaClient.BANK_CALL_COLLECT_LOAN_ENDPOINT}"
         logger.info(f"Calling CollectLoan api_url==> : {api_url}")
         logger.info(f"Calling CollectLoan endpoint with data: {data}")
 
-        # Check if the repayment exists
+        repayment = RepaymentService.get_repayment_by_id(id=data['Id'])
-        logger.info(f"Checking if repayment exists")
-        repayment = RepaymentService.get_repayment_by_transaction_id(transaction_id=data['transactionId'])
-        logger.info(f"Repayment Response From Database ** : {repayment}")
-
         if not repayment:
-            logger.info(f"Repayment with transactionId: {data['transactionId']}, was not found")
+            logger.info(f"Repayment with id: {data['Id']} not found")
             return ResponseHelper.error("Repayment not found")
-        logger.info(f"Repayment Response From Database ** : {repayment.to_dict()}")
+
         repayment_data = repayment.to_dict()
         loan = LoanService.get_loan_by_loan_id(loan_id=int(repayment_data['loanId']))
-        
+        if not loan:
-
+            logger.info(f"Loan with debtId: {repayment_data['loanId']} not found")
-        # If loan is not found
-        if loan is None:
-            logger.info(f"Loan with debtId: {repayment_data['loanId']}, was not found")
             return ResponseHelper.error("Loan not found")
 
         loan_data = loan.to_dict()
-        logger.info(f"loan dict : {loan_data}")
+        logger.info(f"Loan data: {loan_data}")
 
         if repayment_data['repayDate'] is not None:
-            logger.info(
+            logger.info(f"Repayment already processed at {repayment_data['repayDate']}")
-                f"Please call verify collection : {data['transactionId']} repayment send for processing at {repayment_data['repayDate']}")
             return ResponseHelper.error("Repayment already processed")
 
-        # let us set repay date
         RepaymentService.set_repay_date(repayment_data['Id'], repayment_data['customerId'])
         repayment = RepaymentService.get_repayment_by_transaction_id(transaction_id=data['transactionId'])
         repayment_data = repayment.to_dict()
-        logger.info(f"Here is your repayment data after setting repay date: {repayment_data}")
+
-        debtId =  str(loan_data.get('debtId', "")).strip().zfill(6)
+        debtId = str(loan_data.get('debtId', "")).strip().zfill(6)
+        t_id = ''.join(random.choices(string.ascii_uppercase, k=22))
         collect_loan_data = {
-            "transactionId": repayment_data['transactionId'],
+            "transactionId": t_id,
             "fbnTransactionId": loan_data['transactionId'],
             "debtId": debtId,
             "customerId": repayment_data['customerId'],
             "accountId": loan_data['accountId'],
             "productId": repayment_data['productId'],
-            "collectAmount": loan_data['repaymentAmount'],
+            "collectAmount": loan_data['balance'] or 0,
-            "penalCharge": 5,
+            "penalCharge": 0,
             "channel": "USSD",
             "collectionMethod": collectionMethod,
             "lienAmount": 0,
@@ -262,59 +272,100 @@ class SimbrellaClient:
         }
 
         try:
-            logger.info(f"Here is your CollectLoan Request data ***** : {collect_loan_data}")
+            logger.info(f"Sending CollectLoan request............ {collect_loan_data}")
-            response = requests.post(api_url, json=collect_loan_data, headers=get_headers())
+            response = requests.post(api_url, json=collect_loan_data, timeout=30, headers=get_headers())
-            
+
-            logger.info(f"CollectLoan response: {response.json()}")
+            logger.info(f"HTTP response object: {response}")
-            RepaymentService.set_repay_result(repayment_data['Id'], response.json().get('responseCode', ''), response.json().get('responseMessage', ''))
+
+            if response.status_code == 404:
+                RepaymentService.set_repay_result(
+                    repayment_data['Id'],
+                    '404',
+                    'Collection Service url not found'
+                )
+                logger.error("Received 404 from external service")
+                return ResponseHelper.error("Collection Service URL not found", status_code=404)
+
             result = response.json()
-            logger.info(f"this is the result {result}")
+            logger.info(f"CollectLoan response: {result}")
+
+            RepaymentService.set_repay_result(
+                repayment_data['Id'],
+                result.get('responseCode', ''),
+                result.get('responseMessage', '')
+            )
+
             data_to_add = {
                 "transactionId": result.get('transactionId') or collect_loan_data.get('transactionId'),
-                "fbnTransactionId": result.get('fbnTransactionId') or collect_loan_data.get('fbnTransactionId'),
+                "fbnTransactionId": loan_data['transactionId'],
                 "accountId": result.get('accountId') or collect_loan_data.get('accountId'),
                 "customerId": result.get('customerId') or collect_loan_data.get('customerId'),
-                "amountCollected": result.get('amountCollected'),
+                "amountCollected": float(result.get('amountCollected', 0)),
                 "repaymentAmount": collect_loan_data.get('collectAmount'),
                 "responseCode": result.get('responseCode'),
                 "responseDescr": result.get('responseMessage'),
-                "balance":result.get('lienAmount')
+                "balance": round(float(result.get('lienAmount', 0)), 2)
             }
-            
+
             new_repayment_data = RepaymentsData.add_repayment_data(data_to_add)
-            logger.info(f"Repayment data added successfully: {new_repayment_data.to_dict()}")
+            if new_repayment_data:
-            if not new_repayment_data:
+                logger.info(f"Repayment data added: {new_repayment_data.to_dict()}")
-                logger.info(f"Failed to add repayment data")
+            else:
-            
+                logger.warning("Failed to add repayment data")
-            return ResponseHelper.success(response.json(), "Successful")
-        except Exception as e:
-            logger.info(f"Failed to call CollectLoan endpoint: {e}")
-            return ResponseHelper.error("Failed to call CollectLoan endpoint")
 
+            if result.get('responseCode') == '00':
+                amount_collected = Decimal(str(result.get('amountCollected', 0))).quantize(Decimal('0.01'), rounding=ROUND_HALF_UP)
+                logger.info(f"Amount collected: {amount_collected}")
 
-    @staticmethod
+                if loan.balance is None or loan.balance <= 0:
-    def refresh_disbursement(data):
+                    logger.warning(f"Loan ID {loan.id} has no balance. Skipping loan update.")
+                    return ResponseHelper.error("Loan has no balance. Skipping.")
 
-        try:
+                try:
-            logger.info(f"Here is your Disbursement Request data ***** : {data}")
+                    logger.info(f"Updating loan balance for loan ID {loan_data['debtId']} with amount collected: {amount_collected}")
+                    updated_loan = LoanService.update_loan_balance(int(loan_data['debtId']), amount_collected)
+                    logger.info(f"Updated loan: {updated_loan}")
+                except Exception as ex:
+                    logger.error(f"Error updating loan balance for loan ID {loan.id}: {ex}")
+                    return ResponseHelper.error("Error updating loan balance")
 
-            return ResponseHelper.success(data, "Successful")
+                try:
+                    updated_balance = Decimal(str(updated_loan['balance'])).quantize(Decimal('0.01'))
+                    logger.info(f"Updated balance: {updated_balance}")
+
+                    if updated_balance <= Decimal('0.00'):
+                        logger.info('Loan fully repaid')
+                        repaid = LoanService.update_status(updated_loan['debtId'], LoanStatus.REPAID)
+                        logger.info(f'Updated loan with repaid status: {repaid}')
+                    else:
+                        logger.info('Loan partially repaid')
+                        partial = LoanService.update_status(updated_loan['debtId'], LoanStatus.ACTIVE_PARTIAL)
+                        logger.info(f'Updated loan with partial status: {partial}')
+                except Exception as e:
+                    logger.error(f"Error while updating loan status for debtId {updated_loan['debtId']}: {e}")
+
+            return ResponseHelper.success(result, "Successful")
+
+        except SSLError as ssl_err:
+            logger.exception(f"SSL error while calling Simbrella endpoint: {ssl_err}")
+            return ResponseHelper.error("SSL handshake failed with Simbrella", status_code=502, error=str(ssl_err))
+
+        except Timeout as timeout_err:
+            logger.exception(f"Timeout while calling Simbrella: {timeout_err}")
+            return ResponseHelper.error("Connection to Simbrella timed out", status_code=504, error=str(timeout_err))
+
+        except RequestException as req_err:
+            logger.exception(f"RequestException while calling Simbrella: {req_err}")
+            return ResponseHelper.error("Connection to Simbrella failed", status_code=503, error=str(req_err))
+
+        except SystemExit as sys_exit:
+            logger.error(f"SystemExit was triggered: {sys_exit}")
+            return ResponseHelper.error("Unexpected shutdown detected", status_code=500, error=str(sys_exit))
 
         except Exception as e:
-            logger.info(f"Failed to call Disbursement endpoint: {e}")
+            logger.exception(f"Unexpected error occurred while calling CollectLoan: {e}")
-            raise
+            return ResponseHelper.error("Unexpected error while processing loan collection", status_code=500, error=str(e))
 
-    @staticmethod
-    def payment_callback(data):
-
-        try:
-            logger.info(f"Here is your Payment Callback Request data ***** : {data}")
-
-            return ResponseHelper.success(data, "Successful")
-
-        except Exception as e:
-            logger.info(f"Failed to call Payment Callback endpoint: {e}")
-            raise
 
     @staticmethod
     def penal_charge(data):

app/models/loan.py

@@ -7,7 +7,9 @@ import logging
 from sqlalchemy import and_, or_, not_ 
 from sqlalchemy.sql import func
 from app.utils.logger import logger
-from app.extensions import db  
+from app.extensions import db 
+from decimal import Decimal, ROUND_HALF_UP
+from datetime import datetime, timezone
 
 class Loan(db.Model):
     __tablename__ = "loans"
@@ -30,6 +32,7 @@ class Loan(db.Model):
     continuous_fee = db.Column(db.Float, default=0)
     upfront_fee = db.Column(db.Float, nullable=True, default=0.0)
     repayment_amount = db.Column(db.Float, nullable=True, default=0.0)
+    balance = db.Column(db.Float, nullable=True, default=0.0)
     installment_amount = db.Column(db.Float, nullable=True, default=0.0)
     status = db.Column(db.String(20), default='pending')
     tenor = db.Column(db.Integer, nullable=True)
@@ -87,7 +90,10 @@ class Loan(db.Model):
             'loanDate': self.created_at.isoformat() if self.created_at else None,
             'disburseDate': self.disburse_date.isoformat() if self.disburse_date else None,
             'disburseVerify': self.disburse_verify.isoformat() if self.disburse_verify else None,
-            'reference': self.reference
+            'reference': self.reference,
+            'balance': self.balance,
+            'tenor': self.tenor,
+            
         }
 
     @classmethod
@@ -218,4 +224,117 @@ class Loan(db.Model):
         return cls.query.filter(
             cls.disburse_date.isnot(None),
             cls.disburse_verify.is_(None)
-        ).order_by(cls.created_at.desc()).first()
+        ).order_by(cls.created_at.desc()).first()
+        
+    @classmethod
+    def get_customer_loans(cls,  customer_id):
+        """
+        Get customer's active loans and sum by customer_id.
+        """
+        customer_loans = cls.query.filter_by( customer_id = customer_id).all()
+        if not customer_loans:
+            raise ValueError(f"Customer with Id {customer_id} does not have any loan.")
+
+        total_amount = (
+            cls.query.with_entities(func.coalesce(func.sum(cls.balance), 0.0))
+            .filter_by(customer_id=customer_id)
+            .scalar()
+        )
+
+        logger.info(f"Found {len(customer_loans)} loans for customer ID: {customer_id} with total amount: {total_amount}")
+
+        return customer_loans, total_amount
+    @classmethod
+    def get_customer_active_loans(cls, customer_id):
+        """
+        Get customer's active loans and sum by customer_id.
+        """
+        customer_loans = cls.query.filter(
+            cls.customer_id == customer_id,
+            cls.status != 'repaid'
+        ).all()
+
+        if not customer_loans:
+            raise ValueError(f"Customer with Id {customer_id} does not have any active loan.")
+
+        total_amount = (
+        cls.query
+        .with_entities(func.coalesce(func.sum(cls.balance), 0.0))
+        .filter(
+            cls.customer_id == customer_id,
+            cls.status != 'repaid'
+        )
+        .scalar()
+    )
+
+        logger.info(f"Found {len(customer_loans)} active loans for customer ID: {customer_id} with total amount: {total_amount}")
+
+        return customer_loans, total_amount
+
+    
+    @classmethod
+    def update_status(cls, loan_id, status):
+        """
+        Update the status of the loan record with the given loan_id.
+        """
+        try:
+            # Retrieve loan record
+            loan = cls.query.get(loan_id)
+            
+            if not loan:
+                raise ValueError(f"Loan with ID {loan_id} does not exist.")
+            
+            if loan.status == status:
+                return loan.to_dict()  # Still return the current state if no change
+            
+            # Update status and timestamp
+            loan.status = status
+            loan.updated_at = datetime.now(timezone.utc)
+            db.session.commit()
+
+            logger.info("Loan status updated and committed.")
+            return loan.to_dict()
+
+        except Exception as e:
+            db.session.rollback()
+            logger.error(f"Error updating loan status: {e}")
+            raise Exception(f"Error updating loan status: {str(e)}")
+    
+  
+    @classmethod
+    def update_loan_balance(cls, loan_id, amount_collected):
+        """
+        Update the balance of a loan after successful repayment.
+        """
+        try:
+            # Fetch the loan record
+            loan = cls.query.get(loan_id)
+
+            if not loan:
+                raise ValueError(f"Loan with ID {loan_id} does not exist.")
+
+            # Convert to Decimal and round to 2 decimal places
+            amount_collected = Decimal(str(amount_collected)).quantize(Decimal("0.01"), rounding=ROUND_HALF_UP)
+            balance = Decimal(str(loan.balance or 0)).quantize(Decimal("0.01"), rounding=ROUND_HALF_UP)
+
+            # Ensure valid repayment amount
+            if amount_collected <= Decimal("0.00"):
+                raise ValueError("Repayment amount must be greater than zero.")
+            if balance <= Decimal("0.00"):
+                raise ValueError("There is no balance for this loan.")
+            if amount_collected > balance:
+                raise ValueError("Repayment amount exceeds current loan balance.")
+
+            # Deduct the amount from the current balance
+            new_balance = balance - amount_collected
+            loan.balance = float(new_balance)
+            loan.updated_at = datetime.now(timezone.utc)
+            db.session.commit()
+
+            logger.info(f"Loan balance updated for loan ID {loan_id}. New balance: {loan.balance}")
+            return loan.to_dict()
+
+        except Exception as e:
+            db.session.rollback()
+            logger.error(f"Error updating loan balance: {e}")
+            raise Exception(f"Error updating loan balance: {str(e)}")

app/models/repayment.py

@@ -1,6 +1,9 @@
 from app.extensions import db
 from datetime import datetime, timezone
 from app.utils.logger import logger
+from app.enums.loan_status import LoanStatus
+from sqlalchemy.exc import IntegrityError
+
 
 class Repayment(db.Model):
     __tablename__ = "repayments"
@@ -14,6 +17,8 @@ class Repayment(db.Model):
     customer_id = db.Column(db.String(50), nullable=False)
     product_id = db.Column(db.String(20), nullable=True)
     transaction_id = db.Column(db.String(50), nullable=False)
+    initiated_by = db.Column(db.String(50), nullable=True)
+    salary_amount = db.Column(db.Float, nullable=True, default=0.0)
     created_at = db.Column(db.DateTime, default=datetime.now(timezone.utc))
     updated_at = db.Column(db.DateTime, default=datetime.now(timezone.utc), onupdate=datetime.now(timezone.utc))
     repay_date = db.Column(db.DateTime, nullable=True)
@@ -39,15 +44,87 @@ class Repayment(db.Model):
         'verifyResult': self.verify_result,
         'verifyDescription': self.verify_description,
         'transactionId': self.transaction_id,
+        'initiatedBy':self.initiated_by,
+        'salaryAmount':self.salary_amount,
         'repayDate': self.repay_date.isoformat() if self.repay_date else None,
         'VerifyDate': self.verify_date.isoformat() if self.verify_date else None,
     }
 
+    @classmethod
+    def create_repayment(cls, repayment_data):
+
+        if repayment_data["LoanStatus"] not in [LoanStatus.ACTIVE, LoanStatus.START_REPAY,LoanStatus.ACTIVE_PARTIAL]:
+            raise ValueError(f"Repayment cannot be processed. Loan status: ({repayment_data['LoanStatus']})")
+
+        repayment = cls(
+            customer_id=repayment_data["customerId"],
+            loan_id=repayment_data["loanId"],
+            product_id=repayment_data["productId"],
+            transaction_id=repayment_data["transactionId"],
+            created_at=datetime.now(timezone.utc),
+            updated_at=datetime.now(timezone.utc),
+            initiated_by= repayment_data["initiatedBy"],
+            salary_amount=repayment_data["salaryAmount"]
+        )
+
+        try:
+            db.session.add(repayment)
+            db.session.commit()
+            logger.info("Repayment record committed.")
+            return repayment
+        except IntegrityError as err:
+            logger.error(f"Database integrity error: {err}")
+        return {"error": "Integrity error", "details": str(err)}
 
 
+    @classmethod
+    def add_repayment(cls, data: dict):
+        """
+        Create and persist a new repayment record.
+        """
+        logger.info(f"Received repayment data: {data}")
+
+        try:
+            new_repayment = cls(
+                loan_id=data["loanId"],
+                customer_id=data["customerId"],
+                product_id=data.get("productId"),
+                transaction_id=data["transactionId"],
+                initiated_by=data.get("initiatedBy"),
+                salary_amount=float(data.get("salaryAmount", 0.0)),
+                repay_date=(
+                    datetime.strptime(data["repayDate"], "%Y-%m-%d")
+                    .replace(tzinfo=timezone.utc)
+                    if data.get("repayDate")
+                    else None
+                ),
+                repay_result=data.get("repayResult"),
+                repay_description=data.get("repayDescription"),
+                verify_result=data.get("verifyResult"),
+                verify_description=data.get("verifyDescription"),
+                verify_date=(
+                    datetime.strptime(data["verifyDate"], "%Y-%m-%d")
+                    .replace(tzinfo=timezone.utc)
+                    if data.get("verifyDate")
+                    else None
+                ),
+            )
+
+            db.session.add(new_repayment)
+            db.session.commit()
+            logger.info("Repayment record committed.")
+            return new_repayment
+
+        except Exception as e:
+            db.session.rollback()
+            logger.error(f"Error adding repayment data: {e}")
+            raise    
     @classmethod
     def get_repayment_by_transaction_id(cls, transaction_id):
         return cls.query.filter_by(transaction_id=transaction_id).first()
+    @classmethod
+    def get_repayment_by_id(cls, id):
+        return cls.query.filter_by(id=id).first()
     
     @classmethod
     def set_repay_date(cls, repayment_id, customer_id):

app/models/repayments_data.py

@@ -42,6 +42,14 @@ class RepaymentsData(db.Model):
         Add a new repayment data entry.
         """
         try:
+            repayment_amount = float(data.get('repaymentAmount', 0.0))
+            amount_collected = float(data.get('amountCollected', 0.0))
+
+            if amount_collected < 0 or repayment_amount < 0:
+                raise ValueError("Amounts cannot be negative.")
+
+            account_balance = round(repayment_amount - amount_collected, 2)
+
             new_data = cls(
                 transaction_id=data.get('transactionId'),
                 response_code=data.get('responseCode'),
@@ -49,13 +57,19 @@ class RepaymentsData(db.Model):
                 fbn_transaction_id=data.get('fbnTransactionId'),
                 account_id=data.get('accountId'),
                 customer_id=data.get('customerId'),
-                amount_collected=data.get('amountCollected'),
+                amount_collected=amount_collected,
-                repayment_amount=data.get('repaymentAmount'),
+                repayment_amount=repayment_amount,
+                balance=account_balance,
             )
+
             db.session.add(new_data)
             db.session.commit()
-            logger.info(f"data has been commited ")
+
+            logger.info("Repayment data committed successfully")
             return new_data
+
         except Exception as e:
             db.session.rollback()
-            raise Exception(f"Error adding repayment data: {str(e)}")
+            logger.error(f"Error adding repayment data: {e}")
+            raise Exception(f"Error adding repayment data: {str(e)}")
+        

app/models/salary.py

@@ -29,7 +29,7 @@ class Salary(db.Model):
             'id': self.id,
             'customerId': self.customer_id,
             'accountId' : self.account_id,
-            'amount': self.amount,
+            'salaryAmount': self.amount,
             'status': self.status,
             'createdAt': self.created_at.isoformat() if self.created_at else None,
             'updatedAt': self.updated_at.isoformat() if self.updated_at else None,
@@ -41,7 +41,7 @@ class Salary(db.Model):
         """
         Add a new salary data entry.
         """
-        logger.info(f"receieved data:{data}")
+        logger.info(f"Received data:{data}")
         try:
             new_data = cls(
                 customer_id=data.get('customerId'),
@@ -69,3 +69,30 @@ class Salary(db.Model):
         except Exception as e:
             logger.error(f"Error fetching pending salaries: {str(e)}")
             return []
+    @classmethod
+    def update_status(cls, salary_id, status):
+        """
+        Update the status of the salary record with the given salary_id.
+        """
+        try:
+            # Retrieve salary record
+            salary = cls.query.get(salary_id)
+            
+            if not salary:
+                raise ValueError(f"Salary with ID {salary_id} does not exist.")
+            
+            if salary.status == status:
+                return salary.to_dict()  # Still return the current state if no change
+            
+            # Update status and timestamp
+            salary.status = status
+            salary.updated_at = datetime.now(timezone.utc)  # Manually update timestamp if not auto-updating
+            db.session.commit()
+
+            logger.info("Salary status updated and committed.")
+            return salary.to_dict()
+
+        except Exception as e:
+            db.session.rollback()
+            logger.error(f"Error updating salary status: {e}")
+            raise Exception(f"Error updating salary status: {str(e)}")

app/routes/autocall.py

@@ -8,6 +8,7 @@ from app.integrations.simbrella import SimbrellaClient
 from app.services.loan import LoanService
 from app.services.repayment import RepaymentService
 from app.services.salary import SalaryService
+from app.enums.loan_status import LoanStatus
 
 autocall_bp = Blueprint("autocall", __name__)
 
@@ -75,7 +76,7 @@ def refresh_collection():
     repayment = RepaymentService.get_latest_repayment_without_repay_date()
     #repayment = RepaymentService.get_latest_repayment_with_loanId(13735)
     if not repayment:
-        logger.info(f"No repayment found without disbursement date")
+        logger.info(f"No repayment found without repay date")
         return 0
     logger.info(f"Calling repay loan endpoint with data: {repayment}")
     repayment_data = repayment.to_dict()
@@ -86,6 +87,7 @@ def refresh_collection():
         "debtId": repayment_data['loanId'],
         "customerId": repayment_data['customerId'],
         "productId": repayment_data['productId'],
+        "Id":repayment_data['Id']
     }
     logger.info(f"Data being sent to Simbrella: {data}")
     logger.info(f"calling simbrella")
@@ -105,61 +107,130 @@ def payment_callback():
 @autocall_bp.route("/penal-charge", methods=["POST"])
 def penal_charge():
     data = request.get_json()
-    logger.info(f"Calling Penal Charge Endpoints")
+    logger.info(f"Calling Penal Charge Endpoint")
 
-    response = SimbrellaClient.penal_charge(data[0])
+    try:
+        response = SimbrellaClient.penal_charge(data[0])
+        return response
+    except Exception as e:
+        logger.error(f"Error in Penal Charge: {e}")
+        return ResponseHelper.error("Penal charge failed")
 
-    return response
 
 @autocall_bp.route("/analytic-salary-detect", methods=["POST"])
 def salary_detect():
-    #***************************************************
+    payload = request.get_json()
-    # PART 1 Accept any new import of salary detection
+    logger.info("Calling Salary Detect endpoint")
-    #**************************************************
-    data = request.get_json()
-    logger.info(f"Calling Salary Detect Endpoints")
 
+    if payload is None:
+        logger.warning("No payload received in request")
+        return ResponseHelper.error("Missing request payload", status_code=400)
+
+    # Step 1: Try to add new salary data
     try:
-        salary = SalaryService.add_salary_data(data)
+        new_salary = SalaryService.add_salary_data(payload) # TODO - This will come as array of salaries - not just one
-        if salary:
+        if new_salary:
-            logger.info(f"Successful Salary Added")
+            logger.info(f"Salary added: {new_salary.id}")
-           # return ResponseHelper.success(salary.to_dict(), "Successful")
     except Exception as e:
-        logger.info(f"Failed to save salary: {e}")
+        logger.error(f"Failed to save salary: {e}")
 
-    # ***************************************************
+    # Step 2: Try processing salary list
-    # PART 2 SELECT * FROM salaries WHERE status IS 'START' ORDER BY id ASC
+    try:
-    # **************************************************
+        process_salary_list()
+    except Exception as e:
+        logger.exception("Unhandled error occurred while processing salary list {e}")
+        return ResponseHelper.error("Failed to process salary list", status_code=500, error=str(e))
 
+    logger.info("Finished processing List")
+    return ResponseHelper.success([], "AutoCall Add Salary Successful")
+
+
+@autocall_bp.route("/analytic-salary-process", methods=["POST"])
+def salary_process():
+    response = process_salary_list()
+    return ResponseHelper.success([], "AutoCall Successful")
+
+
+def process_salary_list():
+    # Step 1: Get all pending salaries
     pending_salaries = SalaryService.get_pending_salaries()
-
     if not pending_salaries:
-        logger.info(f"No pending salaries found")
+        logger.info("No pending salaries found")
-        # return ResponseHelper.success([], "No pending salaries found")
+        return ResponseHelper.success([], "No pending salaries")
 
-    logger.info(f"Found {len(pending_salaries)} pending salaries")
+    logger.info(f"Found {len(pending_salaries)} pending salaries to process")
 
-    #in the loop
+    for pending_salary in pending_salaries:
-    #    USE the customerID to find thu user Loan
+        logger.info(f"Processing salary ID: {pending_salary.id}")
-    #  if loan is/are found for the user
-    #   INSERT INTO repayments TABLE
-        # repayment = cls(
-        #     customer_id=customer_id,
-        #     loan_id=loan.id,
-        #     product_id=loan.product_id,
-        #     transaction_id = transaction_id,
-        #     created_at=datetime.now(timezone.utc),
-        #     updated_at=datetime.now(timezone.utc),
-        #     initiated_by='SALARY_DETECT'
-        # )
 
-    # by the time you call this you must be on repayment table
+        # Step 2: Update salary status to PROCESSING
-    try:
+        try:
-        SimbrellaClient.collect_loan_user_salary_detect(data)
+            SalaryService.update_status(pending_salary.id, "PROCESSING")
-    except Exception as e:
+        except Exception as e:
-        logger.info(f"Failed to call collect_loan_user_salary_detect: {e}")
+            logger.warning(f"Could not update status for salary ID {pending_salary.id}: {e}")
+            continue
 
-   
+        # Step 3: Get customer's active loans
-    return_data=[]
+        try:
+            loans, total_amount = LoanService.get_customer_active_loans(pending_salary.customer_id)
+            if not loans:
+                logger.warning(f"No loans found for customer ID: {pending_salary.customer_id}")
+                continue
+        except Exception as e:
+            logger.error(f"Error fetching loans for customer ID {pending_salary.customer_id}: {e}")
+            continue
 
-    return ResponseHelper.success(return_data, "AutoCall Successful")
+        # Step 4: Create repayments for each loan
+        for loan in loans:
+            logger.info(f"Processing Loan ID: {loan.id}")
+            try:
+                repayment_data = {
+                    "customerId": loan.customer_id,
+                    "loanId": loan.id,
+                    "productId": loan.product_id,
+                    "transactionId": loan.transaction_id,
+                    "initiatedBy": "SALARY_DETECT",
+                    "salaryAmount": pending_salary.amount,
+                    "LoanStatus": loan.status,
+                }
+
+                logger.info(f"Creating repayment with data: {repayment_data}")
+                repayment = RepaymentService.create_repayment(repayment_data)
+
+                if not repayment:
+                    logger.error(f"Repayment creation failed for loan ID {loan.id}")
+                    continue
+
+                # Update loan status to START_REPAY
+                try:
+                    LoanService.update_status(loan_id=loan.id, status=LoanStatus.START_REPAY)
+                except Exception as e:
+                    logger.error(f"Failed to update loan status for loan ID {loan.id}: {e}")
+
+                logger.info(f"Created repayment ID: {repayment.id}")
+            except Exception as e:
+                logger.error(f"Error creating repayment for loan ID {loan.id}: {e}")
+                continue
+
+            # Step 5: Call Simbrella to collect loan
+            
+            try:
+                simbrella_response = SimbrellaClient.collect_loan_user_salary_detect(repayment.to_dict())
+
+                if isinstance(simbrella_response, tuple):
+                    simbrella_response, status_code = simbrella_response
+                    logger.warning(f"Simbrella returned tuple: status={status_code}, response={simbrella_response}")
+
+                if isinstance(simbrella_response, dict):
+                    status = simbrella_response.get("status")
+                    if status != "success":
+                        logger.warning(f"Simbrella call failed for repayment ID {repayment.id}: {simbrella_response}")
+                else:
+                    logger.warning(f"Unexpected Simbrella response type: {type(simbrella_response)}")
+            except Exception as e:
+                logger.error(f"Failed to call Simbrella for repayment ID {repayment.id}: {e}")
+
+
+        logger.info(f"Finished processing salary ID: {pending_salary.id}")
+
+    return ResponseHelper.success([], "Processed all pending salaries")

app/services/loan.py

@@ -70,3 +70,32 @@ class LoanService:
         Get the latest loan without a disbursement date.
         """
         return Loan.get_latest_loan_with_disburse_date()
+    
+    @classmethod
+    def get_customer_loans(cls,  customer_id):
+        """
+        Get customer's active loans by customer_id.
+        """
+               
+        return Loan.get_customer_loans(customer_id=customer_id)
+    @classmethod
+    def get_customer_active_loans(cls,  customer_id):
+        """
+        Get customer's active loans by customer_id.
+        """
+               
+        return Loan.get_customer_active_loans(customer_id=customer_id)
+
+    @classmethod
+    def update_status(cls, loan_id, status):
+        """
+        Update the status of the loan with the given loan_id.
+        """
+        # Retrieve loan
+        return Loan.update_status(loan_id, status)
+    @classmethod
+    def update_loan_balance(cls,loan_id,amount_collected):
+        """
+        update the loan balance after successful repayment
+        """
+        return Loan.update_loan_balance(loan_id,amount_collected)

app/services/repayment.py

@@ -8,6 +8,12 @@ class RepaymentService:
         Get the repayment by transaction ID
         """
         return Repayment.get_repayment_by_transaction_id(transaction_id)
+    @staticmethod
+    def get_repayment_by_id(id):
+        """
+        Get the repayment by ID
+        """
+        return Repayment.get_repayment_by_id(id)
    
     @classmethod
     def set_repay_date(cls, repayment_id, customer_id):
@@ -55,4 +61,18 @@ class RepaymentService:
         """
         Get the latest repayment with a repay date and no verification date.
         """
-        return Repayment.get_latest_loan_with_repay_date()
+        return Repayment.get_latest_loan_with_repay_date()
+
+    @classmethod
+    def add_repayment(cls, data):
+        """
+        Add a new repayment entry.
+        """
+        return Repayment.add_repayment(data)
+
+    @classmethod
+    def create_repayment(cls, repayment_data):
+        """
+        Add a new repayment entry.
+        """
+        return Repayment.create_repayment(repayment_data)

app/services/salary.py

@@ -15,4 +15,10 @@ class SalaryService:
         """
         Get the pending salary for a given customer.
         """
-        return Salary.get_pending_salaries()
+        return Salary.get_pending_salaries()
+    @classmethod
+    def update_status(cls, salary_id, status):
+        """
+        Update the status of the salary with the given salary_id.
+        """
+        return Salary.update_status(salary_id, status)

openapi.yml

@@ -192,7 +192,7 @@ paths:
                   example: "OP621868"
                 status:
                   type: string
-                amount:
+                salaryAmount:
                   type: number
                   example: 200000
                 salaryDate:

requirements.txt

@@ -10,3 +10,4 @@ flask-sqlalchemy
 psycopg2-binary
 alembic
 python-dateutil
+oracledb