DigiFi/digifi-BankEmulator
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'partial_payment' of DigiFi/digifi-BankEmulator into master

Browse Source
This commit is contained in:
Olusesan Ameye
2025-08-29 19:18:35 +00:00
committed by Gogs
parent cfc40b89dc c0f1845c5d
commit 4e52459d51
3 changed files with 59 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/api/schemas/collect_loan.py
+8 -3
View File
@@ -16,15 +16,20 @@ class CollectLoanSchema(Schema):
comment = fields.Str(allow_none=True) comment = fields.Str(allow_none=True)
class CollectLoanResponseSchema(Schema): class CollectLoanResponseSchema(Schema):
responseCode = fields.Str(allow_none=True)
responseDescr = fields.Str(allow_none=True)
fullDescription = fields.Str(allow_none=True)
transactionId = fields.Str(allow_none=True) transactionId = fields.Str(allow_none=True)
fbnTransactionId = fields.Str(allow_none=True)
debtId = fields.Str(allow_none=True) debtId = fields.Str(allow_none=True)
customerId = fields.Str(allow_none=True) customerId = fields.Str(allow_none=True)
accountId = fields.Str(allow_none=True) accountId = fields.Str(allow_none=True)
productId = fields.Str(allow_none=True) productId = fields.Str(allow_none=True)
amountCollected = fields.Float(required=True) amountCollected = fields.Float(required=True)
interestCollected = fields.Float(required=True)
penalChargeCollected = fields.Float(required=True)
lienAmount = fields.Float(required=True)
countryId = fields.Str(allow_none=True) countryId = fields.Str(allow_none=True)
comment = fields.Str(allow_none=True) comment = fields.Str(allow_none=True)
responseCode = fields.Str(allow_none=True)
responseMessage = fields.Str(allow_none=True) responseMessage = fields.Str(allow_none=True)
responseDescr = fields.Str(allow_none=True)
fullDescription = fields.Str(allow_none=True)
app/api/services/collect_loan.py
+48 -35
View File
@@ -1,8 +1,10 @@
import random
from flask import request, jsonify from flask import request, jsonify
from marshmallow import ValidationError from marshmallow import ValidationError
from app.utils.logger import logger from app.utils.logger import logger
from app.api.helpers.response_helper import ResponseHelper from app.api.helpers.response_helper import ResponseHelper
from app.api.schemas.collect_loan import CollectLoanSchema, CollectLoanResponseSchema from app.api.schemas.collect_loan import CollectLoanSchema, CollectLoanResponseSchema
from app.config import Config
""" """
Process the CollectLoan request. Process the CollectLoan request.
@@ -24,51 +26,62 @@ class CollectLoanService:
validated_data = schema.load(data) validated_data = schema.load(data)
amountForCollection = validated_data.get("collectAmount") amountForCollection = validated_data.get("collectAmount")
productId = validated_data.get("productId")
customerId = validated_data.get("customerId")
amountCollected = amountForCollection amountCollected = amountForCollection
responseDescr= "Loan Collection Successful EMULATOR" responseDescr= "Loan Collection Successful EMULATOR"
fullDescription= "Loan collection completed successfully EMULATOR" fullDescription= "Loan collection completed successfully EMULATOR"
responseMessage= "Loan collection completed successfully EMULATOR" responseMessage= "Loan collection completed successfully EMULATOR"
interestCollected = amountForCollection * 0.03
lienAmount = validated_data.get("lienAmount", 0)
isValid = not (
if amountForCollection in [5555.0, 6666.0, 7777.0, 8888.0 , 9999.0, 22222.0] : int(customerId[-1]) in [2, 7, 9]
amountCollected = amountForCollection * 0.85 )
if Config.MIN_AMOUNT_FOR_COLLECTION <= amountForCollection <= Config.MAX_AMOUNT_FOR_COLLECTION:
amountCollected = amountForCollection if lienAmount >= amountForCollection else 0
responseDescr = "Partial Loan Collection Successful EMULATOR" responseDescr = "Partial Loan Collection Successful EMULATOR"
fullDescription = "Partial Loan collection completed successfully EMULATOR" fullDescription = "Partial Loan collection completed successfully EMULATOR"
responseMessage = "Partial Loan collection completed successfully EMULATOR" responseMessage = "Partial Loan collection completed successfully EMULATOR"
# Simulated processing logic response_data = {
response_data = { "transactionId": validated_data.get("transactionId"),
"transactionId": validated_data.get("transactionId"), "fbnTransactionId": validated_data.get("fbnTransactionId"),
"debtId": validated_data.get("debtId"), "debtId": validated_data.get("debtId"),
"customerId": validated_data.get("customerId"), "customerId": validated_data.get("customerId"),
"accountId": validated_data.get("accountId"), "accountId": validated_data.get("accountId"),
"productId": validated_data.get("productId"), "productId": validated_data.get("productId"),
"amountCollected": amountCollected, "amountCollected": amountCollected,
"countryId": validated_data.get("countryId"), "interestCollected": interestCollected,
"comment": validated_data.get("comment", "Testing CollectionLoanRequest EMULATOR"), "penalChargeCollected": 0,
"responseCode": "00", "lienAmount": lienAmount if amountCollected == 0 else 0,
"responseDescr": responseDescr, "countryId": validated_data.get("countryId"),
"fullDescription": fullDescription, "comment": validated_data.get("comment", "Testing CollectionLoanRequest EMULATOR"),
"responseMessage": responseMessage "responseCode": "00",
} "responseDescr": responseDescr,
"fullDescription": fullDescription,
"responseMessage": responseMessage
}
# # Simulated processing logic else:
# response_data = { response_data = {
# "transactionId": validated_data.get("transactionId", "T002"), "transactionId": validated_data.get("transactionId"),
# "debtId": validated_data.get("debtId", "273194670"), "fbnTransactionId": validated_data.get("fbnTransactionId"),
# "customerId": validated_data.get("customerId", "CN621868"), "debtId": validated_data.get("debtId"),
# "accountId": validated_data.get("accountId", "2017821799"), "customerId": validated_data.get("customerId"),
# "productId": validated_data.get("productId", "101"), "accountId": validated_data.get("accountId"),
# "amountCollected": validated_data.get("collectAmount", 60000.00), "productId": validated_data.get("productId"),
# "countryId": validated_data.get("countryId", "01"), "amountCollected": amountCollected,
# "comment": validated_data.get("comment", "Testing CollectionLoanRequest"), "interestCollected": interestCollected,
# "responseCode": "00", "penalChargeCollected": 0,
# "responseDescr": "Loan Collection Successful", "amountCollected": amountCollected,
# "fullDescription": "Loan collection completed successfully", "countryId": validated_data.get("countryId"),
# "responseMessage": "Loan collection completed successfully" "comment": validated_data.get("comment", "Testing CollectionLoanRequest EMULATOR"),
# } "responseCode": "00",
# "responseDescr": responseDescr,
"fullDescription": fullDescription,
"responseMessage": responseMessage
}
# Validate and serialize the response data # Validate and serialize the response data
response_schema = CollectLoanResponseSchema() response_schema = CollectLoanResponseSchema()
app/config.py
+3
View File
@@ -1,4 +1,5 @@
import os import os
from re import M
from dotenv import load_dotenv from dotenv import load_dotenv
class Config: class Config:
@@ -10,6 +11,8 @@ class Config:
DEBUG = True DEBUG = True
VALID_APP_ID = os.getenv("VALID_APP_ID", "app1") VALID_APP_ID = os.getenv("VALID_APP_ID", "app1")
VALID_API_KEY = os.getenv("VALID_API_KEY", "test-api-key-12345") VALID_API_KEY = os.getenv("VALID_API_KEY", "test-api-key-12345")
MIN_AMOUNT_FOR_COLLECTION = int(os.getenv("MIN_AMOUNT_FOR_COLLECTION", 10000))
MAX_AMOUNT_FOR_COLLECTION = int(os.getenv("MAX_AMOUNT_FOR_COLLECTION", 25000))
# SQLALCHEMY_DATABASE_URI =os.environ.get("DATABASE_URL", "database_url") # SQLALCHEMY_DATABASE_URI =os.environ.get("DATABASE_URL", "database_url")
# SQLALCHEMY_TRACK_MODIFICATIONS = False # SQLALCHEMY_TRACK_MODIFICATIONS = False