Review fixes

Author: k9845

dref/serializers.py

@@ -184,6 +184,7 @@ class DrefSerializer(
     ALLOWED_ASSESSMENT_REPORT_EXTENSIONS = ["pdf", "docx", "pptx"]
     MAX_OPERATION_TIMEFRAME = 30
     ASSESSMENT_REPORT_MAX_OPERATION_TIMEFRAME = 2
+    DREF_UPDATE_ERROR_MESSAGE = "OBSOLETE_PAYLOAD"
     national_society_actions = NationalSocietyActionSerializer(many=True, required=False)
     needs_identified = IdentifiedNeedSerializer(many=True, required=False)
     planned_interventions = PlannedInterventionSerializer(many=True, required=False)
@@ -308,6 +309,11 @@ 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')
@@ -349,7 +355,9 @@ def create(self, validated_data):
     def update(self, instance, validated_data):
         validated_data['modified_by'] = self.context['request'].user
         is_assessment_report = validated_data.get('is_assessment_report')
-        modified_at = validated_data.get('modified_at')
+        modified_at = validated_data.pop('modified_at', None)
+        if modified_at is None:
+            raise serializers.ValidationError('Modified At is required!')
         if is_assessment_report:
             # Previous Operations
             validated_data['lessons_learned'] = None
@@ -382,13 +390,16 @@ def update(self, instance, validated_data):
                   if u.email not in {t.email for t in instance.users.iterator()}}
         else:
             to = None
-        if modified_at and instance.modified_at and modified_at > instance.modified_at:
-            dref = super().update(instance, validated_data)
-            if to:
-                transaction.on_commit(
-                    lambda: send_dref_email.delay(dref.id, list(to), 'Updated')
-                )
-            return dref
+        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}')
+            )
+        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
 
 

dref/test_views.py

@@ -858,14 +858,18 @@ def test_dref_latest_update(self):
         url = f'/api/v2/dref/{dref.id}/'
         data = {
             'title': "New title",
-            'modified_at': datetime(2022, 2, 18, 2, 29, 39, 793615),
         }
 
+        # without `modified_at`
         self.client.force_authenticate(self.user)
         response = self.client.patch(url, data=data)
-        self.assertEqual(response.status_code, 200)
-        # Title should be same since modified_at is less than modified_at in database
-        self.assertEqual(response.data['title'], "Test Title")
+        self.assertEqual(response.status_code, 400)
+
+        # with `modified_at` less than instance `modified_at`
+        data['modified_at'] = datetime(2022, 2, 18, 2, 29, 39, 793615)
+        self.client.force_authenticate(self.user)
+        response = self.client.patch(url, data=data)
+        self.assertEqual(response.status_code, 400)
 
         data['modified_at'] = datetime.now()
         response = self.client.patch(url, data=data)