Compare commits
78 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 64fc119ca7 | |||
| d94d104380 | |||
| ff78788254 | |||
| 3acb5f098a | |||
| 363cdaf192 | |||
| 697e848994 | |||
| 7fa5cb6a83 | |||
| 03d5882a3c | |||
| a87259a6ca | |||
| e2eea4d455 | |||
| d23a088c84 | |||
| c2eb7fa21a | |||
| 53555a178a | |||
| e6d4a441b2 | |||
| e5d9310563 | |||
| ad27a26aec | |||
| 537b6d68f9 | |||
| 7cb34a995b | |||
| e78e7402c8 | |||
| 8f82964b70 | |||
| 771e8c00ed | |||
| 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 |
@@ -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"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
+27
-20
@@ -20,40 +20,47 @@ from flask_jwt_extended import (
|
|||||||
def create_app():
|
def create_app():
|
||||||
"""Factory function to create a Flask app instance"""
|
"""Factory function to create a Flask app instance"""
|
||||||
# import oracledb
|
# import oracledb
|
||||||
|
|
||||||
# oracledb.init_oracle_client(lib_dir=None)
|
|
||||||
|
|
||||||
|
# oracledb.init_oracle_client(lib_dir=None)
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
|
||||||
# Load configuration
|
# Load configuration
|
||||||
app.config.from_object(Config)
|
app.config.from_object(Config)
|
||||||
|
|
||||||
CORS(app)
|
CORS(app)
|
||||||
|
|
||||||
JWTManager(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
|
try:
|
||||||
app.register_blueprint(api)
|
# 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)
|
# Register blueprints
|
||||||
app.register_blueprint(swagger_ui_blueprint, url_prefix=SWAGGER_URL)
|
app.register_blueprint(api)
|
||||||
|
|
||||||
# Error Handlers
|
swagger_ui_blueprint = get_swaggerui_blueprint(SWAGGER_URL, API_URL)
|
||||||
register_error_handlers(app)
|
app.register_blueprint(swagger_ui_blueprint, url_prefix=SWAGGER_URL)
|
||||||
|
|
||||||
from . import models
|
except Exception as e:
|
||||||
|
print(f"Swagger Unexpected error occurred: {e}")
|
||||||
|
|
||||||
# Initialize Flask-Mail
|
|
||||||
mail.init_app(app)
|
|
||||||
|
|
||||||
# Database and Migrations
|
try:
|
||||||
db.init_app(app)
|
# Error Handlers
|
||||||
|
register_error_handlers(app)
|
||||||
|
|
||||||
migrate.init_app(app, db)
|
from . import models
|
||||||
|
|
||||||
return app
|
# 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 .transaction_type import TransactionType
|
from .transaction_type import TransactionType
|
||||||
from .loan_status import LoanStatus
|
from .loan_status import LoanStatus
|
||||||
|
from .repayment_schedule_status import RepaymentScheduleStatus
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
from enum import Enum
|
||||||
|
|
||||||
|
class RepaymentScheduleStatus(str, Enum):
|
||||||
|
ACTIVE = "active"
|
||||||
|
PARTIALLY_PAID = "partially_paid"
|
||||||
|
REPAID = "repaid"
|
||||||
@@ -1,2 +1,3 @@
|
|||||||
from .simbrella import SimbrellaIntegration
|
from .simbrella import SimbrellaIntegration
|
||||||
from .kafka import KafkaIntegration
|
from .kafka import KafkaIntegration
|
||||||
|
from .events_service import EventServiceIntegration
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
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
|
||||||
|
TIMEOUT = settings.TIMEOUT
|
||||||
|
|
||||||
|
@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=EventServiceIntegration.TIMEOUT)
|
||||||
|
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=EventServiceIntegration.TIMEOUT)
|
||||||
|
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=EventServiceIntegration.TIMEOUT)
|
||||||
|
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,66 @@
|
|||||||
|
from os import access
|
||||||
import httpx
|
import httpx
|
||||||
import json
|
import time
|
||||||
from app.utils.logger import logger
|
from app.utils.logger import logger
|
||||||
from app.config import settings
|
from app.config import settings
|
||||||
import logging
|
|
||||||
|
|
||||||
|
|
||||||
class SimbrellaIntegration:
|
class SimbrellaIntegration:
|
||||||
BASE_URL = settings.SIMBRELLA_BASE_URL
|
BASE_URL = settings.SIMBRELLA_BASE_URL
|
||||||
ENDPOINT_RAC_CHECKS = settings.SIMBRELLA_ENDPOINT_RAC_CHECKS
|
ENDPOINT_RAC_CHECKS = settings.SIMBRELLA_ENDPOINT_RAC_CHECKS
|
||||||
|
HEALTH_ENDPOINT = settings.SIMBRELLA_HEALTH
|
||||||
|
AUTH_ENDPOINT = settings.BANK_CALL_AUTH_ENDPOINT
|
||||||
|
SIMBRELLA_VERIFY_BALANCE_ENDPOINT = settings.SIMBRELLA_VERIFY_BALANCE_ENDPOINT
|
||||||
|
TIMEOUT = settings.TIMEOUT
|
||||||
|
|
||||||
|
_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=SimbrellaIntegration.TIMEOUT)
|
||||||
|
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
|
@staticmethod
|
||||||
def rac_check(customer_id, account_id, transaction_id):
|
def rac_check(customer_id, account_id, transaction_id):
|
||||||
@@ -26,14 +79,15 @@ class SimbrellaIntegration:
|
|||||||
"channel": "USSD"
|
"channel": "USSD"
|
||||||
}
|
}
|
||||||
|
|
||||||
headers = {
|
|
||||||
"Content-Type": "application/json",
|
|
||||||
"x-api-key": f"{settings.VALID_API_KEY}",
|
|
||||||
"App-Id": f"{settings.VALID_APP_ID}",
|
|
||||||
}
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
response = httpx.post(url, json=payload, headers=headers, timeout=10.0)
|
access_token = SimbrellaIntegration._get_token()
|
||||||
|
headers = {
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
"Authorization": f"Bearer {access_token}"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
response = httpx.post(url, json=payload, headers=headers, timeout=SimbrellaIntegration.TIMEOUT)
|
||||||
|
|
||||||
logger.info(f"This is Response: {str(response)}", exc_info=True)
|
logger.info(f"This is Response: {str(response)}", exc_info=True)
|
||||||
|
|
||||||
@@ -42,4 +96,79 @@ class SimbrellaIntegration:
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"RACCheck API call failed: {str(e)}", exc_info=True)
|
logger.error(f"RACCheck API call failed: {str(e)}", exc_info=True)
|
||||||
raise Exception(f"RACCheck API call failed: {str(e)}")
|
raise Exception(f"RACCheck API call failed: {str(e)}")
|
||||||
|
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def verify_account_balance(account_id: str, amount: float, request_id: str):
|
||||||
|
"""
|
||||||
|
Calls the Verify Account Balance endpoint
|
||||||
|
"""
|
||||||
|
url = f"{SimbrellaIntegration.BASE_URL}/{SimbrellaIntegration.SIMBRELLA_VERIFY_BALANCE_ENDPOINT}"
|
||||||
|
logger.info(f"Contacting Verify Account Balance Endpoint: {url}")
|
||||||
|
|
||||||
|
payload = {
|
||||||
|
"accountId": account_id,
|
||||||
|
"amount": amount,
|
||||||
|
"requestId": str(request_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=SimbrellaIntegration.TIMEOUT,
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
f"Verify Account Balance Response: "
|
||||||
|
f"status={response.status_code}, body={response.text}"
|
||||||
|
)
|
||||||
|
|
||||||
|
response.raise_for_status()
|
||||||
|
return response
|
||||||
|
|
||||||
|
except httpx.HTTPStatusError as e:
|
||||||
|
logger.error(
|
||||||
|
f"Verify Account Balance failed with status "
|
||||||
|
f"{e.response.status_code}: {e.response.text}",
|
||||||
|
exc_info=True,
|
||||||
|
)
|
||||||
|
raise Exception("Verify Account Balance API returned an error")
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(
|
||||||
|
f"Verify Account Balance API call failed: {str(e)}",
|
||||||
|
exc_info=True,
|
||||||
|
)
|
||||||
|
raise Exception(f"Verify Account Balance 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=SimbrellaIntegration.TIMEOUT)
|
||||||
|
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 flask import Blueprint, request, jsonify, send_from_directory
|
||||||
from app.api.services import (
|
from app.api.services import (
|
||||||
EligibilityCheckService,
|
EligibilityCheckService,
|
||||||
@@ -19,6 +21,9 @@ from flask_jwt_extended import (
|
|||||||
get_jwt_identity,
|
get_jwt_identity,
|
||||||
create_refresh_token,
|
create_refresh_token,
|
||||||
)
|
)
|
||||||
|
from sqlalchemy import text
|
||||||
|
from app.extensions import db
|
||||||
|
from app.config import settings
|
||||||
|
|
||||||
|
|
||||||
api = Blueprint("api", __name__)
|
api = Blueprint("api", __name__)
|
||||||
@@ -88,8 +93,8 @@ def loan_status():
|
|||||||
@jwt_required()
|
@jwt_required()
|
||||||
def repayment():
|
def repayment():
|
||||||
data = request.get_json()
|
data = request.get_json()
|
||||||
logger.error(f"HERE 0000a **** ")
|
# logger.error(f"Loan Repayment Data: {data} ")
|
||||||
# logger.info(f"Repayment request received: {data}")
|
logger.info(f"Repayment request received: {data}")
|
||||||
response = RepaymentService.process_request(data)
|
response = RepaymentService.process_request(data)
|
||||||
return response
|
return response
|
||||||
|
|
||||||
@@ -113,11 +118,77 @@ def notification_callback():
|
|||||||
response = NotificationCallbackService.process_request(data)
|
response = NotificationCallbackService.process_request(data)
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
|
||||||
# Health Check Endpoint
|
# Health Check Endpoint
|
||||||
@api.route("/health", methods=["GET"])
|
@api.route("/health", methods=["GET"])
|
||||||
def health_check():
|
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
|
# Authorize endpoint
|
||||||
|
|||||||
@@ -51,11 +51,18 @@ class EligibilityCheckService(BaseService):
|
|||||||
|
|
||||||
db.session.flush()
|
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="CUSTOMER HAS EXCEEDED THE NUMBER OF DISBURSALS: Disbursal Count 1")
|
||||||
|
|
||||||
# Determine Loan count
|
# Determine Loan count
|
||||||
is_eligible = EligibilityCheckService.check_loan_limits(customer_id)
|
is_eligible, count = EligibilityCheckService.check_loan_limits(customer_id)
|
||||||
|
|
||||||
if not is_eligible:
|
if not is_eligible:
|
||||||
return ResponseHelper.error(result_description="Max loan count reached")
|
return ResponseHelper.error(result_description=f"CUSTOMER HAS EXCEEDED THE NUMBER OF DISBURSALS FOR THE DAY: Disbursal Count Today {count}")
|
||||||
|
|
||||||
# Call RACCheck
|
# Call RACCheck
|
||||||
response = SimbrellaIntegration.rac_check(
|
response = SimbrellaIntegration.rac_check(
|
||||||
@@ -167,7 +174,12 @@ class EligibilityCheckService(BaseService):
|
|||||||
logger.error(f"An error occurred: {str(e)}", exc_info=True)
|
logger.error(f"An error occurred: {str(e)}", exc_info=True)
|
||||||
db.session.rollback()
|
db.session.rollback()
|
||||||
return ResponseHelper.internal_server_error()
|
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
|
@staticmethod
|
||||||
def check_loan_limits(customer_id):
|
def check_loan_limits(customer_id):
|
||||||
@@ -177,14 +189,14 @@ class EligibilityCheckService(BaseService):
|
|||||||
loan = Loan.get_customer_last_loan(customer_id)
|
loan = Loan.get_customer_last_loan(customer_id)
|
||||||
|
|
||||||
if not loan:
|
if not loan:
|
||||||
return True
|
return True, 0
|
||||||
|
|
||||||
offer_id = loan.offer_id[:5]
|
offer_id = loan.offer_id[:5]
|
||||||
|
|
||||||
offer = Offer.get_offer_by_id(offer_id)
|
offer = Offer.get_offer_by_id(offer_id)
|
||||||
if not offer:
|
if not offer:
|
||||||
logger.error(f"Offer not found for offer_id: {offer_id} (customer_id: {customer_id})")
|
logger.error(f"Offer not found for offer_id: {offer_id} (customer_id: {customer_id})")
|
||||||
return False
|
return False, 0
|
||||||
|
|
||||||
daily_count = Loan.get_daily_loan_count(customer_id, offer.product_id)
|
daily_count = Loan.get_daily_loan_count(customer_id, offer.product_id)
|
||||||
|
|
||||||
@@ -192,7 +204,7 @@ class EligibilityCheckService(BaseService):
|
|||||||
logger.info(f"daily_count: {daily_count}, Max: {offer.max_daily_loans}")
|
logger.info(f"daily_count: {daily_count}, Max: {offer.max_daily_loans}")
|
||||||
|
|
||||||
if offer.max_daily_loans is not None and daily_count >= offer.max_daily_loans:
|
if offer.max_daily_loans is not None and daily_count >= offer.max_daily_loans:
|
||||||
return False
|
return False, daily_count
|
||||||
|
|
||||||
|
|
||||||
return True
|
return True, daily_count
|
||||||
|
|||||||
@@ -3,15 +3,15 @@ from marshmallow import ValidationError
|
|||||||
from app.api.enums.loan_status import LoanStatus
|
from app.api.enums.loan_status import LoanStatus
|
||||||
from app.models import Customer
|
from app.models import Customer
|
||||||
from app.utils.logger import logger
|
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.services.base_service import BaseService
|
||||||
from app.api.enums import TransactionType
|
from app.api.enums import TransactionType
|
||||||
from app.extensions import db
|
from app.extensions import db
|
||||||
from app.api.helpers.response_helper import ResponseHelper
|
from app.api.helpers.response_helper import ResponseHelper
|
||||||
|
|
||||||
|
|
||||||
class LoanStatusService(BaseService):
|
class LoanStatusService(BaseService):
|
||||||
TRANSACTION_TYPE = TransactionType.LOAN_STATUS
|
TRANSACTION_TYPE = TransactionType.LOAN_STATUS
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def process_request(data):
|
def process_request(data):
|
||||||
@@ -27,31 +27,57 @@ class LoanStatusService(BaseService):
|
|||||||
try:
|
try:
|
||||||
with db.session.begin():
|
with db.session.begin():
|
||||||
# Validate data
|
# 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}")
|
logger.info(f"Looking for customer *** {customer_id}")
|
||||||
customer = Customer.get_customer_with_loan_list(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
|
# Get loans
|
||||||
loans = [loan.to_dict() for loan in customer.loans if loan.status == LoanStatus.ACTIVE]
|
customer_loans = customer.loans
|
||||||
transaction = LoanStatusService.log_transaction(validated_data = validated_data)
|
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:
|
if not transaction:
|
||||||
logger.error(f"Failed to log transaction")
|
logger.error(f"Failed to log transaction")
|
||||||
return ResponseHelper.error(result_description="Failed to log transaction.")
|
return ResponseHelper.error(
|
||||||
else:
|
result_description="Failed to log transaction."
|
||||||
return ResponseHelper.error(result_description="Invalid Customer or Account")
|
)
|
||||||
|
else:
|
||||||
total_debt_amount = sum(
|
return ResponseHelper.error(
|
||||||
loan.get("currentLoanAmount") or 0
|
result_description="Invalid Customer or Account"
|
||||||
for loan in loans
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# 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
|
# Simulated processing logic
|
||||||
response_data = {
|
response_data = {
|
||||||
"customerId": customer_id,
|
"customerId": customer_id,
|
||||||
@@ -59,6 +85,11 @@ class LoanStatusService(BaseService):
|
|||||||
"transactionId": transactionId,
|
"transactionId": transactionId,
|
||||||
"loans": loans,
|
"loans": loans,
|
||||||
"totalDebtAmount": total_debt_amount,
|
"totalDebtAmount": total_debt_amount,
|
||||||
|
"summary": {
|
||||||
|
"totalSettledAmount": total_settled_amount,
|
||||||
|
"totalOutstandingAmount": total_outstanding_amount,
|
||||||
|
"totalActiveLoanAmount": total_active_loan_amount,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
@@ -68,9 +99,11 @@ class LoanStatusService(BaseService):
|
|||||||
|
|
||||||
logger.error(f"Validation Error: {getattr(err, 'messages', str(err))}")
|
logger.error(f"Validation Error: {getattr(err, 'messages', str(err))}")
|
||||||
db.session.rollback()
|
db.session.rollback()
|
||||||
return ResponseHelper.unprocessable_entity(result_description="Validation exception")
|
return ResponseHelper.unprocessable_entity(
|
||||||
|
result_description="Validation exception"
|
||||||
except ValueError as err:
|
)
|
||||||
|
|
||||||
|
except ValueError as err:
|
||||||
logger.error(f"{getattr(err, 'messages', str(err))}")
|
logger.error(f"{getattr(err, 'messages', str(err))}")
|
||||||
db.session.rollback()
|
db.session.rollback()
|
||||||
return ResponseHelper.error(result_description=str(err))
|
return ResponseHelper.error(result_description=str(err))
|
||||||
@@ -78,4 +111,4 @@ class LoanStatusService(BaseService):
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"An error occurred: {str(e)}", exc_info=True)
|
logger.error(f"An error occurred: {str(e)}", exc_info=True)
|
||||||
db.session.rollback()
|
db.session.rollback()
|
||||||
return ResponseHelper.internal_server_error()
|
return ResponseHelper.internal_server_error()
|
||||||
|
|||||||
@@ -180,7 +180,11 @@ class OfferAnalysis:
|
|||||||
|
|
||||||
if real_eligible_amount < original_transaction_offer.min_amount:
|
if real_eligible_amount < original_transaction_offer.min_amount:
|
||||||
logger.error(f"Max eligible amount ({real_eligible_amount}) is less than the minimum offer amount ({original_transaction_offer.min_amount}).")
|
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.")
|
raise ValueError("You are not eligible for a loan at this time - Minimum amount not met.")
|
||||||
|
|
||||||
|
# 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(
|
transaction_offer = TransactionOffer.create_transaction_offer(
|
||||||
customer_id=customer_id,
|
customer_id=customer_id,
|
||||||
@@ -221,8 +225,12 @@ class OfferAnalysis:
|
|||||||
|
|
||||||
if approved_amount < offer.min_amount:
|
if approved_amount < offer.min_amount:
|
||||||
logger.error(f"Max eligible amount ({approved_amount}) is less than the minimum offer amount ({offer.min_amount}).")
|
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.")
|
continue
|
||||||
|
# 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(
|
transaction_offer = TransactionOffer.create_transaction_offer(
|
||||||
customer_id=customer_id,
|
customer_id=customer_id,
|
||||||
@@ -248,4 +256,8 @@ class OfferAnalysis:
|
|||||||
"tenor": offer.tenor
|
"tenor": offer.tenor
|
||||||
})
|
})
|
||||||
|
|
||||||
|
if not eligible_offers:
|
||||||
|
logger.error("No eligible offers found for customer: {customer_id} - Minimum amount not met")
|
||||||
|
raise ValueError("You are not eligible for a loan at this time - Minimum amount not met")
|
||||||
|
|
||||||
return eligible_offers
|
return eligible_offers
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
from gettext import install
|
||||||
from flask import request, jsonify
|
from flask import request, jsonify
|
||||||
from marshmallow import ValidationError
|
from marshmallow import ValidationError
|
||||||
from app.api.integrations.kafka import KafkaIntegration
|
from app.api.integrations.kafka import KafkaIntegration
|
||||||
@@ -11,8 +12,9 @@ from threading import Thread
|
|||||||
from app.models import Loan, Offer, Charge , TransactionOffer, RACCheck
|
from app.models import Loan, Offer, Charge , TransactionOffer, RACCheck
|
||||||
from app.api.enums import LoanStatus
|
from app.api.enums import LoanStatus
|
||||||
from app.extensions import db
|
from app.extensions import db
|
||||||
from datetime import datetime, timezone
|
from datetime import datetime, timezone, timedelta
|
||||||
from dateutil.relativedelta import relativedelta
|
from dateutil.relativedelta import relativedelta
|
||||||
|
from app.api.integrations import EventServiceIntegration
|
||||||
from app.models import LoanRepaymentSchedule
|
from app.models import LoanRepaymentSchedule
|
||||||
from app.api.services.offer_analysis import OfferAnalysis
|
from app.api.services.offer_analysis import OfferAnalysis
|
||||||
from app.api.helpers.response_helper import ResponseHelper
|
from app.api.helpers.response_helper import ResponseHelper
|
||||||
@@ -142,10 +144,10 @@ class ProvideLoanService(BaseService):
|
|||||||
|
|
||||||
db.session.flush()
|
db.session.flush()
|
||||||
current_product_id = offer.product_id
|
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}")
|
logger.error(f"Failed to create repayment schedule for loan ID {loan.id}")
|
||||||
return ResponseHelper.error(result_description="Failed to generate loan repayment schedule.")
|
return ResponseHelper.error(result_description="Failed to generate loan repayment schedule.")
|
||||||
|
|
||||||
@@ -157,26 +159,37 @@ class ProvideLoanService(BaseService):
|
|||||||
|
|
||||||
loan_charges = LoanCharge.create_charges_for_loan(loan_id = loan_id, transaction_id = transaction_id, referenced_amount = 800, charges = charges)
|
loan_charges = LoanCharge.create_charges_for_loan(loan_id = loan_id, transaction_id = transaction_id, referenced_amount = 800, charges = charges)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
else:
|
else:
|
||||||
return ResponseHelper.error(result_description="Invalid Customer or Account")
|
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 = {
|
response_data = {
|
||||||
"requestId": request_id,
|
"requestId": request_id,
|
||||||
"transactionId": transaction_id,
|
"transactionId": transaction_id,
|
||||||
"loanRef": loan_ref,
|
"loanRef": loan_ref,
|
||||||
"customerId": customer_id,
|
"customerId": customer_id,
|
||||||
"accountId": account_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)
|
# KafkaIntegration.send_loan_request(loan_data = response_data, request_id = request_id)
|
||||||
# Call Kafka in a background thread
|
# Call Kafka in a background thread
|
||||||
thread = Thread(target=ProvideLoanService.async_send_to_kafka, args=(response_data, request_id, "PROCESS_PAYMENT"))
|
kafka_thread = Thread(target=ProvideLoanService.async_send_to_kafka, args=(response_data, request_id, "PROCESS_PAYMENT"))
|
||||||
thread.start()
|
kafka_thread.start()
|
||||||
|
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
return ResponseHelper.success(data=response_data)
|
return ResponseHelper.success(data=response_data)
|
||||||
@@ -195,4 +208,83 @@ class ProvideLoanService(BaseService):
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"An error occurred: {str(e)}", exc_info=True)
|
logger.error(f"An error occurred: {str(e)}", exc_info=True)
|
||||||
db.session.rollback()
|
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
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
from app.api.integrations.simbrella import SimbrellaIntegration
|
||||||
from flask import request, jsonify
|
from flask import request, jsonify
|
||||||
from marshmallow import ValidationError
|
from marshmallow import ValidationError
|
||||||
from app.api.enums.loan_status import LoanStatus
|
from app.api.enums.loan_status import LoanStatus
|
||||||
@@ -11,9 +12,12 @@ from app.api.services.base_service import BaseService
|
|||||||
from app.api.enums import TransactionType
|
from app.api.enums import TransactionType
|
||||||
from threading import Thread
|
from threading import Thread
|
||||||
from app.extensions import db
|
from app.extensions import db
|
||||||
|
from app.api.integrations import EventServiceIntegration
|
||||||
|
from app.config import settings
|
||||||
|
|
||||||
class RepaymentService(BaseService):
|
class RepaymentService(BaseService):
|
||||||
TRANSACTION_TYPE = TransactionType.REPAYMENT
|
TRANSACTION_TYPE = TransactionType.REPAYMENT
|
||||||
|
ENABLE_ACCOUNT_BALANCE_CHECK = settings.ENABLE_ACCOUNT_BALANCE_CHECK
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def process_request(data):
|
def process_request(data):
|
||||||
@@ -38,16 +42,49 @@ class RepaymentService(BaseService):
|
|||||||
# customer = Customer.get_customer_with_loan_list(customer_id)
|
# customer = Customer.get_customer_with_loan_list(customer_id)
|
||||||
transaction_id = validated_data.get('transactionId')
|
transaction_id = validated_data.get('transactionId')
|
||||||
initiated_by = validated_data.get('initiatedBy')
|
initiated_by = validated_data.get('initiatedBy')
|
||||||
logger.error(f"HERE 0002a **** ")
|
logger.error(f"RepaymentService Received **** {data}")
|
||||||
|
|
||||||
if(RepaymentService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
|
if(RepaymentService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
|
||||||
logger.error(f"HERE 0001a **** ")
|
logger.error(f"HERE 0001a **** ")
|
||||||
# Check loan exists
|
# Check loan exists
|
||||||
loan = Loan.get_customer_loan(loan_id = loan_id, customer_id = customer_id)
|
load_loan = Loan.get_customer_loan(loan_id = loan_id, customer_id = customer_id)
|
||||||
|
|
||||||
|
|
||||||
|
# Check Customer Account Balance if enabled
|
||||||
|
if RepaymentService.ENABLE_ACCOUNT_BALANCE_CHECK:
|
||||||
|
response = SimbrellaIntegration.verify_account_balance(
|
||||||
|
account_id = account_id,
|
||||||
|
amount = load_loan.balance,
|
||||||
|
request_id = request_id,
|
||||||
|
)
|
||||||
|
|
||||||
|
# this check for error is not valid
|
||||||
|
if response.status_code != 200:
|
||||||
|
return ResponseHelper.error(result_description="Balance Check failed")
|
||||||
|
|
||||||
|
response = response.json()
|
||||||
|
|
||||||
|
logger.info(f"This is Response (Balance Check): {str(response)}", exc_info=True)
|
||||||
|
|
||||||
|
|
||||||
|
if not response or response['responseCode'] != '00':
|
||||||
|
|
||||||
|
if response:
|
||||||
|
logger.error(f"{response['responseMessage']}")
|
||||||
|
|
||||||
|
return ResponseHelper.error(result_description=f"Balance Check failed")
|
||||||
|
|
||||||
|
verify_account_balance_response = response['isSufficient']
|
||||||
|
|
||||||
|
if not verify_account_balance_response or verify_account_balance_response in [False, "false"]:
|
||||||
|
logger.error(f"Balance Check failed: Insufficient Account Balance")
|
||||||
|
return ResponseHelper.error(result_description=f"Insufficient Account Balance")
|
||||||
|
|
||||||
|
|
||||||
# Save the repayment details
|
# Save the repayment details
|
||||||
repayment = Repayment.create_repayment(
|
repayment = Repayment.create_repayment(
|
||||||
customer_id = customer_id,
|
customer_id = customer_id,
|
||||||
loan = loan,
|
loan = load_loan,
|
||||||
transaction_id = transaction_id
|
transaction_id = transaction_id
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -55,8 +92,10 @@ class RepaymentService(BaseService):
|
|||||||
logger.error(f"Failed to save repayment details")
|
logger.error(f"Failed to save repayment details")
|
||||||
return ResponseHelper.error(result_description="Failed to save repayment details.")
|
return ResponseHelper.error(result_description="Failed to save repayment details.")
|
||||||
|
|
||||||
|
loan_transaction_id = load_loan.transaction_id
|
||||||
|
|
||||||
#Update Loan status
|
#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)
|
transaction = RepaymentService.log_transaction(validated_data = validated_data)
|
||||||
|
|
||||||
if not transaction:
|
if not transaction:
|
||||||
@@ -72,16 +111,19 @@ class RepaymentService(BaseService):
|
|||||||
"Id": repayment.id,
|
"Id": repayment.id,
|
||||||
"repayment_id": repayment.id,
|
"repayment_id": repayment.id,
|
||||||
"initiated_by": repayment.initiated_by,
|
"initiated_by": repayment.initiated_by,
|
||||||
"transactionId": transaction_id,
|
"transactionId": loan_transaction_id,
|
||||||
"customerId": customer_id,
|
"customerId": customer_id,
|
||||||
"productId": loan.product_id,
|
"productId": load_loan.product_id,
|
||||||
"loanRef": loan_ref,
|
"loanRef": loan_ref,
|
||||||
"debtId": loan_id
|
"debtId": loan_id
|
||||||
}
|
}
|
||||||
|
|
||||||
|
event_thread = Thread(target=RepaymentService.trigger_loan_repayment, args=(loan_transaction_id,))
|
||||||
|
event_thread.start()
|
||||||
|
|
||||||
# Call Kafka in a background thread
|
# Call Kafka in a background thread
|
||||||
thread = Thread(target=RepaymentService.async_send_to_kafka, args=(response_data, request_id, "LOAN_REPAYMENT"))
|
kafka_thread = Thread(target=RepaymentService.async_send_to_kafka, args=(response_data, request_id, "LOAN_REPAYMENT"))
|
||||||
thread.start()
|
kafka_thread.start()
|
||||||
|
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
return ResponseHelper.success(data=response_data)
|
return ResponseHelper.success(data=response_data)
|
||||||
@@ -101,3 +143,10 @@ class RepaymentService(BaseService):
|
|||||||
logger.error(f"An error occurred: {str(e)}", exc_info=True)
|
logger.error(f"An error occurred: {str(e)}", exc_info=True)
|
||||||
db.session.rollback()
|
db.session.rollback()
|
||||||
return ResponseHelper.internal_server_error()
|
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")
|
transaction_id = validated_data.get("transactionId")
|
||||||
request_id = validated_data.get("requestId")
|
request_id = validated_data.get("requestId")
|
||||||
|
|
||||||
|
|
||||||
offer_id = int(transaction_offer_id[5:]) # The last part is int
|
offer_id = int(transaction_offer_id[5:]) # The last part is int
|
||||||
|
|
||||||
#"offerId": "SAL30001129",
|
#"offerId": "SAL30001129",
|
||||||
|
|||||||
@@ -46,6 +46,19 @@ class Config:
|
|||||||
VALID_API_KEY = os.getenv("SIMBRELLA_API_KEY", "test-api-key-12345")
|
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_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_ENDPOINT_RAC_CHECKS = os.getenv("SIMBRELLA_ENDPOINT_RAC_CHECKS","api/rac-check")
|
||||||
|
SIMBRELLA_VERIFY_BALANCE_ENDPOINT = os.getenv("SIMBRELLA_VERIFY_BALANCE_ENDPOINT", "api/VerifyAccountBalance")
|
||||||
|
ENABLE_ACCOUNT_BALANCE_CHECK = os.getenv("ENABLE_ACCOUNT_BALANCE_CHECK", True)
|
||||||
|
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")
|
||||||
|
TIMEOUT = os.getenv("TIMEOUT", 60.0)
|
||||||
|
|
||||||
|
|
||||||
|
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_accountStatus = os.environ.get("RAC_RESULT_accountStatus", "true")
|
||||||
RAC_RESULT_bvnValidated = os.environ.get("RAC_RESULT_bvnValidated", "true")
|
RAC_RESULT_bvnValidated = os.environ.get("RAC_RESULT_bvnValidated", "true")
|
||||||
|
|||||||
@@ -47,11 +47,11 @@ class Customer(db.Model):
|
|||||||
@classmethod
|
@classmethod
|
||||||
def create_customer(cls, id, msisdn, country_code, account_id, account_type='savings'):
|
def create_customer(cls, id, msisdn, country_code, account_id, account_type='savings'):
|
||||||
if cls.query.filter_by(id=id).first():
|
if cls.query.filter_by(id=id).first():
|
||||||
raise ValueError("Customer already exists")
|
raise ValueError("Customer ID '{id}' already exists.")
|
||||||
elif Account.query.filter_by(id=account_id).first():
|
elif Account.query.filter_by(id=account_id).first():
|
||||||
raise ValueError("Account already exists")
|
raise ValueError(f"Account ID '{account_id}' already exists.")
|
||||||
elif cls.query.filter_by(msisdn=msisdn).first():
|
elif cls.query.filter_by(msisdn=msisdn).first():
|
||||||
raise ValueError("msisdn already exists")
|
raise ValueError("MSISDN '{msisdn}' already exists")
|
||||||
|
|
||||||
# Create the customer
|
# Create the customer
|
||||||
customer = cls(
|
customer = cls(
|
||||||
|
|||||||
+27
-4
@@ -1,5 +1,6 @@
|
|||||||
from datetime import datetime, timezone, timedelta
|
from datetime import datetime, timezone, timedelta
|
||||||
from itertools import product
|
from itertools import product
|
||||||
|
from app.api.enums.loan_status import LoanStatus
|
||||||
from app.extensions import db
|
from app.extensions import db
|
||||||
from app.models.customer import Customer
|
from app.models.customer import Customer
|
||||||
from app.models.account import Account
|
from app.models.account import Account
|
||||||
@@ -51,6 +52,9 @@ class Loan(db.Model):
|
|||||||
verify_result = db.Column(db.String(10), nullable=True)
|
verify_result = db.Column(db.String(10), nullable=True)
|
||||||
verify_description = db.Column(db.String(100), nullable=True)
|
verify_description = db.Column(db.String(100), nullable=True)
|
||||||
|
|
||||||
|
total_penal_charge = db.Column(db.Float, default=0.0)
|
||||||
|
last_penal_date = db.Column(db.DateTime, nullable=True)
|
||||||
|
|
||||||
customer = relationship(
|
customer = relationship(
|
||||||
"Customer",
|
"Customer",
|
||||||
primaryjoin="Customer.id == Loan.customer_id",
|
primaryjoin="Customer.id == Loan.customer_id",
|
||||||
@@ -192,13 +196,32 @@ class Loan(db.Model):
|
|||||||
Get all active loans with the same original_transaction ID.
|
Get all active loans with the same original_transaction ID.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
active_loans = cls.query.filter_by(
|
active_loans = cls.query.filter(
|
||||||
original_transaction=original_transaction_id,
|
cls.original_transaction == original_transaction_id,
|
||||||
# status='active'
|
or_(
|
||||||
|
cls.status == LoanStatus.ACTIVE.value,
|
||||||
|
cls.status == LoanStatus.START_REPAY.value,
|
||||||
|
cls.status == LoanStatus.ACTIVE_PARTIAL.value,
|
||||||
|
)
|
||||||
).all()
|
).all()
|
||||||
|
|
||||||
return active_loans
|
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
|
@classmethod
|
||||||
def update_status(cls, loan_id, status):
|
def update_status(cls, loan_id, status):
|
||||||
@@ -246,7 +269,7 @@ class Loan(db.Model):
|
|||||||
'loanRef': self.reference,
|
'loanRef': self.reference,
|
||||||
'productId': self.product_id,
|
'productId': self.product_id,
|
||||||
'initialLoanAmount': self.initial_loan_amount,
|
'initialLoanAmount': self.initial_loan_amount,
|
||||||
'currentLoanAmount': self.current_loan_amount,
|
'currentLoanAmount': self.balance,
|
||||||
'defaultPenaltyFee': self.default_penalty_fee,
|
'defaultPenaltyFee': self.default_penalty_fee,
|
||||||
'continuousFee': self.continuous_fee,
|
'continuousFee': self.continuous_fee,
|
||||||
'collectionType': self.collection_type,
|
'collectionType': self.collection_type,
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ from app.extensions import db
|
|||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
from dateutil.relativedelta import relativedelta
|
from dateutil.relativedelta import relativedelta
|
||||||
from sqlalchemy.sql import func
|
from sqlalchemy.sql import func
|
||||||
|
from app.api.enums.repayment_schedule_status import RepaymentScheduleStatus
|
||||||
|
|
||||||
class LoanRepaymentSchedule(db.Model):
|
class LoanRepaymentSchedule(db.Model):
|
||||||
__tablename__ = 'loan_repayment_schedules'
|
__tablename__ = 'loan_repayment_schedules'
|
||||||
@@ -25,6 +26,11 @@ class LoanRepaymentSchedule(db.Model):
|
|||||||
|
|
||||||
created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
|
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())
|
updated_at = db.Column(db.DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
|
||||||
|
|
||||||
|
penal_charge = db.Column(db.Float, default=0.0)
|
||||||
|
penal_count = db.Column(db.Integer, default=0)
|
||||||
|
last_penal_date = db.Column(db.DateTime, nullable=True)
|
||||||
|
|
||||||
loan = relationship(
|
loan = relationship(
|
||||||
"Loan",
|
"Loan",
|
||||||
primaryjoin="LoanRepaymentSchedule.loan_id == Loan.id",
|
primaryjoin="LoanRepaymentSchedule.loan_id == Loan.id",
|
||||||
@@ -51,6 +57,7 @@ class LoanRepaymentSchedule(db.Model):
|
|||||||
installment_amount=round(loan.installment_amount, 2),
|
installment_amount=round(loan.installment_amount, 2),
|
||||||
product_id = loan.product_id,
|
product_id = loan.product_id,
|
||||||
transaction_id = transaction_id,
|
transaction_id = transaction_id,
|
||||||
|
paid_status = RepaymentScheduleStatus.ACTIVE,
|
||||||
created_at=datetime.now(timezone.utc),
|
created_at=datetime.now(timezone.utc),
|
||||||
updated_at=datetime.now(timezone.utc)
|
updated_at=datetime.now(timezone.utc)
|
||||||
)
|
)
|
||||||
@@ -70,6 +77,7 @@ class LoanRepaymentSchedule(db.Model):
|
|||||||
'interestAmount': self.interest_amount,
|
'interestAmount': self.interest_amount,
|
||||||
'totalInstallment': self.total_installment,
|
'totalInstallment': self.total_installment,
|
||||||
'paid': self.paid,
|
'paid': self.paid,
|
||||||
|
'paidStatus': self.paid_status,
|
||||||
'paidAt': self.paid_at.isoformat() if self.paid_at else None
|
'paidAt': self.paid_at.isoformat() if self.paid_at else None
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,9 +36,8 @@ class Repayment(db.Model):
|
|||||||
def create_repayment(cls, customer_id, loan, transaction_id):
|
def create_repayment(cls, customer_id, loan, transaction_id):
|
||||||
|
|
||||||
# Check that the loan is active
|
# 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})")
|
raise ValueError(f"Repayment cannot be processed. Loan status: ({loan.status})")
|
||||||
|
|
||||||
|
|
||||||
repayment = cls(
|
repayment = cls(
|
||||||
customer_id=customer_id,
|
customer_id=customer_id,
|
||||||
@@ -56,6 +55,12 @@ class Repayment(db.Model):
|
|||||||
raise ValueError(f"Database integrity error: {err}")
|
raise ValueError(f"Database integrity error: {err}")
|
||||||
|
|
||||||
return repayment
|
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):
|
def to_dict(self):
|
||||||
return {
|
return {
|
||||||
|
|||||||
+21
-11
@@ -4,6 +4,12 @@ from app.models import account
|
|||||||
from sqlalchemy.exc import IntegrityError
|
from sqlalchemy.exc import IntegrityError
|
||||||
from sqlalchemy import and_, or_, not_
|
from sqlalchemy import and_, or_, not_
|
||||||
from sqlalchemy.sql import func
|
from sqlalchemy.sql import func
|
||||||
|
from app.api.enums import TransactionType
|
||||||
|
|
||||||
|
import logging
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class Transaction(db.Model):
|
class Transaction(db.Model):
|
||||||
__tablename__ = 'transactions'
|
__tablename__ = 'transactions'
|
||||||
@@ -20,7 +26,7 @@ class Transaction(db.Model):
|
|||||||
phone_number = db.Column(db.String(50), nullable=True)
|
phone_number = db.Column(db.String(50), nullable=True)
|
||||||
created_at = db.Column(db.DateTime(timezone=True), server_default=func.now())
|
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())
|
updated_at = db.Column(db.DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return f'<Transaction {self.id}>'
|
return f'<Transaction {self.id}>'
|
||||||
|
|
||||||
@@ -30,17 +36,21 @@ class Transaction(db.Model):
|
|||||||
# if cls.query.filter_by(transaction_id=transaction_id).first():
|
# if cls.query.filter_by(transaction_id=transaction_id).first():
|
||||||
# raise ValueError("Duplicate Transaction")
|
# raise ValueError("Duplicate Transaction")
|
||||||
|
|
||||||
if cls.query.filter( and_( cls.transaction_id ==transaction_id, cls.type==type) ).first():
|
if cls.query.filter(and_(cls.transaction_id == transaction_id, cls.type == type)).first():
|
||||||
raise ValueError("Duplicate Transaction")
|
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 = cls(
|
||||||
transaction_id = transaction_id,
|
transaction_id=transaction_id,
|
||||||
customer_id = customer_id,
|
customer_id=customer_id,
|
||||||
account_id = account_id,
|
account_id=account_id,
|
||||||
type = type,
|
type=type,
|
||||||
channel = channel,
|
channel=channel,
|
||||||
created_at=datetime.now(timezone.utc),
|
created_at=datetime.now(timezone.utc),
|
||||||
updated_at=datetime.now(timezone.utc)
|
updated_at=datetime.now(timezone.utc)
|
||||||
)
|
)
|
||||||
@@ -54,4 +64,4 @@ class Transaction(db.Model):
|
|||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def get_transaction_by_id(cls, transaction_id):
|
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",
|
"openapi": "3.0.3",
|
||||||
"info": {
|
"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)",
|
"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/",
|
"termsOfService": "http://swagger.io/terms/",
|
||||||
"contact": {
|
"contact": {
|
||||||
@@ -20,12 +20,19 @@
|
|||||||
{
|
{
|
||||||
"url": "http://api.dev.simbrellang.net:4500"
|
"url": "http://api.dev.simbrellang.net:4500"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"url": "https://api.dev.simbrellang.net"
|
"url": "https://api.dev.simbrellang.net"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"url": "http://10.2.249.133:4500"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"tags": [
|
"tags": [
|
||||||
{
|
{
|
||||||
|
"name": "Health",
|
||||||
|
"description": "System health check including DB status."
|
||||||
|
},
|
||||||
|
{
|
||||||
"name": "Authorize",
|
"name": "Authorize",
|
||||||
"description": "This feature will be used for authorizing customers.",
|
"description": "This feature will be used for authorizing customers.",
|
||||||
"externalDocs": {
|
"externalDocs": {
|
||||||
@@ -83,6 +90,45 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"paths": {
|
"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": {
|
"/Authorize": {
|
||||||
"$ref": "swagger/paths/Authorize.json"
|
"$ref": "swagger/paths/Authorize.json"
|
||||||
},
|
},
|
||||||
@@ -131,18 +177,6 @@
|
|||||||
"RepaymentResponse": {
|
"RepaymentResponse": {
|
||||||
"$ref": "swagger/schemas/RepaymentResponse.json"
|
"$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": {
|
"ApiResponse": {
|
||||||
"$ref": "swagger/schemas/ApiResponse.json"
|
"$ref": "swagger/schemas/ApiResponse.json"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"post": {
|
"post": {
|
||||||
"tags": ["Authorize Refresh"],
|
"tags": ["AuthorizeRefresh"],
|
||||||
"summary": "Customer Authorize Refresh Request",
|
"summary": "Customer Authorize Refresh Request",
|
||||||
"description": "Customer Authorize Refresh Request",
|
"description": "Customer Authorize Refresh Request",
|
||||||
"operationId": "AuthorizeRefresh",
|
"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": {
|
"properties": {
|
||||||
"transactionId": {
|
"transactionId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "Tr201712RK9232P115"
|
"example": "TRX201712RK9232P115"
|
||||||
},
|
},
|
||||||
"countryCode": {
|
"countryCode": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
@@ -11,19 +11,19 @@
|
|||||||
},
|
},
|
||||||
"customerId": {
|
"customerId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "CN621868"
|
"example": "5268548"
|
||||||
},
|
|
||||||
"msisdn": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "8093451342"
|
|
||||||
},
|
|
||||||
"channel": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "100"
|
|
||||||
},
|
},
|
||||||
"accountId": {
|
"accountId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "ACN8263457"
|
"example": "4348094226"
|
||||||
|
},
|
||||||
|
"msisdn": {
|
||||||
|
"type": "string",
|
||||||
|
"example": "2348093451342"
|
||||||
|
},
|
||||||
|
"channel": {
|
||||||
|
"type": "string",
|
||||||
|
"example": "USSD"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"xml": {
|
"xml": {
|
||||||
|
|||||||
@@ -3,19 +3,19 @@
|
|||||||
"properties": {
|
"properties": {
|
||||||
"customerId": {
|
"customerId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "CN621868"
|
"example": "5268548"
|
||||||
},
|
},
|
||||||
"transactionId": {
|
"transactionId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "TX12345"
|
"example": "TRX201712RK9232P115"
|
||||||
},
|
},
|
||||||
"countryCode": {
|
"countryCode": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "NG"
|
"example": "NGR"
|
||||||
},
|
},
|
||||||
"msisdn": {
|
"msisdn": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "3451342"
|
"example": "2348093451342"
|
||||||
},
|
},
|
||||||
"eligibleOffers": {
|
"eligibleOffers": {
|
||||||
"type": "array",
|
"type": "array",
|
||||||
@@ -24,42 +24,42 @@
|
|||||||
"properties": {
|
"properties": {
|
||||||
"offerId": {
|
"offerId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "Offer1"
|
"example": "SAL90000204"
|
||||||
},
|
},
|
||||||
"productId": {
|
"productId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "Product1"
|
"example": "3MPC"
|
||||||
},
|
},
|
||||||
"minAamount": {
|
"minAamount": {
|
||||||
"type": "number",
|
"type": "number",
|
||||||
"format": "decimal",
|
"format": "decimal",
|
||||||
"example": 100.00
|
"example": 20000.00
|
||||||
},
|
},
|
||||||
"maxAamount": {
|
"maxAamount": {
|
||||||
"type": "number",
|
"type": "number",
|
||||||
"format": "decimal",
|
"format": "decimal",
|
||||||
"example": 1000.00
|
"example": 31257.00
|
||||||
},
|
},
|
||||||
"tenor": {
|
"tenor": {
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
"example": 12
|
"example": 90
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"example": [
|
"example": [
|
||||||
{
|
{
|
||||||
"offerId": "Offer1",
|
"max_amount": "31257.00",
|
||||||
"productId": "Product1",
|
"min_amount": 20000.0,
|
||||||
"minAamount": 100.00,
|
"offerId": "SAL90000204",
|
||||||
"maxAamount": 1000.00,
|
"product_id": "3MPC",
|
||||||
"tenor": 12
|
"tenor": 90
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"offerId": "Offer2",
|
"max_amount": "20838.00",
|
||||||
"productId": "Product2",
|
"min_amount": 5000.0,
|
||||||
"minAamount": 200.00,
|
"offerId": "SAL30000205",
|
||||||
"maxAamount": 2000.00,
|
"product_id": "AMPC",
|
||||||
"tenor": 24
|
"tenor": 30
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -3,15 +3,15 @@
|
|||||||
"properties": {
|
"properties": {
|
||||||
"transactionId": {
|
"transactionId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "Tr201712RK9232P115"
|
"example": "TRCVIC73089465966"
|
||||||
},
|
},
|
||||||
"customerId": {
|
"customerId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "CN621868"
|
"example": "ZX48440946"
|
||||||
},
|
},
|
||||||
"msisdn": {
|
"msisdn": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "3451342"
|
"example": "2348093451342"
|
||||||
},
|
},
|
||||||
"channel": {
|
"channel": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
},
|
},
|
||||||
"accountId": {
|
"accountId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "ACN8263457"
|
"example": "361005323"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"xml": {
|
"xml": {
|
||||||
|
|||||||
@@ -1,83 +1,133 @@
|
|||||||
{
|
{
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
"customerId": {
|
"customerId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "CN621868"
|
"example": "ZX48440946"
|
||||||
},
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"xml": {
|
"transactionId": {
|
||||||
"name": "LoanStatusResponse"
|
"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": {
|
"properties": {
|
||||||
"requestId": {
|
"requestId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "202111170001371256908"
|
"example": "RQID11170001371256908"
|
||||||
},
|
},
|
||||||
"transactionId": {
|
"transactionId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "Tr201712RK9232P115"
|
"example": "TRCVIC73089465966"
|
||||||
},
|
},
|
||||||
"customerId": {
|
"customerId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "CN621868"
|
"example": "ZX48440946"
|
||||||
},
|
},
|
||||||
"accountId": {
|
"accountId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "ACN8263457"
|
"example": "361005323"
|
||||||
},
|
},
|
||||||
"msisdn": {
|
"msisdn": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "3451342"
|
"example": "2348093451342"
|
||||||
},
|
},
|
||||||
"requestedAmount": {
|
"requestedAmount": {
|
||||||
"type": "number",
|
"type": "number",
|
||||||
"format": "decimal",
|
"format": "decimal",
|
||||||
"example": 900
|
"example": 20000
|
||||||
},
|
},
|
||||||
"collectionType": {
|
"collectionType": {
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
"example": 1
|
"example": 0
|
||||||
},
|
},
|
||||||
"offerId": {
|
"offerId": {
|
||||||
"type": "integer",
|
"type": "integer",
|
||||||
"example": 1127
|
"example": "SAL900004543304"
|
||||||
},
|
},
|
||||||
"channel": {
|
"channel": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "100"
|
"example": "USSD"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"xml": {
|
"xml": {
|
||||||
|
|||||||
@@ -1,40 +1,75 @@
|
|||||||
{
|
{
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
"requestId": {
|
"requestId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "202111170001371256908"
|
"example": "81757678335583"
|
||||||
},
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"xml": {
|
"transactionId": {
|
||||||
"name": "ProvideLoanResponse"
|
"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": {
|
"properties": {
|
||||||
"msisdn": {
|
"msisdn": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "3451342"
|
"example": "2348093451342"
|
||||||
},
|
},
|
||||||
"debtId": {
|
"debtId": {
|
||||||
"type": "string",
|
"type": "number",
|
||||||
"example": "10"
|
"example": 80
|
||||||
},
|
},
|
||||||
"transactionId": {
|
"transactionId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "20171209232115"
|
"example": "TRCVIC73089465966"
|
||||||
},
|
},
|
||||||
"customerId": {
|
"customerId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "CID0000025585"
|
"example": "ZX48440946"
|
||||||
},
|
},
|
||||||
"loanRef": {
|
"loanRef": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "Trx5847365252USSD3MPC"
|
"example": "TRCVIC73089465966USSD3MPC"
|
||||||
},
|
},
|
||||||
"accountId": {
|
"accountId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "ACN8263457"
|
"example": "361005323"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"xml": {
|
"xml": {
|
||||||
|
|||||||
@@ -1,28 +1,48 @@
|
|||||||
{
|
{
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
"customerId": {
|
"Id": {
|
||||||
"type": "string",
|
"type": "integer",
|
||||||
"example": "CN621868"
|
"example": 195
|
||||||
},
|
|
||||||
"productId": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "101"
|
|
||||||
},
|
|
||||||
"debtId": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "273194670"
|
|
||||||
},
|
|
||||||
"resultCode": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "00"
|
|
||||||
},
|
|
||||||
"resultDescription": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "Successful"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"xml": {
|
"customerId": {
|
||||||
"name": "RepaymentResponse"
|
"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": {
|
"properties": {
|
||||||
"requestId": {
|
"requestId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "202111170001371256908"
|
"example": "RQID11170001371256908"
|
||||||
},
|
},
|
||||||
"transactionId": {
|
"transactionId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "1231231321232"
|
"example": "TRX1231231321232"
|
||||||
},
|
},
|
||||||
"customerId": {
|
"customerId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "CN621868"
|
"example": "CN6215268548868"
|
||||||
},
|
|
||||||
"msisdn": {
|
|
||||||
"type": "string",
|
|
||||||
"example": "123456789"
|
|
||||||
},
|
|
||||||
"requestedAmount": {
|
|
||||||
"type": "number",
|
|
||||||
"format": "double",
|
|
||||||
"example": 10000.55
|
|
||||||
},
|
},
|
||||||
"accountId": {
|
"accountId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "ACN8263457"
|
"example": "4348094226"
|
||||||
},
|
},
|
||||||
|
"msisdn": {
|
||||||
|
"type": "string",
|
||||||
|
"example": "2348093451342"
|
||||||
|
},
|
||||||
|
"requestedAmount": {
|
||||||
|
"type": "number",
|
||||||
|
"example": 20000
|
||||||
|
},
|
||||||
|
|
||||||
"productId": {
|
"productId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "3MPC"
|
"example": "3MPC"
|
||||||
},
|
},
|
||||||
"offerId": {
|
"offerId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "101"
|
"example": "SAL900004543304"
|
||||||
},
|
},
|
||||||
"channel": {
|
"channel": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": ""
|
"example": "USSD"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"xml": {
|
"xml": {
|
||||||
|
|||||||
@@ -1,121 +1,129 @@
|
|||||||
{
|
{
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
"requestId": {
|
"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",
|
"type": "string",
|
||||||
"example": "202111170001371256908"
|
"example": "SAL90000204"
|
||||||
},
|
},
|
||||||
"transactionId": {
|
"productId": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"example": "1231231321232"
|
"example": "3MPC"
|
||||||
},
|
},
|
||||||
"customerId": {
|
"amount": {
|
||||||
"type": "string",
|
"type": "number",
|
||||||
"example": "1256907"
|
"format": "float",
|
||||||
},
|
"example": 30000.0
|
||||||
"accountId": {
|
},
|
||||||
"type": "string",
|
"upfrontPayment": {
|
||||||
"example": "5948306019"
|
"type": "number",
|
||||||
},
|
"format": "float",
|
||||||
"loan": {
|
"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",
|
"type": "array",
|
||||||
"items": {
|
"items": {
|
||||||
"type": "object",
|
"type": "string"
|
||||||
"properties": {
|
},
|
||||||
"offerId": {
|
"example": [
|
||||||
"type": "string",
|
"2025-10-12",
|
||||||
"example": "14451"
|
"2025-11-12",
|
||||||
},
|
"2025-12-12"
|
||||||
"productId": {
|
]
|
||||||
"type": "string",
|
},
|
||||||
"example": "3MPC"
|
"installmentAmount": {
|
||||||
},
|
"type": "number",
|
||||||
"amount": {
|
"format": "float",
|
||||||
"type": "number",
|
"example": 10900.0
|
||||||
"format": "float",
|
},
|
||||||
"example": 10000.0
|
"repaymentAmount": {
|
||||||
},
|
"type": "number",
|
||||||
"dueDate": {
|
"format": "float",
|
||||||
"type": "string",
|
"example": 32700.0
|
||||||
"example": "2025-04-24 10:31:"
|
},
|
||||||
},
|
"totalRepaymentAmount": {
|
||||||
"upfrontPayment": {
|
"type": "number",
|
||||||
"type": "number",
|
"format": "float",
|
||||||
"format": "float",
|
"example": 33322.5
|
||||||
"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"
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"xml": {
|
"outstandingDebtAmount": {
|
||||||
"name": "SelectOffersResponse"
|
"type": "number",
|
||||||
|
"format": "float",
|
||||||
|
"example": 0
|
||||||
|
},
|
||||||
|
"resultCode": {
|
||||||
|
"type": "string",
|
||||||
|
"example": "00"
|
||||||
|
},
|
||||||
|
"resultDescription": {
|
||||||
|
"type": "string",
|
||||||
|
"example": "Successful"
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
"xml": {
|
||||||
|
"name": "SelectOffersResponse"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+12
-1
@@ -1,3 +1,4 @@
|
|||||||
|
version: '3.8'
|
||||||
services:
|
services:
|
||||||
digifi-bank-to-product-core:
|
digifi-bank-to-product-core:
|
||||||
build: .
|
build: .
|
||||||
@@ -11,4 +12,14 @@ services:
|
|||||||
- DATABASE_URL=postgresql+psycopg2://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}
|
- DATABASE_URL=postgresql+psycopg2://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}
|
||||||
volumes:
|
volumes:
|
||||||
- .:/app
|
- .:/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,32 @@
|
|||||||
|
"""empty message
|
||||||
|
|
||||||
|
Revision ID: 284be77cb54e
|
||||||
|
Revises: 718dc29fbd38
|
||||||
|
Create Date: 2026-03-12 09:10:37.170288
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision = "284be77cb54e"
|
||||||
|
down_revision = "718dc29fbd38"
|
||||||
|
branch_labels = None
|
||||||
|
depends_on = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.add_column(
|
||||||
|
"loan_repayment_schedules",
|
||||||
|
sa.Column("last_penal_date", sa.Float(), nullable=True),
|
||||||
|
)
|
||||||
|
### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_column("loan_repayment_schedules", "last_penal_date")
|
||||||
|
# ### end Alembic commands ###
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
"""empty message
|
||||||
|
|
||||||
|
Revision ID: 718dc29fbd38
|
||||||
|
Revises: 30b45df851fa
|
||||||
|
Create Date: 2026-03-11 14:18:47.523948
|
||||||
|
|
||||||
|
"""
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision = '718dc29fbd38'
|
||||||
|
down_revision = '30b45df851fa'
|
||||||
|
branch_labels = None
|
||||||
|
depends_on = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.add_column('loan_repayment_schedules',
|
||||||
|
sa.Column('penal_charge', sa.Float(), nullable=True),
|
||||||
|
)
|
||||||
|
op.add_column('loan_repayment_schedules',
|
||||||
|
sa.Column('penal_count', sa.Integer(), nullable=True),
|
||||||
|
)
|
||||||
|
op.add_column('loans',
|
||||||
|
sa.Column('total_penal_charge', sa.Float(), nullable=True),
|
||||||
|
)
|
||||||
|
op.add_column('loans',
|
||||||
|
sa.Column('last_penal_date', sa.DateTime(), nullable=True),
|
||||||
|
)
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_column('loan_repayment_schedules', 'penal_count')
|
||||||
|
op.drop_column('loan_repayment_schedules', 'penal_charge')
|
||||||
|
op.drop_column('loans', 'total_penal_charge')
|
||||||
|
op.drop_column('loans', 'last_penal_date')
|
||||||
|
# ### end Alembic commands ###
|
||||||
Reference in New Issue
Block a user