Merge pull request #56 from alan-turing-institute/usage-email-bug-fix

Usage email bug fix

Author: Iain-S

usage_function/tests/test_function_app.py

@@ -35,7 +35,7 @@ def test_main(self) -> None:
             mock_get_all_usage.return_value = ["usage1", "usage2"]
 
             with patch("usage.datetime") as mock_datetime:
-                now = datetime(year=2022, month=7, day=10)
+                now = datetime(year=2022, month=7, day=10, hour=10, minute=5, second=2)
                 mock_datetime.now.return_value = now
 
                 with patch(
@@ -54,31 +54,29 @@ def test_main(self) -> None:
                             _env_file=None,
                         )
 
-                        with patch("usage.date_range") as mock_date_range:
-                            mock_date_range.return_value = [33, 44]
+                        mock_timer = MagicMock()
+                        mock_timer.past_due = True
 
-                            mock_timer = MagicMock()
-                            mock_timer.past_due = True
+                        usage.main(mock_timer)
 
-                            usage.main(mock_timer)
-                            start_datetime = datetime(2022, 7, 8)
-                            end_datetime = datetime(2022, 7, 9)
-
-                            mock_date_range.assert_called_once_with(
-                                start_datetime, end_datetime
-                            )
+                        eighth = datetime(
+                            year=2022, month=7, day=8, hour=0, minute=0, second=0
+                        )
+                        ninth = datetime(
+                            year=2022, month=7, day=9, hour=0, minute=0, second=0
+                        )
 
                         mock_get_all_usage.assert_has_calls(
                             [
                                 call(
-                                    44,
-                                    44,
+                                    ninth,
+                                    ninth,
                                     billing_account_id=None,
                                     mgmt_group="mgmt-group",
                                 ),
                                 call(
-                                    33,
-                                    33,
+                                    eighth,
+                                    eighth,
                                     billing_account_id=None,
                                     mgmt_group="mgmt-group",
                                 ),
@@ -89,8 +87,14 @@ def test_main(self) -> None:
                                 call(
                                     HTTP_ADAPTER.validate_python("https://my.host"),
                                     ["usage1", "usage2"],
-                                    start_datetime.date(),
-                                    end_datetime.date(),
+                                    ninth,
+                                    ninth,
+                                ),
+                                call(
+                                    HTTP_ADAPTER.validate_python("https://my.host"),
+                                    ["usage1", "usage2"],
+                                    eighth,
+                                    eighth,
                                 ),
                             ]
                         )

usage_function/usage/__init__.py

@@ -61,8 +61,8 @@ def main(mytimer: func.TimerRequest) -> None:
                 retrieve_and_send_usage(
                     config.API_URL,
                     usage,
-                    start_datetime.date(),
-                    end_datetime.date(),
+                    usage_date,
+                    usage_date,
                 )
                 break
             except HttpResponseError as e:

usage_function/utils/usage.py

@@ -52,6 +52,9 @@ def get_all_usage(
         credential=CREDENTIALS, subscription_id=str(UUID(int=0))
     )
 
+    # Note that the data we get back seems to ignore the time part
+    # and requesting data between 2023-01-01T00:00:00Z and 2023-01-01T00:00:00Z
+    # will return data for the whole of 2023-01-01.
     filter_from = "properties/usageEnd ge '{}'".format(
         start_time.strftime("%Y-%m-%dT%H:%M:%SZ")
     )