Sync pending status when updating grant

Author: marcoacierno

backend/grants/models.py

@@ -230,6 +230,7 @@ class ApprovedType(models.TextChoices):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self._original_status = self.status
         self._original_pending_status = self.pending_status
         self._original_approved_type = self.approved_type
         self._original_country_type = self.country_type
@@ -241,19 +242,24 @@ def save(self, *args, **kwargs):
         self._update_country_type()
         self._calculate_grant_amounts()
 
+        if self.pending_status == self._original_status:
+            self.pending_status = self.status
+
         update_fields = kwargs.get("update_fields", None)
         if update_fields:
             update_fields.append("total_amount")
             update_fields.append("ticket_amount")
             update_fields.append("accommodation_amount")
             update_fields.append("travel_amount")
             update_fields.append("country_type")
+            update_fields.append("pending_status")
 
         super().save(*args, **kwargs)
 
         self._original_approved_type = self.approved_type
         self._original_country_type = self.country_type
         self._original_pending_status = self.pending_status
+        self._original_status = self.status
 
     def _calculate_grant_amounts(self):
         if self.pending_status != Grant.Status.approved:

backend/grants/tests/test_models.py

@@ -160,3 +160,35 @@ def test_sets_country_type_does_nothing_if_unset():
     grant = GrantFactory(departure_country=None)
 
     assert grant.country_type is None
+
+
+def test_syncs_pending_status_on_change():
+    grant = GrantFactory(
+        pending_status=Grant.Status.pending,
+        status=Grant.Status.pending,
+    )
+
+    grant.status = Grant.Status.approved
+    grant.save(update_fields=["status"])
+
+    # Pending status should be updated to match the status
+    grant.refresh_from_db()
+
+    assert grant.pending_status == Grant.Status.approved
+    assert grant.status == Grant.Status.approved
+
+
+def test_doesnt_sync_pending_status_if_different_values():
+    grant = GrantFactory(
+        pending_status=Grant.Status.refused,
+        status=Grant.Status.pending,
+    )
+
+    grant.status = Grant.Status.waiting_for_confirmation
+    grant.save()
+
+    # Status should not be updated
+    grant.refresh_from_db()
+
+    assert grant.pending_status == Grant.Status.refused
+    assert grant.status == Grant.Status.waiting_for_confirmation