fix: should not skip auto now fields but assign with specified value

Author: mattwang44

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 ### Changed
+- Fix regression introduced in 1.20.3 that prevented using `auto_now` and `auto_now_add` fields with seq or callable.
 
 ### Removed
 

model_bakery/baker.py

@@ -590,9 +590,6 @@ def _skip_field(self, field: Field) -> bool:  # noqa: C901
         else:
             field.fill_optional = field.name in self.fill_in_optional
 
-        if _is_auto_datetime_field(field):
-            return True
-
         if isinstance(field, FileField) and not self.create_files:
             return True
 
@@ -647,8 +644,13 @@ def _handle_auto_now(self, instance: Model, attrs: Dict[str, Any]):
         if not attrs:
             return
 
+        # use .update() to force update auto_now fields
         instance.__class__.objects.filter(pk=instance.pk).update(**attrs)
 
+        # to make the resulting instance has the specified values
+        for k, v in attrs.items():
+            setattr(instance, k, v)
+
     def _handle_one_to_many(self, instance: Model, attrs: Dict[str, Any]):
         for key, values in attrs.items():
             manager = getattr(instance, key)

tests/test_baker.py

@@ -1157,8 +1157,12 @@ def test_make_with_auto_now(self, use_tz, settings):
             sent_date=now,
         )
 
-        instance.refresh_from_db()
+        assert instance.created == now
+        assert instance.updated == now
+        assert instance.sent_date == now
 
+        # Should not update after refreshing from the db
+        instance.refresh_from_db()
         assert instance.created == now
         assert instance.updated == now
         assert instance.sent_date == now
@@ -1169,9 +1173,14 @@ def test_make_with_auto_now_and_fill_optional(self):
             models.ModelWithAutoNowFields,
             _fill_optional=True,
         )
-        created, updated = instance.created, instance.updated
+        created, updated, sent_date = (
+            instance.created,
+            instance.updated,
+            instance.sent_date,
+        )
 
+        # Should not update after refreshing from the db
         instance.refresh_from_db()
-
         assert instance.created == created
         assert instance.updated == updated
+        assert instance.sent_date == sent_date

tests/test_recipes.py

@@ -20,6 +20,7 @@
     DummyBlankFieldsModel,
     DummyNumbersModel,
     LonelyPerson,
+    ModelWithAutoNowFields,
     Person,
     Profile,
     User,
@@ -669,3 +670,37 @@ def test_only_iterators_not_iteratables_are_iterated(self):
             DummyBlankFieldsModel, blank_text_field="not an iterator, so don't iterate!"
         )
         assert r.make().blank_text_field == "not an iterator, so don't iterate!"
+
+
+class TestAutoNowFields:
+    @pytest.mark.django_db
+    def test_make_with_auto_now_using_datetime_generator(self):
+        delta = timedelta(minutes=1)
+
+        def gen():
+            idx = 0
+            while True:
+                idx += 1
+                yield TEST_TIME + idx * delta
+
+        r = Recipe(
+            ModelWithAutoNowFields,
+            created=gen(),
+        )
+
+        assert r.make().created == tz_aware(TEST_TIME + 1 * delta)
+        assert r.make().created == tz_aware(TEST_TIME + 2 * delta)
+
+    @pytest.mark.django_db
+    def test_make_with_auto_now_using_datetime_seq(self):
+        delta = timedelta(minutes=1)
+        r = Recipe(
+            ModelWithAutoNowFields,
+            created=seq(
+                TEST_TIME,
+                increment_by=delta,
+            ),
+        )
+
+        assert r.make().created == tz_aware(TEST_TIME + 1 * delta)
+        assert r.make().created == tz_aware(TEST_TIME + 2 * delta)