Merge pull request #147 from OpenBankingUK/feature/REFAPP-1368-pis-la…

…st-update [REFAPP-1368] PIS legacy test case and consent id match
OpenBankingUK · Sep 16, 2024 · d9b0364 · d9b0364
2 parents 0c8ef03 + bd4f28e
commit d9b0364
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 25 deletions.
diff --git a/manifests/data.json b/manifests/data.json
@@ -438,6 +438,27 @@
         "Risk": {}
       }
     },
+    "minimalInternationalPaymentConsentV4": {
+      "body": {
+        "Data": {
+          "Initiation": {
+            "InstructionIdentification": "$instructionIdentification",
+            "EndToEndIdentification": "$endToEndIdentification",
+            "CurrencyOfTransfer": "$currencyOfTransfer",
+            "InstructedAmount": {
+              "Amount": "$instructedAmountValue",
+              "Currency": "$instructedAmountCurrency"
+            },
+            "CreditorAccount": {
+              "SchemeName": "$internationalCreditorScheme",
+              "Identification": "$internationalCreditorIdentification",
+              "Name": "$internationalCreditorName"
+            }
+          }
+        },
+        "Risk": {}
+      }
+    },
     "minimalInternationalPayment": {
       "body": {
         "Data": {
@@ -460,6 +481,28 @@
         "Risk": {}
       }
     },
+    "minimalInternationalPaymentV4": {
+      "body": {
+        "Data": {
+          "ConsentId": "$OB-400-DOP-101600-ConsentId",
+          "Initiation": {
+            "InstructionIdentification": "$instructionIdentification",
+            "EndToEndIdentification": "$endToEndIdentification",
+            "CurrencyOfTransfer": "$currencyOfTransfer",
+            "InstructedAmount": {
+              "Amount": "$instructedAmountValue",
+              "Currency": "$instructedAmountCurrency"
+            },
+            "CreditorAccount": {
+              "SchemeName": "$internationalCreditorScheme",
+              "Identification": "$internationalCreditorIdentification",
+              "Name": "$internationalCreditorName"
+            }
+          }
+        },
+        "Risk": {}
+      }
+    },
     "minimalInternationalScheduledPaymentConsent": {
       "body": {
         "Data": {
@@ -483,6 +526,29 @@
         "Risk": {}
       }
     },
+    "minimalInternationalScheduledPaymentConsentV4": {
+      "body": {
+        "Data": {
+          "Permission": "Create",
+          "Initiation": {
+            "RequestedExecutionDateTime": "$requestedExecutionDateTime",
+            "InstructionIdentification": "$instructionIdentification",
+            "EndToEndIdentification": "$endToEndIdentification",
+            "CurrencyOfTransfer": "$currencyOfTransfer",
+            "InstructedAmount": {
+              "Amount": "$instructedAmountValue",
+              "Currency": "$instructedAmountCurrency"
+            },
+            "CreditorAccount": {
+              "SchemeName": "$internationalCreditorScheme",
+              "Identification": "$internationalCreditorIdentification",
+              "Name": "$internationalCreditorName"
+            }
+          }
+        },
+        "Risk": {}
+      }
+    },
     "minimalInternationalScheduledPayment": {
       "body": {
         "Data": {
@@ -506,6 +572,29 @@
         "Risk": {}
       }
     },
+    "minimalInternationalScheduledPaymentV4": {
+      "body": {
+        "Data": {
+          "ConsentId": "$OB-400-DOP-102000-ConsentId",
+          "Initiation": {
+            "RequestedExecutionDateTime": "$requestedExecutionDateTime",
+            "InstructionIdentification": "$instructionIdentification",
+            "EndToEndIdentification": "$endToEndIdentification",
+            "CurrencyOfTransfer": "$currencyOfTransfer",
+            "InstructedAmount": {
+              "Amount": "$instructedAmountValue",
+              "Currency": "$instructedAmountCurrency"
+            },
+            "CreditorAccount": {
+              "SchemeName": "$internationalCreditorScheme",
+              "Identification": "$internationalCreditorIdentification",
+              "Name": "$internationalCreditorName"
+            }
+          }
+        },
+        "Risk": {}
+      }
+    },
     "OBFundsConfirmationConsent1": {
       "body": {
         "Data": {

diff --git a/manifests/ob_4.0_payment_fca.json b/manifests/ob_4.0_payment_fca.json
@@ -567,27 +567,6 @@
         "schemaCheck": true,
         "validateSignature": true
       },
-      {
-        "description": "Fails when NumberOfPayments, FinalPaymentDateTime are specified at the time.",
-        "id": "OB-400-DOP-1015001",
-        "refURI": "https://openbankinguk.github.io/read-write-api-site3/v4.0/profiles/payment-initiation-api-profile.html",
-        "detail": "Checks if NumberOfPayments, FinalPaymentDateTime are specified at the time.",
-        "parameters": {
-          "tokenRequestScope": "payments",
-          "paymentID": "$OB-400-DOP-101401-DomesticStandingOrderID"
-        },
-        "uri": "/domestic-standing-orders/$paymentID",
-        "uriImplementation": "conditional",
-        "resource": "DomesticScheduledPayment",
-        "asserts_last_if_all": [
-          "OB3GLOAssertNumberOfPayments",
-          "OB3GLOAssertFinalPaymentDateTime",
-          "OB3GLOAssertOn403"
-        ],
-        "method": "get",
-        "schemaCheck": true,
-        "validateSignature": true
-      },
       {
         "description": "Fails when NumberOfPayments, FinalPaymentDateTime are not specified and FinalPaymentAmount is specified.",
         "id": "OB-400-DOP-1015002",
@@ -620,7 +599,7 @@
           "OB-400-DOP-101600-instructionIdentification": "$instructionIdentification",
           "instructionIdentification": "$fn:instructionIdentificationID()",
           "endToEndIdentification": "e2e-internat-pay",
-          "postData": "$minimalInternationalPaymentConsent",
+          "postData": "$minimalInternationalPaymentConsentV4",
           "requestConsent": "true"
         },
         "body": "$postData",
@@ -672,7 +651,7 @@
           "currencyOfTransfer": "$currencyOfTransfer",
           "instructionIdentification": "$OB-400-DOP-101600-instructionIdentification",
           "endToEndIdentification": "e2e-internat-pay",
-          "postData": "$minimalInternationalPayment",
+          "postData": "$minimalInternationalPaymentV4",
           "consentId": "$OB-400-DOP-101600-ConsentId"
         },
         "headers": {
@@ -725,7 +704,7 @@
           "OB-400-DOP-102000-instructionIdentification": "$instructionIdentification",
           "instructionIdentification": "$fn:instructionIdentificationID()",
           "endToEndIdentification": "e2e-internat-sched-pay",
-          "postData": "$minimalInternationalScheduledPaymentConsent",
+          "postData": "$minimalInternationalScheduledPaymentConsentV4",
           "requestConsent": "true"
         },
         "body": "$postData",
@@ -777,7 +756,7 @@
           "currencyOfTransfer": "$currencyOfTransfer",
           "instructionIdentification": "$OB-400-DOP-102000-instructionIdentification",
           "endToEndIdentification": "e2e-internat-sched-pay",
-          "postData": "$minimalInternationalScheduledPayment",
+          "postData": "$minimalInternationalScheduledPaymentV4",
           "consentId": "$OB-400-DOP-102000-ConsentId"
         },
         "headers": {