feat: add new sensors for DomesticHotWaterStorage (#404)

* add new sensors for DomesticHotWaterStorage * remove ignore properties * add test cases * Update test_Vitocal250A.py * update test case
openviess · Oct 29, 2024 · 4cec5d1 · 4cec5d1
1 parent bf7a655
commit 4cec5d1
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 12 deletions.
diff --git a/PyViCare/PyViCareHeatingDevice.py b/PyViCare/PyViCareHeatingDevice.py
@@ -66,16 +66,30 @@ def getOutsideTemperature(self):
     def getDomesticHotWaterConfiguredTemperature(self):
         return self.service.getProperty("heating.dhw.temperature.main")["properties"]["value"]["value"]
 
+    @handleNotSupported
+    def getDomesticHotWaterStorageTemperature(self):
+        return self.service.getProperty("heating.dhw.sensors.temperature.dhwCylinder")["properties"]["value"][
+            "value"]
+
     @handleNotSupported
     def getHotWaterStorageTemperatureTop(self):
         return self.service.getProperty("heating.dhw.sensors.temperature.dhwCylinder.top")["properties"]["value"][
             "value"]
 
+    @handleNotSupported
+    def getDomesticHotWaterStorageTemperatureMiddle(self):
+        return self.service.getProperty("heating.dhw.sensors.temperature.dhwCylinder.middle")["properties"]["value"][
+            "value"]
+
+    @handleNotSupported
+    def getDomesticHotWaterStorageTemperatureMidBottom(self):
+        return self.service.getProperty("heating.dhw.sensors.temperature.dhwCylinder.midBottom")["properties"]["value"][
+            "value"]
+
     @handleNotSupported
     def getHotWaterStorageTemperatureBottom(self):
-        return \
-            self.service.getProperty("heating.dhw.sensors.temperature.dhwCylinder.bottom")["properties"]["value"][
-                "value"]
+        return self.service.getProperty("heating.dhw.sensors.temperature.dhwCylinder.bottom")["properties"]["value"][
+            "value"]
 
     @handleNotSupported
     def getDomesticHotWaterConfiguredTemperature2(self):
@@ -113,11 +127,6 @@ def getDomesticHotWaterDesiredTemperature(self):
 
         return None
 
-    @handleNotSupported
-    def getDomesticHotWaterStorageTemperature(self):
-        return self.service.getProperty("heating.dhw.sensors.temperature.dhwCylinder")["properties"]["value"][
-            "value"]
-
     @handleNotSupported
     def getDomesticHotWaterOutletTemperature(self):
         return self.service.getProperty("heating.dhw.sensors.temperature.outlet")["properties"]["value"]["value"]

diff --git a/tests/test_TestForMissingProperties.py b/tests/test_TestForMissingProperties.py
@@ -126,10 +126,7 @@ def test_unverifiedProperties(self):
         # properties which are not in any test response data
 
         ignore = [
-            'heating.dhw.sensors.temperature.dhwCylinder.top',  # FIXME: remove once test data is updated
-            'heating.dhw.sensors.temperature.dhwCylinder.bottom',  # FIXME: remove once test data is updated
-            'heating.bufferCylinder.sensors.temperature.main',  # FIXME: remove once test data is updated
-            'heating.bufferCylinder.sensors.temperature.top',  # FIXME: remove once test data is updated
+            'heating.dhw.sensors.temperature.dhwCylinder.midBottom',  # FIXME: remove once test data is updated
         ]
 
         all_features = self.read_all_features()

diff --git a/tests/test_Vitocal250A.py b/tests/test_Vitocal250A.py
@@ -189,3 +189,7 @@ def test_setDomesticHotWaterHysteresisSwitchOff(self):
             self.service.setPropertyData[0]['action'], 'setHysteresisSwitchOffValue')
         self.assertEqual(self.service.setPropertyData[0]['data'], {
                          'hysteresis': 5})
+
+    def test_getDomesticHotWaterStorageTemperature(self):
+        self.assertEqual(
+            self.device.getDomesticHotWaterStorageTemperature(), 58.8)
diff --git a/tests/test_Vitocal333G.py b/tests/test_Vitocal333G.py
@@ -0,0 +1,18 @@
+import unittest
+
+from PyViCare.PyViCareHeatPump import HeatPump
+from tests.ViCareServiceMock import ViCareServiceMock
+
+
+class Vitocal300G(unittest.TestCase):
+    def setUp(self):
+        self.service = ViCareServiceMock('response/Vitocal333G.json')
+        self.device = HeatPump(self.service)
+
+    def test_getDomesticHotWaterStorageTemperature(self):
+        self.assertEqual(
+            self.device.getDomesticHotWaterStorageTemperature(), 47.5)
+
+    def test_getHotWaterStorageTemperatureTop(self):
+        self.assertEqual(
+            self.device.getHotWaterStorageTemperatureTop(), 47.5)