Fix nested fields update

strawberry_django/mutations/fields.py

@@ -42,6 +42,8 @@
     )
     from typing_extensions import Literal, Self
 
+    from .types import FullCleanOptions
+
 
 def _get_validation_errors(error: Exception):
     if isinstance(error, PermissionDenied):
@@ -176,7 +178,7 @@ class DjangoMutationCUD(DjangoMutationBase):
     def __init__(
         self,
         input_type: type | None = None,
-        full_clean: bool = True,
+        full_clean: bool | FullCleanOptions = True,
         argument_name: str | None = None,
         key_attr: str | None = None,
         **kwargs,

strawberry_django/mutations/mutations.py

@@ -26,6 +26,7 @@
     DjangoMutationBase,
     DjangoUpdateMutation,
 )
+from .types import FullCleanOptions
 
 _T = TypeVar("_T")
 
@@ -261,6 +262,7 @@
     extensions: List[FieldExtension] = (),  # type: ignore
     argument_name: Optional[str] = None,
     handle_django_errors: Optional[bool] = None,
+    full_clean: bool | FullCleanOptions = True,
 ) -> Any:
     """Create mutation for django input fields.
 
@@ -297,6 +299,7 @@
         extensions=extensions or (),
         argument_name=argument_name,
         handle_django_errors=handle_django_errors,
+        full_clean=full_clean,
     )
 
 
@@ -320,6 +323,7 @@
     argument_name: Optional[str] = None,
     handle_django_errors: Optional[bool] = None,
     key_attr: Optional[str] = None,
+    full_clean: bool | FullCleanOptions = True,
 ) -> Any:
     """Update mutation for django input fields.
 
@@ -356,6 +360,7 @@
         argument_name=argument_name,
         handle_django_errors=handle_django_errors,
         key_attr=key_attr,
+        full_clean=full_clean,
     )
 
 
@@ -379,6 +384,7 @@
     argument_name: Optional[str] = None,
     handle_django_errors: Optional[bool] = None,
     key_attr: Optional[str] = None,
+    full_clean: bool | FullCleanOptions = True,
 ) -> Any:
     return DjangoDeleteMutation(
         input_type=input_type,
@@ -399,4 +405,5 @@
         argument_name=argument_name,
         handle_django_errors=handle_django_errors,
         key_attr=key_attr,
+        full_clean=full_clean,
     )

strawberry_django/mutations/resolvers.py

@@ -76,7 +76,7 @@
 
         if key_attr in value:
             obj_pk = value[key_attr]
-            if obj_pk is not strawberry.UNSET:
+            if obj_pk not in (None, strawberry.UNSET):  # noqa: PLR6201
                 return model._default_manager.get(pk=obj_pk), value
 
         return None, value
@@ -99,8 +99,9 @@
                 continue
 
             if isinstance(v, ParsedObject):
-                if v.pk is None:
-                    v = create(info, model, v.data or {})  # noqa: PLW2901
+                if v.pk in (None, UNSET):  # noqa: PLR6201
+                    related_model = get_model_fields(model).get(k).related_model
+                    v = create(info, related_model, v.data or {})  # noqa: PLW2901
                 elif isinstance(v.pk, models.Model) and v.data:
                     v = update(info, v.pk, v.data, key_attr=key_attr)  # noqa: PLW2901
                 else:
@@ -178,6 +179,9 @@
         )
 
     if isinstance(data, (OneToOneInput, OneToManyInput)):
+        if not data.set:
+            return None
+
         return ParsedObject(
             pk=parse_input(info, data.set, key_attr=key_attr),
         )
@@ -240,6 +244,12 @@
     if dataclasses.is_dataclass(data):
         data = vars(data)
 
+    # `pk` may be explicitly passed as `None` to force crete object, `pk` is not a field and won't be handled below,
+    # so manually add one into `direct_field_values`
+    pk = data.pop("pk", UNSET)
+    if pk is not UNSET:
+        direct_field_values["pk"] = pk
+
     for name, value in data.items():
         field = fields.get(name)
         direct_field_value = True
@@ -366,16 +376,24 @@
         key_attr=key_attr,
     )
 
-    # Creating the instance directly via create() without full-clean will
-    # raise ugly error messages. To generate user-friendly ones, we want
-    # full-clean() to trigger form-validation style error messages.
-    full_clean_options = full_clean if isinstance(full_clean, dict) else {}
-    if full_clean:
+    try:
+        # Instead of using `get_or_create` shortcut first use `get()`
+        # (which will also raise `DoesNotExist` in case pk `None` value explicitly
+        # passed), if no records found - invoke `full_clean()` and `create`
+        # right after. The idea is to bypass cleaning first to allow getting
+        # an object by e.g. unique fields. In case `full_clean()` invoked before,
+        # it would raise unique constraint validation error
+        instance = model._default_manager.get(**create_kwargs)
+    except model.DoesNotExist:
+        # Creating the instance directly via create() without full-clean will
+        # raise ugly error messages. To generate user-friendly ones, we want
+        # full-clean() to trigger form-validation style error messages.
+        full_clean_options = full_clean if isinstance(full_clean, dict) else {}
         dummy_instance.full_clean(**full_clean_options)  # type: ignore
 
-    # Create the instance using the manager create method to respect
-    # manager create overrides. This also ensures support for proxy-models.
-    instance = model._default_manager.create(**create_kwargs)
+        # Create the instance using the manager create method to respect
+        # manager create overrides. This also ensures support for proxy-models.
+        instance = model._default_manager.create(**create_kwargs)
 
     for field, value in m2m:
         update_m2m(info, instance, field, value, key_attr)
@@ -552,16 +570,33 @@
 
     use_remove = True
     if isinstance(field, ManyToManyField):
-        manager = cast("RelatedManager", getattr(instance, field.attname))
+        remote_field_name = field.attname
+        reverse_field_name = field.remote_field.related_name
     else:
         assert isinstance(field, (ManyToManyRel, ManyToOneRel))
-        accessor_name = field.get_accessor_name()
-        assert accessor_name
-        manager = cast("RelatedManager", getattr(instance, accessor_name))
+        remote_field_name = field.get_accessor_name()
+        reverse_field_name = field.field.name
         if field.one_to_many:
             # remove if field is nullable, otherwise delete
             use_remove = field.remote_field.null is True
 
+    assert remote_field_name
+    assert reverse_field_name
+    manager = cast("RelatedManager", getattr(instance, remote_field_name))
+
+    def create_nested(d):
+        ref_instance = (
+            manager.instance
+            if field.one_to_many or field.one_to_one
+            else [manager.instance]
+        )
+        return create(
+            info,
+            manager.model,
+            d | {reverse_field_name: ref_instance},
+            full_clean=full_clean,
+        )
+
     to_add = []
     to_remove = []
     to_delete = []
@@ -620,11 +655,7 @@
 
                 existing.discard(obj)
             else:
-                if key_attr not in data:  # we have a Input Type
-                    obj, _ = manager.get_or_create(**data)
-                else:
-                    data.pop(key_attr)
-                    obj = manager.create(**data)
+                obj = create_nested(data)
 
                 if full_clean:
                     obj.full_clean(**full_clean_options)
@@ -655,11 +686,7 @@
                 data.pop(key_attr, None)
                 to_add.append(obj)
             elif data:
-                if key_attr not in data:
-                    manager.get_or_create(**data)
-                else:
-                    data.pop(key_attr)
-                    manager.create(**data)
+                create_nested(data)
             else:
                 raise AssertionError
 

strawberry_django/mutations/types.py

@@ -26,8 +26,12 @@ class ParsedObject:
     data: dict[str, Any] | None = None
 
     def parse(self, model: type[_M]) -> tuple[_M | None, dict[str, Any] | None]:
-        if self.pk is None or self.pk is UNSET:
+        if self.pk is UNSET:
             return None, self.data
+        if self.pk is None:
+            # if `pk` was explicitly passed with `None` value, keep one in data as it indicates
+            # that object must be forced created when Django `get_or_create()` invoked
+            return None, (self.data or {}) | {"pk": None}
 
         if isinstance(self.pk, models.Model):
             assert isinstance(self.pk, model)

tests/mutations/test_mutations.py

@@ -205,8 +205,11 @@ def test_update_m2m_with_new_different_objects(mutation, fruit):
 
 
 def test_update_m2m_with_duplicates(mutation, fruit):
+    # Pass id `null` value in the second argument to force create one.
+    # If id is not specified, `apple` type won't be duplicated  as
+    # "get-or-create" approach is used under the hood
     result = mutation(
-        '{ fruits: updateFruits(data: { types: [{name: "apple"}, {name: "apple"}]}) { id types { id name }}}'
+        '{ fruits: updateFruits(data: { types: [{ name: "apple"}, {id: null, name: "apple"}]}) { id types { id name }}}'
     )
     assert not result.errors
     assert result.data["fruits"][0]["types"] == [

tests/projects/models.py

@@ -114,8 +114,11 @@ class Meta:  # type: ignore
     objects = FavoriteQuerySet.as_manager()
 
 
+class BugReproduction(models.Model):
+    description = models.TextField()
+
+
 class Issue(NamedModel):
-    comments: "RelatedManager[Issue]"
     issue_assignees: "RelatedManager[Assignee]"
 
     class Kind(models.TextChoices):
@@ -160,6 +163,13 @@ class Kind(models.TextChoices):
         through="Assignee",
         related_name="+",
     )
+    bug_reproduction = models.OneToOneField["BugReproduction"](
+        "BugReproduction",
+        null=True,
+        blank=True,
+        related_name="issue",
+        on_delete=models.CASCADE,
+    )
 
     @property
     def name_with_kind(self) -> str:
@@ -171,6 +181,21 @@ def name_with_priority(self) -> str:
         return f"{self.kind}: {self.priority}"
 
 
+class Version(NamedModel):
+    issue_id: int
+    issue = models.ForeignKey[Issue](
+        Issue,
+        on_delete=models.CASCADE,
+        related_name="versions",
+        related_query_name="version",
+    )
+
+    class Meta:
+        unique_together = [  # noqa: RUF012
+            ("name", "issue")
+        ]
+
+
 class Assignee(models.Model):
     class Meta:  # type: ignore
         unique_together = [  # noqa: RUF012
@@ -202,14 +227,16 @@ class Meta:  # type: ignore
     )
 
 
-class Tag(NamedModel):
+class Tag(models.Model):
     issues: "RelatedManager[Issue]"
 
     id = models.BigAutoField(
         verbose_name="ID",
         primary_key=True,
     )
 
+    name = models.CharField(max_length=255, unique=True)
+
 
 class Quiz(models.Model):
     title = models.CharField(