Update rac_check.py

app/api/routes/routes.py

@@ -1,5 +1,4 @@
 from flask import Flask, Blueprint, request, jsonify,  send_from_directory
-import sys
 import os
 from app.api.services import (
     RACCheckService,
@@ -17,7 +16,6 @@ from app.utils.logger import logger
 from app.api.middlewares import require_api_key, require_app_id, enforce_json 
 
 
-
 api = Blueprint("api", __name__)
 
 
@@ -164,34 +162,7 @@ def new_transaction_check():
     response = NewTransactionCheckService.process_request(data)
     return response
 
-
 # Health Check Endpoint
-@api.route('/system-health-check', methods=['GET'])
+@api.route('/health', methods=['GET'])
 def health_check():
-    """Basic system health check"""
-    try:
-        checks = {
-            "python_version": sys.version_info >= (3, 6), 
-            "disk_space": os.statvfs('/').f_bavail * os.statvfs('/').f_frsize > 500 * 1024 * 1024, 
-            "system_operational": True
-        }
-        
-        if all(checks.values()):
-            return jsonify({
-                "status": "Active",
-                "responseCode": "00",
-                "responseMessage": "Successful"
-            }), 200
-        else:
-            return jsonify({
-                "status": "Degraded",
-                "responseCode": "01",
-                "responseMessage": "System check failed"
-            }), 200
-            
-    except Exception as e:
-        return jsonify({
-            "status": "Error",
-            "responseCode": "99",
-            "responseMessage": f"Health check failed: {str(e)}"
-        }), 500
+    return {"status": "ok"} , 200

app/api/schemas/collect_loan.py

@@ -16,20 +16,15 @@ class CollectLoanSchema(Schema):
     comment = fields.Str(allow_none=True)          
 
 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)
-    fbnTransactionId = fields.Str(allow_none=True)
     debtId = fields.Str(allow_none=True)
     customerId = fields.Str(allow_none=True)
     accountId = fields.Str(allow_none=True)
     productId = fields.Str(allow_none=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)
     comment = fields.Str(allow_none=True)
-    responseCode = 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/schemas/disbursement.py

@@ -14,7 +14,6 @@ class DisbursementSchema(Schema):
     collectAmountVAT = fields.Float(required=True)
     countryId = fields.Str(required=False, allow_none=True)
     comment = fields.Str(required=False, allow_none=True)
-    
 
 
 class DisburseLoanResponseSchema(Schema):
@@ -32,12 +31,5 @@ class DisburseLoanResponseSchema(Schema):
     countryId = fields.Str(allow_none=True)
     responseCode = fields.Str(allow_none=True)
     responseMessage = fields.Str(allow_none=True)
-    disburseMessage = fields.Str(allow_none=True)
-    disburseDate = fields.Str(allow_none=True)
-    disburseVerify = fields.Str(allow_none=True)
-    disburseDescription = fields.Str(allow_none=True)
-    verifyResult = fields.Str(allow_none=True)
-    verifyDescription = fields.Str(allow_none=True)
-    
 
     

app/api/schemas/transaction_verify.py

@@ -18,8 +18,4 @@ class TransactionVerifyResponseSchema(Schema):
     providedAmount = fields.Float(required=True)
     collectedAmount = fields.Float(required=True)
     transactionId = fields.Str(allow_none=True)
-    transactionType = fields.Str(allow_none=True)
-    disburseVerify = fields.Str(allow_none=True)
-    verifyDescription = fields.Str(allow_none=True)
-    verifyResult = fields.Str(allow_none=True)
-    
+    transactionType = fields.Str(allow_none=True)

app/api/services/collect_loan.py

@@ -1,23 +1,21 @@
-import random
 from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.api.helpers.response_helper import ResponseHelper
-from app.api.schemas.collect_loan import CollectLoanSchema, CollectLoanResponseSchema
-from app.config import Config
+from app.api.schemas.collect_loan import CollectLoanSchema, CollectLoanResponseSchema   
 
-"""
-Process the CollectLoan request.
-
-Args:
-    data (dict): The request data.
-
-Returns:
-    tuple: JSON response and status code.
-"""
 class CollectLoanService:
     @staticmethod
     def process_request(data):
+        """
+        Process the CollectLoan request.
+
+        Args:
+            data (dict): The request data.
+
+        Returns:
+            tuple: JSON response and status code.
+        """
         try:
             logger.info("Processing CollectLoan request")
 
@@ -25,63 +23,21 @@ class CollectLoanService:
             schema = CollectLoanSchema()
             validated_data = schema.load(data)
 
-            amountForCollection =  validated_data.get("collectAmount")
-            productId = validated_data.get("productId")
-            customerId = validated_data.get("customerId")
-            amountCollected = amountForCollection
-            responseDescr= "Loan Collection Successful EMULATOR"
-            fullDescription= "Loan collection completed successfully EMULATOR"
-            responseMessage= "Loan collection completed successfully EMULATOR"
-            interestCollected = amountForCollection * 0.03 
-            lienAmount = validated_data.get("lienAmount", 0)
-
-            isValid = not (
-                int(customerId[-1]) in [2, 7, 9]
-            )
-            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"
-                fullDescription = "Partial Loan collection completed successfully EMULATOR"
-                responseMessage = "Partial Loan collection completed successfully EMULATOR"
-
-                response_data = {
-                    "transactionId": validated_data.get("transactionId"),
-                    "fbnTransactionId": validated_data.get("fbnTransactionId"),
-                    "debtId": validated_data.get("debtId"),
-                    "customerId": validated_data.get("customerId"),
-                    "accountId": validated_data.get("accountId"),
-                    "productId": validated_data.get("productId"),
-                    "amountCollected": amountCollected,
-                    "interestCollected": interestCollected,
-                    "penalChargeCollected": 0,
-                    "lienAmount": lienAmount if amountCollected == 0 else 0,
-                    "countryId": validated_data.get("countryId"),
-                    "comment": validated_data.get("comment", "Testing CollectionLoanRequest EMULATOR"),
-                    "responseCode": "00",
-                    "responseDescr": responseDescr,
-                    "fullDescription": fullDescription,
-                    "responseMessage": responseMessage
-                }
-
-            else:
-                response_data = {
-                    "transactionId": validated_data.get("transactionId"),
-                    "fbnTransactionId": validated_data.get("fbnTransactionId"),
-                    "debtId": validated_data.get("debtId"),
-                    "customerId": validated_data.get("customerId"),
-                    "accountId": validated_data.get("accountId"),
-                    "productId": validated_data.get("productId"),
-                    "amountCollected": amountCollected,
-                    "interestCollected": interestCollected,
-                    "penalChargeCollected": 0,
-                    "amountCollected": amountCollected,
-                    "countryId": validated_data.get("countryId"),
-                    "comment": validated_data.get("comment", "Testing CollectionLoanRequest EMULATOR"),
-                    "responseCode": "00",
-                    "responseDescr": responseDescr,
-                    "fullDescription": fullDescription,
-                    "responseMessage": responseMessage
-                }
+            # Simulated processing logic
+            response_data = {
+                "transactionId": validated_data.get("transactionId", "T002"),
+                "debtId": validated_data.get("debtId", "273194670"),
+                "customerId": validated_data.get("customerId", "CN621868"),
+                "accountId": validated_data.get("accountId", "2017821799"),
+                "productId": validated_data.get("productId", "101"),
+                "amountCollected": validated_data.get("collectAmount", 60000.00),
+                "countryId": validated_data.get("countryId", "01"),
+                "comment": validated_data.get("comment", "Testing CollectionLoanRequest"),
+                "responseCode": "00",
+                "responseDescr": "Loan Collection Successful",
+                "fullDescription": "Loan collection completed successfully",
+                "responseMessage": "Loan collection completed successfully"
+            }
 
             # Validate and serialize the response data
             response_schema = CollectLoanResponseSchema()

app/api/services/disbursement.py

@@ -2,7 +2,6 @@ from flask import request, jsonify
 from marshmallow import ValidationError
 from app.utils.logger import logger
 from app.api.schemas.disbursement import DisbursementSchema, DisburseLoanResponseSchema
-import datetime
 
 class DisbursementService:
     @staticmethod
@@ -27,7 +26,7 @@ class DisbursementService:
             # For demo purposes, we simulate a response using the validated data
             response_data = {
                 "transactionId": validated_data.get("transactionId"),
-                "fbnTransactionId": validated_data.get("fbnTransactionId"),  # Example or generated value
+                "FbnTransactionId": validated_data.get("FbnTransactionId"),  # Example or generated value
                 "debtId": validated_data.get("debtId"),
                 "customerId": validated_data.get("customerId"),
                 "accountId": validated_data.get("accountId"),
@@ -39,10 +38,7 @@ class DisbursementService:
                 "collectAmountVAT": validated_data.get("collectAmountVAT"),
                 "countryId": validated_data.get("countryId"),
                 "responseCode": "00",  # success code example
-                "responseMessage": "Loan Request Completed Successfully!",
-                "disburseDate": datetime.datetime.now().isoformat(),
-                "disburseResult": "00",
-                "disburseDescription": "Loan Request Completed Successfully!",
+                "responseMessage": "Loan Request Completed Successfully!"
             }
 
             # Serialize response

app/api/services/rac_check.py

@@ -25,64 +25,53 @@ class RACCheckService:
             schema = RACCheckSchema()
             validated_data = schema.load(data)
 
-            customer_id = validated_data["customerId"]
-            is_valid = True
-
-
-            try:
-                salary_count = int(str(customer_id)[-1]) + 1
-                if salary_count < 1 or salary_count > 6:
-                    salary_count = 3 
-            except ValueError:
-                salary_count = 3 
-
-            salary_payments = {}
-            total_salary = 0
-
-            for i in range(1, salary_count + 1):
-                salary = (((salary_count + i) * 7919) % 200000 + 10000) * 5
-                salary_payments[f"salarypaymenT_{i}"] = salary
-                total_salary += salary
-
-            average_salary = total_salary // salary_count if salary_count > 0 else 0
-
+            # Simulated RAC check logic — create racResponse manually or via logic
+            # rac_response = {
+            #     "hasSalaryAccount": True,
+            #     "bvnValidated": True,
+            #     "creditBureauCheck": False,
+            #     "crmsCheck": True,
+            #     "accountStatus": True,
+            #     "hasLien": False,
+            #     "noBouncedCheck": True,
+            #     "isWhitelisted": True,
+            #     "hasPastDueLoan": False
+            # }
 
             rac_response = {
                 "procesS_DATE": datetime.strptime("2025-06-05", "%Y-%m-%d").date(),
                 "ciF_ID": "416405737",
-                "customeR_id": customer_id,
+                "customeR_id": "7032744",
                 "salaccT_1": "4142904114",
                 "alerT_PHONE": "2348039301606",
-                "averagE_SALARY": average_salary,
+                "averagE_SALARY": 5000,
                 "loaN_OUSTANDING_BAL": 0,
                 "emi": 1000,
                 "eliG_AMT": 25000,
-                "rule1_45day_sal": is_valid,
-                "rule2_2m_sal": is_valid,
-                "rule3_no_bounced_check": is_valid,
-                "rule4_current_loan_payments": True if is_valid is False else is_valid,
-                "rule5_no_past_due_fadv_loan": is_valid,
-                "rule6_no_past_due_other_loan": is_valid,
-                "rule7_consistent_salary_amount": is_valid,
-                "rule8_whitelisted": True if is_valid is False else is_valid,
-                "rule9_regular_account": True if is_valid is False else is_valid,
-                "rule10_bvn_validation": is_valid,
-                "rule11_CRC_no_delinquency": is_valid,
-                "rule12_CRMS_no_delinquency": True if is_valid is False else is_valid,
-                "rule13_BVN_ignore": is_valid,
-                "rule14_no_lien": is_valid,
-                "rule15_null_ignore": True if is_valid is False else is_valid,
-                "overalL_ELIG": is_valid
-                # "salarypaymenT_1": 180000,
-                # "salarypaymenT_2": 50000,
-                # "salarypaymenT_3": 70000,
-                # "salarypaymenT_4": 0,
-                # "salarypaymenT_5": 0,
-                # "salarypaymenT_6": 0
+                "rule1_45day_sal": True,
+                "rule2_2m_sal": True,
+                "rule3_no_bounced_check": True,
+                "rule4_current_loan_payments": True,
+                "rule5_no_past_due_fadv_loan": True,
+                "rule6_no_past_due_other_loan": True,
+                "rule7_consistent_salary_amount": True,
+                "rule8_whitelisted": True,
+                "rule9_regular_account": True,
+                "rule10_bvn_validation": True,
+                "rule11_CRC_no_delinquency": True,
+                "rule12_CRMS_no_delinquency": True,
+                "rule13_BVN_ignore": True,
+                "rule14_no_lien": True,
+                "rule15_null_ignore": True,
+                "overalL_ELIG": True,
+                "salarypaymenT_1": 180000,
+                "salarypaymenT_2": 50000,
+                "salarypaymenT_3": 70000,
+                "salarypaymenT_4": 0,
+                "salarypaymenT_5": 0,
+                "salarypaymenT_6": 0
             }
 
-            rac_response.update(salary_payments)
-
 
             full_response = {
                 "transactionId": validated_data["transactionId"],

app/api/services/transaction_verify.py

@@ -6,7 +6,6 @@ from app.api.schemas.transaction_verify import (
     TransactionVerifySchema,
     TransactionVerifyResponseSchema
 )
-import datetime
 
 
 class TransactionVerifyService:
@@ -38,10 +37,7 @@ class TransactionVerifyService:
                 "providedAmount": 0.0,
                 "collectedAmount": 7.50,
                 "transactionId": validated_data.get("transactionId"),
-                "transactionType": validated_data.get("transactionType"),
-                "disburseVerify": datetime.datetime.now().isoformat(),
-                "verifyResult": "00",
-                "verifyDescription": "Collect Status retrieved successfully.",
+                "transactionType": validated_data.get("transactionType")
             }
 
             # Validate and serialize response with TransactionVerifyResponseSchema

app/config.py

@@ -1,5 +1,4 @@
 import os
-from re import M
 from dotenv import load_dotenv
 
 class Config:
@@ -11,8 +10,6 @@ class Config:
     DEBUG = True
     VALID_APP_ID = os.getenv("VALID_APP_ID", "app1")
     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_TRACK_MODIFICATIONS = False

app/swagger/digifi_swagger.json

@@ -110,9 +110,6 @@
     }
   ],
   "paths": {
-    "/api/system-health-check": {
-     "$ref": "swagger/paths/HealthCheck.json"
-    },
     "/api/rac-check": {
       "$ref": "swagger/paths/RACCheck.json"
     },

app/swagger/paths/HealthCheck.json

@@ -1,19 +0,0 @@
-{
-    "get": {
-        "tags": ["System"],
-        "summary": "System Health Check",
-        "description": "Returns the current health status of the system",
-        "responses": {
-          "200": {
-            "description": "Successful operation",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "../schemas/HealthCheckResponse.json"
-                }
-              }
-            }
-          }
-        }
-      }
-  }

app/swagger/schemas/DisbursementResponse.json

@@ -70,22 +70,6 @@
       "type": "string",
       "example": "Loan Request Completed Successfully!",
       "nullable": true
-    },
-    "disburseDate": {
-      "type": "string",
-      "format": "date-time",
-      "example": "2023-10-01T12:00:00Z",
-      "nullable": true
-    },
-    "disburseResult": {
-      "type": "string",
-      "example": "00",
-      "nullable": true
-    },
-    "disburseDescription": {
-      "type": "string",
-      "example": "Loan Request Completed Successfully!",
-      "nullable": true
     }
   },
   "required": [

app/swagger/schemas/HealthCheckRequest.json

@@ -1,17 +0,0 @@
-{
-  "type": "object",
-  "properties": {
-    "status": {
-      "type": "string",
-      "example": "Active"
-    },
-    "responseCode": {
-      "type": "string",
-      "example": "00"
-    },
-    "responseMessage": {
-      "type": "string",
-      "example": "Successful"
-    }
-  }
-}

app/swagger/schemas/HealthCheckResponse.json

@@ -1,17 +0,0 @@
-{
-  "type": "object",
-  "properties": {
-    "status": {
-      "type": "string",
-      "example": "Active"
-    },
-    "responseCode": {
-      "type": "string",
-      "example": "00"
-    },
-    "responseMessage": {
-      "type": "string",
-      "example": "Successful"
-    }
-  }
-}

app/swagger/schemas/TransactionVerifyResponse.json

@@ -38,20 +38,6 @@
     "transactionType": {
       "type": "string",
       "example": "Disbursement"
-    },
-    "disburseVerify":{
-      "type": "string",
-      "format": "date-time",
-      "example": "2023-10-01T12:00:00Z",
-      "nullable": true
-    },
-    "verifyResult": {
-      "type": "string",
-      "example": "Success"
-    },
-    "verifyDescription": {
-      "type": "string",
-      "example": "Disbursement was verified and collection completed."
     }
   },
   "required": [