WIP consolidation task - small fixes

Author: chrisvanrun

app/grandchallenge/challenges/costs.py

@@ -61,9 +61,6 @@ def get_compute_costs_for_invoice(*, invoice, limit_to_covered_period):
         item["compute_cost_euro_millicents__sum"] or 0 for item in items
     )
 
-    if limit_to_covered_period:
-        total = min(total, invoice.compute_costs_euros * 1000 * 100)
-
     return total
 
 

app/grandchallenge/challenges/tasks.py

@@ -116,18 +116,32 @@ def update_challenge_compute_costs():
                 )  # Todo: add queryset-level filter to only return those invoices with authorized budget
             )
 
-            covered_compute_costs = 0
+            overall_covered_compute_costs = 0
             last_index = len(invoices) - 1
             for idx, invoice in enumerate(invoices):
                 is_last = idx == last_index
+
                 compute_costs = get_compute_costs_for_invoice(
                     invoice=invoice,
                     limit_to_covered_period=not is_last,
                 )
-                invoice.compute_cost_euro_millicents = (
-                    compute_costs - covered_compute_costs
+
+                # Take into account earlier covered compute costs
+                covered_compute_costs = (
+                    compute_costs - overall_covered_compute_costs
                 )
-                covered_compute_costs = compute_costs
+
+                if not is_last:
+                    # Limit to authorized budget for all but the last invoice
+                    covered_compute_costs = min(
+                        covered_compute_costs,
+                        invoice.compute_costs_euros * 1000 * 100,
+                    )
+
+                invoice.compute_cost_euro_millicents = covered_compute_costs
+
+                # Add newly covered compute costs
+                overall_covered_compute_costs += covered_compute_costs
 
             @retry_with_backoff((LockNotAvailable,))
             def save_invoices():

app/tests/challenges_tests/test_tasks.py

@@ -543,7 +543,7 @@ def test_update_challenge_compute_costs_expired_utilization():
         compute_costs_euros=20,
         payment_status=PaymentStatusChoices.PAID,
         payment_type=PaymentTypeChoices.PREPAID,
-        expires_on=now().date(),
+        expires_on=now().date() - timedelta(days=1),
     )
 
     invoice_later_this_year = InvoiceFactory(
@@ -560,7 +560,7 @@ def test_update_challenge_compute_costs_expired_utilization():
     )
     job_utilization = job_last_year.job_utilization
     job_utilization.challenge = challenge
-    job_utilization.created = now() - timedelta(days=365)
+    job_utilization.created = now() - timedelta(days=400)
     job_utilization.compute_cost_euro_millicents = (
         100 * 1000 * 100  # Note: Huge
     )
@@ -573,6 +573,9 @@ def test_update_challenge_compute_costs_expired_utilization():
     update_challenge_compute_costs()
 
     invoice_last_year.refresh_from_db()
+    invoice_this_year.refresh_from_db()
+    invoice_later_this_year.refresh_from_db()
+
     assert (  # Fully utilized
         invoice_last_year.compute_cost_euro_millicents == 10 * 1000 * 100
     )