[update]: .gitignore file

app/__init__.py

@@ -2,6 +2,7 @@ from flask import Flask
 from flask_cors import CORS
 from app.config import Config
 from app.routes import api
+from app.errors import method_not_allowed, unsupported_media_type
 
 def create_app():
     """ Factory function to create a Flask app instance """
@@ -16,4 +17,8 @@ def create_app():
     # Register blueprints
     app.register_blueprint(api)
 
+     # Error Handlers
+    app.register_error_handler(405, method_not_allowed)
+    app.register_error_handler(415, unsupported_media_type)
+
     return app

app/blueprints/__init__.py

@@ -1,18 +0,0 @@
-from app.blueprints.eligibility_check import EligibilityCheckService
-from app.blueprints.select_offer import SelectOfferService
-from app.blueprints.provide_loan import ProvideLoanService
-from app.blueprints.loan_information import LoanInformationService
-from app.blueprints.repayment import RepaymentService
-from app.blueprints.customer_consent import CustomerConsentService
-from app.blueprints.notification_callback import NotificationCallbackService
-from app.blueprints.rac_check import RACCheckService
-from app.blueprints.disbursement import DisbursementService
-from app.blueprints.collect_loan import CollectLoanService
-from app.blueprints.transaction_verify import TransactionVerifyService
-from app.blueprints.penal_charge import PenalChargeService
-from app.blueprints.revoke_enable_consent import RevokeEnableConsentService
-from app.blueprints.token_validation import TokenValidationService
-from app.blueprints.lien_check import LienCheckService
-from app.blueprints.new_transaction_check import NewTransactionCheckService
-from app.blueprints.sms import SMSService
-from app.blueprints.bulk_sms import BulkSMSService

app/blueprints/bulk_sms.py

@@ -1,55 +0,0 @@
-from marshmallow import ValidationError
-from app.utils.logger import logger
-from app.helpers.response_helper import ResponseHelper
-from app.schemas.bulk_sms import BulkSMSSchema 
-
-class BulkSMSService:
-    @staticmethod
-    def process_request(data):
-        """
-        Process the Bulk SMS request.
-
-        Args:
-            data (dict): The request data.
-
-        Returns:
-            dict: A standardized response.
-        """
-        try:
-            logger.info("Processing BulkSMS request")
-
-            # Validate input data using BulkSMSSchema
-            schema = BulkSMSSchema()
-            validated_data = schema.load(data)  # Raises ValidationError if invalid
-
-            # Simulated Bulk SMS sending logic
-            response_data = {
-                "data": "",
-                "statusCode": 200,
-                "isSuccessful": True,
-                "errorMessage": None
-            }
-
-
-            # return ResponseHelper.success(
-            #     data=response_data,
-            #     message="Bulk SMS sent successfully"
-            # )
-
-            return response_data
-
-        except ValidationError as err:
-            logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
-
-        except Exception as e:
-            logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )

app/blueprints/sms.py

@@ -1,56 +0,0 @@
-from marshmallow import ValidationError
-from app.utils.logger import logger
-from app.helpers.response_helper import ResponseHelper
-from app.schemas.sms import SMSSchema
-
-
-class SMSService:
-    @staticmethod
-    def process_request(data):
-        """
-        Process the SMS request.
-
-        Args:
-            data (dict): The request data.
-
-        Returns:
-            dict: A standardized response.
-        """
-        try:
-            logger.info("Processing SMS request")
-
-            # Validate input data using SMSSchema
-            schema = SMSSchema()
-            validated_data = schema.load(data)  # Raises ValidationError if invalid
-
-            # Simulated SMS sending logic
-            response_data = {
-                "data": "",
-                "statusCode": 200,
-                "isSuccessful": True,
-                "errorMessage": None
-            }
-
-
-            # return ResponseHelper.success(
-            #     data=response_data,
-            #     message="SMS sent successfully"
-            # )
-
-            return response_data
-
-        except ValidationError as err:
-            logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
-
-        except Exception as e:
-            logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )

app/errors/__init__.py

@@ -0,0 +1 @@
+from .handlers import method_not_allowed, unsupported_media_type

app/errors/handlers.py

@@ -0,0 +1,14 @@
+from flask import jsonify
+from app.helpers.response_helper import ResponseHelper
+
+def method_not_allowed(error):
+    return jsonify({"message": "Method Not Allowed"}), 405
+
+def not_found(error):
+    return jsonify({"message": "Resource not found"}), 404
+
+def bad_request(error):
+    return jsonify({"message": "Bad Request"}), 400
+
+def unsupported_media_type(error):
+    return jsonify({"message": "Unsupported Media Type"}), 415

app/helpers/response_helper.py

@@ -35,7 +35,7 @@ class ResponseHelper:
             "data": data if data is not None else {},
             "error": error if error is not None else {},
         }
-        return response
+        return jsonify(response), status_code
 
     @staticmethod
     def success(
@@ -210,4 +210,42 @@ class ResponseHelper:
         Returns:
             Dict[str, Any]: A dictionary representing the JSON response.
         """
-        return ResponseHelper.build_response(False, message, data, 422, error)
+        return ResponseHelper.build_response(False, message, data, 422, error)
+    
+    @staticmethod
+    def method_not_allowed(
+        message: str = "Method Not Allowed",
+        data: Optional[Union[Dict, List, str]] = None,
+        error: Optional[Union[Dict, str]] = None,
+    ) -> Dict[str, Any]:
+        """
+        Return a response for a method not allowed error.
+
+        Args:
+            message (str): A message describing the error.
+            data (Optional[Union[Dict, List, str]]): The data to return in the response.
+            error (Optional[Union[Dict, str]]): Any error details to include in the response.
+
+        Returns:
+            Dict[str, Any]: A dictionary representing the JSON response.
+        """
+        return ResponseHelper.build_response(False, message, data, 405, error)
+    
+    @staticmethod
+    def bad_request(
+        message: str = "Bad Request",
+        data: Optional[Union[Dict, List, str]] = None,
+        error: Optional[Union[Dict, str]] = None,
+    ) -> Dict[str, Any]:
+        """
+        Return a response for a bad request error.
+
+        Args:
+            message (str): A message describing the error.
+            data (Optional[Union[Dict, List, str]]): The data to return in the response.
+            error (Optional[Union[Dict, str]]): Any error details to include in the response.
+
+        Returns:
+            Dict[str, Any]: A dictionary representing the JSON response.
+        """
+        return ResponseHelper.build_response(False, message, data, 400, error)

app/middlewares/__init__.py

@@ -0,0 +1,3 @@
+from .verify_api_key import require_api_key
+from .app_id_checker import require_app_id
+from .cors import enforce_json

app/middlewares/app_id_checker.py

@@ -0,0 +1,26 @@
+from functools import wraps
+from flask import request, jsonify
+from app.utils.logger import logger
+import os
+
+# Load valid App-IDs from environment variables (comma-separated list)
+VALID_APP_ID = os.getenv("VALID_APP_ID", "app1,app2,app3").split(",")
+
+def require_app_id(f):
+    """Decorator to enforce App-ID validation."""
+    @wraps(f)
+    def decorated_function(*args, **kwargs):
+        app_id = request.headers.get("App-ID")
+
+        if not app_id:
+            logger.error("Unauthorized access: Missing App-ID.")
+            return jsonify({"message": "Invalid request parameters"}), 400
+
+
+        if app_id not in VALID_APP_ID:
+            logger.error(f"Unauthorized access: Invalid App-ID {app_id}.")
+            return jsonify({"message": "Invalid request parameters"}), 400
+
+        return f(*args, **kwargs)
+
+    return decorated_function

app/middlewares/cors.py

@@ -1,9 +1,7 @@
-# app/middlewares/cors.py
-from flask import request
+from flask import request, jsonify
 
-def cors_headers(response):
-    """Allow cross-origin requests"""
-    response.headers["Access-Control-Allow-Origin"] = "*"
-    response.headers["Access-Control-Allow-Methods"] = "GET, POST, PUT, PATCH, DELETE"
-    response.headers["Access-Control-Allow-Headers"] = "Authorization, Content-Type"
-    return response
+
+def enforce_json():
+    """Middleware to enforce JSON Content-Type for incoming requests"""
+    if request.method in ["POST", "PUT", "PATCH"] and request.content_type != "application/json":
+        return jsonify({"message": "Invalid request parameters"}), 400

app/middlewares/encryption.py

@@ -1,14 +0,0 @@
-# app/middlewares/encryption.py
-from cryptography.fernet import Fernet
-import os
-
-ENCRYPTION_KEY = os.getenv("ENCRYPTION_KEY", Fernet.generate_key())
-cipher = Fernet(ENCRYPTION_KEY)
-
-def encrypt_data(data):
-    """Encrypt sensitive data"""
-    return cipher.encrypt(data.encode()).decode()
-
-def decrypt_data(data):
-    """Decrypt sensitive data"""
-    return cipher.decrypt(data.encode()).decode()

app/middlewares/request_validator.py

@@ -1,11 +0,0 @@
-# app/middlewares/request_validator.py
-from flask import request
-from app.helpers.response_helper import ResponseHelper
-
-def validate_json():
-    """Ensure request has valid JSON"""
-    if not request.is_json:
-        return ResponseHelper.error(
-                message="Request must be JSON",
-                status_code=415
-            )

app/middlewares/verify_api_key.py

@@ -1,8 +1,25 @@
-# app/middlewares/auth.py
+from functools import wraps
 from flask import request, jsonify
+from app.utils.logger import logger
+import os
 
-def require_api_key():
-    """Middleware to check if API key is present"""
-    api_key = request.headers.get("X-API-KEY")
-    if not api_key:
-        return jsonify({"error": "Missing API key"}), 403
+# Load valid API key from environment variables (fallback for testing)
+VALID_API_KEY = os.getenv("VALID_API_KEY", "test-api-key-12345")
+
+def require_api_key(f):
+    """Decorator to enforce API key authentication."""
+    @wraps(f)
+    def decorated_function(*args, **kwargs):
+        api_key = request.headers.get("X-API-KEY")
+
+        if not api_key:
+            logger.error("Unauthorized access: Missing API key.")
+            return jsonify({"message": "Invalid request parameters"}), 400
+
+        if api_key != VALID_API_KEY:
+            logger.error("Unauthorized access: Invalid API key.")
+            return jsonify({"message": "Invalid request parameters"}), 400
+
+        return f(*args, **kwargs)
+
+    return decorated_function

app/routes/routes.py

@@ -1,5 +1,5 @@
 from flask import Blueprint, request, jsonify
-from app.blueprints import (
+from app.services import (
     EligibilityCheckService,
     SelectOfferService,
     ProvideLoanService,
@@ -15,159 +15,195 @@ from app.blueprints import (
     RevokeEnableConsentService,
     TokenValidationService,
     LienCheckService,
-    NewTransactionCheckService,
-    SMSService,
-    BulkSMSService
+    NewTransactionCheckService
 )
 from app.utils.logger import logger
+from app.middlewares import require_api_key, require_app_id, enforce_json 
 
 
 api = Blueprint("api", __name__)
 
 
+@api.before_request
+def cors_middleware():
+    """Middleware applied globally to all API routes in this blueprint"""
+    return enforce_json()
+
+
 # EligibilityCheck Endpoint
 @api.route('/EligibilityCheck', methods=['POST'])
+@require_api_key
+@require_app_id
 def eligibility_check():
     data = request.get_json()
     # logger.info(f"EligibilityCheck request received: {data}")
     response = EligibilityCheckService.process_request(data)
-    return jsonify(response)
+    return response
 
 # SelectOffer Endpoint
 @api.route('/SelectOffer', methods=['POST'])
+@require_api_key
+@require_app_id
 def select_offer():
     data = request.get_json()
     # logger.info(f"SelectOffer request received: {data}")
     response = SelectOfferService.process_request(data)
-    return jsonify(response)
+    return response
+
 
 # ProvideLoan Endpoint
 @api.route('/ProvideLoan', methods=['POST'])
+@require_api_key
+@require_app_id
 def provide_loan():
     data = request.get_json()
     # logger.info(f"ProvideLoan request received: {data}")
     response = ProvideLoanService.process_request(data)
-    return jsonify(response)
+    return response
+
 
 # LoanInformation Endpoint
 @api.route('/LoanInformation', methods=['GET'])
+@require_api_key
+@require_app_id
 def loan_information():
     data = request.args.to_dict()
     # logger.info(f"LoanInformation request received: {data}")
     response = LoanInformationService.process_request(data)
-    return jsonify(response)
+    return response
+
 
 # Repayment Endpoint
 @api.route('/Repayment', methods=['POST'])
+@require_api_key
+@require_app_id
 def repayment():
     data = request.get_json()
     # logger.info(f"Repayment request received: {data}")
     response = RepaymentService.process_request(data)
-    return jsonify(response)
+    return response
+
 
 # CustomerConsent Endpoint
 @api.route('/CustomerConsent', methods=['POST'])
+@require_api_key
+@require_app_id
 def customer_consent():
     data = request.get_json()
     # logger.info(f"CustomerConsent request received: {data}")
     response = CustomerConsentService.process_request(data)
-    return jsonify(response)
+    return response
+
 
 # NotificationCallback Endpoint
 @api.route('/NotificationCallback', methods=['POST'])
+@require_api_key
+@require_app_id
 def notification_callback():
     data = request.get_json()
     # logger.info(f"NotificationCallback request received: {data}")
     response = NotificationCallbackService.process_request(data)
-    return jsonify(response)
+    return response
+
 
 # RACCheck Endpoint
 @api.route('/RACCheck', methods=['POST'])
+@require_api_key
+@require_app_id
 def rac_check():
     data = request.get_json()
     # logger.info(f"RACCheck request received: {data}")
     response = RACCheckService.process_request(data)
-    return jsonify(response)
+    return response
+
 
 # Disbursement Endpoint
 @api.route('/Disbursement', methods=['POST'])
+@require_api_key
+@require_app_id
 def disbursement():
     data = request.get_json()
     # logger.info(f"Disbursement request received: {data}")
     response = DisbursementService.process_request(data)
-    return jsonify(response)
+    return response
+
 
 # CollectLoan Endpoint
 @api.route('/CollectLoan', methods=['POST'])
+@require_api_key
+@require_app_id
 def collect_loan():
     data = request.get_json()
     # logger.info(f"CollectLoan request received: {data}")
     response = CollectLoanService.process_request(data)
-    return jsonify(response)
+    return response
+
 
 # TransactionVerify Endpoint
 @api.route('/TransactionVerify', methods=['POST'])
+@require_api_key
+@require_app_id
 def transaction_verify():
     data = request.get_json()
     # logger.info(f"TransactionVerify request received: {data}")
     response = TransactionVerifyService.process_request(data)
-    return jsonify(response)
+    return response
+
 
 # PenalCharge Endpoint
 @api.route('/PenalCharge', methods=['POST'])
+@require_api_key
+@require_app_id
 def penal_charge():
     data = request.get_json()
     # logger.info(f"PenalCharge request received: {data}")
     response = PenalChargeService.process_request(data)
-    return jsonify(response)
+    return response
+
 
 # RevokeEnableConsent Endpoint
 @api.route('/RevokeEnableConsent', methods=['POST'])
+@require_api_key
+@require_app_id
 def revoke_enable_consent():
     data = request.get_json()
     # logger.info(f"RevokeEnableConsent request received: {data}")
     response = RevokeEnableConsentService.process_request(data)
-    return jsonify(response)
+    return response
+
 
 # TokenValidation Endpoint
 @api.route('/TokenValidation', methods=['POST'])
+@require_api_key
+@require_app_id
 def token_validation():
     data = request.get_json()
     # logger.info(f"TokenValidation request received: {data}")
     response = TokenValidationService.process_request(data)
-    return jsonify(response)
+    return response
+
 
 # LienCheck Endpoint
 @api.route('/LienCheck', methods=['POST'])
+@require_api_key
+@require_app_id
 def lien_check():
     data = request.get_json()
     # logger.info(f"LienCheck request received: {data}")
     response = LienCheckService.process_request(data)
-    return jsonify(response)
+    return response
+
 
 # NewTransactionCheck Endpoint
 @api.route('/NewTransactionCheck', methods=['POST'])
+@require_api_key
+@require_app_id
 def new_transaction_check():
     data = request.get_json()
     # logger.info(f"NewTransactionCheck request received: {data}")
     response = NewTransactionCheckService.process_request(data)
-    return jsonify(response)
+    return response
 
-# SMS Endpoint
-@api.route('/SMS', methods=['POST'])
-def sms():
-    data = request.get_json()
-    # logger.info(f"SMS request received: {data}")
-    response = SMSService.process_request(data)
-    return jsonify(response)
-
-# BulkSMS Endpoint
-@api.route('/BulkSMS', methods=['POST'])
-def bulk_sms():
-    data = request.get_json()
-    # logger.info(f"BulkSMS request received: {data}")
-    response = BulkSMSService.process_request(data)
-    return jsonify(response)
 
 # Health Check Endpoint
 @api.route('/health', methods=['GET'])

app/schemas/disbursement.py

@@ -2,16 +2,17 @@ from marshmallow import Schema, fields
 
 # Disbursement Schema
 class DisbursementSchema(Schema):
-    requestId = fields.Str(required=True, data_key="requestId")
-    debtId = fields.Str(required=True, data_key="debtId")
-    transactionId = fields.Str(required=True, data_key="transactionId")
-    customerId = fields.Str(required=True, data_key="customerId")
-    accountId = fields.Str(required=True, data_key="accountId")
-    productId = fields.Str(required=True, data_key="productId")
-    provideAmount = fields.Float(required=True, data_key="provideAmount")
-    collectAmountInterest = fields.Float(required=False, data_key="collectAmountInterest")  # Optional
-    collectAmountMgtFee = fields.Float(required=True, data_key="collectAmountMgtFee")
-    collectAmountInsurance = fields.Float(required=True, data_key="collectAmountInsurance")
-    collectAmountVAT = fields.Float(required=True, data_key="collectAmountVAT")
-    countryId = fields.Str(required=True, data_key="countryId")
-    comment = fields.Str(required=False, data_key="comment")  # Optional
+    requestId = fields.Str(required=True)
+    debtId = fields.Str(required=True)
+    transactionId = fields.Str(required=True)
+    customerId = fields.Str(required=True)
+    accountId = fields.Str(required=True)
+    productId = fields.Str(required=True)
+    provideAmount = fields.Float(required=True)
+    collectAmountInterest = fields.Float(required=False)  # Optional
+    collectAmountMgtFee = fields.Float(required=True)
+    collectAmountInsurance = fields.Float(required=True)
+    collectAmountVAT = fields.Float(required=True)
+    countryId = fields.Str(required=True)
+    comment = fields.Str(required=False)  # Optional
+    

app/schemas/eligibility_check.py

@@ -1,11 +1,11 @@
 from marshmallow import Schema, fields
 
 class EligibilityCheckSchema(Schema):
-    type = fields.Str(required=True, description="Request type")
-    transactionId = fields.Str(data_key="transactionId", required=True, description="Transaction ID")
-    countryCode = fields.Str(data_key="countryCode", required=True, description="Country code (ISO)")
-    customerId = fields.Str(data_key="customerId", required=True, description="Customer ID")
-    accountId = fields.Str(data_key="accountId", required=True, description="Account ID")
-    msisdn = fields.Str(required=True, description="Mobile number")
-    lienAmount = fields.Float(required=True, description="Amount for lien")
-    channel = fields.Str(required=True, description="Transaction channel (USSD, Mobile, Web)")
+    type = fields.Str(required=True)
+    transactionId = fields.Str(required=True)
+    countryCode = fields.Str(required=True)
+    customerId = fields.Str(required=True)
+    accountId = fields.Str(required=True)
+    msisdn = fields.Str(required=True)
+    lienAmount = fields.Float(required=True)
+    channel = fields.Str(required=True)

app/schemas/lien_check.py

@@ -2,7 +2,7 @@ from marshmallow import Schema, fields
 
 # Lien Check Schema
 class LienCheckSchema(Schema):
-    transactionId = fields.Str(required=True, metadata={"description": "Unique Identifier in Simbrella system"})
-    customerId = fields.Str(required=True, metadata={"description": "Unique identifier of customer"})
-    accountId = fields.Str(required=True, metadata={"description": "Unique identifier of account"})
-    countryId = fields.Str(required=True, metadata={"description": 'Set to static value "01"'})
+    transactionId = fields.Str(required=True)
+    customerId = fields.Str(required=True)
+    accountId = fields.Str(required=True)
+    countryId = fields.Str(required=True)

app/schemas/penal_charge.py

@@ -3,12 +3,12 @@ from marshmallow import Schema, fields
 
 # Penal Charge Schema
 class PenalChargeSchema(Schema):
-    transactionId = fields.Str(required=True, metadata={"description": "Unique identifier of transaction in Simbrella system"})
-    fbnTransactionId = fields.Str(required=True, metadata={"description": "Unique id of the transaction received from FBN in Eligibility or Provision requests"})
-    debtId = fields.Str(required=True, metadata={"description": "Unique identifier of providing loan in Simbrella system"})
-    customerId = fields.Str(required=True, metadata={"description": "Unique identifier of a user"})
-    accountId = fields.Str(required=True, metadata={"description": "Specific identifier of a user’s account"})
-    penalCharge = fields.Decimal(required=True, metadata={"description": "Penalty amount that needs to be collected from user’s account"})
-    lienAmount = fields.Decimal(required=True, metadata={"description": "Aggregated (summed up) lien amount"})
-    countryId = fields.Str(required=True, metadata={"description": 'Set to static value "01"'})
-    comment = fields.Str(required=False, metadata={"description": "Any additional comment for provided loan operation"})
+    transactionId = fields.Str(required=True)
+    fbnTransactionId = fields.Str(required=True)
+    debtId = fields.Str(required=True)
+    customerId = fields.Str(required=True)
+    accountId = fields.Str(required=True)
+    penalCharge = fields.Decimal(required=True)
+    lienAmount = fields.Decimal(required=True)
+    countryId = fields.Str(required=True)
+    comment = fields.Str(required=False)

app/schemas/revoke_enable_consent.py

@@ -3,11 +3,11 @@ from marshmallow import Schema, fields
 
 # Revoke Enable Consent Schema
 class RevokeEnableConsentSchema(Schema):
-    transactionId = fields.Str(required=True, metadata={"description": "Unique identifier of transaction in Simbrella system"})
-    fbnTransactionId = fields.Str(required=True, metadata={"description": "Unique id of the transaction received from FBN in CustomerConsentRequest"})
-    customerId = fields.Str(required=True, metadata={"description": "Unique identifier of a user"})
-    accountId = fields.Str(required=True, metadata={"description": "Specific identifier of a user’s account"})
-    processTime = fields.DateTime(required=True, metadata={"description": "Date and time when consent request was processed"})
-    consentType = fields.Str(required=True, metadata={"description": '“Enable” or “Revoke”'})
-    countryId = fields.Str(required=True, metadata={"description": 'Set to static value "01"'})
-    comment = fields.Str(required=False, metadata={"description": "Any additional comment for consent operation"})
+    transactionId = fields.Str(required=True)
+    fbnTransactionId = fields.Str(required=True)
+    customerId = fields.Str(required=True)
+    accountId = fields.Str(required=True)
+    processTime = fields.DateTime(required=True)
+    consentType = fields.Str(required=True)
+    countryId = fields.Str(required=True)
+    comment = fields.Str(required=False)

app/schemas/select_offer.py

@@ -2,12 +2,12 @@ from marshmallow import Schema, fields
 
 # Select Offer Schema
 class SelectOfferSchema(Schema):
-    requestId = fields.Str(required=True, description="Unique request identifier")
-    transactionId = fields.Str(required=True, description="Transaction ID")
-    customerId = fields.Str(required=True, description="Customer ID")
-    accountId = fields.Str(required=True, description="Account ID")
-    msisdn = fields.Str(required=True, description="Mobile number")
-    requestedAmount = fields.Float(required=True, description="Amount requested")
-    productId = fields.Str(required=True, description="Product ID")
-    channel = fields.Str(required=True, description="Transaction channel (e.g., USSD)")
+    requestId = fields.Str(required=True)
+    transactionId = fields.Str(required=True)
+    customerId = fields.Str(required=True)
+    accountId = fields.Str(required=True)
+    msisdn = fields.Str(required=True)
+    requestedAmount = fields.Float(required=True)
+    productId = fields.Str(required=True)
+    channel = fields.Str(required=True)
 

app/services/__init__.py

@@ -0,0 +1,16 @@
+from app.services.eligibility_check import EligibilityCheckService
+from app.services.select_offer import SelectOfferService
+from app.services.provide_loan import ProvideLoanService
+from app.services.loan_information import LoanInformationService
+from app.services.repayment import RepaymentService
+from app.services.customer_consent import CustomerConsentService
+from app.services.notification_callback import NotificationCallbackService
+from app.services.rac_check import RACCheckService
+from app.services.disbursement import DisbursementService
+from app.services.collect_loan import CollectLoanService
+from app.services.transaction_verify import TransactionVerifyService
+from app.services.penal_charge import PenalChargeService
+from app.services.revoke_enable_consent import RevokeEnableConsentService
+from app.services.token_validation import TokenValidationService
+from app.services.lien_check import LienCheckService
+from app.services.new_transaction_check import NewTransactionCheckService

app/services/collect_loan.py

@@ -1,4 +1,4 @@
-from flask import request
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
@@ -44,20 +44,16 @@ class CollectLoanService:
             #     data=response_data,
             #     message="Loan collection completed successfully"
             # )
-            return response_data
+            return jsonify(response_data), 200
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/customer_consent.py

@@ -1,7 +1,6 @@
-from flask import request
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
-from app.helpers.response_helper import ResponseHelper
 from app.schemas.customer_consent import CustomerConsentSchema   
 
 
@@ -40,16 +39,12 @@ class CustomerConsentService:
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/disbursement.py

@@ -1,4 +1,4 @@
-from flask import request
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
@@ -51,16 +51,12 @@ class DisbursementService:
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/eligibility_check.py

@@ -1,4 +1,4 @@
-from flask import session
+from flask import session, jsonify
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
 from app.schemas.eligibility_check import EligibilityCheckSchema
@@ -62,16 +62,12 @@ class EligibilityCheckService:
             return response_data
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
-            logger.error(f"An error occurred during EligibilityCheck processing: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            logger.error(f"An error occurred: {str(e)}", exc_info=True)
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/lien_check.py

@@ -1,3 +1,4 @@
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
@@ -39,16 +40,12 @@ class LienCheckService:
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/loan_information.py

@@ -1,4 +1,4 @@
-from flask import request
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
@@ -52,16 +52,12 @@ class LoanInformationService:
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/new_transaction_check.py

@@ -1,3 +1,4 @@
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
@@ -46,16 +47,12 @@ class NewTransactionCheckService:
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/notification_callback.py

@@ -1,4 +1,4 @@
-from flask import request
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
@@ -39,16 +39,12 @@ class NotificationCallbackService:
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/penal_charge.py

@@ -1,4 +1,4 @@
-from flask import request
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
@@ -40,16 +40,12 @@ class PenalChargeService:
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/provide_loan.py

@@ -1,4 +1,4 @@
-from flask import request
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
@@ -44,16 +44,12 @@ class ProvideLoanService:
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/rac_check.py

@@ -1,4 +1,4 @@
-from flask import request
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
@@ -52,16 +52,12 @@ class RACCheckService:
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/repayment.py

@@ -1,4 +1,4 @@
-from flask import request
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
@@ -39,16 +39,12 @@ class RepaymentService:
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/revoke_enable_consent.py

@@ -1,4 +1,4 @@
-from flask import request
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
@@ -43,16 +43,12 @@ class RevokeEnableConsentService:
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/select_offer.py

@@ -1,4 +1,4 @@
-from flask import request
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
@@ -23,14 +23,7 @@ class SelectOfferService:
             schema = SelectOfferSchema()
             validated_data = schema.load(data)  # Raises ValidationError if invalid
 
-            # Business logic - selecting an offer
-            response_data = {
-                "outstandingDebtAmount": 0,
-                "requestId": "202111170001371256908",
-                "transactionId": "1231231321232",
-                "customerId": "1256907",
-                "accountId": "5948306019",
-                "offers": [
+            offers = [
                     {
                     "offerId": "14451",
                     "productId": "2030",
@@ -79,7 +72,16 @@ class SelectOfferService:
                     "installmentAmount": 4021.15,
                     "totalRepaymentAmount": 12063.45
                     }
-                ],
+                ]
+
+            # Business logic - selecting an offer
+            response_data = {
+                "outstandingDebtAmount": 0,
+                "requestId": "202111170001371256908",
+                "transactionId": "1231231321232",
+                "customerId": "1256907",
+                "accountId": "5948306019",
+                "offers": offers,
                 "resultCode": "00",
                 "resultDescription": "Successful"
                 }
@@ -94,16 +96,12 @@ class SelectOfferService:
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/token_validation.py

@@ -1,4 +1,4 @@
-from flask import request
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
@@ -43,16 +43,12 @@ class TokenValidationService:
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/services/transaction_verify.py

@@ -1,4 +1,4 @@
-from flask import request
+from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.helpers.response_helper import ResponseHelper
@@ -46,16 +46,12 @@ class TransactionVerifyService:
 
         except ValidationError as err:
             logger.error(f"Validation Error: {err.messages}")
-            return ResponseHelper.error(
-                message="Invalid input data",
-                status_code=400,
-                error=err.messages
-            )
+            return jsonify({
+                "message": "Validation exception"
+                }) , 422
 
         except Exception as e:
             logger.error(f"An error occurred: {str(e)}", exc_info=True)
-            return ResponseHelper.error(
-                message="An internal error occurred",
-                status_code=500,
-                error=str(e)
-            )
+            return jsonify({
+                "message": "Internal Server Error"
+                }) , 500

app/utils/logger.py

@@ -5,7 +5,7 @@ logging.basicConfig(
     level=logging.INFO,
     format="%(asctime)s - %(levelname)s - %(message)s",
     handlers=[
-        logging.StreamHandler(),  # Log to console
+        # logging.StreamHandler(),  
         logging.FileHandler("app.log", mode='a')  # Log to file
     ]
 )