From 698036d2eada06dafa6ccd7d5f32f9c3bb1cebea Mon Sep 17 00:00:00 2001 From: Michael Geers Date: Wed, 2 Apr 2025 12:18:36 +0200 Subject: [PATCH 1/2] Tariff Plugin: price > value --- docs/tariffs.mdx | 6 +++--- docs/tariffs/_dynamischer_strompreis.mdx | 6 +++--- i18n/en/docusaurus-plugin-content-docs/current/tariffs.mdx | 6 +++--- .../current/tariffs/_dynamic_electricity_price.mdx | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/tariffs.mdx b/docs/tariffs.mdx index b8fc70f6a..fa773289a 100644 --- a/docs/tariffs.mdx +++ b/docs/tariffs.mdx @@ -212,7 +212,7 @@ tariffs: forecast: source: http uri: https://api.allinpower.nl/troodon/api/p/spot_market/prices/?product_type=ELK - jq: '[.timestamps, .prices] | transpose | map({ "start": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | strftime("%Y-%m-%dT%H:%M:%SZ")), "end": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | mktime + 3600 | strftime("%Y-%m-%dT%H:%M:%SZ")), "price": .[1] }) | tostring' + jq: '[.timestamps, .prices] | transpose | map({ "start": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | strftime("%Y-%m-%dT%H:%M:%SZ")), "end": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | mktime + 3600 | strftime("%Y-%m-%dT%H:%M:%SZ")), "value": .[1] }) | tostring' ``` Das Plugin muss eine JSON-Struktur zurückgeben, welches eine Liste von Zeiträumen und Preisen enthält. @@ -221,8 +221,8 @@ Siehe nachfolgendes Beispiel: ```js [ - { "start": "2025-01-01T00:00:00Z", "end": "2025-01-01T01:00:00Z", "price": 25.0 }, - { "start": "2025-01-01T01:00:00Z", "end": "2025-01-01T02:00:00Z", "price": 30.0 }, + { "start": "2025-01-01T00:00:00Z", "end": "2025-01-01T01:00:00Z", "value": 25.0 }, + { "start": "2025-01-01T01:00:00Z", "end": "2025-01-01T02:00:00Z", "value": 30.0 }, ] ``` diff --git a/docs/tariffs/_dynamischer_strompreis.mdx b/docs/tariffs/_dynamischer_strompreis.mdx index 3eef613e3..db0c93ea6 100644 --- a/docs/tariffs/_dynamischer_strompreis.mdx +++ b/docs/tariffs/_dynamischer_strompreis.mdx @@ -24,7 +24,7 @@ tariffs: forecast: source: http uri: https://api.allinpower.nl/troodon/api/p/spot_market/prices/?product_type=ELK - jq: '[.timestamps, .prices] | transpose | map({ "start": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | strftime("%Y-%m-%dT%H:%M:%SZ")), "end": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | mktime + 3600 | strftime("%Y-%m-%dT%H:%M:%SZ")), "price": .[1] }) | tostring' + jq: '[.timestamps, .prices] | transpose | map({ "start": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | strftime("%Y-%m-%dT%H:%M:%SZ")), "end": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | mktime + 3600 | strftime("%Y-%m-%dT%H:%M:%SZ")), "value": .[1] }) | tostring' ``` Das Plugin muss eine JSON-Struktur zurückgeben, welches eine Liste von Zeiträumen und Preisen enthält. @@ -33,8 +33,8 @@ Siehe nachfolgendes Beispiel: ```js [ - { "start": "2025-01-01T00:00:00Z", "end": "2025-01-01T01:00:00Z", "price": 25.0 }, - { "start": "2025-01-01T01:00:00Z", "end": "2025-01-01T02:00:00Z", "price": 30.0 }, + { "start": "2025-01-01T00:00:00Z", "end": "2025-01-01T01:00:00Z", "value": 25.0 }, + { "start": "2025-01-01T01:00:00Z", "end": "2025-01-01T02:00:00Z", "value": 30.0 }, ] ``` diff --git a/i18n/en/docusaurus-plugin-content-docs/current/tariffs.mdx b/i18n/en/docusaurus-plugin-content-docs/current/tariffs.mdx index 573f250f2..76ea0e798 100644 --- a/i18n/en/docusaurus-plugin-content-docs/current/tariffs.mdx +++ b/i18n/en/docusaurus-plugin-content-docs/current/tariffs.mdx @@ -218,7 +218,7 @@ tariffs: forecast: source: http uri: https://api.allinpower.nl/troodon/api/p/spot_market/prices/?product_type=ELK - jq: '[.timestamps, .prices] | transpose | map({ "start": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | strftime("%Y-%m-%dT%H:%M:%SZ")), "end": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | mktime + 3600 | strftime("%Y-%m-%dT%H:%M:%SZ")), "price": .[1] }) | tostring' + jq: '[.timestamps, .prices] | transpose | map({ "start": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | strftime("%Y-%m-%dT%H:%M:%SZ")), "end": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | mktime + 3600 | strftime("%Y-%m-%dT%H:%M:%SZ")), "value": .[1] }) | tostring' ``` The plugin must return a JSON structure containing a list of time periods and prices. @@ -227,8 +227,8 @@ See the following example: ```js [ - { "start": "2025-01-01T00:00:00Z", "end": "2025-01-01T01:00:00Z", "price": 25.0 }, - { "start": "2025-01-01T01:00:00Z", "end": "2025-01-01T02:00:00Z", "price": 30.0 }, + { "start": "2025-01-01T00:00:00Z", "end": "2025-01-01T01:00:00Z", "value": 25.0 }, + { "start": "2025-01-01T01:00:00Z", "end": "2025-01-01T02:00:00Z", "value": 30.0 }, ] ``` diff --git a/i18n/en/docusaurus-plugin-content-docs/current/tariffs/_dynamic_electricity_price.mdx b/i18n/en/docusaurus-plugin-content-docs/current/tariffs/_dynamic_electricity_price.mdx index 48e5d77f9..0b5a45d20 100644 --- a/i18n/en/docusaurus-plugin-content-docs/current/tariffs/_dynamic_electricity_price.mdx +++ b/i18n/en/docusaurus-plugin-content-docs/current/tariffs/_dynamic_electricity_price.mdx @@ -24,7 +24,7 @@ tariffs: forecast: source: http uri: https://api.allinpower.nl/troodon/api/p/spot_market/prices/?product_type=ELK - jq: '[.timestamps, .prices] | transpose | map({ "start": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | strftime("%Y-%m-%dT%H:%M:%SZ")), "end": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | mktime + 3600 | strftime("%Y-%m-%dT%H:%M:%SZ")), "price": .[1] }) | tostring' + jq: '[.timestamps, .prices] | transpose | map({ "start": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | strftime("%Y-%m-%dT%H:%M:%SZ")), "end": (.[0] | strptime("%Y-%m-%dT%H:%M:%S.%f%z") | mktime + 3600 | strftime("%Y-%m-%dT%H:%M:%SZ")), "value": .[1] }) | tostring' ``` The plugin must return a JSON structure containing a list of time periods and prices. @@ -33,8 +33,8 @@ See the following example: ```js [ - { "start": "2025-01-01T00:00:00Z", "end": "2025-01-01T01:00:00Z", "price": 25.0 }, - { "start": "2025-01-01T01:00:00Z", "end": "2025-01-01T02:00:00Z", "price": 30.0 }, + { "start": "2025-01-01T00:00:00Z", "end": "2025-01-01T01:00:00Z", "value": 25.0 }, + { "start": "2025-01-01T01:00:00Z", "end": "2025-01-01T02:00:00Z", "value": 30.0 }, ] ``` From 95792904ea7b86250465666735ed5b73ad69a05a Mon Sep 17 00:00:00 2001 From: Michael Geers Date: Wed, 2 Apr 2025 12:58:02 +0200 Subject: [PATCH 2/2] rest docs --- static/rest-api.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/rest-api.yaml b/static/rest-api.yaml index f0c8ecdf0..477458e94 100644 --- a/static/rest-api.yaml +++ b/static/rest-api.yaml @@ -1123,7 +1123,7 @@ components: end: description: End of charging interval $ref: "#/components/schemas/Timestamp" - price: + value: description: Cost of charging interval type: number minimum: 0