Billing small fixes (#601)

* Added gcp-projects API to billing, new Billing CostByTime page

* Updated StackedAreaByDateChart with more custom properties.

* First version of Bar and Dount charts.

* Upgrading babel / vulnerability.

api/routes/__init__.py

@@ -10,13 +10,4 @@
 from api.routes.web import router as web_router
 from api.routes.enum import router as enum_router
 from api.routes.sequencing_groups import router as sequencing_groups_router
-
-billing_envs = [
-    'SM_GCP_BQ_AGGREG_VIEW',
-    'SM_GCP_BQ_AGGREG_RAW',
-    'SM_GCP_BQ_AGGREG_EXT_VIEW',
-    'SM_GCP_BQ_BUDGET_VIEW',
-]
-
-if all([os.environ.get(env) for env in billing_envs]):
-    from api.routes.billing import router as billing_router
+from api.routes.billing import router as billing_router

api/utils/dates.py

@@ -21,9 +21,14 @@ def get_invoice_month_range(convert_month: date) -> tuple[date, date]:
     # Grab the first day of invoice month then subtract INVOICE_DAY_DIFF days
     start_day = first_day + timedelta(days=-INVOICE_DAY_DIFF)
 
+    if convert_month.month == 12:
+        next_month = first_day.replace(month=1, year=convert_month.year + 1)
+    else:
+        next_month = first_day.replace(month=convert_month.month + 1)
+
     # Grab the last day of invoice month then add INVOICE_DAY_DIFF days
     last_day = (
-        first_day.replace(month=(convert_month.month % 12) + 1)
+        next_month
         + timedelta(days=-1)
         + timedelta(days=INVOICE_DAY_DIFF)
     )

db/python/layers/billing.py

@@ -711,7 +711,7 @@ async def get_running_cost(
         results.append(
             BillingCostBudgetRecord.from_json(
                 {
-                    'field': f'All {field.value}s',
+                    'field': f'{BillingColumn.generate_all_title(field)}',
                     'total_monthly': (
                         total_monthly['C']['ALL'] + total_monthly['S']['ALL']
                     ),

models/models/billing.py

@@ -151,6 +151,15 @@ def extended_cols(cls) -> list[str]:
             'sequencing_group',
         ]
 
+    @staticmethod
+    def generate_all_title(record) -> str:
+        """Generate Column as All Title
+        """
+        if record == BillingColumn.PROJECT:
+            return 'All GCP Projects'
+
+        return f'All {record.title()}s'
+
 
 class BillingTotalCostQueryModel(SMBase):
     """

web/src/pages/billing/Billing.css

@@ -9,3 +9,7 @@
 .field-selector-dropdown {
     width: 80% !important;
 }
+
+.donut-chart {
+    margin-top: 20px;
+}