fix: cache the payload in fetch_all_features on the per-device service (#813)

Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com>

Author: lackas

PyViCare/PyViCareCachedServiceBase.py

@@ -34,6 +34,11 @@ def getProperty(self, accessor: ViCareDeviceAccessor, property_name: str) -> Any
         entities = self._extract_entities(data, accessor)
         return readFeature(entities, property_name)
 
+    def fetch_all_features(self, accessor: ViCareDeviceAccessor) -> Any:
+        # cached, so a caller refreshing with fetch_all_features() warms the
+        # cache the following getProperty calls read from
+        return self._get_or_update_cache(accessor)
+
     def setProperty(self, accessor: ViCareDeviceAccessor, property_name: str, action: str, data: Any) -> Any:
         response = super().setProperty(accessor, property_name, action, data)
         self.clear_cache()

PyViCare/PyViCareCachedServiceViaGateway.py

@@ -28,7 +28,3 @@ def _fetch_uncached(self, accessor: ViCareDeviceAccessor) -> Any:
 
     def _extract_entities(self, data: dict, accessor: ViCareDeviceAccessor) -> list[dict[str, Any]]:
         return filter_features_for_device(data["data"], accessor.device_id)
-
-    def fetch_all_features(self, accessor: ViCareDeviceAccessor) -> Any:
-        # cached too, so per-device coordinators share one bulk fetch
-        return self._get_or_update_cache(accessor)

tests/test_PyViCareCachedService.py

@@ -21,6 +21,17 @@ def setUp(self):
         self.service = ViCareCachedService(
             self.oauth_mock, [], self.CACHE_DURATION)
 
+    def test_fetch_all_features_is_cached(self):
+        """fetch_all_features() must warm the cache, like the gateway variant.
+
+        Callers that refresh with fetch_all_features() and then read properties
+        would otherwise pay for two requests per interval.
+        """
+        with now_is('2000-01-01 00:00:00'):
+            self.service.fetch_all_features(self.accessor)
+            self.service.getProperty(self.accessor, "someprop")
+        self.assertEqual(self.oauth_mock.get.call_count, 1)
+
     def test_getProperty_existing(self):
         self.service.getProperty(self.accessor, "someprop")
         self.oauth_mock.get.assert_called_once_with(