[COST-4713] Handle Azure billingcurrency column (#4946)

Simplify leap year test failure fix.

Co-authored-by: Sam Doran <[email protected]>
Co-authored-by: Cody Myers <[email protected]>

Author: 3 people

koku/koku/test_pg_partition.py

@@ -2,11 +2,9 @@
 # Copyright 2021 Red Hat Inc.
 # SPDX-License-Identifier: Apache-2.0
 #
-import calendar
 import datetime
 import json
 import uuid
-from datetime import timedelta
 
 from django.db import connection as conn
 from django_tenants.utils import schema_context
@@ -25,12 +23,12 @@ def _execute(sql, params=None):
 
 
 def handle_leap_year_overflow(date, years):
+    future_year = date.year + years
     try:
-        new_date = date.replace(year=(date.year + years))
+        return date.replace(year=future_year)
     except ValueError:
-        # If an error occurs, set the day to the last day of the month
-        new_date = (date + timedelta(days=31)).replace(year=(date.year + years), day=1)
-    return new_date
+        # If an error occurs, it's probably not a leap year in the future so roll back one day
+        return (date - datetime.timedelta(days=1)).replace(year=future_year)
 
 
 def _get_table_partition_info(schema, table):
@@ -964,7 +962,6 @@ def test_repartition_all_tables(self):
         with schema_context(self.schema_name):
             aws_lids = AWSCostEntryLineItemDailySummary.objects.order_by("-usage_start")[0]
             aws_lids.usage_start = handle_leap_year_overflow(aws_lids.usage_start, 11)
-            aws_lids.usage_start = aws_lids.usage_start.replace(year=(aws_lids.usage_start.year + 11))
             aws_lids.save()
             ocp_lids = OCPUsageLineItemDailySummary.objects.order_by("-usage_start")[0]
             ocp_lids.usage_start = handle_leap_year_overflow(aws_lids.usage_start, 11)
@@ -1031,14 +1028,7 @@ def test_repartition_all_tables(self):
                 if new_ocp_lids.usage_start.day < 28
                 else new_ocp_lids.usage_start.day - 1
             )
-            if (
-                ocp_lids.usage_start.month == 2
-                and ocp_lids.usage_start.day == 28
-                and calendar.isleap(ocp_lids.usage_start.year)
-            ):
-                new_ocp_lids.usage_start = ocp_lids.usage_start.replace(day=29)
-            else:
-                new_ocp_lids.usage_start = ocp_lids.usage_start.replace(day=new_day)
+            new_ocp_lids.usage_start = ocp_lids.usage_start.replace(day=new_day)
             new_ocp_lids.save()
 
             with conn.cursor() as cur:

koku/masu/database/trino_sql/reporting_ocpazurecostlineitem_daily_summary.sql

@@ -164,7 +164,7 @@ SELECT cast(uuid() as varchar) as uuid,
         ELSE unitofmeasure
     END) as unit_of_measure,
     sum(coalesce(nullif(azure.quantity, 0), azure.usagequantity)) as usage_quantity,
-    coalesce(nullif(azure.billingcurrencycode, ''), azure.currency) as currency,
+    coalesce(nullif(azure.billingcurrencycode, ''), nullif(azure.currency, ''), azure.billingcurrency) as currency,
     sum(coalesce(nullif(azure.costinbillingcurrency, 0), azure.pretaxcost)) as pretax_cost,
     azure.tags,
     max(azure.resource_id_matched) as resource_id_matched,
@@ -183,7 +183,7 @@ GROUP BY coalesce(azure.date, azure.usagedatetime),
     coalesce(nullif(servicename, ''), metercategory),
     coalesce(nullif(subscriptionid, ''), subscriptionguid),
     azure.resourcelocation,
-    coalesce(nullif(azure.billingcurrencycode, ''), azure.currency),
+    coalesce(nullif(azure.billingcurrencycode, ''), nullif(azure.currency, ''), azure.billingcurrency),
     azure.tags
 ;
 
@@ -233,7 +233,7 @@ SELECT cast(uuid() as varchar) as uuid,
         ELSE unitofmeasure
     END) as unit_of_measure,
     sum(coalesce(nullif(azure.quantity, 0), azure.usagequantity)) as usage_quantity,
-    coalesce(nullif(azure.billingcurrencycode, ''), azure.currency) as currency,
+    coalesce(nullif(azure.billingcurrencycode, ''), nullif(azure.currency, ''), azure.billingcurrency) as currency,
     sum(coalesce(nullif(azure.costinbillingcurrency, 0), azure.pretaxcost)) as pretax_cost,
     json_format(
         cast(
@@ -260,7 +260,7 @@ GROUP BY coalesce(azure.date, azure.usagedatetime),
     coalesce(nullif(servicename, ''), metercategory),
     coalesce(nullif(subscriptionid, ''), subscriptionguid),
     azure.resourcelocation,
-    coalesce(nullif(azure.billingcurrencycode, ''), azure.currency),
+    coalesce(nullif(azure.billingcurrencycode, ''), nullif(azure.currency, ''), azure.billingcurrency),
     12, -- tags
     azure.matched_tag
 ;