learning-credentials 0.4.1rc5__tar.gz → 0.4.1rc6__tar.gz

{learning_credentials-0.4.1rc5/learning_credentials.egg-info → learning_credentials-0.4.1rc6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: learning-credentials
-Version: 0.4.1rc5
+Version: 0.4.1rc6
 Summary: A pluggable service for preparing Open edX credentials.
 Author-email: OpenCraft <help@opencraft.com>
 License-Expression: AGPL-3.0-or-later

{learning_credentials-0.4.1rc5 → learning_credentials-0.4.1rc6}/learning_credentials/models.py

@@ -33,6 +33,25 @@ if TYPE_CHECKING:  # pragma: no cover
 log = logging.getLogger(__name__)
 
 
+def _deep_merge(base: dict, override: dict) -> dict:
+    """
+    Deep merge two dictionaries.
+
+    Values from `override` take precedence. Nested dictionaries are merged recursively.
+
+    :param base: The base dictionary.
+    :param override: The dictionary with overriding values.
+    :return: A new dictionary with merged values.
+    """
+    result = base.copy()
+    for key, value in override.items():
+        if key in result and isinstance(result[key], dict) and isinstance(value, dict):
+            result[key] = _deep_merge(result[key], value)
+        else:
+            result[key] = value
+    return result
+
+
 class CredentialType(TimeStampedModel):
     """
     Model to store global credential configurations for each type.
@@ -176,7 +195,7 @@ class CredentialConfiguration(TimeStampedModel):
         module = import_module(module_path)
         func = getattr(module, func_name)
 
-        custom_options = {**self.credential_type.custom_options, **self.custom_options}
+        custom_options = _deep_merge(self.credential_type.custom_options, self.custom_options)
         return func(self.learning_context_key, custom_options)
 
     def generate_credential_for_user(self, user_id: int, celery_task_id: int = 0):
@@ -195,7 +214,7 @@ class CredentialConfiguration(TimeStampedModel):
         # Use the name from the profile if it is not empty. Otherwise, use the first and last name.
         # We check if the profile exists because it may not exist in some cases (e.g., when a User is created manually).
         user_full_name = getattr(getattr(user, 'profile', None), 'name', f"{user.first_name} {user.last_name}")
-        custom_options = {**self.credential_type.custom_options, **self.custom_options}
+        custom_options = _deep_merge(self.credential_type.custom_options, self.custom_options)
 
         credential, _ = Credential.objects.update_or_create(
             user_id=user_id,

{learning_credentials-0.4.1rc5 → learning_credentials-0.4.1rc6/learning_credentials.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: learning-credentials
-Version: 0.4.1rc5
+Version: 0.4.1rc6
 Summary: A pluggable service for preparing Open edX credentials.
 Author-email: OpenCraft <help@opencraft.com>
 License-Expression: AGPL-3.0-or-later

{learning_credentials-0.4.1rc5 → learning_credentials-0.4.1rc6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "learning-credentials"
-version = "0.4.1rc5"
+version = "0.4.1rc6"
 description = "A pluggable service for preparing Open edX credentials."
 dynamic = ["readme"]
 requires-python = ">=3.11"

{learning_credentials-0.4.1rc5 → learning_credentials-0.4.1rc6}/tests/test_models.py

@@ -160,6 +160,61 @@ class TestCredentialConfiguration:
         eligible_user_ids = self.config.get_eligible_user_ids()
         assert eligible_user_ids == [1, 2, 3]
 
+    @patch('test_models._mock_retrieval_func')
+    def test_custom_options_deep_merge(self, mock_retrieval_func: Mock):
+        """Test that custom_options are deep-merged between CredentialType and CredentialConfiguration."""
+        self.credential_type.custom_options = {
+            'top_level': 'base_value',
+            'nested': {
+                'key1': 'base_key1',
+                'key2': 'base_key2',
+                'key3': {
+                    'sub_key1': 'sub_value1',
+                    'sub_key2': 'sub_value2',
+                },
+                'key4': False,
+                'key5': {
+                    'sub_key1': 'sub_value1',
+                    'sub_key2': 'sub_value2',
+                },
+            },
+        }
+        self.config.custom_options = {
+            'top_level': 'override_value',
+            'nested': {
+                'key2': 'override_key2',
+                'key6': 'new_key5',
+                'key3': {
+                    'sub_key1': 'sub_override_value1',
+                },
+                'key4': {
+                    'sub_key': 'sub_value',
+                },
+                'key5': False,
+            },
+            'new_top': 'new_value',
+        }
+
+        self.config.get_eligible_user_ids()
+
+        assert mock_retrieval_func.call_args[0][1] == {
+            'top_level': 'override_value',  # Overridden.
+            'nested': {
+                'key1': 'base_key1',  # Preserved from type.
+                'key2': 'override_key2',  # Overridden.
+                'key3': {  # Merged into type, with an override.
+                    'sub_key1': 'sub_override_value1',
+                    'sub_key2': 'sub_value2',
+                },
+                'key4': {  # Overridden non-dict with dict.
+                    'sub_key': 'sub_value',
+                },
+                'key5': False,  # Overridden dict with non-dict.
+                'key6': 'new_key5',  # Added from override.
+            },
+            'new_top': 'new_value',  # Added from override.
+        }
+
     @pytest.mark.django_db
     def test_filter_out_user_ids_with_credentials(self):
         """Test the filter_out_user_ids_with_credentials method."""