debugging
This commit was merged in pull request #34.
This commit is contained in:
Chinenye Nmoh
@@ -218,38 +218,29 @@ class SimbrellaClient:
|
||||
logger.info(f"Calling CollectLoan api_url==> : {api_url}")
|
||||
logger.info(f"Calling CollectLoan endpoint with data: {data}")
|
||||
|
||||
# Check if the repayment exists
|
||||
logger.info(f"Checking if repayment exists")
|
||||
repayment = RepaymentService.get_repayment_by_id(id=data['Id'])
|
||||
logger.info(f"Repayment Response From Database ** : {repayment}")
|
||||
|
||||
if not repayment:
|
||||
logger.info(f"Repayment with id: {data['Id']}, 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 loan is not found
|
||||
if loan is None:
|
||||
logger.info(f"Loan with debtId: {repayment_data['loanId']}, was not found")
|
||||
if not loan:
|
||||
logger.info(f"Loan with debtId: {repayment_data['loanId']} 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(
|
||||
f"Please call verify collection : {data['transactionId']} repayment send for processing at {repayment_data['repayDate']}")
|
||||
logger.info(f"Repayment already processed 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)
|
||||
collect_loan_data = {
|
||||
"transactionId": loan_data['transactionId'],
|
||||
"fbnTransactionId": loan_data['transactionId'],
|
||||
@@ -258,7 +249,7 @@ class SimbrellaClient:
|
||||
"accountId": loan_data['accountId'],
|
||||
"productId": repayment_data['productId'],
|
||||
"collectAmount": loan_data['repaymentAmount'] or 0,
|
||||
"penalCharge": 5,
|
||||
"penalCharge": 0,
|
||||
"channel": "USSD",
|
||||
"collectionMethod": collectionMethod,
|
||||
"lienAmount": 0,
|
||||
@@ -267,13 +258,21 @@ class SimbrellaClient:
|
||||
}
|
||||
|
||||
try:
|
||||
logger.info(f"Here is your CollectLoan Request data ***** : {collect_loan_data}")
|
||||
response = requests.post(api_url, json=collect_loan_data,timeout=30, headers=get_headers())
|
||||
|
||||
logger.info(f"CollectLoan response: {response.json()}")
|
||||
RepaymentService.set_repay_result(repayment_data['Id'], response.json().get('responseCode', ''), response.json().get('responseMessage', ''))
|
||||
logger.info(f"Sending CollectLoan request: {collect_loan_data}")
|
||||
response = requests.post(api_url, json=collect_loan_data, timeout=30, headers=get_headers())
|
||||
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', '')
|
||||
)
|
||||
|
||||
if not result.get('transactionId'):
|
||||
logger.error("Missing transactionId in response")
|
||||
return ResponseHelper.error("Missing transactionId from Simbrella response", status_code=500)
|
||||
|
||||
data_to_add = {
|
||||
"transactionId": result.get('transactionId') or collect_loan_data.get('transactionId'),
|
||||
"fbnTransactionId": result.get('fbnTransactionId') or collect_loan_data.get('fbnTransactionId'),
|
||||
@@ -288,33 +287,40 @@ class SimbrellaClient:
|
||||
|
||||
new_repayment_data = RepaymentsData.add_repayment_data(data_to_add)
|
||||
if new_repayment_data:
|
||||
logger.info(f"Repayment data added successfully: {new_repayment_data.to_dict()}")
|
||||
logger.info(f"Repayment data added: {new_repayment_data.to_dict()}")
|
||||
else:
|
||||
logger.warning("Failed to add repayment data")
|
||||
|
||||
# Process loan update only if successful
|
||||
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}')
|
||||
logger.info(f"Amount collected: {amount_collected}")
|
||||
|
||||
if loan.balance is None or loan.balance <= 0:
|
||||
logger.warning(f"Loan ID {loan.id} has no balance. Skipping loan update.")
|
||||
return ResponseHelper.error("Loan has no balance. Skipping.")
|
||||
|
||||
try:
|
||||
logger.info(f"Updating loan balance for loan ID {loan_data} with amount collected: {amount_collected}")
|
||||
updated_loan = LoanService.update_loan_balance(int(loan_data['debtId']), amount_collected)
|
||||
except ValueError as ve:
|
||||
logger.error(f"Validation error updating loan balance: {ve}")
|
||||
return ResponseHelper.error(str(ve), status_code=400)
|
||||
logger.info(f"Updated loan: {updated_loan}")
|
||||
except Exception as ex:
|
||||
logger.error(f"Unexpected error updating loan balance: {ex}")
|
||||
return ResponseHelper.error("Unexpected error updating loan balance", status_code=500)
|
||||
logger.error(f"Error updating loan balance for loan ID {loan.id}: {ex}")
|
||||
return ResponseHelper.error("Error updating loan balance")
|
||||
|
||||
logger.info(f'updated loan {updated_loan}')
|
||||
updated_balance = Decimal(str(updated_loan['balance'])).quantize(Decimal('0.01'))
|
||||
logger.info(f'updated balance {updated_balance}')
|
||||
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'):
|
||||
repaid = LoanService.update_status(updated_loan['debtId'], LoanStatus.REPAID)
|
||||
logger.info(f'updated loan with repaid {repaid}')
|
||||
else:
|
||||
LoanService.update_status(updated_loan['debtId'], LoanStatus.ACTIVE_PARTIAL)
|
||||
logger.info(f'updated loan with partial ')
|
||||
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")
|
||||
|
||||
@@ -322,6 +328,7 @@ class SimbrellaClient:
|
||||
logger.exception("Failed to call CollectLoan endpoint")
|
||||
return ResponseHelper.error("Failed to call CollectLoan endpoint")
|
||||
|
||||
|
||||
@staticmethod
|
||||
def penal_charge(data):
|
||||
|
||||
|
||||
Reference in New Issue
Block a user