From d8c516ce2b71eec3f19b6672f4e56fc21320e7b2 Mon Sep 17 00:00:00 2001
From: Benoit Orihuela <benoit.orihuela@egm.io>
Date: Thu, 8 Aug 2024 14:45:36 +0100
Subject: [PATCH] feat: add estimatedPrice for fluid consumptions (#22)

---
 jsonld-contexts/fluid.jsonld           |  7 ++++---
 ngsild-payloads/fluidMonitoring.jsonld | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/jsonld-contexts/fluid.jsonld b/jsonld-contexts/fluid.jsonld
index 7454092..fbe30ad 100644
--- a/jsonld-contexts/fluid.jsonld
+++ b/jsonld-contexts/fluid.jsonld
@@ -1,13 +1,14 @@
 {
     "@context": {
         "consumption": "https://vocab.egm.io/consumption",
+        "estimatedPrice": "https://vocab.egm.io/estimatedPrice",
         "FluidMonitoring": "https://vocab.egm.io/FluidMonitoring",
         "fluidType": "https://vocab.egm.io/fluidType",
-        "lastRetrievedStartDate": "https://vocab.egm.io/lastRetrievedStartDate",
         "isConnected ": "https://vocab.egm.io/isConnected",
+        "lastRetrievedStartDate": "https://vocab.egm.io/lastRetrievedStartDate",
+        "lastStartDate": "https://vocab.egm.io/lastStartDate",
         "meterReference": "https://vocab.egm.io/meterReference",
         "refDevice": "https://vocab.egm.io/refDevice",
-        "retrievalStatus": "https://vocab.egm.io/retrievalStatus",
-        "lastStartDate": "https://vocab.egm.io/lastStartDate"
+        "retrievalStatus": "https://vocab.egm.io/retrievalStatus"
     }
 }
\ No newline at end of file
diff --git a/ngsild-payloads/fluidMonitoring.jsonld b/ngsild-payloads/fluidMonitoring.jsonld
index caf2691..e8d0614 100644
--- a/ngsild-payloads/fluidMonitoring.jsonld
+++ b/ngsild-payloads/fluidMonitoring.jsonld
@@ -44,5 +44,28 @@
             "observedAt": "2023-12-14T00:00:00Z",
             "datasetId": "urn:ngsi-ld:Dataset:Total"
         }
+    ],
+    "estimatedPrice": [
+        {
+            "type": "Property",
+            "value": 0.696,
+            "unitCode": "EUR",
+            "observedAt": "2023-12-14T00:00:00Z",
+            "datasetId": "urn:ngsi-ld:Dataset:OffPeakHour"
+        },
+        {
+            "type": "Property",
+            "value": 1.044,
+            "unitCode": "EUR",
+            "observedAt": "2023-12-14T00:00:00Z",
+            "datasetId": "urn:ngsi-ld:Dataset:FullHour"
+        },
+        {
+            "type": "Property",
+            "value": 1.74,
+            "unitCode": "EUR",
+            "observedAt": "2023-12-14T00:00:00Z",
+            "datasetId": "urn:ngsi-ld:Dataset:Total"
+        }
     ]
 }
\ No newline at end of file