expanded disbursement endpoint

app/api/schemas/disbursement.py

@@ -32,7 +32,7 @@ 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)
+    disburseResult = fields.Str(allow_none=True)
     disburseDate = fields.Str(allow_none=True)
     disburseVerify = fields.Str(allow_none=True)
     disburseDescription = 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/disbursement.py

@@ -40,6 +40,9 @@ class DisbursementService:
                 "countryId": validated_data.get("countryId"),
                 "responseCode": "00",  # success code example
                 "responseMessage": "Loan Request Completed Successfully!",
+                "disburseVerify": datetime.datetime.now().isoformat(),
+                "verifyResult": "00",
+                "verifyDescription": "Collect Status retrieved successfully.",
                 "disburseDate": datetime.datetime.now().isoformat(),
                 "disburseResult": "00",
                 "disburseDescription": "Loan Request Completed Successfully!",

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/swagger/schemas/DisbursementResponse.json

@@ -86,6 +86,22 @@
       "type": "string",
       "example": "Loan Request Completed Successfully!",
       "nullable": true
+    },
+    "disburseVerify": {
+      "type": "string",
+      "format": "date-time",
+      "example": "2023-10-01T12:00:00Z",
+      "nullable": true
+    },
+    "verifyResult": {
+      "type": "string",
+      "example": "00",
+      "nullable": true
+    },
+    "verifyDescription": {
+      "type": "string",
+      "example": "Collect Status retrieved successfully.",
+      "nullable": true
     }
   },
   "required": [

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": [