Merge pull request #1732 from steve-community/1731-not-showing-intermediate-meter-values

1731 not showing intermediate meter values

Author: goekay

src/main/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelper.java

@@ -51,40 +51,49 @@ public static boolean isEnergyValue(TransactionDetails.MeterValues v) {
             return false;
         }
 
-        // from 1.6 docs: "To retain backward compatibility, the default values of all of the optional fields on a
-        // sampledValue element are such that a value without any additional fields will be interpreted, as a register
-        // reading of active import energy in Wh (Watt-hour) units."
-        if (Strings.isNullOrEmpty(v.getReadingContext())
-            && Strings.isNullOrEmpty(v.getFormat())
-            && Strings.isNullOrEmpty(v.getMeasurand())
-            && Strings.isNullOrEmpty(v.getLocation())
-            && Strings.isNullOrEmpty(v.getUnit())
-            && Strings.isNullOrEmpty(v.getPhase())) {
-            return true;
-        }
+        // edge case handling for format
+        {
+            ValueFormat format = Strings.isNullOrEmpty(v.getFormat())
+                ? ValueFormat.RAW
+                : ValueFormat.fromValue(v.getFormat());
 
-        // if the format is "SignedData", we cannot make any sense of this entry. we don't know how to decode it.
-        // https://github.com/steve-community/steve/issues/816
-        if (ValueFormat.SIGNED_DATA.value().equals(v.getFormat())) {
-            return false;
+            // if the format is "SignedData", we cannot make any sense of this entry. we don't know how to decode it.
+            // https://github.com/steve-community/steve/issues/816
+            if (ValueFormat.SIGNED_DATA == format) {
+                return false;
+            }
         }
 
-        if (!isWHOrKWH(v.getUnit())) {
-            return false;
+        // edge case handling for measurand
+        {
+            Measurand measurand = Strings.isNullOrEmpty(v.getMeasurand())
+                ? Measurand.ENERGY_ACTIVE_IMPORT_REGISTER
+                : Measurand.fromValue(v.getMeasurand());
+
+            if (Measurand.ENERGY_ACTIVE_IMPORT_REGISTER != measurand) {
+                return false;
+            }
         }
 
-        if (!Measurand.ENERGY_ACTIVE_IMPORT_REGISTER.value().equals(v.getMeasurand())) {
-            return false;
+        // edge case handling for unit
+        {
+            UnitOfMeasure unit = Strings.isNullOrEmpty(v.getUnit())
+                ? UnitOfMeasure.WH
+                : UnitOfMeasure.fromValue(v.getUnit());
+
+            if (!isWHOrKWH(unit)) {
+                return false;
+            }
         }
 
         // at this point, we have a value with
-        // - RAW or null format
+        // - RAW format
         // - Wh or kWh unit
         // - Energy.Active.Import.Register as the measurand
         return true;
     }
 
-    private static boolean isWHOrKWH(String str) {
-        return UnitOfMeasure.WH.value().equals(str) || UnitOfMeasure.K_WH.value().equals(str);
+    private static boolean isWHOrKWH(UnitOfMeasure unit) {
+        return UnitOfMeasure.WH == unit || UnitOfMeasure.K_WH == unit;
     }
 }

src/test/java/de/rwth/idsg/steve/utils/TransactionStopServiceHelperTest.java

@@ -152,4 +152,14 @@ public void testIsEnergy_nonNumericValue() {
 
         Assertions.assertFalse(TransactionStopServiceHelper.isEnergyValue(value));
     }
+
+    @Test
+    public void testIsEnergy_valueAndUnit() {
+        var value = TransactionDetails.MeterValues.builder()
+            .value("22")
+            .unit("Wh")
+            .build();
+
+        Assertions.assertTrue(TransactionStopServiceHelper.isEnergyValue(value));
+    }
 }