From 1fad78222b0b24775d1f013127d730528546cc4e Mon Sep 17 00:00:00 2001
From: Ranim Naimi <156652078+ranim-n@users.noreply.github.com>
Date: Mon, 7 Oct 2024 14:36:47 +0200
Subject: [PATCH] feat: FluidEstimate entity for estimated consumption (#26)

---
 jsonld-contexts/fluid.jsonld         |  6 ++
 ngsild-payloads/fluidEstimate.jsonld | 89 ++++++++++++++++++++++++++++
 ngsild-payloads/userProfile.jsonld   |  2 +-
 3 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 ngsild-payloads/fluidEstimate.jsonld

diff --git a/jsonld-contexts/fluid.jsonld b/jsonld-contexts/fluid.jsonld
index 4a2a738..96a0c85 100644
--- a/jsonld-contexts/fluid.jsonld
+++ b/jsonld-contexts/fluid.jsonld
@@ -3,6 +3,12 @@
         "consumption": "https://vocab.egm.io/consumption",
         "estimatedPrice": "https://vocab.egm.io/estimatedPrice",
         "FluidMonitoring": "https://vocab.egm.io/FluidMonitoring",
+        "FluidEstimate": "https://vocab.egm.io/FluidEstimate",
+        "heatingEstimate": "https://vocab.egm.io/heatingEstimate",
+        "hotWaterEstimate": "https://vocab.egm.io/hotWaterEstimate",
+        "cookingEstimate": "https://vocab.egm.io/cookingEstimate",
+        "specificElectricityEstimate": "https://vocab.egm.io/specificElectricityEstimate",
+        "coldWaterEstimate": "https://vocab.egm.io/coldWaterEstimate",
         "fluidType": "https://vocab.egm.io/fluidType",
         "isConnected ": "https://vocab.egm.io/isConnected",
         "lastRetrievedStartDate": "https://vocab.egm.io/lastRetrievedStartDate",
diff --git a/ngsild-payloads/fluidEstimate.jsonld b/ngsild-payloads/fluidEstimate.jsonld
new file mode 100644
index 0000000..00226ff
--- /dev/null
+++ b/ngsild-payloads/fluidEstimate.jsonld
@@ -0,0 +1,89 @@
+{
+	"id": "urn:ngsi-ld:FluidEstimate:8eed99ab-1fb3-4bdd-a4a8-5ac5736ab1e0",
+	"type": "FluidEstimate",
+	"heatingEstimate": {
+		"type": "JsonProperty",
+		"json": {
+			"01": 2530,
+			"02": 2149,
+			"03": 1520,
+			"04": 730,
+			"05": 320,
+			"06": 30,
+			"07": 6,
+			"08": 6,
+			"09": 83,
+			"10": 600,
+			"11": 1670,
+			"12": 2420
+		}
+	},
+	"hotWaterEstimate": {
+		"type": "JsonProperty",
+		"json": {
+			"01": 230,
+			"02": 249,
+			"03": 220,
+			"04": 230,
+			"05": 180,
+			"06": 130,
+			"07": 116,
+			"08": 120,
+			"09": 180,
+			"10": 219,
+			"11": 237,
+			"12": 240
+		}
+	},
+	"cookingEstimate": {
+		"type": "JsonProperty",
+		"json": {
+			"01": 53,
+			"02": 49,
+			"03": 50,
+			"04": 52,
+			"05": 53,
+			"06": 45,
+			"07": 50,
+			"08": 35,
+			"09": 55,
+			"10": 50,
+			"11": 55,
+			"12": 52
+		}
+	},
+	"specificElectricityEstimate": {
+		"type": "JsonProperty",
+		"json": {
+			"01": 55,
+			"02": 54,
+			"03": 57,
+			"04": 50,
+			"05": 52,
+			"06": 55,
+			"07": 53,
+			"08": 45,
+			"09": 55,
+			"10": 50,
+			"11": 55,
+			"12": 52
+		}
+	},
+	"coldWaterEstimate": {
+		"type": "JsonProperty",
+		"json": {
+			"01": 11.5,
+			"02": 11.6,
+			"03": 11.5,
+			"04": 11.6,
+			"05": 11.6,
+			"06": 11.5,
+			"07": 11.6,
+			"08": 9.8,
+			"09": 11.5,
+			"10": 11.5,
+			"11": 11.4,
+			"12": 11.5
+		}
+	}
+}
\ No newline at end of file
diff --git a/ngsild-payloads/userProfile.jsonld b/ngsild-payloads/userProfile.jsonld
index 413a3ec..8398666 100644
--- a/ngsild-payloads/userProfile.jsonld
+++ b/ngsild-payloads/userProfile.jsonld
@@ -3,7 +3,7 @@
     "type": "UserProfile",
     "userInfos": {
         "type": "JsonProperty",
-        "value": {
+        "json": {
             "givenName": "Obi",
             "familyName": "Wan",
             "email": "obi.wan@egm.io"