WIP consolidation task - take budget authorisation into account

Author: chrisvanrun

app/grandchallenge/challenges/tasks.py

@@ -113,9 +113,10 @@ def update_challenge_compute_costs():
             invoices = list(
                 Invoice.objects.filter(challenge_id=challenge_id).order_by(
                     "expires_on", "created"
-                )  # Todo: add queryset-level filter to only return those invoices with authorized budget
+                )
             )
 
+            # TODO: maybe push remainder to challenge-level compute costs to cover if there are NO valid invoices? I.e. a deficit?
             overall_covered_compute_costs = 0
             last_index = len(invoices) - 1
             for idx, invoice in enumerate(invoices):
@@ -133,9 +134,13 @@ def update_challenge_compute_costs():
 
                 if not is_last:
                     # Limit to authorized budget for all but the last invoice
+                    authorized_budget_compute_costs = (
+                        invoice.compute_costs_euros * 1000 * 100
+                        if invoice.is_budget_authorized
+                        else 0
+                    )
                     covered_compute_costs = min(
-                        covered_compute_costs,
-                        invoice.compute_costs_euros * 1000 * 100,
+                        covered_compute_costs, authorized_budget_compute_costs
                     )
 
                 invoice.compute_cost_euro_millicents = covered_compute_costs

app/tests/challenges_tests/test_tasks.py

@@ -586,5 +586,20 @@ def test_update_challenge_compute_costs_expired_utilization():
         invoice_later_this_year.compute_cost_euro_millicents == 70 * 1000 * 100
     )
 
+    # Cancel invoice_last_year and check costs are reallocated to invoice_later_this_year
+    invoice_last_year.payment_status = PaymentStatusChoices.CANCELLED
+    assert not invoice_last_year.is_budget_authorized
+    invoice_last_year.save()
 
-# TODO: add test that checks if we filter on authorized budget when calculating compute costs for invoices
+    update_challenge_compute_costs()
+    invoice_last_year.refresh_from_db()
+    invoice_this_year.refresh_from_db()
+    invoice_later_this_year.refresh_from_db()
+
+    assert invoice_last_year.compute_cost_euro_millicents == 0
+    assert (  # Fully utilized
+        invoice_this_year.compute_cost_euro_millicents == 20 * 1000 * 100
+    )
+    assert (  # Utilization from earlier bubble up to this one
+        invoice_later_this_year.compute_cost_euro_millicents == 80 * 1000 * 100
+    )