[Fixes #13800] Refact metadata i18n mechanism - gemini fixes

Author: etj

geonode/base/i18n.py

@@ -87,7 +87,7 @@ def get_entry(self, lang, data_key):
         date is needed for checking the entry freshness when setting info
         data may be None if not cached or expired
         """
-        cached_entry = self.lang_cache.get(lang, None)
+        cached_entry: I18nCacheEntry = self.lang_cache.get(lang, None)
 
         # TODO: thesaurus date check should be done only after a given time interval from last check
         thesaurus_date = (  # may be none if thesaurus does not exist
@@ -96,7 +96,7 @@ def get_entry(self, lang, data_key):
         if cached_entry:
             if thesaurus_date == cached_entry.date:
                 # only return cached data if thesaurus has not been modified
-                return thesaurus_date, cached_entry.get(data_key, None)
+                return thesaurus_date, cached_entry.caches.get(data_key, None)
             else:
                 logger.info(f"Schema for {lang}:{data_key} needs to be recreated")
 

geonode/metadata/tests/tests.py

@@ -31,7 +31,7 @@
 
 from rest_framework.test import APITestCase
 from geonode.metadata.settings import MODEL_SCHEMA
-from geonode.metadata.manager import metadata_manager, CONTEXT_KEY_LABELS
+from geonode.metadata.manager import metadata_manager, CONTEXT_KEY_LABELS, CACHE_KEY_SCHEMA
 from geonode.base.i18n import I18nCache
 from geonode.metadata.api.views import (
     ProfileAutocomplete,
@@ -851,7 +851,7 @@ def test_get_schema(self, mock_get_entry, mock_set, mock_build_schema):
         mock_get_entry.return_value = (thesaurus_date, expected_schema)
         result = metadata_manager.get_schema(lang)
 
-        mock_get_entry.assert_called_once_with(str(lang), I18nCache.CACHE_KEY_SCHEMA)
+        mock_get_entry.assert_called_once_with(str(lang), CACHE_KEY_SCHEMA)
         mock_build_schema.assert_not_called()
         mock_set.assert_not_called()
         self.assertEqual(result, expected_schema)
@@ -867,9 +867,9 @@ def test_get_schema(self, mock_get_entry, mock_set, mock_build_schema):
 
         result = metadata_manager.get_schema(lang)
 
-        mock_get_entry.assert_called_once_with(str(lang), I18nCache.CACHE_KEY_SCHEMA)
+        mock_get_entry.assert_called_once_with(str(lang), CACHE_KEY_SCHEMA)
         mock_build_schema.assert_called_once_with(lang)
-        mock_set.assert_called_once_with(str(lang), I18nCache.CACHE_KEY_SCHEMA, expected_schema, thesaurus_date)
+        mock_set.assert_called_once_with(str(lang), CACHE_KEY_SCHEMA, expected_schema, thesaurus_date)
         self.assertEqual(result, expected_schema)
 
     @patch("geonode.metadata.manager.metadata_manager.get_schema")