DigiFi/digifi-BankToProductCore
1
1
Fork 1
Code Issues Pull Requests 2 Releases Activity

Merge branch 'loan_repayment_fix' of DigiFi/digifi-BankToProductCore into master

Browse Source
This commit is contained in:
Olusesan Ameye
2025-04-10 13:07:36 +00:00
committed by Gogs
parent edd19b9a39 7026c8378b
commit 729ebd5d08
8 changed files with 94 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vscode/settings.json
Vendored
+24 -24
View File
@@ -1,24 +1,24 @@
{
"editor.lineNumbers": "off",
"editor.padding.top": 3,
"editor.padding.bottom": 3,
"editor.formatOnSave": true,
"editor.formatOnPaste": true,
"editor.fontSize": 14,
"editor.lineHeight": 4.5,
"editor.suggestFontSize": 15,
// "editor.suggestLineHeight": 4,
"breadcrumbs.enabled": false,
"workbench.tips.enabled": false,
"workbench.statusBar.visible": false,
// "workbench.editor.showTabs": "single",
"git.enableSmartCommit": true,
"workbench.editor.editorActionsLocation": "hidden",
// "workbench.activityBar.location": "hidden",
"workbench.editor.enablePreviewFromQuickOpen": false,
"editor.lightbulb.enabled": "off",
"editor.selectionHighlight": false,
"editor.overviewRulerBorder": false,
"editor.renderLineHighlight": "none",
"editor.occurrencesHighlight": "off"
}
// {
// "editor.lineNumbers": "off",
// "editor.padding.top": 3,
// "editor.padding.bottom": 3,
// "editor.formatOnSave": true,
// "editor.formatOnPaste": true,
// "editor.fontSize": 14,
// "editor.lineHeight": 4.5,
// "editor.suggestFontSize": 15,
// // "editor.suggestLineHeight": 4,
// "breadcrumbs.enabled": false,
// "workbench.tips.enabled": false,
// "workbench.statusBar.visible": false,
// // "workbench.editor.showTabs": "single",
// "git.enableSmartCommit": true,
// "workbench.editor.editorActionsLocation": "hidden",
// // "workbench.activityBar.location": "hidden",
// "workbench.editor.enablePreviewFromQuickOpen": false,
// "editor.lightbulb.enabled": "off",
// "editor.selectionHighlight": false,
// "editor.overviewRulerBorder": false,
// "editor.renderLineHighlight": "none",
// "editor.occurrencesHighlight": "off"
// }
app/api/schemas/provide_loan.py
+2 -2
View File
@@ -8,8 +8,8 @@ class ProvideLoanSchema(Schema):
customerId = fields.Str(required=True)
accountId = fields.Str(required=True)
msisdn = fields.Str(required=False)
# productId = fields.Str(required=True)
# lienAmount = fields.Float(required=True)
# productId = fields.Str(required=True)
# lienAmount = fields.Float(required=True)
requestedAmount = fields.Float(required=True)
collectionType = fields.Int(required=True)
offerId = fields.Int(required=True)
app/api/services/provide_loan.py
+21 -1
View File
@@ -7,6 +7,7 @@ from app.utils.logger import logger
from app.api.schemas.provide_loan import ProvideLoanSchema
from app.api.integrations import KafkaIntegration
from threading import Thread
from app.models.loan import Loan
class ProvideLoanService(BaseService):
@@ -32,6 +33,7 @@ class ProvideLoanService(BaseService):
transaction_id = validated_data.get('transactionId')
if (ProvideLoanService.validate_account_ownership(account_id = account_id, customer_id = customer_id)):
transaction = ProvideLoanService.log_transaction(validated_data = validated_data)
if not transaction:
@@ -39,6 +41,25 @@ class ProvideLoanService(BaseService):
return jsonify({
"message": "Failed to log transaction."
}), 400
# Save the loan details
loan_id = f"loan_{transaction_id}"
loan = Loan.create_loan(
customer_id=customer_id,
account_id=account_id,
offer_id=validated_data.get('offerId'),
principal_amount=validated_data.get('requestedAmount'),
status="active"
)
if not loan:
logger.error(f"Failed to save loan details")
return jsonify({
"message": "Failed to save loan details."
}), 400
else:
return jsonify({
"message": "Invalid Customer or Account"
@@ -89,4 +110,3 @@ class ProvideLoanService(BaseService):
KafkaIntegration.send_loan_request(loan_data = loan_data, request_id = request_id)
KafkaIntegration.flush()
app/api/services/repayment.py
+5 -2
View File
@@ -21,10 +21,13 @@ class RepaymentService(BaseService):
"""
try:
validated_data = RepaymentService.validate_data(data, RepaymentSchema())
account_id = validated_data.get('accountId')
customer_id = validated_data.get('customerId')
customer = RepaymentService.get_or_create_customer(validated_data)
account = customer.accounts[0]
validated_data['accountId'] = account.id
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)):
transaction = RepaymentService.log_transaction(validated_data = validated_data)
if not transaction:
app/api/services/select_offer.py
+1 -1
View File
@@ -3,7 +3,7 @@ from marshmallow import ValidationError
from app.api.services.base_service import BaseService
from app.api.enums import TransactionType
from app.utils.logger import logger
from app.api.schemas.select_offer import SelectOfferSchema
from app.api.schemas.select_offer import SelectOfferSchema
class SelectOfferService(BaseService):
TRANSACTION_TYPE = TransactionType.SELECT_OFFER
app/models/customer.py
+3 -3
View File
@@ -20,11 +20,11 @@ class Customer(db.Model):
)
@classmethod
def is_eligible(cls, customer_id):
def is_valid_customer(cls, customer_id):
customer = cls.query.filter_by(id=customer_id).first()
if not customer:
return False, "Customer not found"
return True, "Customer is eligible"
return False
return True
@classmethod
def create_customer(cls, id, msisdn, country_code, account_id, account_type='savings'):
app/models/loan.py
+38 -4
View File
@@ -1,20 +1,54 @@
from datetime import datetime, timezone
from app.extensions import db
from app.models.customer import Customer
from app.models.account import Account
class Loan(db.Model):
__tablename__ = 'loans'
id = db.Column(db.String(50), primary_key=True)
id = db.Column(
db.Integer,
primary_key=True,
autoincrement=True,
)
customer_id = db.Column(db.String(50), nullable=False)
account_id = db.Column(db.String(50), nullable=False)
product_id = db.Column(db.String(20), nullable=False)
offer_id = db.Column(db.String(20), nullable=False)
principal_amount = db.Column(db.Float, nullable=False)
status = db.Column(db.String(20), default='pending')
created_at = db.Column(db.DateTime, default=datetime.now(timezone.utc))
updated_at = db.Column(db.DateTime, default=datetime.now(timezone.utc), onupdate=datetime.now(timezone.utc))
@classmethod
def create_loan(cls, customer_id, account_id, offer_id, principal_amount, status='pending'):
# Check if customer exists
is_valid = Customer.is_valid_customer(customer_id)
if not is_valid:
raise ValueError("Customer does not exist")
# # Check for active loans
# has_active_loans = cls.has_active_loans(customer_id)
# if has_active_loans:
# raise ValueError("Customer has active loans")
# Create and save the loan
loan = cls(
customer_id=customer_id,
account_id=account_id,
offer_id=offer_id,
principal_amount=principal_amount,
status=status
)
db.session.add(loan)
db.session.commit()
return loan
@classmethod
def has_active_loans(cls, customer_id):
active_loans = cls.query.filter_by(
@@ -23,8 +57,8 @@ class Loan(db.Model):
).count()
if active_loans > 0:
return False, "Customer has active loans"
return True, "No active loans"
return False
return True
def __repr__(self):
app/swagger/schemas/ProvideLoanRequest.json
-9
View File
@@ -21,15 +21,6 @@
"type": "string",
"example": "3451342"
},
"productId": {
"type": "string",
"example": "101"
},
"lienAmount": {
"type": "number",
"format": "decimal",
"example": 400
},
"requestedAmount": {
"type": "number",
"format": "decimal",