Merge branch 'develop' into task/authoritative-msca-delegation

Author: mikeseibel

endorsement/models/itbill.py

@@ -92,22 +92,29 @@ def clear_provisions(self):
 
     @property
     def current_quota(self):
-        return self.get_quota_on_date(timezone.now().date())
+        return (self.current_quantity * 100) + getattr(
+            settings, "ITBILL_SHARED_DRIVE_SUBSIDIZED_QUOTA"
+        )
+
+    @property
+    def current_quantity(self):
+        return self.get_quantity_on_date(timezone.now().date())
 
-    def get_quota_on_date(self, now):
+    def get_quantity_on_date(self, now):
         """
         Walks Provisions list to return the subscribed quota
         associated with the given date
         """
+        current_quantity = 0
         if self.state == self.SUBSCRIPTION_DEPLOYED:
             for provision in self.get_provisions():
                 for quantity in provision.get_quantities():
-                    if quantity.start_date <= now:
-                        if (quantity.end_date is None
-                                or quantity.end_date >= now):
-                            return quantity.quantity_gigabytes
+                    if (quantity.start_date <= now
+                        and (quantity.end_date is None
+                             or quantity.end_date >= now)):
+                        current_quantity += quantity.quantity
 
-        return None
+        return current_quantity
 
     def json_data(self):
         return {
@@ -134,12 +141,6 @@ class ITBillProvision(
     )
     current_quantity = models.IntegerField()
 
-    @property
-    def current_quantity_gigabytes(self):
-        return (self.current_quantity * 100) + getattr(
-            settings, "ITBILL_SHARED_DRIVE_SUBSIDIZED_QUOTA"
-        )
-
     def from_json(self, provision):
         for quantity in provision.quantities:
             self.set_quantity(quantity)

endorsement/test/models/test_itbill.py

@@ -24,25 +24,25 @@ def test_current_quota(self):
             shared_drive__drive_id='IRDXB54TWF3OY8MVC9J')
 
         now = datetime.strptime('2023-12-31', '%Y-%m-%d').date()
-        quota = record.subscription.get_quota_on_date(now)
-        self.assertEqual(quota, None)
+        quota = record.subscription.get_quantity_on_date(now)
+        self.assertEqual(quota, 0)
 
         now = datetime.strptime('2024-01-01', '%Y-%m-%d').date()
-        quota = record.subscription.get_quota_on_date(now)
-        self.assertEqual(quota, 300)
+        quota = record.subscription.get_quantity_on_date(now)
+        self.assertEqual(quota, 2)
 
         now = datetime.strptime('2024-01-02', '%Y-%m-%d').date()
-        quota = record.subscription.get_quota_on_date(now)
-        self.assertEqual(quota, 300)
+        quota = record.subscription.get_quantity_on_date(now)
+        self.assertEqual(quota, 2)
 
         now = datetime.strptime('2024-12-28', '%Y-%m-%d').date()
-        quota = record.subscription.get_quota_on_date(now)
-        self.assertEqual(quota, 300)
+        quota = record.subscription.get_quantity_on_date(now)
+        self.assertEqual(quota, 2)
 
         now = datetime.strptime('2024-12-29', '%Y-%m-%d').date()
-        quota = record.subscription.get_quota_on_date(now)
-        self.assertEqual(quota, 300)
+        quota = record.subscription.get_quantity_on_date(now)
+        self.assertEqual(quota, 2)
 
         now = datetime.strptime('2024-12-30', '%Y-%m-%d').date()
-        quota = record.subscription.get_quota_on_date(now)
-        self.assertEqual(quota, None)
+        quota = record.subscription.get_quantity_on_date(now)
+        self.assertEqual(quota, 0)