Fix recipes with foreign_key and one_to_one=True

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 ### Changed
+- Fix recipes declared with reverse relationship using `foreign_key` and `one_to_one=True`
 
 ### Removed
 
@@ -27,7 +28,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Fix `requirements.txt` to cover Django 3.2 (everything from 2.2 till 4.0) [PR #182](https://github.com/model-bakers/model_bakery/pull/182)
 
-
 ## [1.3.0](https://pypi.org/project/model-bakery/1.3.0/)
 
 ### Added

model_bakery/baker.py

@@ -367,6 +367,10 @@ def _make(
                         "{0} iterator is empty.".format(field.name)
                     )
 
+        for k, v in self.model_attrs.items():
+            if is_iterator(v):
+                self.model_attrs[k] = next(v)
+
         instance = self.instance(
             self.model_attrs,
             _commit=commit,

tests/generic/baker_recipes.py

@@ -13,6 +13,8 @@
     LonelyPerson,
     Person,
     School,
+    User,
+    AnotherProfile,
 )
 
 person = Recipe(
@@ -35,6 +37,10 @@
     name=seq("joe"),
 )
 
+profile = Recipe(AnotherProfile, email="johndoe@example.com")
+
+user_with_profile = Recipe(User, another_profile=foreign_key(profile, one_to_one=True))
+
 serial_numbers = Recipe(
     DummyDefaultFieldsModel,
     default_decimal_field=seq(Decimal("20.1")),

tests/generic/models.py

@@ -64,6 +64,13 @@ class User(models.Model):
     )
 
 
+class AnotherProfile(models.Model):
+    user = models.OneToOneField(
+        User, on_delete=models.CASCADE, related_name="another_profile"
+    )
+    email = models.EmailField()
+
+
 class PaymentBill(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     value = models.FloatField()

tests/test_recipes.py

@@ -412,6 +412,11 @@ def test_one_to_one_relationship(self):
         friend_ids = set([x.only_friend.id for x in lonely_people])
         assert len(friend_ids) == 2
 
+    def test_reverse_one_to_one_relationship(self):
+        users = baker.make_recipe("tests.generic.user_with_profile", _quantity=2)
+        profile_ids = {u.another_profile.id for u in users}
+        assert len(profile_ids) == 2
+
 
 @pytest.mark.django_db
 class TestM2MField: