Pre-release PR v2

Middleware/.classpath

@@ -32,8 +32,8 @@
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
-			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 		</attributes>
 	</classpathentry>

Middleware/docs/examples/code/CalibrationExampleWithCITYdata.py

@@ -8,12 +8,12 @@
 # USER CONFIGURATION
 # ==========================
 # Configuration
-BASE_URL = "https://ngci.encs.concordia.ca/citydata"
-USERNAME = username  # Production username created by CITYdata team
-PASSWORD = password  # Production password created by CITYdata team
-# BASE_URL = "http://localhost:8080/citydata"
-# USERNAME = username  # Local username created with the script (cf. README)
-# PASSWORD = password  # Local password created with the script (cf. README)
+#BASE_URL = "https://ngci.encs.concordia.ca/citydata"
+#USERNAME = "workshop"  # Production username
+#PASSWORD = "workshop2026"  # Production password
+BASE_URL = "http://localhost:8080"
+USERNAME = "temp"  # Local username
+PASSWORD = "temp"  # Local password
 
 
 
@@ -33,7 +33,7 @@ def print_result(response):
     raw_data = response.get("result", "")
     raw_data = raw_data.strip("[]")
 
-    parts = raw_data.split(", ")
+    parts =raw_data.split(", ")
 
     print("\nResults:\n")
     for i in range(0, len(parts), 3):
@@ -55,37 +55,39 @@ def fetch_consumption(base_url, token):
         "Authorization": f"Bearer {token}"
     }
 
-    # json_input = {
-    #     "use": "ca.concordia.encs.citydata.producers.CalibrationProducer",
-    #     "withParams": [
-    #         { "name": "filePath", "value": "src/test/resources/OMHM_natural_gas.csv" }
-    #     ],
-    #     "apply": [
-    #         {
-    #             "name": "ca.concordia.encs.citydata.operations.CSVFilterOperation",
-    #             "withParams": [
-    #                 { "name": "addressFilter", "value": "H1W3J9" },
-    #                 { "name": "dateFilter",    "value": "2022-04-30" }
-    #             ]
-    #         }
-    #     ]
-    # }
-
     json_input = {
-        "use": "ca.concordia.encs.citydata.producers.CalibrationProducer",
-        "withParams": [
-            { "name": "filePath", "value": "src/test/resources/OMHM_electricity.csv" }
-        ],
-        "apply": [
-            {
-                "name": "ca.concordia.encs.citydata.operations.CSVFilterOperation",
-                "withParams": [
-                    { "name": "addressFilter", "value": "H1Z 0B3" },
-                    { "name": "dateFilter",    "value": "2022-02-28" }
-                ]
-            }
-        ]
-    }
+         "use": "ca.concordia.encs.citydata.producers.CalibrationProducer",
+         "withParams": [
+             { "name": "filePath", "value": "src/test/resources/OMHM_natural_gas.csv" }
+         ],
+         "apply": [
+             {
+                 "name": "ca.concordia.encs.citydata.operations.CSVFilterOperation",
+                 "withParams": [
+                     { "name": "addressFilter", "value": "8431 Allée Léo-Bricault Montréal H1Z 0B3;8441 Allée Léo-Bricault Montréal H1Z 0B3;8425 Avenue 25e Montréal H1Z 4A9" },
+		             { "name": "startDateFilter", "value": "2022-01-31" },
+		             { "name": "endDateFilter",   "value": "2022-12-31" }
+                 ]
+             }
+         ]
+     }
+
+   # json_input = {
+   #	  "use": "ca.concordia.encs.citydata.producers.CalibrationProducer",
+   #	  "withParams": [
+   # 		  { "name": "filePath", "value": "src/test/resources/OMHM_electricity.csv" }
+   #	   ],
+   #	  "apply": [
+   #		  {
+   #			"name": "ca.concordia.encs.citydata.operations.CSVFilterOperation",
+   #			"withParams": [
+   #  				{ "name": "addressFilter", "value": "8431 Allée Léo-Bricault Montréal H1Z 0B3;8441 Allée Léo-Bricault Montréal H1Z 0B3;8425 Avenue 25e Montréal H1Z 4A9" },
+   #   				{ "name": "startDateFilter", "value": "2022-01-31" },
+   #    			{ "name": "endDateFilter",   "value": "2022-12-31" }
+   #   				]
+   #  		  }
+   # 	   ]
+   # }
 
     response = requests.post(sync_url, headers=headers, data=json.dumps(json_input))
 

Middleware/docs/examples/code/PortfolioManagerWithCITYDataTest.py

@@ -9,7 +9,7 @@
 # USER CONFIGURATION
 # ==========================
 # Configuration
-B ASE_URL = "https://ngci.encs.concordia.ca/citydata"
+BASE_URL = "https://ngci.encs.concordia.ca/citydata"
 USERNAME = "workshop"  # Production username
 PASSWORD = "workshop2026"  # Production password
 #BASE_URL = "http://localhost:8080/citydata"

Middleware/docs/examples/queries/filterPortfolioManagerProducerConsumption.json

@@ -1,27 +1,16 @@
 {
-    "use": "ca.concordia.encs.citydata.producers.PortfolioManagerProducer",
+    "use": "ca.concordia.encs.citydata.core.implementations.PortfolioManagerProducer",
     "withParams": [
-        {
-            "name": "meterId",
-            "value": "299278275"
-        }
+        { "name": "meterId", "value": meter_id }
     ],
     "apply": [
-		{
-		    "use": "ca.concordia.encs.citydata.producers.PortfolioManagerProducer",
-		    "withParams": [
-		        { "name": "meterId", "value": "299278275" }
-		    ],
-		    "apply": [
-		        {
-		            "name": "ca.concordia.encs.citydata.operations.XmlToJsonFilterOperation",
-		            "withParams": [
-		                { "name": "filterKey", "value": "startDate" },
-		                { "name": "from", "value": "2024-11-01" },
-		                { "name": "to", "value": "2024-12-31" }
-		            ]
-		        }
-		    ]
-		}
+        {
+            "name": "ca.concordia.encs.citydata.operations.XmlToJsonFilterOperation",
+            "withParams": [
+                { "name": "filterKey", "value": "startDate" },
+                { "name": "from", "value": "2020-11-01" },
+                { "name": "to", "value": "2023-12-31" }
+            ]
+        }
     ]
 }

Middleware/src/main/java/ca/concordia/encs/citydata/core/implementations/AbstractProducer.java

@@ -38,8 +38,9 @@
  * @since 2025-05-27
  */
 
-public sealed abstract class AbstractProducer<E> extends AbstractEntity implements IProducer<E> permits JSONProducer,
-		CSVProducer, ExceptionProducer, FirebaseProducer, PortfolioManagerProducer, PortfolioManagerMetadataProducer {
+public sealed abstract class AbstractProducer<E> extends AbstractEntity implements IProducer<E>
+		permits JSONProducer, CSVProducer, ExceptionProducer, FirebaseProducer, PortfolioManagerProducer,
+		PortfolioManagerMetadataProducer, JsonArrayProducer {
 	private String filePath;
 	private RequestOptions fileOptions;
 	private IOperation<E> operation;

Middleware/src/main/java/ca/concordia/encs/citydata/core/implementations/JsonArrayProducer.java

@@ -0,0 +1,55 @@
+package ca.concordia.encs.citydata.core.implementations;
+
+import java.io.OutputStream;
+import java.util.ArrayList;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+import ca.concordia.encs.citydata.core.contracts.IProducer;
+import ca.concordia.encs.citydata.core.utils.RequestOptions;
+
+/**
+*This acts as a base producer for EnergyConsuimption Producer and any other producer that needs to return a JSON array.
+*
+* @author Sikandar Ejaz
+* @since 2026-05-13
+*/
+
+public non-sealed class JsonArrayProducer extends AbstractProducer<JsonArray> implements IProducer<JsonArray> {
+
+	public JsonArrayProducer(final String filePath) {
+		super(filePath);
+	}
+
+	public JsonArrayProducer(final String filePath, final RequestOptions fileOptions) {
+		super(filePath, fileOptions);
+	}
+
+	@Override
+	public void fetch() {
+		final ArrayList<JsonObject> jsonOutput = new ArrayList<>();
+
+		// Use ByteArrayOutputStream to fetch data
+
+		OutputStream outputStream = this.fetchFromPath();
+		String inputJson = outputStream.toString();
+
+		// Convert JSON string to object
+		final JsonElement inputJsonElement = JsonParser.parseString(inputJson);
+
+		JsonObject outputJsonObject = new JsonObject();
+		if (inputJsonElement.isJsonArray()) {
+			outputJsonObject.add("result", inputJsonElement);
+		} else {
+			outputJsonObject = inputJsonElement.getAsJsonObject();
+		}
+
+		jsonOutput.add(outputJsonObject);
+		this.setResult(jsonOutput);
+		this.applyOperation();
+	}
+
+}

Middleware/src/main/java/ca/concordia/encs/citydata/core/implementations/PortfolioManagerMetadataProducer.java

@@ -29,6 +29,14 @@ public non-sealed class PortfolioManagerMetadataProducer extends AbstractProduce
 	private IOperation<JsonObject> operation;
 	private IRunner runnerObserver;
 
+	public PortfolioManagerMetadataProducer() {
+	    super();
+	}
+
+	public PortfolioManagerMetadataProducer(String filePath, RequestOptions fileOptions) {
+	    super(filePath, fileOptions);
+	}
+
 	public void setAccountId(String accountId) {
 		this.accountId = accountId;
 	}

Middleware/src/main/java/ca/concordia/encs/citydata/core/implementations/PortfolioManagerProducer.java

@@ -24,11 +24,20 @@
 public non-sealed class PortfolioManagerProducer extends AbstractProducer<JsonObject> implements IProducer<JsonObject> {
 	private String meterId;
 	private final ArrayList<JsonObject> intermediateResult = new ArrayList<>();
-
-	public void setMeterId(String meterId) {
-		this.meterId = meterId;
-	}
-
+
+	public PortfolioManagerProducer() {
+        super();
+    }
+
+    public PortfolioManagerProducer(String filePath, RequestOptions fileOptions) {
+        super(filePath, fileOptions);
+    }
+
+    public void setMeterId(String meterId) {
+        System.out.println(">>> setMeterId called with: " + meterId);
+        this.meterId = meterId;
+    }
+
 	@SuppressWarnings("unchecked")
 	private ArrayList<JsonObject> getMeterMetadata(SingleStepRunner runner) {
 		final InMemoryDataStore store = InMemoryDataStore.getInstance();

Middleware/src/main/java/ca/concordia/encs/citydata/operations/JsonArrayAverageOperation.java

@@ -38,6 +38,7 @@ public ArrayList<JsonArray> apply(ArrayList<JsonArray> inputs) {
 
 		// compute the average
 		for (JsonArray list : inputs) {
+			floatAverage = 0.0f;
 			for (JsonElement element : list) {
 				floatAverage += element.getAsJsonObject().get(keyName).getAsFloat();
 			}

Middleware/src/main/java/ca/concordia/encs/citydata/producers/CalibrationProducer.java

@@ -6,6 +6,7 @@
 
 import ca.concordia.encs.citydata.core.exceptions.MiddlewareException;
 import ca.concordia.encs.citydata.core.implementations.CSVProducer;
+import ca.concordia.encs.citydata.core.utils.RequestOptions;
 
 /**
  * This Producer outputs metadata about a building, such as floors, zones and sensors.
@@ -19,6 +20,10 @@ public CalibrationProducer(String filePath) {
 		super(filePath);
 	}
 
+	public CalibrationProducer(String filePath, RequestOptions fileOptions) {
+		super(filePath, fileOptions);
+	}
+
 	@Override
 	public void fetch() {
 		System.out.println("Fetching file from path: " + this.getFilePath());