Compare commits
68 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e5b2d6e7b6 | |||
| 2a184d134d | |||
| 5e5f1b83ad | |||
| 2413446107 | |||
| ff5cbcc49d | |||
| 9f2daad7c8 | |||
| 9f7435227f | |||
| 0961a65b19 | |||
| 798d264748 | |||
| 5b1d867d49 | |||
| c4b2df714c | |||
| 6138085c0e | |||
| fc9f7fe175 | |||
| 2aee3d08ed | |||
| d99640345a | |||
| 6221447353 | |||
| 54e52c639b | |||
| bb85c8f166 | |||
| 6077c78840 | |||
| 9cbc824661 | |||
| 2e08c636a2 | |||
| ad043ba3f8 | |||
| 63da7e8292 | |||
| b73bf9a234 | |||
| e8abb3c668 | |||
| 396516b941 | |||
| c59068d3bb | |||
| ccd5b12f2c | |||
| 9913f6500c | |||
| 17c760981a | |||
| 68aca1407c | |||
| 550895b8ef | |||
| b7e3527f35 | |||
| 1bab78ec1a | |||
| fe5d3fbc6e | |||
| c516c3f52c | |||
| 55140efed8 | |||
| f8da81d564 | |||
| 0faf01bcfa | |||
| 9da259900c | |||
| 4da0b8c716 | |||
| ddb08d8063 | |||
| 8c405c5d2e | |||
| 4c95112bde | |||
| 244f648974 | |||
| 324293ee96 | |||
| 06b266c3a7 | |||
| ab9330bb23 | |||
| f5cf4e5bdd | |||
| 0b78698db9 | |||
| d8abd0ff2a | |||
| c6acd9e73a | |||
| 18dda45fa1 | |||
| 363c6b498a | |||
| 2a12215931 | |||
| 2f3b589420 | |||
| f0679b8c1e | |||
| c8e21be48c | |||
| f1e9e39fe5 | |||
| b412313fc5 | |||
| cba6eac501 | |||
| 443c6262b7 | |||
| 2ba97cee4a | |||
| 8c714cb45c | |||
| c93e1a8bdd | |||
| 6d8fe24718 | |||
| deaddd8132 | |||
| 6e08b0680f |
@@ -12,6 +12,7 @@ DATABASE_PASSWORD=FirstAdvance!
|
||||
DATABASE_HOST=dev-data.simbrellang.net
|
||||
DATABASE_PORT=10532
|
||||
DATABASE_NAME=firstadvancedev
|
||||
#SQLALCHEMY_DATABASE_URI_FULL="oracle+oracledb://FIRSTADVSTG:Pchanged_56789@10.2.110.30:1521/?service_name=firstadv"
|
||||
|
||||
# DATABASE_HOST=10.20.30.60
|
||||
# DATABASE_USER=firstadvance
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
from flask import Flask
|
||||
from app.extensions import mail
|
||||
from app.utils.mail import send_report_email, get_report_data
|
||||
from app.config import settings
|
||||
|
||||
app = Flask(__name__)
|
||||
app.config.from_object(settings)
|
||||
|
||||
mail.init_app(app)
|
||||
|
||||
with app.app_context():
|
||||
report_data = get_report_data()
|
||||
recipients = ["vdagbue@gmail.com"]
|
||||
result = send_report_email(report_data, recipients)
|
||||
print(result)
|
||||
@@ -0,0 +1,40 @@
|
||||
|
||||
# Environment Variables ======================================================
|
||||
BASIC_AUTH_USERNAME=user
|
||||
BASIC_AUTH_PASSWORD=password
|
||||
SWAGGER_URL="/documentation"
|
||||
API_URL="/swagger.json"
|
||||
|
||||
# Flask Configuration =========================================================
|
||||
FLASK_APP=wsgi.py
|
||||
FLASK_ENV=development
|
||||
APP_PORT=4500
|
||||
|
||||
#Database Configuration =======================================================
|
||||
DATABASE_USER=FIRSTADVSTG
|
||||
DATABASE_PASSWORD=Pchanged_56789
|
||||
DATABASE_HOST=ig-x6-uat-scan
|
||||
DATABASE_PORT=1521
|
||||
DATABASE_NAME=FIRSTADVSTG
|
||||
DATABASE_SID=firstadv
|
||||
SQLALCHEMY_DATABASE_URI_FULL="oracle+oracledb://FIRSTADVSTG:Pchanged_56789@10.2.110.30:1521/?service_name=firstadv"
|
||||
|
||||
# Event Bus =====================================================================
|
||||
KAFKA_BROKER="10.2.110.20:9082"
|
||||
|
||||
#Bank Calls =====================================================================
|
||||
SIMBRELLA_BASE_URL="https://bank-emulator.dev.simbrellang.net"
|
||||
SIMBRELLA_APP_ID="app1"
|
||||
SIMBRELLA_API_KEY="testtest-api-key-12345"
|
||||
|
||||
#Events Direct Location =========================================================
|
||||
EVENTS_SERVICE_BASE_URL="http://10.2.24.133:5000"
|
||||
ENDPOINT_DIRECT_LOAN="/autocall/direct/loan"
|
||||
ENDPOINT_DIRECT_REPAYMENT="/autocall/direct/repayment"
|
||||
|
||||
#EVENTS_SERVICE_BASE_URL2="https://event-core.simbrellang.net"
|
||||
#EVENTS_SERVICE_BASE_URL="http://10.10.11.17:14700"
|
||||
|
||||
|
||||
|
||||
|
||||
+30
-19
@@ -1,4 +1,5 @@
|
||||
from flask import Flask
|
||||
from flask_mail import Mail
|
||||
import os
|
||||
from flask_swagger_ui import get_swaggerui_blueprint
|
||||
from flask_cors import CORS
|
||||
@@ -7,7 +8,7 @@ from app.api.routes import api
|
||||
from app.errors import register_error_handlers
|
||||
from flask_sqlalchemy import SQLAlchemy
|
||||
from flask_migrate import Migrate
|
||||
from app.extensions import db, migrate
|
||||
from app.extensions import db, migrate, mail
|
||||
from flask_jwt_extended import (
|
||||
JWTManager,
|
||||
jwt_required,
|
||||
@@ -19,37 +20,47 @@ from flask_jwt_extended import (
|
||||
def create_app():
|
||||
"""Factory function to create a Flask app instance"""
|
||||
# import oracledb
|
||||
|
||||
# oracledb.init_oracle_client(lib_dir=None)
|
||||
|
||||
# oracledb.init_oracle_client(lib_dir=None)
|
||||
app = Flask(__name__)
|
||||
|
||||
# Load configuration
|
||||
app.config.from_object(Config)
|
||||
|
||||
CORS(app)
|
||||
|
||||
JWTManager(app)
|
||||
CORS(app, supports_credentials=True)
|
||||
CORS(app, supports_credentials=True)
|
||||
|
||||
# Swagger Doc
|
||||
SWAGGER_URL = app.config.get("SWAGGER_URL")
|
||||
API_URL = app.config.get("API_URL")
|
||||
|
||||
# Register blueprints
|
||||
app.register_blueprint(api)
|
||||
try:
|
||||
# Swagger Doc
|
||||
SWAGGER_URL = app.config.get("SWAGGER_URL")
|
||||
API_URL = app.config.get("API_URL")
|
||||
|
||||
swagger_ui_blueprint = get_swaggerui_blueprint(SWAGGER_URL, API_URL)
|
||||
app.register_blueprint(swagger_ui_blueprint, url_prefix=SWAGGER_URL)
|
||||
# Register blueprints
|
||||
app.register_blueprint(api)
|
||||
|
||||
# Error Handlers
|
||||
register_error_handlers(app)
|
||||
swagger_ui_blueprint = get_swaggerui_blueprint(SWAGGER_URL, API_URL)
|
||||
app.register_blueprint(swagger_ui_blueprint, url_prefix=SWAGGER_URL)
|
||||
|
||||
from . import models
|
||||
except Exception as e:
|
||||
print(f"Swagger Unexpected error occurred: {e}")
|
||||
|
||||
# Database and Migrations
|
||||
db.init_app(app)
|
||||
|
||||
migrate.init_app(app, db)
|
||||
try:
|
||||
# Error Handlers
|
||||
register_error_handlers(app)
|
||||
|
||||
return app
|
||||
from . import models
|
||||
|
||||
# Initialize Flask-Mail
|
||||
mail.init_app(app)
|
||||
|
||||
# Database and Migrations
|
||||
db.init_app(app)
|
||||
|
||||
migrate.init_app(app, db)
|
||||
|
||||
return app
|
||||
except Exception as e:
|
||||
print(f"An unexpected error occurred: {e}")
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
from .simbrella import SimbrellaIntegration
|
||||
from .kafka import KafkaIntegration
|
||||
from .kafka import KafkaIntegration
|
||||
from .events_service import EventServiceIntegration
|
||||
@@ -0,0 +1,69 @@
|
||||
import httpx
|
||||
from app.utils.logger import logger
|
||||
from app.config import settings
|
||||
|
||||
|
||||
class EventServiceIntegration:
|
||||
BASE_URL = settings.SIMBRELLA_BASE_URL
|
||||
EVENTS_SERVICE_BASE_URL = settings.EVENTS_SERVICE_BASE_URL
|
||||
ENDPOINT_DIRECT_LOAN = settings.ENDPOINT_DIRECT_LOAN
|
||||
ENDPOINT_DIRECT_REPAYMENT = settings.ENDPOINT_DIRECT_REPAYMENT
|
||||
|
||||
@staticmethod
|
||||
def direct_loan(transaction_id: str):
|
||||
"""
|
||||
Calls the Direct Loan endpoint
|
||||
"""
|
||||
url = f"{EventServiceIntegration.EVENTS_SERVICE_BASE_URL}{EventServiceIntegration.ENDPOINT_DIRECT_LOAN}"
|
||||
logger.info(f"Direct Loan URL: {url}")
|
||||
payload = {"transactionId": str(transaction_id)}
|
||||
|
||||
headers = {
|
||||
"Content-Type": "application/json"
|
||||
}
|
||||
|
||||
try:
|
||||
response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
|
||||
logger.info(f"Loan Response: {response.text}")
|
||||
return response
|
||||
except Exception as e:
|
||||
logger.error(f"Direct Loan API call failed: {str(e)}", exc_info=True)
|
||||
raise
|
||||
|
||||
@staticmethod
|
||||
def direct_repayment(transaction_id: str):
|
||||
"""
|
||||
Calls the Direct Repayment endpoint
|
||||
"""
|
||||
url = f"{EventServiceIntegration.EVENTS_SERVICE_BASE_URL}{EventServiceIntegration.ENDPOINT_DIRECT_REPAYMENT}"
|
||||
logger.info(f"Direct Repayment URL: {url}")
|
||||
payload = {"transactionId": str(transaction_id)}
|
||||
|
||||
headers = {
|
||||
"Content-Type": "application/json",
|
||||
}
|
||||
|
||||
try:
|
||||
response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
|
||||
logger.info(f"Repayment Response: {response.text}")
|
||||
return response
|
||||
except Exception as e:
|
||||
logger.error(f"Direct Repayment API call failed: {str(e)}", exc_info=True)
|
||||
raise
|
||||
|
||||
|
||||
@staticmethod
|
||||
def health_check():
|
||||
"""
|
||||
Health check for Events Service
|
||||
"""
|
||||
url = f"{EventServiceIntegration.EVENTS_SERVICE_BASE_URL}/health"
|
||||
logger.info(f"Health Check URL: {url}")
|
||||
|
||||
try:
|
||||
response = httpx.get(url, timeout=5.0)
|
||||
logger.info(f"Health Check Response: {response.text}")
|
||||
return response
|
||||
except Exception as e:
|
||||
logger.error(f"Health Check API call failed: {str(e)}", exc_info=True)
|
||||
raise
|
||||
@@ -1,13 +1,64 @@
|
||||
from os import access
|
||||
import httpx
|
||||
import json
|
||||
import time
|
||||
from app.utils.logger import logger
|
||||
from app.config import settings
|
||||
import logging
|
||||
|
||||
|
||||
class SimbrellaIntegration:
|
||||
BASE_URL = settings.SIMBRELLA_BASE_URL
|
||||
ENDPOINT_RAC_CHECKS = settings.SIMBRELLA_ENDPOINT_RAC_CHECKS
|
||||
HEALTH_ENDPOINT = settings.SIMBRELLA_HEALTH
|
||||
AUTH_ENDPOINT = settings.BANK_CALL_AUTH_ENDPOINT
|
||||
|
||||
_access_token = None # cache token in memory
|
||||
_token_expiry = 0
|
||||
|
||||
@staticmethod
|
||||
def generate_token():
|
||||
"""
|
||||
Generate a new access token using the username and password from settings.
|
||||
"""
|
||||
url = f"{SimbrellaIntegration.BASE_URL}{SimbrellaIntegration.AUTH_ENDPOINT}"
|
||||
|
||||
payload = {
|
||||
"username": settings.BANK_CALL_USERNAME,
|
||||
"password": settings.BANK_CALL_PASSWORD,
|
||||
"grant_type": "password"
|
||||
}
|
||||
|
||||
headers = {"Content-Type": "application/json"}
|
||||
|
||||
try:
|
||||
logger.info(f"Requesting Bank token from {url}")
|
||||
|
||||
response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
|
||||
response.raise_for_status()
|
||||
|
||||
data = response.json()
|
||||
expires_in = data.get("expires_in", 1800)
|
||||
|
||||
SimbrellaIntegration._access_token = data.get("access_token")
|
||||
SimbrellaIntegration._token_expiry = time.time() + expires_in - 60
|
||||
|
||||
if not SimbrellaIntegration._access_token:
|
||||
raise Exception("Access token not found in Bank Authorization response")
|
||||
|
||||
logger.info("Successfully retrieved Bank access token")
|
||||
return SimbrellaIntegration._access_token
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Token generation failed: {str(e)}", exc_info=True)
|
||||
raise Exception(f"Token generation failed: {str(e)}")
|
||||
|
||||
@staticmethod
|
||||
def _get_token():
|
||||
"""
|
||||
Return a valid token, refreshing if expired or missing
|
||||
"""
|
||||
if not SimbrellaIntegration._access_token or time.time() >= SimbrellaIntegration._token_expiry:
|
||||
return SimbrellaIntegration.generate_token()
|
||||
return SimbrellaIntegration._access_token
|
||||
|
||||
@staticmethod
|
||||
def rac_check(customer_id, account_id, transaction_id):
|
||||
@@ -26,13 +77,14 @@ class SimbrellaIntegration:
|
||||
"channel": "USSD"
|
||||
}
|
||||
|
||||
headers = {
|
||||
"Content-Type": "application/json",
|
||||
"x-api-key": f"{settings.VALID_API_KEY}",
|
||||
"App-Id": f"{settings.VALID_APP_ID}",
|
||||
}
|
||||
|
||||
try:
|
||||
access_token = SimbrellaIntegration._get_token()
|
||||
headers = {
|
||||
"Content-Type": "application/json",
|
||||
"Authorization": f"Bearer {access_token}"
|
||||
}
|
||||
|
||||
|
||||
response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
|
||||
|
||||
logger.info(f"This is Response: {str(response)}", exc_info=True)
|
||||
@@ -42,4 +94,27 @@ class SimbrellaIntegration:
|
||||
except Exception as e:
|
||||
logger.error(f"RACCheck API call failed: {str(e)}", exc_info=True)
|
||||
raise Exception(f"RACCheck API call failed: {str(e)}")
|
||||
|
||||
@staticmethod
|
||||
def health_check():
|
||||
"""
|
||||
Health check for Bank Service
|
||||
"""
|
||||
|
||||
url = f"{SimbrellaIntegration.BASE_URL}/{SimbrellaIntegration.HEALTH_ENDPOINT}"
|
||||
logger.info(f"Bank Health Check URL: {url}")
|
||||
|
||||
try:
|
||||
access_token = SimbrellaIntegration._get_token()
|
||||
headers = {
|
||||
"Content-Type": "application/json",
|
||||
"Authorization": f"Bearer {access_token}"
|
||||
}
|
||||
|
||||
response = httpx.get(url, headers=headers, timeout=10.0)
|
||||
logger.info(f"Bank Health Check Response: {response.text}")
|
||||
return response
|
||||
except Exception as e:
|
||||
logger.error(f"Bank Health Check API call failed: {str(e)}", exc_info=True)
|
||||
raise Exception(f"Bank Health Check API call failed: {str(e)}")
|
||||
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
from app.api.integrations.events_service import EventServiceIntegration
|
||||
from app.api.integrations.simbrella import SimbrellaIntegration
|
||||
from flask import Blueprint, request, jsonify, send_from_directory
|
||||
from app.api.services import (
|
||||
EligibilityCheckService,
|
||||
@@ -19,6 +21,9 @@ from flask_jwt_extended import (
|
||||
get_jwt_identity,
|
||||
create_refresh_token,
|
||||
)
|
||||
from sqlalchemy import text
|
||||
from app.extensions import db
|
||||
from app.config import settings
|
||||
|
||||
|
||||
api = Blueprint("api", __name__)
|
||||
@@ -113,11 +118,77 @@ def notification_callback():
|
||||
response = NotificationCallbackService.process_request(data)
|
||||
return response
|
||||
|
||||
|
||||
# Health Check Endpoint
|
||||
@api.route("/health", methods=["GET"])
|
||||
def health_check():
|
||||
return {"status": "ok"}, 200
|
||||
SQLALCHEMY_DATABASE_URI = settings.SQLALCHEMY_DATABASE_URI
|
||||
response = {}
|
||||
db_status = "Connection Successful"
|
||||
events_service_status = "Connection Successful"
|
||||
bank_status = "Connection Successful"
|
||||
errors = []
|
||||
status = "ok"
|
||||
|
||||
|
||||
# Extract the database URI
|
||||
try:
|
||||
db_uri = db.engine.url.render_as_string(hide_password=False)
|
||||
db_uri = db_uri
|
||||
except Exception as e:
|
||||
db_uri = "Unavailable"
|
||||
|
||||
|
||||
# Check database connection
|
||||
try:
|
||||
logger.info(f"Database Health == : {SQLALCHEMY_DATABASE_URI}")
|
||||
db.session.execute(text("SELECT table_name FROM user_tables ORDER BY table_name"))
|
||||
except Exception as e:
|
||||
db_status = "Connection Failed"
|
||||
errors.append(f"Database Error: {str(e)}")
|
||||
status = "failed"
|
||||
|
||||
|
||||
# Check Events Service health
|
||||
try:
|
||||
events_service_response = EventServiceIntegration.health_check()
|
||||
|
||||
if events_service_response.status_code != 200:
|
||||
events_service_status = "Connection Failed"
|
||||
status = "failed"
|
||||
errors.append(f"Events Service response: {events_service_response.text}")
|
||||
|
||||
|
||||
except Exception as e:
|
||||
events_service_status = "Connection Failed"
|
||||
status = "failed"
|
||||
errors.append(f"Events Service connection failed: {str(e)}")
|
||||
|
||||
# Check Bank health
|
||||
try:
|
||||
emulator_response = SimbrellaIntegration.health_check()
|
||||
|
||||
if emulator_response.status_code != 200:
|
||||
bank_status = "Connection Failed"
|
||||
status = "failed"
|
||||
errors.append(f"Bank Connection response: {emulator_response.text}")
|
||||
|
||||
except Exception as e:
|
||||
bank_status = "Connection Failed"
|
||||
status = "failed"
|
||||
errors.append(f"Connection to Bank failed: {str(e)}")
|
||||
|
||||
|
||||
response = {
|
||||
"status": status,
|
||||
"db_status": db_status,
|
||||
"events_service_status": events_service_status,
|
||||
"bank_status": bank_status,
|
||||
"db_uri": db_uri,
|
||||
"errors": errors or None
|
||||
}
|
||||
|
||||
|
||||
return jsonify(response), 200 if status == "ok" else 500
|
||||
|
||||
|
||||
# Authorize endpoint
|
||||
|
||||
@@ -4,6 +4,7 @@ from flask import jsonify
|
||||
from marshmallow import ValidationError
|
||||
import logging
|
||||
from app.api.integrations import KafkaIntegration
|
||||
from app.utils.mail import send_report_email, get_report_data
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -173,3 +174,6 @@ class BaseService:
|
||||
# return {"rate": 0, "fee": 0, "due_days": 0}
|
||||
|
||||
|
||||
@classmethod
|
||||
def send_mail(cls, report_data, recipients):
|
||||
send_report_email(report_data, recipients)
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -3,15 +3,15 @@ from marshmallow import ValidationError
|
||||
from app.api.enums.loan_status import LoanStatus
|
||||
from app.models import Customer
|
||||
from app.utils.logger import logger
|
||||
from app.api.schemas.loan_status import LoanStatusSchema
|
||||
from app.api.schemas.loan_status import LoanStatusSchema
|
||||
from app.api.services.base_service import BaseService
|
||||
from app.api.enums import TransactionType
|
||||
from app.api.enums import TransactionType
|
||||
from app.extensions import db
|
||||
from app.api.helpers.response_helper import ResponseHelper
|
||||
|
||||
|
||||
class LoanStatusService(BaseService):
|
||||
TRANSACTION_TYPE = TransactionType.LOAN_STATUS
|
||||
TRANSACTION_TYPE = TransactionType.LOAN_STATUS
|
||||
|
||||
@staticmethod
|
||||
def process_request(data):
|
||||
@@ -27,31 +27,57 @@ class LoanStatusService(BaseService):
|
||||
try:
|
||||
with db.session.begin():
|
||||
# Validate data
|
||||
validated_data = LoanStatusService.validate_data(data, LoanStatusSchema())
|
||||
validated_data = LoanStatusService.validate_data(
|
||||
data, LoanStatusSchema()
|
||||
)
|
||||
|
||||
customer_id = validated_data.get('customerId')
|
||||
customer_id = validated_data.get("customerId")
|
||||
|
||||
logger.info(f"Looking for customer *** {customer_id}")
|
||||
customer = Customer.get_customer_with_loan_list(customer_id)
|
||||
|
||||
transactionId = validated_data.get('transactionId')
|
||||
account_id = validated_data.get('accountId')
|
||||
|
||||
if(LoanStatusService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
|
||||
transactionId = validated_data.get("transactionId")
|
||||
account_id = validated_data.get("accountId")
|
||||
|
||||
if LoanStatusService.validate_account_ownership(
|
||||
account_id=account_id, customer_id=customer_id
|
||||
):
|
||||
# Get loans
|
||||
loans = [loan.to_dict() for loan in customer.loans if loan.status == LoanStatus.ACTIVE]
|
||||
transaction = LoanStatusService.log_transaction(validated_data = validated_data)
|
||||
customer_loans = customer.loans
|
||||
loans = [
|
||||
loan.to_dict()
|
||||
for loan in customer_loans
|
||||
if loan.status in [LoanStatus.ACTIVE, LoanStatus.START_REPAY, LoanStatus.ACTIVE_PARTIAL]
|
||||
]
|
||||
|
||||
transaction = LoanStatusService.log_transaction(
|
||||
validated_data=validated_data
|
||||
)
|
||||
if not transaction:
|
||||
logger.error(f"Failed to log transaction")
|
||||
return ResponseHelper.error(result_description="Failed to log transaction.")
|
||||
else:
|
||||
return ResponseHelper.error(result_description="Invalid Customer or Account")
|
||||
|
||||
total_debt_amount = sum(
|
||||
loan.get("currentLoanAmount") or 0
|
||||
for loan in loans
|
||||
return ResponseHelper.error(
|
||||
result_description="Failed to log transaction."
|
||||
)
|
||||
else:
|
||||
return ResponseHelper.error(
|
||||
result_description="Invalid Customer or Account"
|
||||
)
|
||||
|
||||
# CONFIRM IF THE TOTAL DEBT IF FOR ONLY ACTIVE LOANS OR ALL LOANS
|
||||
total_debt_amount = sum(
|
||||
loan.get("currentLoanAmount") or 0 for loan in loans
|
||||
)
|
||||
|
||||
total_outstanding_amount = sum(
|
||||
loan.get("currentLoanAmount") or 0 for loan in loans
|
||||
)
|
||||
|
||||
total_active_loan_amount = sum(
|
||||
loan.get("repaymentAmount") or 0 for loan in loans
|
||||
)
|
||||
|
||||
total_settled_amount = total_active_loan_amount - total_outstanding_amount
|
||||
|
||||
# Simulated processing logic
|
||||
response_data = {
|
||||
"customerId": customer_id,
|
||||
@@ -59,6 +85,11 @@ class LoanStatusService(BaseService):
|
||||
"transactionId": transactionId,
|
||||
"loans": loans,
|
||||
"totalDebtAmount": total_debt_amount,
|
||||
"summary": {
|
||||
"totalSettledAmount": total_settled_amount,
|
||||
"totalOutstandingAmount": total_outstanding_amount,
|
||||
"totalActiveLoanAmount": total_active_loan_amount,
|
||||
}
|
||||
}
|
||||
|
||||
db.session.commit()
|
||||
@@ -68,9 +99,11 @@ class LoanStatusService(BaseService):
|
||||
|
||||
logger.error(f"Validation Error: {getattr(err, 'messages', str(err))}")
|
||||
db.session.rollback()
|
||||
return ResponseHelper.unprocessable_entity(result_description="Validation exception")
|
||||
|
||||
except ValueError as err:
|
||||
return ResponseHelper.unprocessable_entity(
|
||||
result_description="Validation exception"
|
||||
)
|
||||
|
||||
except ValueError as err:
|
||||
logger.error(f"{getattr(err, 'messages', str(err))}")
|
||||
db.session.rollback()
|
||||
return ResponseHelper.error(result_description=str(err))
|
||||
@@ -78,4 +111,4 @@ class LoanStatusService(BaseService):
|
||||
except Exception as e:
|
||||
logger.error(f"An error occurred: {str(e)}", exc_info=True)
|
||||
db.session.rollback()
|
||||
return ResponseHelper.internal_server_error()
|
||||
return ResponseHelper.internal_server_error()
|
||||
|
||||
@@ -182,6 +182,10 @@ class OfferAnalysis:
|
||||
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.")
|
||||
|
||||
# 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}).")
|
||||
# raise ValueError("You are not eligible for a loan at this time.")
|
||||
|
||||
transaction_offer = TransactionOffer.create_transaction_offer(
|
||||
customer_id=customer_id,
|
||||
transaction_id=transaction_id,
|
||||
@@ -223,6 +227,9 @@ class OfferAnalysis:
|
||||
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.")
|
||||
|
||||
# if approved_amount < 100:
|
||||
# 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.")
|
||||
|
||||
transaction_offer = TransactionOffer.create_transaction_offer(
|
||||
customer_id=customer_id,
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
from gettext import install
|
||||
from flask import request, jsonify
|
||||
from marshmallow import ValidationError
|
||||
from app.api.integrations.kafka import KafkaIntegration
|
||||
@@ -11,11 +12,13 @@ from threading import Thread
|
||||
from app.models import Loan, Offer, Charge , TransactionOffer, RACCheck
|
||||
from app.api.enums import LoanStatus
|
||||
from app.extensions import db
|
||||
from datetime import datetime, timezone
|
||||
from datetime import datetime, timezone, timedelta
|
||||
from dateutil.relativedelta import relativedelta
|
||||
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
|
||||
|
||||
class ProvideLoanService(BaseService):
|
||||
TRANSACTION_TYPE = TransactionType.PROVIDE_LOAN
|
||||
@@ -111,9 +114,12 @@ class ProvideLoanService(BaseService):
|
||||
management = charges["management"]
|
||||
insurance = charges["insurance"]
|
||||
vat = charges["vat"]
|
||||
|
||||
# Generate Loan Reference
|
||||
loan_ref = f"SIM{datetime.now().strftime('%Y%m%d%H%M%S%f')}"
|
||||
|
||||
padded_id = str(transaction_id).zfill(12)
|
||||
loan_ref = f"{padded_id}{channel}{offer.product_id}"
|
||||
# padded_id = str(transaction_id).zfill(12)
|
||||
# loan_ref = f"{padded_id}{channel}{offer.product_id}"
|
||||
|
||||
|
||||
# Save the loan details
|
||||
@@ -142,10 +148,10 @@ class ProvideLoanService(BaseService):
|
||||
|
||||
db.session.flush()
|
||||
current_product_id = offer.product_id
|
||||
schedule = LoanRepaymentSchedule.add_repayment_schedule(loan = loan, num_schedules = num_schedules, transaction_id = transaction_id)
|
||||
schedules = LoanRepaymentSchedule.add_repayment_schedule(loan = loan, num_schedules = num_schedules, transaction_id = transaction_id)
|
||||
|
||||
|
||||
if not schedule:
|
||||
if not schedules:
|
||||
logger.error(f"Failed to create repayment schedule for loan ID {loan.id}")
|
||||
return ResponseHelper.error(result_description="Failed to generate loan repayment schedule.")
|
||||
|
||||
@@ -157,26 +163,37 @@ 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,
|
||||
schedules=schedules
|
||||
)
|
||||
|
||||
response_data = {
|
||||
"requestId": request_id,
|
||||
"transactionId": transaction_id,
|
||||
"loanRef": loan_ref,
|
||||
"customerId": customer_id,
|
||||
"accountId": account_id,
|
||||
"msisdn": customer.msisdn
|
||||
"msisdn": customer.msisdn,
|
||||
"schedule": charge_schedule_items,
|
||||
}
|
||||
|
||||
|
||||
event_thread = Thread(target=ProvideLoanService.trigger_loan_disbursement, args=(transaction_id,))
|
||||
event_thread.start()
|
||||
|
||||
# KafkaIntegration.send_loan_request(loan_data = response_data, request_id = request_id)
|
||||
# Call Kafka in a background thread
|
||||
thread = Thread(target=ProvideLoanService.async_send_to_kafka, args=(response_data, request_id, "PROCESS_PAYMENT"))
|
||||
thread.start()
|
||||
kafka_thread = Thread(target=ProvideLoanService.async_send_to_kafka, args=(response_data, request_id, "PROCESS_PAYMENT"))
|
||||
kafka_thread.start()
|
||||
|
||||
db.session.commit()
|
||||
return ResponseHelper.success(data=response_data)
|
||||
@@ -195,4 +212,83 @@ class ProvideLoanService(BaseService):
|
||||
except Exception as e:
|
||||
logger.error(f"An error occurred: {str(e)}", exc_info=True)
|
||||
db.session.rollback()
|
||||
return ResponseHelper.internal_server_error()
|
||||
return ResponseHelper.internal_server_error()
|
||||
|
||||
@classmethod
|
||||
def trigger_loan_disbursement(cls, transaction_id: str):
|
||||
response = EventServiceIntegration.direct_loan(transaction_id=transaction_id)
|
||||
return response
|
||||
|
||||
@classmethod
|
||||
def get_charge_schedule_items(cls, loan_charges, offer, loan_ref, amount, schedules):
|
||||
now = datetime.now(timezone.utc)
|
||||
due_date = now + timedelta(days=offer.tenor)
|
||||
id_counter = 1
|
||||
|
||||
charge_schedule_items = []
|
||||
|
||||
charge_schedule_items.append({
|
||||
"id": id_counter,
|
||||
"dueDate": due_date.isoformat(),
|
||||
"amountDue": amount,
|
||||
"componentName": "PRINCIPAL",
|
||||
"startDate": now.isoformat(),
|
||||
})
|
||||
|
||||
interest_amount = 0.0
|
||||
|
||||
for charge in loan_charges:
|
||||
|
||||
code = charge.code.upper()
|
||||
|
||||
if code == "INTEREST":
|
||||
interest_amount = float(charge.amount)
|
||||
continue
|
||||
|
||||
|
||||
item = {
|
||||
"id": id_counter,
|
||||
"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(),
|
||||
}
|
||||
|
||||
charge_schedule_items.append(item)
|
||||
id_counter += 1
|
||||
|
||||
|
||||
num_schedules = len(schedules)
|
||||
if num_schedules > 0:
|
||||
principal_per_schedule = amount / num_schedules
|
||||
else:
|
||||
principal_per_schedule = 0.0
|
||||
|
||||
|
||||
for schedule in schedules:
|
||||
default = {
|
||||
"id": id_counter,
|
||||
"installmentNo": schedule.installment_number,
|
||||
"dueDate": schedule.due_date.isoformat(),
|
||||
"amountDue": round(principal_per_schedule, 2),
|
||||
"componentName": "DEFAULT",
|
||||
"startDate": schedule.created_at.isoformat(),
|
||||
}
|
||||
|
||||
charge_schedule_items.append(default)
|
||||
id_counter += 1
|
||||
|
||||
interest = {
|
||||
"id": id_counter,
|
||||
"dueDate": schedule.due_date.isoformat(),
|
||||
"amountDue": round(interest_amount, 2),
|
||||
"componentName": "INTEREST",
|
||||
"startDate": schedule.created_at.isoformat()
|
||||
}
|
||||
|
||||
charge_schedule_items.append(interest)
|
||||
id_counter += 1
|
||||
|
||||
return charge_schedule_items
|
||||
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ from app.api.services.base_service import BaseService
|
||||
from app.api.enums import TransactionType
|
||||
from threading import Thread
|
||||
from app.extensions import db
|
||||
from app.api.integrations import EventServiceIntegration
|
||||
|
||||
class RepaymentService(BaseService):
|
||||
TRANSACTION_TYPE = TransactionType.REPAYMENT
|
||||
@@ -56,7 +57,7 @@ class RepaymentService(BaseService):
|
||||
return ResponseHelper.error(result_description="Failed to save repayment details.")
|
||||
|
||||
#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:
|
||||
@@ -79,9 +80,12 @@ class RepaymentService(BaseService):
|
||||
"debtId": loan_id
|
||||
}
|
||||
|
||||
event_thread = Thread(target=RepaymentService.trigger_loan_repayment, args=(transaction_id,))
|
||||
event_thread.start()
|
||||
|
||||
# Call Kafka in a background thread
|
||||
thread = Thread(target=RepaymentService.async_send_to_kafka, args=(response_data, request_id, "LOAN_REPAYMENT"))
|
||||
thread.start()
|
||||
kafka_thread = Thread(target=RepaymentService.async_send_to_kafka, args=(response_data, request_id, "LOAN_REPAYMENT"))
|
||||
kafka_thread.start()
|
||||
|
||||
db.session.commit()
|
||||
return ResponseHelper.success(data=response_data)
|
||||
@@ -101,3 +105,10 @@ class RepaymentService(BaseService):
|
||||
logger.error(f"An error occurred: {str(e)}", exc_info=True)
|
||||
db.session.rollback()
|
||||
return ResponseHelper.internal_server_error()
|
||||
|
||||
|
||||
@classmethod
|
||||
def trigger_loan_repayment(cls, transaction_id: str):
|
||||
response = EventServiceIntegration.direct_repayment(transaction_id=transaction_id)
|
||||
return response
|
||||
|
||||
@@ -38,6 +38,7 @@ class SelectOfferService(BaseService):
|
||||
transaction_id = validated_data.get("transactionId")
|
||||
request_id = validated_data.get("requestId")
|
||||
|
||||
|
||||
offer_id = int(transaction_offer_id[5:]) # The last part is int
|
||||
|
||||
#"offerId": "SAL30001129",
|
||||
|
||||
+24
-2
@@ -24,7 +24,10 @@ class Config:
|
||||
# Database Connection
|
||||
# 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_INTERNAL = (f"oracle+oracledb://{DATABASE_USER}:{DATABASE_PASSWORD}@{DNS}")
|
||||
SQLALCHEMY_DATABASE_URI = os.getenv("SQLALCHEMY_DATABASE_URI_FULL", SQLALCHEMY_DATABASE_URI_INTERNAL)
|
||||
|
||||
#SQLALCHEMY_DATABASE_URI_FULL = 'oracle+oracledb://FIRSTADVSTG:Pchanged_56789@10.2.110.30:1521/?service_name=firstadv'
|
||||
|
||||
SQLALCHEMY_TRACK_MODIFICATIONS = False
|
||||
|
||||
@@ -43,6 +46,17 @@ class Config:
|
||||
VALID_API_KEY = os.getenv("SIMBRELLA_API_KEY", "test-api-key-12345")
|
||||
SIMBRELLA_BASE_URL = os.getenv("SIMBRELLA_BASE_URL", "http://127.0.0.1:6337")
|
||||
SIMBRELLA_ENDPOINT_RAC_CHECKS = os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS","api/rac-check")
|
||||
SIMBRELLA_HEALTH = os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS","api/system-health-check")
|
||||
BANK_CALL_AUTH_ENDPOINT = os.getenv("BANK_CALL_AUTH_ENDPOINT", "/api/Auth/generate-token")
|
||||
BANK_CALL_USERNAME = os.getenv("BANK_CALL_USERNAME", "simbrella")
|
||||
BANK_CALL_PASSWORD = os.getenv("BANK_CALL_PASSWORD", "G7$k9@pL2!qR")
|
||||
|
||||
|
||||
|
||||
EVENTS_SERVICE_BASE_URL = os.getenv("EVENTS_SERVICE_BASE_URL","https://event-core.simbrellang.net")
|
||||
ENDPOINT_DIRECT_LOAN = os.getenv("ENDPOINT_DIRECT_LOAN","/autocall/direct/loan")
|
||||
ENDPOINT_DIRECT_REPAYMENT = os.getenv("ENDPOINT_DIRECT_REPAYMENT","/autocall/direct/repayment")
|
||||
|
||||
|
||||
RAC_RESULT_accountStatus = os.environ.get("RAC_RESULT_accountStatus", "true")
|
||||
RAC_RESULT_bvnValidated = os.environ.get("RAC_RESULT_bvnValidated", "true")
|
||||
@@ -85,7 +99,15 @@ class Config:
|
||||
"salarypaymenT_6"
|
||||
]
|
||||
|
||||
|
||||
MAIL_SERVER = os.getenv('MAIL_SERVER','smtp.zoho.com')
|
||||
MAIL_PORT = 587
|
||||
MAIL_USERNAME = os.getenv('MAIL_USERNAME', 'firstadvance@dynamikservices.tech')
|
||||
MAIL_PASSWORD = os.getenv('MAIL_PASSWORD')
|
||||
MAIL_USE_TLS = True
|
||||
MAIL_USE_SSL = False
|
||||
MAIL_DEFAULT_SENDER = ('FirstAdvance', 'firstadvance@dynamikservices.tech')
|
||||
MAIL_RECEIVER= os.getenv('MAIL_RECEIVER', 'vdagbue@gmail.com')
|
||||
|
||||
|
||||
|
||||
settings = Config()
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
from flask_sqlalchemy import SQLAlchemy
|
||||
from flask_migrate import Migrate
|
||||
from flask_mail import Mail
|
||||
|
||||
mail = Mail()
|
||||
db = SQLAlchemy()
|
||||
migrate = Migrate()
|
||||
+24
-4
@@ -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):
|
||||
@@ -246,7 +266,7 @@ class Loan(db.Model):
|
||||
'loanRef': self.reference,
|
||||
'productId': self.product_id,
|
||||
'initialLoanAmount': self.initial_loan_amount,
|
||||
'currentLoanAmount': self.current_loan_amount,
|
||||
'currentLoanAmount': self.balance,
|
||||
'defaultPenaltyFee': self.default_penalty_fee,
|
||||
'continuousFee': self.continuous_fee,
|
||||
'collectionType': self.collection_type,
|
||||
|
||||
@@ -17,6 +17,11 @@ class LoanRepaymentSchedule(db.Model):
|
||||
total_repayment_amount = db.Column(db.Float, default=0.0)
|
||||
paid = db.Column(db.Boolean, default=False)
|
||||
paid_at = db.Column(db.DateTime, nullable=True)
|
||||
due_process_date = db.Column(db.DateTime, nullable=True)
|
||||
due_process_count = db.Column(db.Integer, default=0)
|
||||
paid_status = db.Column(db.String(20), nullable=True)
|
||||
repay_description = db.Column(db.String(255), nullable=True)
|
||||
partial_balance = db.Column(db.Float, default=0.0)
|
||||
|
||||
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())
|
||||
|
||||
@@ -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,
|
||||
@@ -56,6 +55,12 @@ class Repayment(db.Model):
|
||||
raise ValueError(f"Database integrity error: {err}")
|
||||
|
||||
return repayment
|
||||
|
||||
# Get loan repayments
|
||||
@classmethod
|
||||
def get_repayments_by_id(cls, loan_id):
|
||||
return cls.query.filter_by(loan_id=loan_id).all()
|
||||
|
||||
|
||||
def to_dict(self):
|
||||
return {
|
||||
|
||||
+21
-11
@@ -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)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"openapi": "3.0.3",
|
||||
"info": {
|
||||
"title": "Swagger Bank Channel to Simbrella FirstAdvance - OpenAPI 3.0",
|
||||
"title": "Swagger Simbrella Core [10/22/2025] - OpenAPI 3.0",
|
||||
"description": "This is a Simbrella FirstAdvance Backend Server with the OpenAPI 3.0 specification. \n\n\nSome useful links:\n- [Web Simulated Demo Page](https://digifi-salaryloan.chiefsoft.net/)\n- [Web Management Support Portal](https://digifi-office.chiefsoft.net/auth/login)",
|
||||
"termsOfService": "http://swagger.io/terms/",
|
||||
"contact": {
|
||||
@@ -20,12 +20,19 @@
|
||||
{
|
||||
"url": "http://api.dev.simbrellang.net:4500"
|
||||
},
|
||||
{
|
||||
{
|
||||
"url": "https://api.dev.simbrellang.net"
|
||||
},
|
||||
{
|
||||
"url": "http://10.2.249.133:4500"
|
||||
}
|
||||
],
|
||||
"tags": [
|
||||
{
|
||||
{
|
||||
"name": "Health",
|
||||
"description": "System health check including DB status."
|
||||
},
|
||||
{
|
||||
"name": "Authorize",
|
||||
"description": "This feature will be used for authorizing customers.",
|
||||
"externalDocs": {
|
||||
@@ -83,6 +90,45 @@
|
||||
}
|
||||
],
|
||||
"paths": {
|
||||
"/health": {
|
||||
"get": {
|
||||
"tags": ["Health"],
|
||||
"summary": "Health Check",
|
||||
"description": "Returns service health information including DB connection status.",
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Health check successful",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"example": {
|
||||
"status": "ok",
|
||||
"db_status": "Connection Successful",
|
||||
"events_service_status":"Connection Successful",
|
||||
"bank_status":"Connection Successful",
|
||||
"db_uri": "postgresql://user:****@localhost:5432/digifi_db",
|
||||
"error": []
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"500": {
|
||||
"description": "Health check failed",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"example": {
|
||||
"status": "failed",
|
||||
"db_status": "Connection Failed",
|
||||
"events_service_status":"Connection Failed",
|
||||
"bank_status":"Connection Failed",
|
||||
"db_uri": "Unavailable",
|
||||
"error":["could not connect to server: Connection refused"]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/Authorize": {
|
||||
"$ref": "swagger/paths/Authorize.json"
|
||||
},
|
||||
@@ -131,18 +177,6 @@
|
||||
"RepaymentResponse": {
|
||||
"$ref": "swagger/schemas/RepaymentResponse.json"
|
||||
},
|
||||
"CustomerConsentRequest": {
|
||||
"$ref": "swagger/schemas/CustomerConsentRequest.json"
|
||||
},
|
||||
"CustomerConsentResponse": {
|
||||
"$ref": "swagger/schemas/CustomerConsentResponse.json"
|
||||
},
|
||||
"NotificationCallbackRequest": {
|
||||
"$ref": "swagger/schemas/NotificationCallbackRequest.json"
|
||||
},
|
||||
"NotificationCallbackResponse": {
|
||||
"$ref": "swagger/schemas/NotificationCallbackResponse.json"
|
||||
},
|
||||
"ApiResponse": {
|
||||
"$ref": "swagger/schemas/ApiResponse.json"
|
||||
},
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"post": {
|
||||
"tags": ["Authorize Refresh"],
|
||||
"tags": ["AuthorizeRefresh"],
|
||||
"summary": "Customer Authorize Refresh Request",
|
||||
"description": "Customer Authorize Refresh Request",
|
||||
"operationId": "AuthorizeRefresh",
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
{
|
||||
"post": {
|
||||
"tags": [
|
||||
"CustomerConsent"
|
||||
],
|
||||
"summary": "Customer Consent Request",
|
||||
"description": "Customer Consent Request",
|
||||
"operationId": "CustomerConsent",
|
||||
"requestBody": {
|
||||
"required": true,
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "../schemas/CustomerConsentRequest.json"
|
||||
}
|
||||
},
|
||||
"application/xml": {
|
||||
"schema": {
|
||||
"$ref": "../schemas/CustomerConsentRequest.json"
|
||||
}
|
||||
},
|
||||
"application/x-www-form-urlencoded": {
|
||||
"schema": {
|
||||
"$ref": "../schemas/CustomerConsentRequest.json"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "../schemas/CustomerConsentResponse.json"
|
||||
}
|
||||
},
|
||||
"application/xml": {
|
||||
"schema": {
|
||||
"$ref": "../schemas/CustomerConsentResponse.json"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"400": {
|
||||
"description": "Invalid request"
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation exception"
|
||||
},
|
||||
"500": {
|
||||
"description": "Internal server error"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
{
|
||||
"post": {
|
||||
"tags": [
|
||||
"NotificationCallback"
|
||||
],
|
||||
"summary": "Loan Information Request ",
|
||||
"description": "Loan Information Request",
|
||||
"operationId": "NotificationCallback",
|
||||
"requestBody": {
|
||||
"description": "Post JSON to conduct eligibility tests",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "../schemas/NotificationCallbackRequest.json"
|
||||
}
|
||||
},
|
||||
"application/xml": {
|
||||
"schema": {
|
||||
"$ref": "../schemas/NotificationCallbackRequest.json"
|
||||
}
|
||||
},
|
||||
"application/x-www-form-urlencoded": {
|
||||
"schema": {
|
||||
"$ref": "../schemas/NotificationCallbackRequest.json"
|
||||
}
|
||||
}
|
||||
},
|
||||
"required": true
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful operation",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "../schemas/NotificationCallbackResponse.json"
|
||||
}
|
||||
},
|
||||
"application/xml": {
|
||||
"schema": {
|
||||
"$ref": "../schemas/NotificationCallbackResponse.json"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"400": {
|
||||
"description": "Invalid request"
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation exception"
|
||||
},
|
||||
"500": {
|
||||
"description": "Internal server error"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
{
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"type": {
|
||||
"type": "string",
|
||||
"example": "CustomerConsentRequest"
|
||||
},
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "20171209232177"
|
||||
},
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "CN621868"
|
||||
},
|
||||
"accountId": {
|
||||
"type": "string",
|
||||
"example": "ACN8263457"
|
||||
},
|
||||
"requestTime": {
|
||||
"type": "string",
|
||||
"format": "date-time",
|
||||
"example": "2019-10-18 14:26:21.063"
|
||||
},
|
||||
"consentType": {
|
||||
"type": "string",
|
||||
"example": "Revoke"
|
||||
},
|
||||
"channel": {
|
||||
"type": "string",
|
||||
"example": "USSD"
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
"name": "CustomerConsentRequest"
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"resultCode": {
|
||||
"type": "string",
|
||||
"example": "00"
|
||||
},
|
||||
"resultDescription": {
|
||||
"type": "string",
|
||||
"example": "Request is received"
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
"name": "CustomerConsentResponse"
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
"properties": {
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "Tr201712RK9232P115"
|
||||
"example": "TRX201712RK9232P115"
|
||||
},
|
||||
"countryCode": {
|
||||
"type": "string",
|
||||
@@ -11,19 +11,19 @@
|
||||
},
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "CN621868"
|
||||
},
|
||||
"msisdn": {
|
||||
"type": "string",
|
||||
"example": "8093451342"
|
||||
},
|
||||
"channel": {
|
||||
"type": "string",
|
||||
"example": "100"
|
||||
"example": "5268548"
|
||||
},
|
||||
"accountId": {
|
||||
"type": "string",
|
||||
"example": "ACN8263457"
|
||||
"example": "4348094226"
|
||||
},
|
||||
"msisdn": {
|
||||
"type": "string",
|
||||
"example": "2348093451342"
|
||||
},
|
||||
"channel": {
|
||||
"type": "string",
|
||||
"example": "USSD"
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
|
||||
@@ -3,19 +3,19 @@
|
||||
"properties": {
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "CN621868"
|
||||
"example": "5268548"
|
||||
},
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "TX12345"
|
||||
"example": "TRX201712RK9232P115"
|
||||
},
|
||||
"countryCode": {
|
||||
"type": "string",
|
||||
"example": "NG"
|
||||
"example": "NGR"
|
||||
},
|
||||
"msisdn": {
|
||||
"type": "string",
|
||||
"example": "3451342"
|
||||
"example": "2348093451342"
|
||||
},
|
||||
"eligibleOffers": {
|
||||
"type": "array",
|
||||
@@ -24,42 +24,42 @@
|
||||
"properties": {
|
||||
"offerId": {
|
||||
"type": "string",
|
||||
"example": "Offer1"
|
||||
"example": "SAL90000204"
|
||||
},
|
||||
"productId": {
|
||||
"type": "string",
|
||||
"example": "Product1"
|
||||
"example": "3MPC"
|
||||
},
|
||||
"minAamount": {
|
||||
"type": "number",
|
||||
"format": "decimal",
|
||||
"example": 100.00
|
||||
"example": 20000.00
|
||||
},
|
||||
"maxAamount": {
|
||||
"type": "number",
|
||||
"format": "decimal",
|
||||
"example": 1000.00
|
||||
"example": 31257.00
|
||||
},
|
||||
"tenor": {
|
||||
"type": "integer",
|
||||
"example": 12
|
||||
"example": 90
|
||||
}
|
||||
}
|
||||
},
|
||||
"example": [
|
||||
{
|
||||
"offerId": "Offer1",
|
||||
"productId": "Product1",
|
||||
"minAamount": 100.00,
|
||||
"maxAamount": 1000.00,
|
||||
"tenor": 12
|
||||
{
|
||||
"max_amount": "31257.00",
|
||||
"min_amount": 20000.0,
|
||||
"offerId": "SAL90000204",
|
||||
"product_id": "3MPC",
|
||||
"tenor": 90
|
||||
},
|
||||
{
|
||||
"offerId": "Offer2",
|
||||
"productId": "Product2",
|
||||
"minAamount": 200.00,
|
||||
"maxAamount": 2000.00,
|
||||
"tenor": 24
|
||||
"max_amount": "20838.00",
|
||||
"min_amount": 5000.0,
|
||||
"offerId": "SAL30000205",
|
||||
"product_id": "AMPC",
|
||||
"tenor": 30
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
@@ -3,15 +3,15 @@
|
||||
"properties": {
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "Tr201712RK9232P115"
|
||||
"example": "TRCVIC73089465966"
|
||||
},
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "CN621868"
|
||||
"example": "ZX48440946"
|
||||
},
|
||||
"msisdn": {
|
||||
"type": "string",
|
||||
"example": "3451342"
|
||||
"example": "2348093451342"
|
||||
},
|
||||
"channel": {
|
||||
"type": "string",
|
||||
@@ -19,7 +19,7 @@
|
||||
},
|
||||
"accountId": {
|
||||
"type": "string",
|
||||
"example": "ACN8263457"
|
||||
"example": "361005323"
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
|
||||
@@ -1,83 +1,133 @@
|
||||
{
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "CN621868"
|
||||
},
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "Tr201712RK9232P115"
|
||||
},
|
||||
"loans": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"debtId": {
|
||||
"type": "string",
|
||||
"example": "123456789"
|
||||
},
|
||||
"loanDate": {
|
||||
"type": "string",
|
||||
"format": "date-time",
|
||||
"example": "2019-10-18 14:26:21.063"
|
||||
},
|
||||
"dueDate": {
|
||||
"type": "string",
|
||||
"format": "date-time",
|
||||
"example": "2019-11-20 14:26:21.063"
|
||||
},
|
||||
"currentLoanAmount": {
|
||||
"type": "integer",
|
||||
"example": 8500
|
||||
},
|
||||
"initialLoanAmount": {
|
||||
"type": "integer",
|
||||
"example": 10000
|
||||
},
|
||||
"defaultPenaltyFee": {
|
||||
"type": "integer",
|
||||
"example": 0
|
||||
},
|
||||
"continuousFee": {
|
||||
"type": "integer",
|
||||
"example": 0
|
||||
},
|
||||
"productId": {
|
||||
"type": "string",
|
||||
"example": "101"
|
||||
},
|
||||
"installment": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"amount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 10000.0
|
||||
},
|
||||
"repaymentDate": {
|
||||
"type": "string",
|
||||
"example": "2025-04-24 10:31:"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"resultCode": {
|
||||
"type": "string",
|
||||
"example": "00"
|
||||
},
|
||||
"resultDescription": {
|
||||
"type": "string",
|
||||
"example": "Successful"
|
||||
}
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "ZX48440946"
|
||||
},
|
||||
"xml": {
|
||||
"name": "LoanStatusResponse"
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "TRCVIC49381378037"
|
||||
},
|
||||
"accountId": {
|
||||
"type": "string",
|
||||
"example": "361005323"
|
||||
},
|
||||
"loans": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"debtId": {
|
||||
"type": "integer",
|
||||
"example": 80
|
||||
},
|
||||
"loanDate": {
|
||||
"type": "string",
|
||||
"format": "date-time",
|
||||
"example": "2025-09-12T11:58:58"
|
||||
},
|
||||
"dueDate": {
|
||||
"type": "string",
|
||||
"format": "date-time",
|
||||
"example": "2025-12-11T11:58:58"
|
||||
},
|
||||
"currentLoanAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 30000.0
|
||||
},
|
||||
"initialLoanAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 30000.0
|
||||
},
|
||||
"defaultPenaltyFee": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 0.0
|
||||
},
|
||||
"continuousFee": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 0.0
|
||||
},
|
||||
"productId": {
|
||||
"type": "string",
|
||||
"example": "3MPC"
|
||||
},
|
||||
"installmentAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 10900.0
|
||||
},
|
||||
"repaymentAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 32700.0
|
||||
},
|
||||
"loanRef": {
|
||||
"type": "string",
|
||||
"example": "TRCVIC73089465966USSD3MPC"
|
||||
},
|
||||
"status": {
|
||||
"type": "string",
|
||||
"example": "active"
|
||||
},
|
||||
"tenor": {
|
||||
"type": "integer",
|
||||
"example": 90
|
||||
},
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "TRCVIC73089465966"
|
||||
},
|
||||
"upfrontFee": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 622.5
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"resultCode": {
|
||||
"type": "string",
|
||||
"example": "00"
|
||||
},
|
||||
"resultDescription": {
|
||||
"type": "string",
|
||||
"example": "Successful"
|
||||
},
|
||||
"totalDebtAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 30000.0
|
||||
},
|
||||
"summary": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"totalOutstandingAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 114450.0,
|
||||
"description": "Total amount still owed across all unpaid loans."
|
||||
},
|
||||
"totalActiveLoanAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 40000.0,
|
||||
"description": "Total principal amount of currently active loans."
|
||||
},
|
||||
"totalSettledAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 80000.0,
|
||||
"description": "Total amount that has been fully repaid."
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
"name": "LoanStatusResponse"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
{
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"fbnTransactionId": {
|
||||
"type": "string",
|
||||
"example": "123456789"
|
||||
},
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "123456789"
|
||||
},
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "CN621868"
|
||||
},
|
||||
"accountId": {
|
||||
"type": "string",
|
||||
"example": "ACN8263457"
|
||||
},
|
||||
"debtId": {
|
||||
"type": "string",
|
||||
"example": "987654321"
|
||||
},
|
||||
"transactionType": {
|
||||
"type": "string",
|
||||
"example": "Disbursement"
|
||||
},
|
||||
"amountProvided": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 1000.00
|
||||
},
|
||||
"amountCollected": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 0.00
|
||||
},
|
||||
"responseCode": {
|
||||
"type": "string",
|
||||
"example": "00"
|
||||
},
|
||||
"responseDescription": {
|
||||
"type": "string",
|
||||
"example": "Successful"
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
"name": "NotificationCallbackRequest"
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
{
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"resultCode": {
|
||||
"type": "string",
|
||||
"example": "00"
|
||||
},
|
||||
"resultDescription": {
|
||||
"type": "string",
|
||||
"example": "Successful"
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
"name": "NotificationCallbackResponse"
|
||||
}
|
||||
}
|
||||
@@ -3,40 +3,40 @@
|
||||
"properties": {
|
||||
"requestId": {
|
||||
"type": "string",
|
||||
"example": "202111170001371256908"
|
||||
"example": "RQID11170001371256908"
|
||||
},
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "Tr201712RK9232P115"
|
||||
"example": "TRCVIC73089465966"
|
||||
},
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "CN621868"
|
||||
"example": "ZX48440946"
|
||||
},
|
||||
"accountId": {
|
||||
"type": "string",
|
||||
"example": "ACN8263457"
|
||||
"example": "361005323"
|
||||
},
|
||||
"msisdn": {
|
||||
"type": "string",
|
||||
"example": "3451342"
|
||||
"example": "2348093451342"
|
||||
},
|
||||
"requestedAmount": {
|
||||
"type": "number",
|
||||
"format": "decimal",
|
||||
"example": 900
|
||||
"example": 20000
|
||||
},
|
||||
"collectionType": {
|
||||
"type": "integer",
|
||||
"example": 1
|
||||
"example": 0
|
||||
},
|
||||
"offerId": {
|
||||
"type": "integer",
|
||||
"example": 1127
|
||||
"example": "SAL900004543304"
|
||||
},
|
||||
"channel": {
|
||||
"type": "string",
|
||||
"example": "100"
|
||||
"example": "USSD"
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
|
||||
@@ -1,40 +1,75 @@
|
||||
{
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"requestId": {
|
||||
"type": "string",
|
||||
"example": "202111170001371256908"
|
||||
},
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "Tr201712RK9232P115"
|
||||
},
|
||||
"loanRef": {
|
||||
"type": "string",
|
||||
"example": "1620029887USSDAMPC"
|
||||
},
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "CN621868"
|
||||
},
|
||||
"accountId": {
|
||||
"type": "string",
|
||||
"example": "ACN8263457"
|
||||
},
|
||||
"msisdn": {
|
||||
"type": "string",
|
||||
"example": "3451342"
|
||||
},
|
||||
"resultCode": {
|
||||
"type": "string",
|
||||
"example": "00"
|
||||
},
|
||||
"resultDescription": {
|
||||
"type": "string",
|
||||
"example": "Successful"
|
||||
}
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"requestId": {
|
||||
"type": "string",
|
||||
"example": "81757678335583"
|
||||
},
|
||||
"xml": {
|
||||
"name": "ProvideLoanResponse"
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "TRCVIC73089465966"
|
||||
},
|
||||
"loanRef": {
|
||||
"type": "string",
|
||||
"example": "TRCVIC73089465966USSD3MPC"
|
||||
},
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "ZX48440946"
|
||||
},
|
||||
"accountId": {
|
||||
"type": "string",
|
||||
"example": "361005323"
|
||||
},
|
||||
"msisdn": {
|
||||
"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"
|
||||
},
|
||||
"resultDescription": {
|
||||
"type": "string",
|
||||
"example": "Successful"
|
||||
}
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
"name": "ProvideLoanResponse"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,27 +3,27 @@
|
||||
"properties": {
|
||||
"msisdn": {
|
||||
"type": "string",
|
||||
"example": "3451342"
|
||||
"example": "2348093451342"
|
||||
},
|
||||
"debtId": {
|
||||
"type": "string",
|
||||
"example": "10"
|
||||
"type": "number",
|
||||
"example": 80
|
||||
},
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "20171209232115"
|
||||
"example": "TRCVIC73089465966"
|
||||
},
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "CID0000025585"
|
||||
"example": "ZX48440946"
|
||||
},
|
||||
"loanRef": {
|
||||
"type": "string",
|
||||
"example": "Trx5847365252USSD3MPC"
|
||||
"example": "TRCVIC73089465966USSD3MPC"
|
||||
},
|
||||
"accountId": {
|
||||
"type": "string",
|
||||
"example": "ACN8263457"
|
||||
"example": "361005323"
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
|
||||
@@ -1,28 +1,48 @@
|
||||
{
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "CN621868"
|
||||
},
|
||||
"productId": {
|
||||
"type": "string",
|
||||
"example": "101"
|
||||
},
|
||||
"debtId": {
|
||||
"type": "string",
|
||||
"example": "273194670"
|
||||
},
|
||||
"resultCode": {
|
||||
"type": "string",
|
||||
"example": "00"
|
||||
},
|
||||
"resultDescription": {
|
||||
"type": "string",
|
||||
"example": "Successful"
|
||||
}
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"Id": {
|
||||
"type": "integer",
|
||||
"example": 195
|
||||
},
|
||||
"xml": {
|
||||
"name": "RepaymentResponse"
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "ZX48440946"
|
||||
},
|
||||
"debtId": {
|
||||
"type": "string",
|
||||
"example": "80"
|
||||
},
|
||||
"initiated_by": {
|
||||
"type": "string",
|
||||
"example": "USER_INITIATED"
|
||||
},
|
||||
"loanRef": {
|
||||
"type": "string",
|
||||
"example": "TRCVIC73089465966USSD3MPC"
|
||||
},
|
||||
"productId": {
|
||||
"type": "string",
|
||||
"example": "3MPC"
|
||||
},
|
||||
"repayment_id": {
|
||||
"type": "integer",
|
||||
"example": 195
|
||||
},
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "TRCVIC73089465966"
|
||||
},
|
||||
"resultCode": {
|
||||
"type": "string",
|
||||
"example": "00"
|
||||
},
|
||||
"resultDescription": {
|
||||
"type": "string",
|
||||
"example": "Successful"
|
||||
}
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
"name": "RepaymentResponse"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,40 +3,40 @@
|
||||
"properties": {
|
||||
"requestId": {
|
||||
"type": "string",
|
||||
"example": "202111170001371256908"
|
||||
"example": "RQID11170001371256908"
|
||||
},
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "1231231321232"
|
||||
"example": "TRX1231231321232"
|
||||
},
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "CN621868"
|
||||
},
|
||||
"msisdn": {
|
||||
"type": "string",
|
||||
"example": "123456789"
|
||||
},
|
||||
"requestedAmount": {
|
||||
"type": "number",
|
||||
"format": "double",
|
||||
"example": 10000.55
|
||||
"example": "CN6215268548868"
|
||||
},
|
||||
"accountId": {
|
||||
"type": "string",
|
||||
"example": "ACN8263457"
|
||||
"example": "4348094226"
|
||||
},
|
||||
"msisdn": {
|
||||
"type": "string",
|
||||
"example": "2348093451342"
|
||||
},
|
||||
"requestedAmount": {
|
||||
"type": "number",
|
||||
"example": 20000
|
||||
},
|
||||
|
||||
"productId": {
|
||||
"type": "string",
|
||||
"example": "3MPC"
|
||||
},
|
||||
"offerId": {
|
||||
"type": "string",
|
||||
"example": "101"
|
||||
"example": "SAL900004543304"
|
||||
},
|
||||
"channel": {
|
||||
"type": "string",
|
||||
"example": ""
|
||||
"example": "USSD"
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
|
||||
@@ -1,121 +1,129 @@
|
||||
{
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"requestId": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"requestId": {
|
||||
"type": "string",
|
||||
"example": "81757678225025"
|
||||
},
|
||||
"transactionId": {
|
||||
"type": "string",
|
||||
"example": "TRCVIC73089465966"
|
||||
},
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "ZX48440946"
|
||||
},
|
||||
"accountId": {
|
||||
"type": "string",
|
||||
"example": "361005323"
|
||||
},
|
||||
"loan": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"offerId": {
|
||||
"type": "string",
|
||||
"example": "202111170001371256908"
|
||||
},
|
||||
"transactionId": {
|
||||
"example": "SAL90000204"
|
||||
},
|
||||
"productId": {
|
||||
"type": "string",
|
||||
"example": "1231231321232"
|
||||
},
|
||||
"customerId": {
|
||||
"type": "string",
|
||||
"example": "1256907"
|
||||
},
|
||||
"accountId": {
|
||||
"type": "string",
|
||||
"example": "5948306019"
|
||||
},
|
||||
"loan": {
|
||||
"example": "3MPC"
|
||||
},
|
||||
"amount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 30000.0
|
||||
},
|
||||
"upfrontPayment": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 622.5
|
||||
},
|
||||
"interestRate": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 3.0
|
||||
},
|
||||
"interestFee": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 2700.0
|
||||
},
|
||||
"managementRate": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 1.0
|
||||
},
|
||||
"managementFee": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 300.0
|
||||
},
|
||||
"insuranceRate": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 1.0
|
||||
},
|
||||
"insuranceFee": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 300.0
|
||||
},
|
||||
"VATRate": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 7.5
|
||||
},
|
||||
"VATAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 22.5
|
||||
},
|
||||
"recommendedRepaymentDates": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"offerId": {
|
||||
"type": "string",
|
||||
"example": "14451"
|
||||
},
|
||||
"productId": {
|
||||
"type": "string",
|
||||
"example": "3MPC"
|
||||
},
|
||||
"amount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 10000.0
|
||||
},
|
||||
"dueDate": {
|
||||
"type": "string",
|
||||
"example": "2025-04-24 10:31:"
|
||||
},
|
||||
"upfrontPayment": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 1000.0
|
||||
},
|
||||
"interestRate": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 3.0
|
||||
},
|
||||
"interestFee": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 3000.00
|
||||
},
|
||||
"ManagementRate": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 1.0
|
||||
},
|
||||
"ManagementFee": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 1.0
|
||||
},
|
||||
"InsuranceRate": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 1.0
|
||||
},
|
||||
"InsuranceFee": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 100.0
|
||||
},
|
||||
"VATRate": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 7.5
|
||||
},
|
||||
"VATamount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 100.0
|
||||
},
|
||||
"installmentRepaymentDates": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "string"
|
||||
},
|
||||
"example": [
|
||||
"2022-11-30"
|
||||
]
|
||||
},
|
||||
"installmentAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 11000.0
|
||||
},
|
||||
"totalRepaymentAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 11000.0
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"resultCode": {
|
||||
"type": "string",
|
||||
"example": "00"
|
||||
},
|
||||
"resultDescription": {
|
||||
"type": "string",
|
||||
"example": "Successful"
|
||||
"type": "string"
|
||||
},
|
||||
"example": [
|
||||
"2025-10-12",
|
||||
"2025-11-12",
|
||||
"2025-12-12"
|
||||
]
|
||||
},
|
||||
"installmentAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 10900.0
|
||||
},
|
||||
"repaymentAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 32700.0
|
||||
},
|
||||
"totalRepaymentAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 33322.5
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
"name": "SelectOffersResponse"
|
||||
"outstandingDebtAmount": {
|
||||
"type": "number",
|
||||
"format": "float",
|
||||
"example": 0
|
||||
},
|
||||
"resultCode": {
|
||||
"type": "string",
|
||||
"example": "00"
|
||||
},
|
||||
"resultDescription": {
|
||||
"type": "string",
|
||||
"example": "Successful"
|
||||
}
|
||||
}
|
||||
},
|
||||
"xml": {
|
||||
"name": "SelectOffersResponse"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
from flask_mail import Message
|
||||
from flask import current_app
|
||||
from app.extensions import mail
|
||||
import pandas as pd
|
||||
from io import BytesIO
|
||||
|
||||
def get_report_data():
|
||||
"""
|
||||
Fetch and return loan summary data.
|
||||
"""
|
||||
return [
|
||||
{"Type": "Disbursement", "Count": 45},
|
||||
{"Type": "Repayment", "Count": 32},
|
||||
]
|
||||
def send_report_email(report_data: list, recipients: list):
|
||||
"""
|
||||
Sends an HTML + Excel report to the given email recipients.
|
||||
"""
|
||||
df = pd.DataFrame(report_data)
|
||||
output = BytesIO()
|
||||
df.to_excel(output, index=False)
|
||||
output.seek(0)
|
||||
|
||||
html_table = df.to_html(index=False, border=1)
|
||||
|
||||
msg = Message(
|
||||
subject="Loan Report Summary",
|
||||
recipients=recipients,
|
||||
html=f"<h3>Loan Report Summary</h3>{html_table}",
|
||||
)
|
||||
msg.attach(
|
||||
"loan_report.xlsx",
|
||||
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
|
||||
output.read()
|
||||
)
|
||||
|
||||
with current_app.app_context():
|
||||
mail.send(msg)
|
||||
|
||||
return "Report email sent"
|
||||
+12
-1
@@ -1,3 +1,4 @@
|
||||
version: '3.8'
|
||||
services:
|
||||
digifi-bank-to-product-core:
|
||||
build: .
|
||||
@@ -11,4 +12,14 @@ services:
|
||||
- DATABASE_URL=postgresql+psycopg2://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}
|
||||
volumes:
|
||||
- .:/app
|
||||
restart: always
|
||||
restart: always
|
||||
networks:
|
||||
- my_custom_network
|
||||
|
||||
|
||||
networks:
|
||||
my_custom_network:
|
||||
driver: bridge
|
||||
ipam:
|
||||
config:
|
||||
- subnet: 10.244.0.0/26
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
"""empty message
|
||||
|
||||
Revision ID: 30b45df851fa
|
||||
Revises: d59bfb9ead82
|
||||
Create Date: 2025-08-26 13:48:27.458593
|
||||
|
||||
"""
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = '30b45df851fa'
|
||||
down_revision = 'd59bfb9ead82'
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def upgrade():
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.add_column(
|
||||
'loan_repayment_schedules',
|
||||
sa.Column('paid_status', sa.String(length=20), nullable=True),
|
||||
)
|
||||
|
||||
op.add_column(
|
||||
'loan_repayment_schedules',
|
||||
sa.Column('repay_description', sa.String(length=255), nullable=True),
|
||||
)
|
||||
|
||||
|
||||
op.add_column(
|
||||
'loan_repayment_schedules',
|
||||
sa.Column('partial_balance', sa.Float(), nullable=True),
|
||||
)
|
||||
# ### end Alembic commands ###
|
||||
|
||||
|
||||
def downgrade():
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.drop_column('loan_repayment_schedules', 'partial_balance')
|
||||
op.drop_column('loan_repayment_schedules', 'repay_description')
|
||||
op.drop_column('loan_repayment_schedules', 'paid_status')
|
||||
|
||||
# ### end Alembic commands ###
|
||||
@@ -0,0 +1,38 @@
|
||||
"""empty message
|
||||
|
||||
Revision ID: d59bfb9ead82
|
||||
Revises: 05b5494ad406
|
||||
Create Date: 2025-08-21 14:22:19.220158
|
||||
|
||||
"""
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = 'd59bfb9ead82'
|
||||
down_revision = '05b5494ad406'
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def upgrade():
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
|
||||
op.add_column(
|
||||
'loan_repayment_schedules',
|
||||
sa.Column('due_process_date', sa.DateTime(), nullable=True)
|
||||
)
|
||||
|
||||
# Add due_process_count column
|
||||
op.add_column(
|
||||
'loan_repayment_schedules',
|
||||
sa.Column('due_process_count', sa.Integer(), nullable=True)
|
||||
)
|
||||
|
||||
|
||||
def downgrade():
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
op.drop_column('loan_repayment_schedules', 'due_process_date')
|
||||
op.drop_column('loan_repayment_schedules', 'due_process_count')
|
||||
# ### end Alembic commands ###
|
||||
@@ -40,3 +40,6 @@ confluent-kafka==1.9.2
|
||||
|
||||
python-dateutil
|
||||
|
||||
Flask-Mail==0.10.0
|
||||
pandas==2.1.3
|
||||
openpyxl==3.1.5
|
||||
Reference in New Issue
Block a user