Remove auto_now from modified_at

Author: k9845

dref/migrations/0065_auto_20230728_0405.py

@@ -0,0 +1,29 @@
+# Generated by Django 3.2.20 on 2023-07-28 04:05
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dref', '0064_dreffinalreport_financial_report_preview'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='dref',
+            name='modified_at',
+            field=models.DateTimeField(default=django.utils.timezone.now, null=True, verbose_name='modified at'),
+        ),
+        migrations.AlterField(
+            model_name='dreffinalreport',
+            name='modified_at',
+            field=models.DateTimeField(default=django.utils.timezone.now, null=True, verbose_name='modified at'),
+        ),
+        migrations.AlterField(
+            model_name='drefoperationalupdate',
+            name='modified_at',
+            field=models.DateTimeField(default=django.utils.timezone.now, null=True, verbose_name='modified at'),
+        ),
+    ]

dref/models.py

@@ -10,6 +10,7 @@
 from django.templatetags.static import static
 from django.core.exceptions import ValidationError
 from django.contrib.postgres.aggregates import ArrayAgg
+from django.utils import timezone
 
 from api.models import Country, DisasterType, District, FieldReport
 
@@ -224,7 +225,7 @@ class Status(models.IntegerChoices):
         COMPLETED = 1, _("Completed")
 
     created_at = models.DateTimeField(verbose_name=_("created at"), auto_now_add=True)
-    modified_at = models.DateTimeField(verbose_name=_("modified at"), auto_now=True, blank=True)
+    modified_at = models.DateTimeField(verbose_name=_("modified at"), default=timezone.now, null=True)
     created_by = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         verbose_name=_("created by"),
@@ -660,7 +661,7 @@ def clone(self, user):
 @reversion.register()
 class DrefOperationalUpdate(models.Model):
     created_at = models.DateTimeField(verbose_name=_("created at"), auto_now_add=True)
-    modified_at = models.DateTimeField(verbose_name=_("modified at"), auto_now=True, blank=True)
+    modified_at = models.DateTimeField(verbose_name=_("modified at"), default=timezone.now, null=True)
     created_by = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         verbose_name=_("created by"),
@@ -1018,7 +1019,7 @@ def get_for(user):
 @reversion.register()
 class DrefFinalReport(models.Model):
     created_at = models.DateTimeField(verbose_name=_("created at"), auto_now_add=True)
-    modified_at = models.DateTimeField(verbose_name=_("modified at"), auto_now=True)
+    modified_at = models.DateTimeField(verbose_name=_("modified at"), default=timezone.now, null=True)
     created_by = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         verbose_name=_("created by"),

dref/serializers.py

@@ -518,6 +518,7 @@ def update(self, instance, validated_data):
             to = None
         if modified_at and instance.modified_at and modified_at < instance.modified_at:
             raise serializers.ValidationError({"modified_at": settings.DREF_OP_UPDATE_FINAL_REPORT_UPDATE_ERROR_MESSAGE})
+        validated_data["modified_at"] = modified_at
         dref = super().update(instance, validated_data)
         if to:
             transaction.on_commit(lambda: send_dref_email.delay(dref.id, list(to), "Updated"))
@@ -888,6 +889,7 @@ def update(self, instance, validated_data):
 
         if modified_at and instance.modified_at and modified_at < instance.modified_at:
             raise serializers.ValidationError({"modified_at": settings.DREF_OP_UPDATE_FINAL_REPORT_UPDATE_ERROR_MESSAGE})
+        validated_data["modified_at"] = modified_at
         return super().update(instance, validated_data)
 
 
@@ -1154,7 +1156,7 @@ def update(self, instance, validated_data):
             raise serializers.ValidationError({"modified_at": "Modified At is required!"})
         if modified_at and instance.modified_at and modified_at < instance.modified_at:
             raise serializers.ValidationError({"modified_at": settings.DREF_OP_UPDATE_FINAL_REPORT_UPDATE_ERROR_MESSAGE})
-
+        validated_data["modified_at"] = modified_at
         validated_data["modified_by"] = self.context["request"].user
         return super().update(instance, validated_data)
 

dref/test_views.py

@@ -402,7 +402,7 @@ def test_dref_is_published(self, mock_now):
         Test for dref if is_published = True
         """
 
-        initial_now = datetime(2011, 11, 11)
+        initial_now = datetime(2023, 7, 28)
         mock_now.return_value = initial_now
 
         region = Region.objects.create(name=RegionName.AFRICA)
@@ -430,6 +430,7 @@ def test_dref_is_published(self, mock_now):
         )
         url = f"/api/v2/dref/{not_published_dref.id}/"
         self.client.force_authenticate(self.user)
+        data["modified_at"] = initial_now + timedelta(days=10)
         response = self.client.patch(url, data)
         self.assert_200(response)