Fix modified at usage for DREF

Author: frozenhelium

dref/migrations/0045_alter_dref_modified_at.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.16 on 2022-10-24 06:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dref', '0044_alter_dref_modified_at'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='dref',
+            name='modified_at',
+            field=models.DateTimeField(auto_now=True, verbose_name='modified at'),
+        ),
+    ]

dref/models.py

@@ -230,7 +230,8 @@ class Status(models.IntegerChoices):
     created_at = models.DateTimeField(verbose_name=_('created at'), auto_now_add=True)
     modified_at = models.DateTimeField(
         verbose_name=_('modified at'),
-        default=datetime.now, blank=True
+        auto_now=True,
+        blank=True
     )
     created_by = models.ForeignKey(
         settings.AUTH_USER_MODEL, verbose_name=_('created by'), on_delete=models.SET_NULL,

dref/serializers.py

@@ -207,6 +207,7 @@ class DrefSerializer(
     assessment_report_details = DrefFileSerializer(source='assessment_report', read_only=True)
     supporting_document_details = DrefFileSerializer(read_only=True, source='supporting_document')
     risk_security = RiskSecuritySerializer(many=True, required=False)
+    modified_at = serializers.DateTimeField(required=True)
 
     class Meta:
         model = Dref
@@ -309,11 +310,6 @@ def validate_operation_timeframe(self, operation_timeframe):
             )
         return operation_timeframe
 
-    def validate_modified_at(self, modified_at):
-        if self.instance and self.instance.modified_at is None:
-            raise serializers.ValidationError('Modified At can\'t be None')
-        return modified_at
-
     def create(self, validated_data):
         validated_data['created_by'] = self.context['request'].user
         is_assessment_report = validated_data.get('is_assessment_report')
@@ -357,7 +353,7 @@ def update(self, instance, validated_data):
         is_assessment_report = validated_data.get('is_assessment_report')
         modified_at = validated_data.pop('modified_at', None)
         if modified_at is None:
-            raise serializers.ValidationError('Modified At is required!')
+            raise serializers.ValidationError({ 'modified_at': 'Modified At is required!' })
         if is_assessment_report:
             # Previous Operations
             validated_data['lessons_learned'] = None
@@ -391,16 +387,13 @@ def update(self, instance, validated_data):
         else:
             to = None
         if modified_at and instance.modified_at and modified_at < instance.modified_at:
-            raise serializers.ValidationError(
-                gettext(f'Input Payload in {self.DREF_UPDATE_ERROR_MESSAGE}')
-            )
+            raise serializers.ValidationError({ 'modified_at': self.DREF_UPDATE_ERROR_MESSAGE })
         dref = super().update(instance, validated_data)
         if to:
             transaction.on_commit(
                 lambda: send_dref_email.delay(dref.id, list(to), 'Updated')
             )
         return dref
-        return instance
 
 
 class DrefOperationalUpdateSerializer(