From c712184e9f89e8c1cfb5959170ad1be982db1592 Mon Sep 17 00:00:00 2001 From: Mirjam Herald Date: Wed, 5 Mar 2025 14:23:01 +0100 Subject: [PATCH 1/6] created correct example in the product list for touchpoint 4 (infoplaza) --- src/openapi/products/SE-products-TP.yaml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/openapi/products/SE-products-TP.yaml b/src/openapi/products/SE-products-TP.yaml index 17305e4..75f8670 100644 --- a/src/openapi/products/SE-products-TP.yaml +++ b/src/openapi/products/SE-products-TP.yaml @@ -144,32 +144,37 @@ paths: } ] } - List containing one product which can only be sold by touchpointId 3 (called by touchpointId 4): + List containing one product which can only be sold by touchpointId 4 (called by touchpointId 4): summary: List containing one product which can only be sold by touchpointId 3 (called by touchpointId 4) description: Product is still returned (because touchpointId 3 is part of same retailer) but no price, as touchpointId 4 is not allowed to sell this product. value: { "Entries": [ { - "productId": 49, + "productId": 126, "productCode": null, - "productName": "HTM Regio Vrij", - "productDescription": "Voor een vast bedrag onbeperkt reizen met EBS, HTM en RET in het gekozen gebied in de regio Rotterdam Den Haag.", + "productName": "HTM-30001", + "productDescription": "Reis met 20% korting op je betaalpas bij HTM.", "productCategory": { - "productCategoryId": 3, + "productCategoryId": 1, "isTravelProduct": true, - "name": "Afgekocht reisrecht" + "name": "Kortingsabonnement" }, - "tokenTypes": null, + "tokenTypes": [ + { + "tokenTypeId": 1, + "name": "EMV" + } + ], "sellableTouchpointIds": [ 4 ], - "amountInclTax": null, + "amountInclTax": 300, "imageReference": "https://www.htm.nl/media/leif2leu/htm-logo-mobile.svg", "productPageUrl": "https://www.htm.nl/nog-onbekende-product-pagina", "_links": { "get_details": { - "href": "https://api.integratielaag.nl/abt/touchpoint/2.0/products/49", + "href": "https://api.integratielaag.nl/abt/touchpoint/2.0/products/126", "method": "GET" } } From 5864d43b0fd87d34bfe29e8992bef08cabf3b9b3 Mon Sep 17 00:00:00 2001 From: Mirjam Herald Date: Wed, 5 Mar 2025 14:31:39 +0100 Subject: [PATCH 2/6] added extra scenario --- src/openapi/products/SE-products-TP.yaml | 35 +++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/src/openapi/products/SE-products-TP.yaml b/src/openapi/products/SE-products-TP.yaml index 75f8670..90d3f76 100644 --- a/src/openapi/products/SE-products-TP.yaml +++ b/src/openapi/products/SE-products-TP.yaml @@ -144,9 +144,41 @@ paths: } ] } - List containing one product which can only be sold by touchpointId 4 (called by touchpointId 4): + List containing one product which can only be sold by touchpointId 3 (called by touchpointId 4): summary: List containing one product which can only be sold by touchpointId 3 (called by touchpointId 4) description: Product is still returned (because touchpointId 3 is part of same retailer) but no price, as touchpointId 4 is not allowed to sell this product. + value: + { + "Entries": [ + { + "productId": 49, + "productCode": null, + "productName": "HTM Regio Vrij", + "productDescription": "Voor een vast bedrag onbeperkt reizen met EBS, HTM en RET in het gekozen gebied in de regio Rotterdam Den Haag.", + "productCategory": { + "productCategoryId": 3, + "isTravelProduct": true, + "name": "Afgekocht reisrecht" + }, + "tokenTypes": null, + "sellableTouchpointIds": [ + 3 + ], + "amountInclTax": null, + "imageReference": "https://www.htm.nl/media/leif2leu/htm-logo-mobile.svg", + "productPageUrl": "https://www.htm.nl/nog-onbekende-product-pagina", + "_links": { + "get_details": { + "href": "https://api.integratielaag.nl/abt/touchpoint/2.0/products/49", + "method": "GET" + } + } + } + ] + } + List containing one product which can be sold by touchpointId 3 and 4 (called by touchpointId 4): + summary: List containing one product which can be sold by touchpointId 3 and 4 (called by touchpointId 4) + description: Product is returned value: { "Entries": [ @@ -167,6 +199,7 @@ paths: } ], "sellableTouchpointIds": [ + 3, 4 ], "amountInclTax": 300, From 43ace0543c92ba6807ff603c2dd92abce319f9cb Mon Sep 17 00:00:00 2001 From: Mirjam Herald Date: Wed, 5 Mar 2025 14:35:40 +0100 Subject: [PATCH 3/6] small fix for consistency --- src/openapi/products/SE-products-TP.yaml | 26 ++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/openapi/products/SE-products-TP.yaml b/src/openapi/products/SE-products-TP.yaml index 90d3f76..4605c22 100644 --- a/src/openapi/products/SE-products-TP.yaml +++ b/src/openapi/products/SE-products-TP.yaml @@ -556,6 +556,32 @@ paths: }, "forbiddenPaymentMethods": null, "sellingPrices": null + }, + { + "sellingPeriodId": 173, + "fromInclusive": "2025-01-19T23:00:00.000+00:00", + "toInclusive": "2028-11-17T23:00:00.000+00:00", + "salesTouchpoint": { + "salesTouchpointId": 3, + "name": "Website (Perplex)", + "isActive": true, + "retailer": { + "retailerId": 1001, + "name": "HTM externe touchpoints", + "street": "Koningin Julianaplein", + "number": 10, + "numberAddition": null, + "postalCode": "2595 AA", + "city": "Den Haag", + "country": "Nederland", + "emailAddress": "info@htm.nl", + "phoneNumber": "070 374 9002", + "taxId": 572309345923, + "imageReference": "https://www.htm.nl/media/leif2leu/htm-logo-mobile.svg" + } + }, + "forbiddenPaymentMethods": null, + "sellingPrices": null } ], "purchasePrices": null, From 0860a7926735bc080f336eb7a4819eed21df9424 Mon Sep 17 00:00:00 2001 From: Max Martens Date: Thu, 6 Mar 2025 09:58:30 +0100 Subject: [PATCH 4/6] Also persist changes in SE products yaml --- src/openapi/products/SE-products-SE.yaml | 66 +++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/src/openapi/products/SE-products-SE.yaml b/src/openapi/products/SE-products-SE.yaml index c8cd23d..5fcf625 100644 --- a/src/openapi/products/SE-products-SE.yaml +++ b/src/openapi/products/SE-products-SE.yaml @@ -162,7 +162,7 @@ paths: }, "tokenTypes": [], "sellableTouchpointIds": [ - 4 + 3 ], "amountInclTax": null, "imageReference": "https://www.htm.nl/media/leif2leu/htm-logo-mobile.svg", @@ -176,6 +176,44 @@ paths: } ] } + List containing one product which can be sold by touchpointId 3 and 4 (called by touchpointId 4): + summary: List containing one product which can be sold by touchpointId 3 and 4 (called by touchpointId 4) + description: Product is returned + value: + { + "Entries": [ + { + "productId": 126, + "productCode": null, + "productName": "HTM-30001", + "productDescription": "Reis met 20% korting op je betaalpas bij HTM.", + "productCategory": { + "productCategoryId": 1, + "isTravelProduct": true, + "name": "Kortingsabonnement" + }, + "tokenTypes": [ + { + "tokenTypeId": 1, + "name": "EMV" + } + ], + "sellableTouchpointIds": [ + 3, + 4 + ], + "amountInclTax": 300, + "imageReference": "https://www.htm.nl/media/leif2leu/htm-logo-mobile.svg", + "productPageUrl": "https://www.htm.nl/nog-onbekende-product-pagina", + "_links": { + "get_details": { + "href": "https://api.integratielaag.nl/abt/abtserviceengine/2.0/products/126", + "method": "GET" + } + } + } + ] + } List containing multiple products (called by touchpointId 3): summary: List containing multiple products (called by touchpointId 3) description: Only products that have active SellingPeriods for touchpoint 3 and/or 4 (part of same retailer) are returned @@ -518,6 +556,32 @@ paths: }, "forbiddenPaymentMethods": null, "sellingPrices": null + }, + { + "sellingPeriodId": 173, + "fromInclusive": "2025-01-19T23:00:00.000+00:00", + "toInclusive": "2028-11-17T23:00:00.000+00:00", + "salesTouchpoint": { + "salesTouchpointId": 3, + "name": "Website (Perplex)", + "isActive": true, + "retailer": { + "retailerId": 1001, + "name": "HTM externe touchpoints", + "street": "Koningin Julianaplein", + "number": 10, + "numberAddition": null, + "postalCode": "2595 AA", + "city": "Den Haag", + "country": "Nederland", + "emailAddress": "info@htm.nl", + "phoneNumber": "070 374 9002", + "taxId": 572309345923, + "imageReference": "https://www.htm.nl/media/leif2leu/htm-logo-mobile.svg" + } + }, + "forbiddenPaymentMethods": null, + "sellingPrices": null } ], "purchasePrices": null, From dcfdbeec348ba9ae5c0921ea6eb89e88d5838843 Mon Sep 17 00:00:00 2001 From: Max Martens Date: Thu, 6 Mar 2025 15:29:20 +0100 Subject: [PATCH 5/6] Remove TP3 sellingPeriod that is not allowed to be seen by TP4 from examples --- src/openapi/products/SE-products-SE.yaml | 26 ------------------------ src/openapi/products/SE-products-TP.yaml | 26 ------------------------ 2 files changed, 52 deletions(-) diff --git a/src/openapi/products/SE-products-SE.yaml b/src/openapi/products/SE-products-SE.yaml index 5fcf625..ec853ef 100644 --- a/src/openapi/products/SE-products-SE.yaml +++ b/src/openapi/products/SE-products-SE.yaml @@ -556,32 +556,6 @@ paths: }, "forbiddenPaymentMethods": null, "sellingPrices": null - }, - { - "sellingPeriodId": 173, - "fromInclusive": "2025-01-19T23:00:00.000+00:00", - "toInclusive": "2028-11-17T23:00:00.000+00:00", - "salesTouchpoint": { - "salesTouchpointId": 3, - "name": "Website (Perplex)", - "isActive": true, - "retailer": { - "retailerId": 1001, - "name": "HTM externe touchpoints", - "street": "Koningin Julianaplein", - "number": 10, - "numberAddition": null, - "postalCode": "2595 AA", - "city": "Den Haag", - "country": "Nederland", - "emailAddress": "info@htm.nl", - "phoneNumber": "070 374 9002", - "taxId": 572309345923, - "imageReference": "https://www.htm.nl/media/leif2leu/htm-logo-mobile.svg" - } - }, - "forbiddenPaymentMethods": null, - "sellingPrices": null } ], "purchasePrices": null, diff --git a/src/openapi/products/SE-products-TP.yaml b/src/openapi/products/SE-products-TP.yaml index 91e2931..d4005a1 100644 --- a/src/openapi/products/SE-products-TP.yaml +++ b/src/openapi/products/SE-products-TP.yaml @@ -556,32 +556,6 @@ paths: }, "forbiddenPaymentMethods": null, "sellingPrices": null - }, - { - "sellingPeriodId": 173, - "fromInclusive": "2025-01-19T23:00:00.000+00:00", - "toInclusive": "2028-11-17T23:00:00.000+00:00", - "salesTouchpoint": { - "salesTouchpointId": 3, - "name": "Website (Perplex)", - "isActive": true, - "retailer": { - "retailerId": 1001, - "name": "HTM externe touchpoints", - "street": "Koningin Julianaplein", - "number": 10, - "numberAddition": null, - "postalCode": "2595 AA", - "city": "Den Haag", - "country": "Nederland", - "emailAddress": "info@htm.nl", - "phoneNumber": "070 374 9002", - "taxId": 572309345923, - "imageReference": "https://www.htm.nl/media/leif2leu/htm-logo-mobile.svg" - } - }, - "forbiddenPaymentMethods": null, - "sellingPrices": null } ], "purchasePrices": null, From dc0435bb50ea6bc3299711a2b366ab8f59f5e628 Mon Sep 17 00:00:00 2001 From: Max Martens Date: Tue, 11 Mar 2025 13:10:35 +0100 Subject: [PATCH 6/6] Change sellableTouchpointIds to lowercase P --- src/openapi/products/SE-products-SE.yaml | 12 ++++++------ src/openapi/products/SE-products-TP.yaml | 12 ++++++------ src/openapi/products/products-crud-v2.2.yaml | 20 ++++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/openapi/products/SE-products-SE.yaml b/src/openapi/products/SE-products-SE.yaml index ec853ef..55f1f3f 100644 --- a/src/openapi/products/SE-products-SE.yaml +++ b/src/openapi/products/SE-products-SE.yaml @@ -65,7 +65,7 @@ paths: "productDescription": null, "productCategory": null, "tokenTypes": [], - "sellableTouchPointIds": [], + "sellableTouchpointIds": [], "amountInclTax": null, "imageReference": null, "productPageUrl": null, @@ -95,7 +95,7 @@ paths: "name": "Barcode" }, "tokenTypes": [], - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 1, 2 ], @@ -128,7 +128,7 @@ paths: "name": "Barcode" }, "tokenTypes": [], - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 3, 4 ], @@ -231,7 +231,7 @@ paths: "name": "Barcode" }, "tokenTypes": [], - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 3, 4 ], @@ -261,7 +261,7 @@ paths: "name": "EMV" } ], - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 3, 4 ], @@ -2133,7 +2133,7 @@ components: name: type: string example: EMV - sellableTouchPointIds: + sellableTouchpointIds: type: array items: type: integer diff --git a/src/openapi/products/SE-products-TP.yaml b/src/openapi/products/SE-products-TP.yaml index d4005a1..fe42ee4 100644 --- a/src/openapi/products/SE-products-TP.yaml +++ b/src/openapi/products/SE-products-TP.yaml @@ -65,7 +65,7 @@ paths: "productDescription": null, "productCategory": null, "tokenTypes": [], - "sellableTouchPointIds": [], + "sellableTouchpointIds": [], "amountInclTax": null, "imageReference": null, "productPageUrl": null, @@ -95,7 +95,7 @@ paths: "name": "Barcode" }, "tokenTypes": [], - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 1, 2 ], @@ -128,7 +128,7 @@ paths: "name": "Barcode" }, "tokenTypes": [], - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 3, 4 ], @@ -231,7 +231,7 @@ paths: "name": "Barcode" }, "tokenTypes": [], - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 3, 4 ], @@ -261,7 +261,7 @@ paths: "name": "EMV" } ], - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 3, 4 ], @@ -2133,7 +2133,7 @@ components: name: type: string example: EMV - sellableTouchPointIds: + sellableTouchpointIds: type: array items: type: integer diff --git a/src/openapi/products/products-crud-v2.2.yaml b/src/openapi/products/products-crud-v2.2.yaml index bea0651..dfdd8f1 100644 --- a/src/openapi/products/products-crud-v2.2.yaml +++ b/src/openapi/products/products-crud-v2.2.yaml @@ -74,7 +74,7 @@ paths: "name": "EMV" } ], - "sellableTouchPointIds": null, + "sellableTouchpointIds": null, "amountInclTax": null, "imageReference": "https://www.htm.nl/media/leif2leu/htm-logo-mobile.svg", "productPageUrl": "https://www.htm.nl/nog-onbekende-product-pagina" @@ -98,7 +98,7 @@ paths: "name": "Barcode" }, "tokenTypes": null, - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 1, 2, 3, @@ -127,7 +127,7 @@ paths: "name": "Barcode" }, "tokenTypes": null, - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 3, 4 ], @@ -159,7 +159,7 @@ paths: "name": "EMV" } ], - "sellableTouchPointIds": null, + "sellableTouchpointIds": null, "amountInclTax": null, "imageReference": "https://www.htm.nl/media/leif2leu/htm-logo-mobile.svg", "productPageUrl": "https://www.htm.nl/nog-onbekende-product-pagina" @@ -175,7 +175,7 @@ paths: "name": "Barcode" }, "tokenTypes": null, - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 1, 2, 3, @@ -201,7 +201,7 @@ paths: "name": "EMV" } ], - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 1, 2 ], @@ -225,7 +225,7 @@ paths: "name": "EMV" } ], - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 3, 4 ], @@ -252,7 +252,7 @@ paths: "name": "Barcode" }, "tokenTypes": null, - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 3, 4 ], @@ -276,7 +276,7 @@ paths: "name": "EMV" } ], - "sellableTouchPointIds": [ + "sellableTouchpointIds": [ 3, 4 ], @@ -2126,7 +2126,7 @@ components: name: type: string example: EMV - sellableTouchPointIds: + sellableTouchpointIds: type: array items: type: integer