feat: add ability to get the current tank's compressor status and fil…

…l level (#31)
bigboxer23 · Jan 7, 2025 · 047a359 · 047a359
1 parent d720333
commit 047a359
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.bigboxer23</groupId>
   <artifactId>econetapi-java</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.5</version>
 
   <name>econet-java</name>
   <url>https://github.com/bigboxer23/econetapi-java</url>

diff --git a/src/main/java/com/bigboxer23/eco_net/EcoNetAPI.java b/src/main/java/com/bigboxer23/eco_net/EcoNetAPI.java
@@ -24,7 +24,7 @@ public class EcoNetAPI implements IEcoNetConstants {
 
 	private static MqttAsyncClient mqttClient;
 
-	private List<IEventSubscriber> subscribers = new ArrayList<>();
+	private final List<IEventSubscriber> subscribers = new ArrayList<>();
 	private final String userToken;
 	private final String accountId;
 
@@ -74,10 +74,10 @@ public Optional<UserData> fetchUserData() {
 				baseUrl + "/code/" + CLEAR_BLADE_SYSTEM_KEY + "/getUserDataForApp",
 				OkHttpRequestBodyUtils.createBodyFromString(new JsonMapBuilder()
 						.put("location_only", false)
-						.put("type", "com.econet.econetconsumerandroid")
-						.put("version", "6.0.0-375-01b4870e")
+						.put("type", TYPE)
+						.put("version", VERSION)
 						.toJson()),
-				getHeaders(Collections.singletonMap("ClearBlade-UserToken", userToken)))) {
+				getHeaders(Collections.singletonMap(CLEAR_BLADE_USER_TOKEN, userToken)))) {
 			Optional<UserData> body = OkHttpUtil.getBody(response, UserData.class);
 			if (body.isPresent() && !body.get().isSuccess()) {
 				logger.error("fetchUserData: ");
@@ -96,7 +96,7 @@ public Optional<EnergyResults> fetchEnergyUsage(
 				baseUrl + "/code/" + CLEAR_BLADE_SYSTEM_KEY + "/dynamicAction",
 				OkHttpRequestBodyUtils.createBodyFromJsonObject(
 						new FetchUsageCommand(deviceId, serialNumber, day, month, year), FetchUsageCommand.class),
-				getHeaders(Collections.singletonMap("ClearBlade-UserToken", userToken)))) {
+				getHeaders(Collections.singletonMap(CLEAR_BLADE_USER_TOKEN, userToken)))) {
 			Optional<EnergyResults> body = OkHttpUtil.getBody(response, EnergyResults.class);
 			if (body.isPresent() && !body.get().isSuccess()) {
 				logger.error("fetchEnergyUsage: " + body.get().getLogs());

diff --git a/src/main/java/com/bigboxer23/eco_net/IEcoNetConstants.java b/src/main/java/com/bigboxer23/eco_net/IEcoNetConstants.java
@@ -6,6 +6,9 @@ public interface IEcoNetConstants {
 	String baseUrl = "https://rheem.clearblade.com/api/v/1/";
 	String CLEAR_BLADE_SYSTEM_KEY = "e2e699cb0bb0bbb88fc8858cb5a401";
 	String CLEAR_BLADE_SYSTEM_SECRET = "E2E699CB0BE6C6FADDB1B0BC9A20";
+	String TYPE = "com.econet.econetconsumerandroid";
+	String VERSION = "6.0.0-375-01b4870e";
+	String CLEAR_BLADE_USER_TOKEN = "ClearBlade-UserToken";
 	int TIMEOUT = 60000;
 	int QOS = 2;
 }
diff --git a/src/main/java/com/bigboxer23/eco_net/data/Equipment.java b/src/main/java/com/bigboxer23/eco_net/data/Equipment.java
@@ -26,4 +26,14 @@ public class Equipment {
 
 	@Json(name = "@MODE")
 	private Modes modes;
+
+	@Json(name = "@RUNNING")
+	private String compressorStatus;
+
+	@Json(name = "@HOTWATER")
+	private String tankStatusUrl;
+
+	public float getTankStatus() {
+		return TankStatus.getTankStatus(tankStatusUrl);
+	}
 }
diff --git a/src/main/java/com/bigboxer23/eco_net/data/TankStatus.java b/src/main/java/com/bigboxer23/eco_net/data/TankStatus.java
@@ -0,0 +1,21 @@
+package com.bigboxer23.eco_net.data;
+
+import org.apache.commons.lang3.StringUtils;
+
+/** */
+public class TankStatus {
+	private static final String EMPTY = "ic_tank_zero_percent_v2.png.png";
+	private static final String ONE_THIRD = "ic_tank_ten_percent_v2.png";
+	private static final String TWO_THIRD = "ic_tank_fourty_percent_v2.png";
+	private static final String FULL = "ic_tank_hundread_percent_v2.png";
+
+	public static float getTankStatus(String tankStatusUrl) {
+		return switch (StringUtils.defaultIfEmpty(tankStatusUrl, "")) {
+			case EMPTY -> 0.0f;
+			case ONE_THIRD -> .33f;
+			case TWO_THIRD -> .66f;
+			case FULL -> 1f;
+			default -> -1f;
+		};
+	}
+}
diff --git a/src/test/java/com/bigboxer23/eco_net/EcoNetApiTest.java b/src/test/java/com/bigboxer23/eco_net/EcoNetApiTest.java
@@ -63,6 +63,21 @@ public void getUserData() {
 				.get(0)
 				.getSetpoint()
 				.getValue());
+		assertTrue(result.get()
+						.getResults()
+						.getLocations()
+						.get(0)
+						.getEquipments()
+						.get(0)
+						.getTankStatus()
+				>= 0);
+		assertNotNull(result.get()
+				.getResults()
+				.getLocations()
+				.get(0)
+				.getEquipments()
+				.get(0)
+				.getCompressorStatus());
 	}
 
 	@Test