One more fix for broken JalAsset (after cache change)

Author: titov-vv

jal/db/asset.py

@@ -129,6 +129,7 @@ def add_symbol(self, symbol: str, currency_id: int=None, note: str='', data_sour
             if existing['quote_source'] == MarketDataFeed.NA:
                 _ = self._exec("UPDATE asset_tickers SET quote_source=:data_source WHERE id=:id",
                                [(":data_source", data_source), (":id", existing['id'])])
+        self._data = self.db_cache.update_data(self._load_asset_data, (self._id,))  # Reload asset data from DB
 
     # Returns country object for the asset
     def country(self) -> JalCountry:
@@ -254,7 +255,7 @@ def set_tag(self, tag_id: int) -> None:
                        "VALUES(:asset_id, :datatype, :expiry)",
                        [(":asset_id", self._id), (":datatype", AssetData.Tag), (":expiry", str(tag_id))])
         self._tag = JalTag(tag_id)
-        self._fetch_data()
+        self._data = self.db_cache.update_data(self._load_asset_data, (self._id,))  # Reload asset data from DB
 
     # Updates relevant asset data fields with information provided in data dictionary
     def update_data(self, data: dict) -> None:
@@ -274,7 +275,7 @@ def update_data(self, data: dict) -> None:
                     updaters[key](data[key])
                 except KeyError:  # No updater for this key is present
                     continue
-        self._fetch_data()
+        self._data = self.db_cache.update_data(self._load_asset_data, (self._id,))  # Reload asset data from DB
 
     def _update_isin(self, new_isin: str) -> None:
         if self._isin:
@@ -409,7 +410,8 @@ def get_assets(cls) -> list:
         assets = []
         query = cls._exec("SELECT id FROM assets")
         while query.next():
-            assets.append(JalAsset(super(JalAsset, JalAsset)._read_record(query, cast=[int])))
+            asset_id = cls._read_record(query, cast=[int])
+            assets.append(JalAsset(asset_id))
         return assets
 
     # Method returns a list of JalAsset objects that describe currencies defined in ledger

jal/universal_cache.py

@@ -34,6 +34,21 @@ def get_data(
 
         return self._cache[key]
 
+    def update_data(
+            self,
+            func: Callable,
+            args: Tuple[Hashable, ...] = ()
+    ) -> Any:
+        """
+        Invalidates old cache entry and executes function to have new data cached.
+
+        :param func: Function to cache/execute
+        :param args: Function arguments (must be hashable)
+        :return: Function result from new execution
+        """
+        self.invalidate(func, args)
+        return self.get_data(func, args)
+
     def invalidate(self, func: Callable, args: Tuple[Hashable, ...] = ()) -> None:
         """Delete a specific cache entry"""
         key = self._create_key(func, args)