From df4500b6437b52d012b9a435e8328fc9c818b4fc Mon Sep 17 00:00:00 2001 From: "b.boterman@htm.nl" Date: Wed, 12 Mar 2025 11:41:29 +0100 Subject: [PATCH 1/4] OVPAY-1637 - Add "ovPayTokenId" to GET response bodies. --- src/openapi/contracts/contracts-se.yaml | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/openapi/contracts/contracts-se.yaml b/src/openapi/contracts/contracts-se.yaml index 79454b4..8761d12 100644 --- a/src/openapi/contracts/contracts-se.yaml +++ b/src/openapi/contracts/contracts-se.yaml @@ -44,6 +44,7 @@ paths: "billingDay": 15, "highestInvoiceTerm": 1, "created": "2024-08-01 15:01:00.000", + "ovPayTokenId": 1337, }, { "contractId": "f07253e6-c364-474c-a342-a10a4a7cf305", @@ -59,6 +60,7 @@ paths: "billingDay": 15, "highestInvoiceTerm": 1, "created": "2024-08-01 15:01:00.000", + "ovPayTokenId": 1338, }, ] /customers/contracts/{contractId}: @@ -126,6 +128,7 @@ paths: "termDuration": "P0Y1M0D", "billingDay": 15, "highestInvoiceTerm": 1, + "ovPayTokenId": 1337, "contractVersions": [ { @@ -266,11 +269,11 @@ paths: $ref: "#/components/schemas/unavailable" example: { - "cancellationMoment": "termBound", + "cancellationMoment": "termBound", "termDuration": "P1M", "billingDay": 18, "cancellationFrom": "2024-08-10T00:00:00", - "cancellationUntil": "2026-08-10T00:00:00" + "cancellationUntil": "2026-08-10T00:00:00", } /contracts/{contractId}/cancellationvalidation: parameters: @@ -300,10 +303,7 @@ paths: application/json: schema: $ref: "#/components/schemas/unavailable" - example: - { - "end": "2024-08-10T00:00:00" - } + example: { "end": "2024-08-10T00:00:00" } responses: "200": description: OK @@ -317,7 +317,7 @@ paths: "validationMessage": "", "end": "2024-08-10T03:59:59", "refundAmount": "2489", - "refundMethods": [ "creditInvoice", "iDeal" ] + "refundMethods": ["creditInvoice", "iDeal"], } /contracts/{contractId}/cancellation: parameters: @@ -343,15 +343,12 @@ paths: - SE Contract Cancellation v2 requestBody: required: true - content: + content: application/json: schema: $ref: "#/components/schemas/unavailable" example: - { - "end": "2024-08-10T00:00:00", - "refundMethod": "creditInvoice" - } + { "end": "2024-08-10T00:00:00", "refundMethod": "creditInvoice" } responses: "200": description: OK @@ -363,7 +360,7 @@ paths: { "end": "2024-08-10T03:59:59", "refundAmount": "2489", - "refundMethod": "creditInvoice" + "refundMethod": "creditInvoice", } components: securitySchemes: From bd67e51713bd4ff214b4f71b96bd32a0652b74de Mon Sep 17 00:00:00 2001 From: "b.boterman@htm.nl" Date: Wed, 12 Mar 2025 16:29:46 +0100 Subject: [PATCH 2/4] OVPAY-1637 - Moved "ovPayTokenId" to HATEOAS links. --- src/openapi/contracts/contracts-se.yaml | 29 +++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/src/openapi/contracts/contracts-se.yaml b/src/openapi/contracts/contracts-se.yaml index 8761d12..1e6b668 100644 --- a/src/openapi/contracts/contracts-se.yaml +++ b/src/openapi/contracts/contracts-se.yaml @@ -4,7 +4,7 @@ info: version: "1.0" description: Service Engine APIs for ABT Contracts v2. These are NOT the CRUD APIs to the data hub. servers: - - url: https://api.integratielaag.nl/v1 + - url: https://api.integratielaag.nl/abt/touchpoint/1.0 paths: /customers/contracts: parameters: @@ -44,7 +44,14 @@ paths: "billingDay": 15, "highestInvoiceTerm": 1, "created": "2024-08-01 15:01:00.000", - "ovPayTokenId": 1337, + "_links": + { + "get_token": + { + "href": "https://api.integratielaag.nl/abt/touchpoint/1.0/customers/tokens/1337", + "method": "GET", + }, + }, }, { "contractId": "f07253e6-c364-474c-a342-a10a4a7cf305", @@ -60,7 +67,14 @@ paths: "billingDay": 15, "highestInvoiceTerm": 1, "created": "2024-08-01 15:01:00.000", - "ovPayTokenId": 1338, + "_links": + { + "get_token": + { + "href": "https://api.integratielaag.nl/abt/touchpoint/1.0/customers/tokens/1338", + "method": "GET", + }, + }, }, ] /customers/contracts/{contractId}: @@ -128,7 +142,6 @@ paths: "termDuration": "P0Y1M0D", "billingDay": 15, "highestInvoiceTerm": 1, - "ovPayTokenId": 1337, "contractVersions": [ { @@ -183,6 +196,14 @@ paths: "isCredit": false, }, ], + "_links": + { + "get_token": + { + "href": "https://api.integratielaag.nl/abt/touchpoint/1.0/customers/tokens/1337", + "method": "GET", + }, + }, } /customers/contracts/{contractId}/invoices: parameters: From d9bfbe4c3dc0f7a66aca8d1668e8b1b5a3e16a42 Mon Sep 17 00:00:00 2001 From: "b.boterman@htm.nl" Date: Wed, 12 Mar 2025 16:39:51 +0100 Subject: [PATCH 3/4] OVPAY-1637 - "ovPayTokenId" is a query param, not a path param. --- src/openapi/contracts/contracts-se.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openapi/contracts/contracts-se.yaml b/src/openapi/contracts/contracts-se.yaml index 1e6b668..9eada74 100644 --- a/src/openapi/contracts/contracts-se.yaml +++ b/src/openapi/contracts/contracts-se.yaml @@ -48,7 +48,7 @@ paths: { "get_token": { - "href": "https://api.integratielaag.nl/abt/touchpoint/1.0/customers/tokens/1337", + "href": "https://api.integratielaag.nl/abt/touchpoint/1.0/tokens?ovPayTokenId=1337", "method": "GET", }, }, @@ -71,7 +71,7 @@ paths: { "get_token": { - "href": "https://api.integratielaag.nl/abt/touchpoint/1.0/customers/tokens/1338", + "href": "https://api.integratielaag.nl/abt/touchpoint/1.0/tokens?ovPayTokenId=1338", "method": "GET", }, }, @@ -200,7 +200,7 @@ paths: { "get_token": { - "href": "https://api.integratielaag.nl/abt/touchpoint/1.0/customers/tokens/1337", + "href": "https://api.integratielaag.nl/abt/touchpoint/1.0/tokens?ovPayTokenId=1337", "method": "GET", }, }, From ffb320eaf0a86981fe82177e08670b7d868d3802 Mon Sep 17 00:00:00 2001 From: "b.boterman@htm.nl" Date: Fri, 21 Mar 2025 10:44:58 +0100 Subject: [PATCH 4/4] OVPAY-1637 - Added "ovPayTokenId" to response body (AGAIN!!). --- src/openapi/contracts/contracts-se.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/openapi/contracts/contracts-se.yaml b/src/openapi/contracts/contracts-se.yaml index 9eada74..b6d636d 100644 --- a/src/openapi/contracts/contracts-se.yaml +++ b/src/openapi/contracts/contracts-se.yaml @@ -44,6 +44,7 @@ paths: "billingDay": 15, "highestInvoiceTerm": 1, "created": "2024-08-01 15:01:00.000", + "ovPayTokenId": 1337, "_links": { "get_token": @@ -67,6 +68,7 @@ paths: "billingDay": 15, "highestInvoiceTerm": 1, "created": "2024-08-01 15:01:00.000", + "ovPayTokenId": 1338, "_links": { "get_token": @@ -142,6 +144,7 @@ paths: "termDuration": "P0Y1M0D", "billingDay": 15, "highestInvoiceTerm": 1, + "ovPayTokenId": 1337, "contractVersions": [ {