Merge pull request #765 from uw-it-aca/develop

Develop

Author: mikeseibel

endorsement/models/itbill.py

@@ -7,6 +7,7 @@
 from django_prometheus.models import ExportModelOperationsMixin
 from endorsement.util.date import datetime_to_str, date_to_str
 from endorsement.util.key_remote import key_remote
+from datetime import date
 import json
 
 
@@ -102,16 +103,25 @@ def current_quantity(self):
 
     def get_quantity_on_date(self, now):
         """
-        Walks Provisions list to return the subscribed quota
-        associated with the given date
+        Walks provision quantities to return the subscribed quota
+        associated with the given date.  Quantity dates must fall
+        within ITBill billing period, which is December 1st to
+        November 30th of the following year.
         """
+        billing_period_start_year = now.year if (
+            now.month == 12) else now.year - 1
+        billing_period_end_year = now.year if (
+            now.month < 12) else now.year + 1
+        billing_period_start_date = date(billing_period_start_year, 12, 1)
+        billing_period_end_date = date(billing_period_end_year, 11, 30)
+
         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
-                        and (quantity.end_date is None
-                             or quantity.end_date >= now)):
+                    if ((not quantity.end_date
+                            or quantity.end_date > billing_period_start_date)
+                            and quantity.start_date < billing_period_end_date):
                         current_quantity += quantity.quantity
 
         return current_quantity

endorsement/static/endorsement/js/tab/google.js

@@ -189,7 +189,9 @@ var ManageSharedDrives = (function () {
         _prepSharedDriveContext = function (drive) {
             var expiration = moment(drive.datetime_expiration),
                 deadline = moment(drive.datetime_subscription_deadline),
-                now = moment.utc();
+                now = moment.utc(),
+                billing_period_start = moment(((now.month() == 11) ? now.year() : now.year() - 1) + '-12-01'),
+                billing_period_end = moment(((now.month() == 11) ? now.year() + 1 : now.year()) + '-11-30');
 
             drive.expiration_date = expiration.format('M/D/YYYY');
             drive.expiration_days = expiration.diff(now, 'days');
@@ -212,8 +214,8 @@ var ManageSharedDrives = (function () {
                     $.each(this.quantities, function () {
                         var starting = this.start_date ? moment(this.start_date) : null,
                             ending = this.end_date ? moment(this.end_date): null,
-                            is_future = starting && starting.diff(now) > 0,
-                            is_ending = starting && ending && starting.diff(now) < 0 && ending.diff(now) > 0,
+                            is_future = starting && starting.diff(billing_period_end) > 0 && this.quota_limit != drive.drive.drive_quota.quota_limit,
+                            is_ending = ending && ending.diff(billing_period_end) < 0,
                             is_increasing = this.quota_limit > drive.drive.drive_quota.quota_limit,
                             is_decreasing = this.quota_limit < drive.drive.drive_quota.quota_limit,
                             is_changing = (is_future || is_ending);

endorsement/test/models/test_itbill.py

@@ -23,7 +23,7 @@ def test_current_quota(self):
         record = SharedDriveRecord.objects.get(
             shared_drive__drive_id='IRDXB54TWF3OY8MVC9J')
 
-        now = datetime.strptime('2023-12-31', '%Y-%m-%d').date()
+        now = datetime.strptime('2023-11-30', '%Y-%m-%d').date()
         quota = record.subscription.get_quantity_on_date(now)
         self.assertEqual(quota, 0)
 
@@ -43,6 +43,6 @@ def test_current_quota(self):
         quota = record.subscription.get_quantity_on_date(now)
         self.assertEqual(quota, 2)
 
-        now = datetime.strptime('2024-12-30', '%Y-%m-%d').date()
+        now = datetime.strptime('2025-12-01', '%Y-%m-%d').date()
         quota = record.subscription.get_quantity_on_date(now)
         self.assertEqual(quota, 0)