BaseUtils: improve cached services

TheCodeLabs_BaseUtils/TheCodeLabs_BaseUtils/CachedService.py

@@ -13,12 +13,12 @@ class CachedService(ABC):
     def get_data(self) -> Dict:
         if self.__is_data_obsolete():
             self._data = self._fetch_data()
+            self._lastFetchTimestamp = now = datetime.now().timestamp()
         return self._data
 
     def __is_data_obsolete(self) -> bool:
         now = datetime.now().timestamp()
         if (now - self._lastFetchTimestamp) > self._fetchThresholdInSeconds:
-            self._lastFetchTimestamp = now
             return True
 
         return False

TheCodeLabs_BaseUtils/TheCodeLabs_BaseUtils/MultiCacheKeyService.py

@@ -30,12 +30,12 @@ class MultiCacheKeyService(ABC):
             cacheEntry = self._cache[cacheKey]
             if self.__is_data_obsolete(cacheEntry):
                 cacheEntry.cachedData = self._fetch_data(cacheEntry.settings)
+                cacheEntry.lastFetchTimestamp = datetime.now().timestamp()
             return cacheEntry.cachedData
 
     def __is_data_obsolete(self, cacheEntry: CacheEntry) -> bool:
         now = datetime.now().timestamp()
         if (now - cacheEntry.lastFetchTimestamp) > cacheEntry.fetchIntervalInSeconds:
-            cacheEntry.lastFetchTimestamp = now
             return True
 
         return False