Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| dd0f39428a | |||
| 50eaf0099b | |||
| 6377158c3c | |||
| ce6b0684c8 | |||
| b6ca91153f |
@@ -1,4 +1,3 @@
|
||||
from sqlite3 import DatabaseError
|
||||
from app.api.integrations.events_service import EventServiceIntegration
|
||||
from flask import Blueprint, request, jsonify, send_from_directory
|
||||
from app.api.services import (
|
||||
@@ -24,6 +23,7 @@ from flask_jwt_extended import (
|
||||
from sqlalchemy import text
|
||||
from app.extensions import db
|
||||
from app.config import settings
|
||||
from urllib.parse import urlparse
|
||||
|
||||
|
||||
api = Blueprint("api", __name__)
|
||||
@@ -42,10 +42,10 @@ def swagger_json():
|
||||
return send_from_directory(swagger_dir, "digifi_swagger.json")
|
||||
|
||||
|
||||
@api.route("/swagger/<path:filename>")
|
||||
def serve_paths(filename):
|
||||
swagger_dir = os.path.join("swagger")
|
||||
return send_from_directory(swagger_dir, filename)
|
||||
# @api.route("/swagger/<path:filename>")
|
||||
# def serve_paths(filename):
|
||||
# swagger_dir = os.path.join("swagger")
|
||||
# return send_from_directory(swagger_dir, filename)
|
||||
|
||||
|
||||
# EligibilityCheck Endpoint
|
||||
@@ -118,6 +118,7 @@ def notification_callback():
|
||||
response = NotificationCallbackService.process_request(data)
|
||||
return response
|
||||
|
||||
|
||||
# Health Check Endpoint
|
||||
@api.route("/health", methods=["GET"])
|
||||
def health_check():
|
||||
@@ -128,7 +129,6 @@ def health_check():
|
||||
errors = []
|
||||
status = "ok"
|
||||
|
||||
|
||||
# Extract the database URI
|
||||
try:
|
||||
db_uri = db.engine.url.render_as_string(hide_password=False)
|
||||
@@ -166,8 +166,8 @@ def health_check():
|
||||
response = {
|
||||
"status": status,
|
||||
"db_status": db_status,
|
||||
"events_service_status": events_service_status,
|
||||
"db_uri": db_uri,
|
||||
"events_service_status": events_service_status,
|
||||
"errors": errors or None
|
||||
}
|
||||
|
||||
|
||||
@@ -17,7 +17,6 @@ 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, timezone, timedelta
|
||||
|
||||
class ProvideLoanService(BaseService):
|
||||
TRANSACTION_TYPE = TransactionType.PROVIDE_LOAN
|
||||
@@ -159,26 +158,20 @@ class ProvideLoanService(BaseService):
|
||||
|
||||
loan_charges = LoanCharge.create_charges_for_loan(loan_id = loan_id, transaction_id = transaction_id, referenced_amount = 800, charges = charges)
|
||||
|
||||
|
||||
|
||||
else:
|
||||
return ResponseHelper.error(result_description="Invalid Customer or Account")
|
||||
|
||||
|
||||
charge_schedule_items = ProvideLoanService.get_charge_schedule_items(
|
||||
loan_charges=loan_charges,
|
||||
offer=offer,
|
||||
loan_ref=loan_ref,
|
||||
amount=amount
|
||||
)
|
||||
|
||||
|
||||
|
||||
response_data = {
|
||||
"requestId": request_id,
|
||||
"transactionId": transaction_id,
|
||||
"loanRef": loan_ref,
|
||||
"customerId": customer_id,
|
||||
"accountId": account_id,
|
||||
"msisdn": customer.msisdn,
|
||||
"schedule": charge_schedule_items,
|
||||
"msisdn": customer.msisdn
|
||||
}
|
||||
|
||||
|
||||
@@ -214,35 +207,4 @@ class ProvideLoanService(BaseService):
|
||||
response = EventServiceIntegration.direct_loan(transaction_id=transaction_id)
|
||||
return response
|
||||
|
||||
@classmethod
|
||||
def get_charge_schedule_items(cls, loan_charges, offer, loan_ref, amount):
|
||||
now = datetime.now(timezone.utc)
|
||||
due_date = now + timedelta(days=offer.tenor)
|
||||
|
||||
charge_schedule_items = []
|
||||
|
||||
charge_schedule_items.append({
|
||||
"id": 1,
|
||||
"dueDate": due_date.isoformat(),
|
||||
"amountDue": amount,
|
||||
"componentName": "PRINCIPAL",
|
||||
"startDate": now.isoformat(),
|
||||
})
|
||||
|
||||
for idx, charge in enumerate(loan_charges, start=len(charge_schedule_items) + 1):
|
||||
item = {
|
||||
"id": idx,
|
||||
"dueDate": charge.due_date.isoformat(),
|
||||
"amountDue": float(charge.amount),
|
||||
"componentName": charge.code.upper(), # e.g. INTEREST, MGMT_FEE, VAT_FEE
|
||||
"startDate": charge.created_at.isoformat(),
|
||||
}
|
||||
|
||||
if charge.code.upper() == "INTEREST":
|
||||
item["loanRef"] = loan_ref
|
||||
|
||||
charge_schedule_items.append(item)
|
||||
|
||||
return charge_schedule_items
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"post": {
|
||||
"tags": ["AuthorizeRefresh"],
|
||||
"tags": ["Authorize Refresh"],
|
||||
"summary": "Customer Authorize Refresh Request",
|
||||
"description": "Customer Authorize Refresh Request",
|
||||
"operationId": "AuthorizeRefresh",
|
||||
|
||||
@@ -25,41 +25,6 @@
|
||||
"type": "string",
|
||||
"example": "98016510058"
|
||||
},
|
||||
"schedule": {
|
||||
"type": "array",
|
||||
"description": "List of loan repayment components with due dates and amounts.",
|
||||
"items": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"id": {
|
||||
"type": "integer",
|
||||
"example": 1
|
||||
},
|
||||
"amountDue": {
|
||||
"type": "number",
|
||||
"example": 2000.0
|
||||
},
|
||||
"componentName": {
|
||||
"type": "string",
|
||||
"example": "INTEREST"
|
||||
},
|
||||
"dueDate": {
|
||||
"type": "string",
|
||||
"format": "date-time",
|
||||
"example": "2026-01-13T11:36:39.890747+00:00"
|
||||
},
|
||||
"startDate": {
|
||||
"type": "string",
|
||||
"format": "date-time",
|
||||
"example": "2025-10-15T11:36:39.890747+00:00"
|
||||
},
|
||||
"loanRef": {
|
||||
"type": "string",
|
||||
"example": "TRX1760528156816285USSD3MPC"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"resultCode": {
|
||||
"type": "string",
|
||||
"example": "00"
|
||||
|
||||
Reference in New Issue
Block a user