Correctly set values for Reference objects in parent object

Author: J-Bu

scim2_tester/filling.py

@@ -48,6 +48,7 @@ def generate_random_value(
     context: CheckContext,
     obj: Resource[Any],
     field_name: str,
+    ref_objs: dict[str, Resource[Any]],
 ) -> Any:
     field_type = obj.get_field_root_type(field_name)
 
@@ -71,6 +72,17 @@ def generate_random_value(
     elif field_name == "value" and "phone" in obj.__class__.__name__.lower():
         value = "".join(str(random.choice(range(10))) for _ in range(10))
 
+    elif field_name == "value" and obj.__class__.__name__.lower() in ref_objs:
+        value = ref_objs[obj.__class__.__name__.lower()].id
+
+    elif field_name == "type" and obj.__class__.__name__.lower() in ref_objs:
+        value = ref_objs[obj.__class__.__name__.lower()].meta.resource_type
+
+    elif (
+        field_name == "display" or field_name == "display_name"
+    ) and obj.__class__.__name__.lower() in ref_objs:
+        value = ref_objs[obj.__class__.__name__.lower()].display_name
+
     elif field_type is int:
         value = uuid.uuid4().int
 
@@ -80,9 +92,8 @@ def generate_random_value(
     elif get_origin(field_type) is Reference and get_args(field_type)[0] != Any:
         ref_type = get_args(field_type)[0]
         if ref_type not in (ExternalReference, URIReference):
-            model = model_from_ref_type(context, ref_type, different_than=obj.__class__)
-            ref_obj = context.resource_manager.create_and_register(model)
-            value = ref_obj.meta.location
+            if obj.__class__.__name__.lower() in ref_objs:
+                value = ref_objs[obj.__class__.__name__.lower()].meta.location
 
         else:
             value = f"https://{str(uuid.uuid4())}.test"
@@ -102,6 +113,21 @@ def generate_random_value(
     return value
 
 
+def create_ref_object(
+    context: CheckContext,
+    obj: Resource[Any],
+    field_name: str,
+) -> dict[str, Resource[Any]] | None:
+    field_type = obj.get_field_root_type(field_name)
+    if get_origin(field_type) is Reference and get_args(field_type)[0] != Any:
+        ref_type = get_args(field_type)[0]
+        if ref_type not in (ExternalReference, URIReference):
+            model = model_from_ref_type(context, ref_type, different_than=obj.__class__)
+            return context.resource_manager.create_and_register(model)
+
+    return None
+
+
 def fill_with_random_values(
     context: CheckContext,
     obj: Resource[Any],
@@ -114,6 +140,21 @@ def fill_with_random_values(
     :param field_names: Optional list of field names to fill (defaults to all)
     :returns: The filled object or None if the object ends up empty
     """
+    ref_objs = {}
+    for field_name in (
+        field_names if field_names is not None else obj.__class__.model_fields.keys()
+    ):
+        if field_name not in obj.__class__.model_fields:
+            continue
+
+        field = obj.__class__.model_fields[field_name]
+        if field.default:
+            continue
+
+        ref_obj = create_ref_object(context, obj, field_name)
+        if ref_obj is not None:
+            ref_objs[obj.__class__.__name__.lower()] = ref_obj
+
     for field_name in (
         field_names if field_names is not None else obj.__class__.model_fields.keys()
     ):
@@ -124,7 +165,7 @@ def fill_with_random_values(
         if field.default:
             continue
 
-        value = generate_random_value(context, obj, field_name)
+        value = generate_random_value(context, obj, field_name, ref_objs)
 
         is_multiple = obj.get_field_multiplicity(field_name)
         if is_multiple:

tests/test_filling.py

@@ -1,11 +1,14 @@
 """Test automatic field filling functionality."""
 
 import base64
+import uuid
 from typing import Literal
 from unittest.mock import patch
 
 from scim2_models import Group
+from scim2_models import Meta
 from scim2_models import User
+from scim2_models.resources.resource_type import ResourceType
 from scim2_models.resources.user import X509Certificate
 
 from scim2_tester.filling import fill_with_random_values
@@ -23,6 +26,14 @@ def get_resource_model(self, model_name):
         model_map = {"User": User, "Group": Group}
         return model_map.get(model_name)
 
+    def create(self, obj):
+        obj.id = str(uuid.uuid4())
+        obj.meta = Meta(
+            location=f"http://scim-tester.test/{obj.id}",
+            resource_type=ResourceType.from_resource(obj).name,
+        )
+        return obj
+
 
 def test_generate_random_value_bytes_field():
     """Validates random value generation for bytes fields."""
@@ -31,7 +42,7 @@ def test_generate_random_value_bytes_field():
 
     cert = X509Certificate(value=base64.b64encode(b"placeholder"))
 
-    value = generate_random_value(context, cert, "value")
+    value = generate_random_value(context, cert, "value", {})
 
     assert isinstance(value, str)
     assert len(value) == 36  # UUID string length
@@ -50,6 +61,19 @@ def test_model_resolution_from_reference_type():
     assert result == User
 
 
+def test_generate_random_value_for_reference():
+    """Validates random value generation for reference fields."""
+    config = CheckConfig()
+    context = CheckContext(MockClient(), config)
+
+    group = Group()
+
+    result = fill_with_random_values(context, group)
+
+    assert len(result.members) == 1
+    assert result.members[0].value == result.members[0].ref.rsplit("/", 1)[-1]
+
+
 def test_fill_with_empty_field_list():
     """Confirms no fields are modified when empty field list provided."""
     conf = CheckConfig()