corrected commit error
This commit was merged in pull request #37.
This commit is contained in:
@@ -7,6 +7,7 @@ from app.utils.extras import preprocess_loan_charges_data
|
||||
import random
|
||||
import random
|
||||
import string
|
||||
from app.extensions import db
|
||||
from app.utils.logger import logger
|
||||
from flask import jsonify, current_app
|
||||
from app.services.transactions import TransactionService
|
||||
@@ -18,6 +19,8 @@ from app.enums.loan_status import LoanStatus
|
||||
from decimal import Decimal, ROUND_HALF_UP
|
||||
from requests.exceptions import SSLError, RequestException,Timeout
|
||||
import sys
|
||||
from requests.exceptions import ReadTimeout, ConnectTimeout
|
||||
import socket
|
||||
|
||||
|
||||
class SimbrellaClient:
|
||||
@@ -273,11 +276,11 @@ class SimbrellaClient:
|
||||
|
||||
try:
|
||||
logger.info(f"Sending CollectLoan request............ {collect_loan_data}")
|
||||
response = requests.post(api_url, json=collect_loan_data, timeout=30, headers=get_headers())
|
||||
|
||||
response = requests.post(api_url, json=collect_loan_data, timeout=90, headers=get_headers())
|
||||
logger.info(f"HTTP response object: {response}")
|
||||
|
||||
if response.status_code == 404:
|
||||
db.session.rollback()
|
||||
RepaymentService.set_repay_result(
|
||||
repayment_data['Id'],
|
||||
'404',
|
||||
@@ -326,6 +329,7 @@ class SimbrellaClient:
|
||||
updated_loan = LoanService.update_loan_balance(int(loan_data['debtId']), amount_collected)
|
||||
logger.info(f"Updated loan: {updated_loan}")
|
||||
except Exception as ex:
|
||||
db.session.rollback()
|
||||
logger.error(f"Error updating loan balance for loan ID {loan.id}: {ex}")
|
||||
return ResponseHelper.error("Error updating loan balance")
|
||||
|
||||
@@ -342,28 +346,55 @@ class SimbrellaClient:
|
||||
partial = LoanService.update_status(updated_loan['debtId'], LoanStatus.ACTIVE_PARTIAL)
|
||||
logger.info(f'Updated loan with partial status: {partial}')
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
logger.error(f"Error while updating loan status for debtId {updated_loan['debtId']}: {e}")
|
||||
|
||||
return ResponseHelper.success(result, "Successful")
|
||||
|
||||
except SSLError as ssl_err:
|
||||
db.session.rollback()
|
||||
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:
|
||||
except (Timeout, ReadTimeout, ConnectTimeout, socket.timeout, TimeoutError) as timeout_err:
|
||||
db.session.rollback()
|
||||
logger.exception(f"Timeout while calling Simbrella: {timeout_err}")
|
||||
RepaymentService.set_repay_result(
|
||||
repayment_data['Id'],
|
||||
'500',
|
||||
'There was a timeout while calling Simbrella'
|
||||
)
|
||||
return ResponseHelper.error("Connection to Simbrella timed out", status_code=504, error=str(timeout_err))
|
||||
|
||||
except RequestException as req_err:
|
||||
db.session.rollback()
|
||||
logger.exception(f"RequestException while calling Simbrella: {req_err}")
|
||||
RepaymentService.set_repay_result(
|
||||
repayment_data['Id'],
|
||||
'500',
|
||||
'There was a request error while calling Simbrella'
|
||||
)
|
||||
return ResponseHelper.error("Connection to Simbrella failed", status_code=503, error=str(req_err))
|
||||
|
||||
except SystemExit as sys_exit:
|
||||
db.session.rollback()
|
||||
logger.error(f"SystemExit was triggered: {sys_exit}")
|
||||
RepaymentService.set_repay_result(
|
||||
repayment_data['Id'],
|
||||
'500',
|
||||
'There was a system error while calling Simbrella'
|
||||
|
||||
|
||||
)
|
||||
return ResponseHelper.error("Unexpected shutdown detected", status_code=500, error=str(sys_exit))
|
||||
|
||||
except Exception as e:
|
||||
db.session.rollback()
|
||||
logger.exception(f"Unexpected error occurred while calling CollectLoan: {e}")
|
||||
RepaymentService.set_repay_result(
|
||||
repayment_data['Id'],
|
||||
'500',
|
||||
'Unexpected error while processing loan collection'
|
||||
)
|
||||
return ResponseHelper.error("Unexpected error while processing loan collection", status_code=500, error=str(e))
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user