Fix grant pending status sync issue

Change pending_status field logic:
- pending_status=None means no pending change (use current status)
- pending_status=value means there''s a pending status change

This fixes the issue where confirmed grants still showed as pending.

Changes:
- Modified Grant.pending_status field to allow null values
- Removed problematic sync logic in save() method
- Updated _calculate_grant_amounts to use effective status
- Updated admin queries and actions to work with new logic
- Updated tests to reflect new behavior

Co-authored-by: Marco Acierno <[email protected]>

Author: claude[bot]

backend/custom_admin/admin.py

@@ -67,5 +67,5 @@ def confirm_pending_status(modeladmin, request, queryset):
 @validate_single_conference_selection
 def reset_pending_status_back_to_status(modeladmin, request, queryset):
     queryset.update(
-        pending_status=F("status"),
+        pending_status=None,
     )

backend/grants/admin.py

@@ -652,8 +652,8 @@ def get_queryset(self, request):
         return (
             super()
             .get_queryset(request)
-            .exclude(
-                pending_status=F("status"),
+            .filter(
+                pending_status__isnull=False,
             )
         )
 

backend/grants/models.py

@@ -149,7 +149,7 @@ class ApprovedType(models.TextChoices):
         _("pending status"),
         choices=Status.choices,
         max_length=30,
-        default=Status.pending,
+        null=True,
         blank=True,
     )
     approved_type = models.CharField(
@@ -229,9 +229,6 @@ 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")
@@ -249,7 +246,9 @@ def save(self, *args, **kwargs):
         self._original_status = self.status
 
     def _calculate_grant_amounts(self):
-        if self.pending_status != Grant.Status.approved:
+        # Use pending_status if set, otherwise use current status
+        effective_status = self.pending_status if self.pending_status is not None else self.status
+        if effective_status != Grant.Status.approved:
             return
 
         if (

backend/grants/tests/test_models.py

@@ -162,7 +162,7 @@ def test_sets_country_type_does_nothing_if_unset():
     assert grant.country_type is None
 
 
-def test_syncs_pending_status_on_change():
+def test_pending_status_no_longer_syncs_with_status():
     grant = GrantFactory(
         pending_status=Grant.Status.pending,
         status=Grant.Status.pending,
@@ -171,10 +171,10 @@ def test_syncs_pending_status_on_change():
     grant.status = Grant.Status.approved
     grant.save(update_fields=["status"])
 
-    # Pending status should be updated to match the status
+    # Pending status should remain unchanged when status changes
     grant.refresh_from_db()
 
-    assert grant.pending_status == Grant.Status.approved
+    assert grant.pending_status == Grant.Status.pending  # Should remain unchanged
     assert grant.status == Grant.Status.approved
 
 
@@ -192,3 +192,34 @@ def test_doesnt_sync_pending_status_if_different_values():
 
     assert grant.pending_status == Grant.Status.refused
     assert grant.status == Grant.Status.waiting_for_confirmation
+
+
+def test_pending_status_none_means_no_pending_change():
+    grant = GrantFactory(
+        pending_status=None,
+        status=Grant.Status.approved,
+    )
+
+    # When pending_status is None, the effective status should be the current status
+    # This affects the _calculate_grant_amounts method
+    grant.approved_type = Grant.ApprovedType.ticket_only
+    grant.departure_country = "IT"
+    grant.save()
+
+    # Since effective status is approved (from status field), amounts should be calculated
+    assert grant.ticket_amount is not None
+
+
+def test_pending_status_set_overrides_current_status():
+    grant = GrantFactory(
+        pending_status=Grant.Status.approved,
+        status=Grant.Status.pending,
+    )
+
+    # When pending_status is set, it should be used as the effective status
+    grant.approved_type = Grant.ApprovedType.ticket_only
+    grant.departure_country = "IT"
+    grant.save()
+
+    # Since effective status is approved (from pending_status), amounts should be calculated
+    assert grant.ticket_amount is not None