Merge pull request #16 from digin-energi/v1.0.2

Version 1.0.2 bugfixes
3lbits · Jan 26, 2022 · ca405c3 · ca405c3
2 parents f037d08 + 7c7b4d3
commit ca405c3
Show file tree

Hide file tree

Showing 9 changed files with 209 additions and 83 deletions.
diff --git a/DiginGridTariffAPI.v1_0.json b/DiginGridTariffAPI.v1_0.json
@@ -3,7 +3,7 @@
   "info": {
     "title": "Digin Grid Tariff API",
     "description": "Provides grid tariffs. For external and internal use. https://github.com/digin-energi/API-nettleie-for-styring",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "contact": {
       "name": "Digin Grid Tariff API",
       "url": "https://github.com/digin-energi/API-nettleie-for-styring"
@@ -147,7 +147,7 @@
           },
           {
             "name": "Range",
-            "description": "Range dictates which day to query, valid values is yesterday,today,tomorrow",
+            "description": "Range dictates which day to query, valid values is yesterday,today,tomorrow. Exclusive OR with startTime/endTime. Yesterday = hour 0 through hour 23 yesterday etc.",
             "in": "query",
             "schema": {
               "maxLength": 10,
@@ -160,7 +160,7 @@
           {
             "name": "StartTime",
             "in": "query",
-            "description": "StartTime/EndTime dictates which timeperiod to query.",
+            "description": "Start DateTime/End DateTime dictates which timeperiod to query. Exclusive OR with range. Example 2021-09-17T00:00:00+02:00",
             "schema": {
               "type": "string",
               "format": "date-time",
@@ -170,7 +170,7 @@
           {
             "name": "EndTime",
             "in": "query",
-            "description": "StartTime/EndTime dictates which timeperiod to query.",
+            "description": "Start DateTime/End DateTime dictates which timeperiod to query. Exclusive OR with range. Example 2021-09-18T00:00:00+02:00",
             "schema": {
               "type": "string",
               "format": "date-time",

diff --git a/README.md b/README.md
@@ -283,5 +283,18 @@ Input with startTime and endTime parameters: https://github.com/digin-energi/API
 <br/>
 
 ## 11. Endringslogg:
-22.12.2021 Versjon 1.0.1: DiginGridTariffAPI.v1_0: Lagt til input parameter Product(for internt bruk for nettselskap) som er Exclusive OR med TariffKey. TariffKey ikke lenger definert required.
+22.12.2021: Versjon 1.0.1:<br/>
+<ul>
+  <li> DiginGridTariffAPI.v1_0: Lagt til input parameter Product(for internt bruk for nettselskap) som er Exclusive OR med TariffKey. TariffKey ikke lenger definert required.</li><br/>
+</ul>
+26.01.2022: Versjon 1.0.2:<br/> 
+<ul>
+  <li>DiginGridTariffAPI.v1_0.json:</li>
+  Endret description for StartTime, EndTime og Range i tag TariffQuery.<br/>
+  <br/>
+  <li>gridtariffapi.v1_0.common.schema.json og alle eksempelfiler:</li>
+  Endret MeteringPointsAndPriceLevels til å inneholde currentFixedPriceLevel og meteringPoints, for å koble lastUpdated til meteringPoints og ikke currentFixedPriceLevel.<br/>
+  Endret CurrentFixedPriceLevel.levelId.description og MeteringPointDetails.lastUpdated.description.<br/>
+  Endret FixedPrices.pricelevel til FixedPrices.pricelevels og fra PowerPrices.pricelevel til PowerPrices.pricelevels.<br/>
+</ul>
 <br/>
diff --git a/doc/DiginGridTariffAPI.v1_0_meteringpointsgridtariffs_json_output_HSDN_example1.json b/doc/DiginGridTariffAPI.v1_0_meteringpointsgridtariffs_json_output_HSDN_example1.json
@@ -9,7 +9,7 @@
           "companyOrgNo": "900000003",
           "title": "Nettleie høyspent dn",
           "consumptionFlag": true,
-          "lastUpdated": "2021-11-05T00:00:00+01:00",
+          "lastUpdated": "2021-09-01T00:00:00+02:00",
           "usePublicHolidayPrices": false,
           "useWeekendPrices": false,
           "fixedPriceConfiguration": {
@@ -283,7 +283,7 @@
                 "id": "216783ff-5dda-4c38-b491-d6f0fcee9a9b",
                 "startDate": "2021-09-17",
                 "endDate": "2021-09-17",
-                "priceLevel": [
+                "priceLevels": [
                   {
                     "id": "edcf53ce-70d3-4fa0-8bfb-e79918335ab7",
                     "valueMin": null,
@@ -334,7 +334,7 @@
                 "id": "f122e3e7-3e0c-43ca-a3ce-051ec0339b98",
                 "startDate": "2021-09-17",
                 "endDate": "2021-09-17",
-                "priceLevel": [
+                "priceLevels": [
                   {
                     "id": "c87bfdc8-a73c-4c93-9a3b-b2558b4aa3c4",
                     "valueMin": null,
@@ -412,10 +412,26 @@
       },
       "meteringPointsAndPriceLevels": [
         {
-          "meteringPointIds": [
-            "707057500000000007",
-            "707057500000000008",
-            "707057500000000009"
+          "currentFixedPriceLevel": {
+            "id": "216783ff-5dda-4c38-b491-d6f0fcee9a9b",
+            "levelId": "edcf53ce-70d3-4fa0-8bfb-e79918335ab7"
+          },
+          "meteringPoints": [
+            {
+              "meteringPointId": "707057500000000012",
+              "levelValue": null,
+              "lastUpdated": null
+            },
+            {
+              "meteringPointId": "707057500000000013",
+              "levelValue": null,
+              "lastUpdated": null
+            },
+            {
+              "meteringPointId": "707057500000000014",
+              "levelValue": null,
+              "lastUpdated": null
+            }
           ]
         }
       ]

diff --git a/doc/DiginGridTariffAPI.v1_0_meteringpointsgridtariffs_json_output_LSDN_example1.json b/doc/DiginGridTariffAPI.v1_0_meteringpointsgridtariffs_json_output_LSDN_example1.json
@@ -9,7 +9,7 @@
           "companyOrgNo": "900000003",
           "title": "Nettleie lavspent dn",
           "consumptionFlag": true,
-          "lastUpdated": "2021-11-05T00:00:00+01:00",
+          "lastUpdated": "2021-09-01T00:00:00+02:00",
           "usePublicHolidayPrices": false,
           "useWeekendPrices": false,
           "fixedPriceConfiguration": {
@@ -283,7 +283,7 @@
                 "id": "216783ff-5dda-4c38-b491-d6f0fcee9a9b",
                 "startDate": "2021-09-17",
                 "endDate": "2021-09-17",
-                "priceLevel": [
+                "priceLevels": [
                   {
                     "id": "edcf53ce-70d3-4fa0-8bfb-e79918335ab7",
                     "valueMin": null,
@@ -334,7 +334,7 @@
                 "id": "f122e3e7-3e0c-43ca-a3ce-051ec0339b98",
                 "startDate": "2021-09-17",
                 "endDate": "2021-09-17",
-                "priceLevel": [
+                "priceLevels": [
                   {
                     "id": "c87bfdc8-a73c-4c93-9a3b-b2558b4aa3c4",
                     "valueMin": null,
@@ -412,10 +412,16 @@
       },
       "meteringPointsAndPriceLevels": [
         {
-          "meteringPointIds": [
-            "707057500000000007",
-            "707057500000000008",
-            "707057500000000009"
+          "currentFixedPriceLevel": {
+            "id": "216783ff-5dda-4c38-b491-d6f0fcee9a9b",
+            "levelId": "edcf53ce-70d3-4fa0-8bfb-e79918335ab7"
+          },
+          "meteringPoints": [
+            {
+              "meteringPointId": "707057500000000000",
+              "levelValue": null,
+              "lastUpdated": null
+            }
           ]
         }
       ]

diff --git a/doc/DiginGridTariffAPI.v1_0_meteringpointsgridtariffs_json_output_LSDN_example2.json b/doc/DiginGridTariffAPI.v1_0_meteringpointsgridtariffs_json_output_LSDN_example2.json
@@ -9,7 +9,7 @@
           "companyOrgNo": "900000003",
           "title": "Nettleie lavspent dn diff effektledd",
           "consumptionFlag": true,
-          "lastUpdated": "2021-11-05T00:00:00+01:00",
+          "lastUpdated": "2021-09-01T00:00:00+02:00",
           "usePublicHolidayPrices": false,
           "useWeekendPrices": false,
           "fixedPriceConfiguration": {
@@ -283,7 +283,7 @@
                 "id": "216783ff-5dda-4c38-b491-d6f0fcee9a9b",
                 "startDate": "2021-09-17",
                 "endDate": "2021-09-17",
-                "priceLevel": [
+                "priceLevels": [
                   {
                     "id": "edcf53ce-70d3-4fa0-8bfb-e79918335ab7",
                     "valueMin": null,
@@ -334,7 +334,7 @@
                 "id": "f122e3e7-3e0c-43ca-a3ce-051ec0339b98",
                 "startDate": "2021-09-17",
                 "endDate": "2021-09-17",
-                "priceLevel": [
+                "priceLevels": [
                   {
                     "id": "c87bfdc8-a73c-4c93-9a3b-b2558b4aa3c4",
                     "valueMin": 0,
@@ -466,10 +466,26 @@
       },
       "meteringPointsAndPriceLevels": [
         {
-          "meteringPointIds": [
-            "707057500000000010",
-            "707057500000000011",
-            "707057500000000012"
+          "currentFixedPriceLevel": {
+            "id": "216783ff-5dda-4c38-b491-d6f0fcee9a9b",
+            "levelId": "edcf53ce-70d3-4fa0-8bfb-e79918335ab7"
+          },
+          "meteringPoints": [
+            {
+              "meteringPointId": "707057500000000010",
+              "levelValue": null,
+              "lastUpdated": null
+            },
+            {
+              "meteringPointId": "707057500000000011",
+              "levelValue": null,
+              "lastUpdated": null
+            },
+            {
+              "meteringPointId": "707057500000000012",
+              "levelValue": null,
+              "lastUpdated": null
+            }
           ]
         }
       ]

diff --git a/doc/DiginGridTariffAPI.v1_0_meteringpointsgridtariffs_json_output_dailymax_example1.json b/doc/DiginGridTariffAPI.v1_0_meteringpointsgridtariffs_json_output_dailymax_example1.json
@@ -9,7 +9,7 @@
           "companyOrgNo": "900000001",
           "title": "Nettleie normal under 100MW",
           "consumptionFlag": true,
-          "lastUpdated": "2021-11-05T00:00:00+01:00",
+          "lastUpdated": "2021-09-01T00:00:00+02:00",
           "usePublicHolidayPrices": false,
           "useWeekendPrices": false,
           "fixedPriceConfiguration": {
@@ -227,7 +227,7 @@
                 "id": "216783ff-5dda-4c38-b491-d6f0fcee9a9b",
                 "startDate": "2021-09-17",
                 "endDate": "2021-09-17",
-                "priceLevel": [
+                "priceLevels": [
                   {
                     "id": "edcf53ce-70d3-4fa0-8bfb-e79918335ab7",
                     "valueMin": 0.0000,
@@ -517,24 +517,45 @@
         {
           "currentFixedPriceLevel": {
             "id": "216783ff-5dda-4c38-b491-d6f0fcee9a9b",
-            "levelId": "edcf53ce-70d3-4fa0-8bfb-e79918335ab7",
-            "levelValue": null,
-            "lastUpdated": "2021-11-05T01:00:00+01:00"
+            "levelId": null
           },
-          "meteringPointIds": [
-            "707057500000000004"
+          "meteringPoints": [
+            {
+              "meteringPointId": "707057500000000004",
+              "levelValue": null,
+              "lastUpdated": null
+            }
+          ]
+        },
+        {
+          "currentFixedPriceLevel": {
+            "id": "216783ff-5dda-4c38-b491-d6f0fcee9a9b",
+            "levelId": "edcf53ce-70d3-4fa0-8bfb-e79918335ab7"
+          },
+          "meteringPoints": [
+            {
+              "meteringPointId": "707057500000000005",
+              "levelValue": null,
+              "lastUpdated": "2021-09-17T01:00:00+02:00"
+            }
           ]
         },
         {
           "currentFixedPriceLevel": {
             "id": "216783ff-5dda-4c38-b491-d6f0fcee9a9b",
-            "levelId": "4e3de6a7-e1ed-4156-9b1e-04f924609b7d",
-            "levelValue": null,
-            "lastUpdated": "2021-11-05T01:00:00+01:00"
+            "levelId": "4e3de6a7-e1ed-4156-9b1e-04f924609b7d"
           },
-          "meteringPointIds": [
-            "707057500000000005",
-            "707057500000000006"
+          "meteringPoints": [
+            {
+              "meteringPointId": "707057500000000006",
+              "levelValue": null,
+              "lastUpdated": "2021-09-17T02:00:00+02:00"
+            },
+            {
+              "meteringPointId": "707057500000000007",
+              "levelValue": null,
+              "lastUpdated": "2021-09-17T03:00:00+02:00"
+            }
           ]
         }
       ]

diff --git a/doc/DiginGridTariffAPI.v1_0_meteringpointsgridtariffs_json_output_fusesize_example1.json b/doc/DiginGridTariffAPI.v1_0_meteringpointsgridtariffs_json_output_fusesize_example1.json
@@ -9,7 +9,7 @@
           "companyOrgNo": "900000002",
           "title": "Nettleie normal under 100MW",
           "consumptionFlag": true,
-          "lastUpdated": "2021-11-05T00:00:00+01:00",
+          "lastUpdated": "2021-09-01T00:00:00+02:00",
           "usePublicHolidayPrices": false,
           "useWeekendPrices": false,
           "fixedPriceConfiguration": {
@@ -227,7 +227,7 @@
                 "id": "216783ff-5dda-4c38-b491-d6f0fcee9a9b",
                 "startDate": "2021-09-17",
                 "endDate": "2021-09-17",
-                "priceLevel": [
+                "priceLevels": [
                   {
                     "id": "edcf53ce-70d3-4fa0-8bfb-e79918335ab7",
                     "valueMin": 10.0000,
@@ -602,24 +602,45 @@
         {
           "currentFixedPriceLevel": {
             "id": "216783ff-5dda-4c38-b491-d6f0fcee9a9b",
-            "levelId": "edcf53ce-70d3-4fa0-8bfb-e79918335ab7",
-            "levelValue": null,
-            "lastUpdated": "2021-11-05T01:00:00+01:00"
+            "levelId": null
           },
-          "meteringPointIds": [
-            "707057500000000007"
+          "meteringPoints": [
+            {
+              "meteringPointId": "707057500000000008",
+              "levelValue": null,
+              "lastUpdated": null
+            }
+          ]
+        },
+        {
+          "currentFixedPriceLevel": {
+            "id": "216783ff-5dda-4c38-b491-d6f0fcee9a9b",
+            "levelId": "edcf53ce-70d3-4fa0-8bfb-e79918335ab7"
+          },
+          "meteringPoints": [
+            {
+              "meteringPointId": "707057500000000009",
+              "levelValue": null,
+              "lastUpdated": "2021-09-17T01:00:00+02:00"
+            }
           ]
         },
         {
           "currentFixedPriceLevel": {
             "id": "216783ff-5dda-4c38-b491-d6f0fcee9a9b",
-            "levelId": "4e3de6a7-e1ed-4156-9b1e-04f924609b7d",
-            "levelValue": null,
-            "lastUpdated": "2021-11-05T01:00:00+01:00"
+            "levelId": "4e3de6a7-e1ed-4156-9b1e-04f924609b7d"
           },
-          "meteringPointIds": [
-            "707057500000000008",
-            "707057500000000009"
+          "meteringPoints": [
+            {
+              "meteringPointId": "707057500000000010",
+              "levelValue": null,
+              "lastUpdated": "2021-09-17T02:00:00+02:00"
+            },
+            {
+              "meteringPointId": "707057500000000011",
+              "levelValue": null,
+              "lastUpdated": "2021-09-17T03:00:00+02:00"
+            }
           ]
         }
       ]