calculate invoice periodically hotfix

uselotus · Dec 16, 2022 · 7b39d6c · 7b39d6c
1 parent 2a82224
commit 7b39d6c
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/backend/metering_billing/tasks.py b/backend/metering_billing/tasks.py
@@ -40,6 +40,7 @@
     CUSTOMER_BALANCE_ADJUSTMENT_STATUS,
     FLAT_FEE_BILLING_TYPE,
     INVOICE_STATUS,
+    SUBSCRIPTION_STATUS,
 )
 
 EVENT_CACHE_FLUSH_COUNT = settings.EVENT_CACHE_FLUSH_COUNT
@@ -78,13 +79,11 @@ def calculate_invoice():
                 "Error generating invoice for subscription {}".format(old_subscription)
             )
             continue
-        num_subscription_records_active = (
-            SubscriptionRecord.objects.active()
-            .filter(
-                organization=old_subscription.organization,
-            )
-            .count()
-        )
+        num_subscription_records_active = SubscriptionRecord.objects.filter(
+            organization=old_subscription.organization,
+            status=SUBSCRIPTION_STATUS.ACTIVE,
+            end_date__gte=old_subscription.end_date,
+        ).count()
         if num_subscription_records_active > 0:
             sub = Subscription.objects.create(
                 organization=old_subscription.organization,