fix: parse total build minutes

browniebroke · May 25, 2021 · 07f0885 · 07f0885
1 parent 74bd0b7
commit 07f0885
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/netlify_builds/cli.py b/netlify_builds/cli.py
@@ -53,12 +53,13 @@ def parse_response(team, response_data):
     start_date = parse(minutes["period_start_date"])
     end_date = parse(minutes["period_end_date"])
     used = minutes["current"]
+    total = minutes["included_minutes"]
     percent_elapsed = (
         100
         * (dt.datetime.now(tz=start_date.tzinfo) - start_date)
         / (end_date - start_date)
     )
-    return team, used, start_date, end_date, percent_elapsed
+    return team, used, total, start_date, end_date, percent_elapsed
 
 
 def print_table(rows):
@@ -74,8 +75,8 @@ def print_table(rows):
     table.add_column("Elapsed", justify="right")
     table.add_column("Used", justify="right")
 
-    for team, used, start_date, end_date, percent_elapsed in rows:
-        percent_used = 100 * used / 300
+    for team, used, total, start_date, end_date, percent_elapsed in rows:
+        percent_used = 100 * used / total
         style = "red" if percent_used > percent_elapsed else "green"
         table.add_row(
             team,

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -84,12 +84,13 @@ def dummy_response_data():
 
 @time_machine.travel("2019-11-01 10:00")
 def test_parse_response(dummy_response_data):
-    team, used, start_date, end_date, percent_elapsed = parse_response(
+    team, used, total, start_date, end_date, percent_elapsed = parse_response(
         "example", dummy_response_data
     )
 
     assert team == "example"
     assert used == 49
+    assert total == 300
     assert start_date == dt.datetime(2019, 10, 15, 0, 0, tzinfo=tzoffset(None, -25200))
     assert end_date == dt.datetime(2019, 11, 15, 0, 0, tzinfo=tzoffset(None, -25200))
     assert int(percent_elapsed) == 55
@@ -109,8 +110,15 @@ def test_print_table_no_rows(console_print):
 def test_print_table_with_rows(console_print):
     print_table(
         [
-            ("a-team", 30, dt.datetime(2019, 10, 15), dt.datetime(2019, 11, 15), 70),
-            ("blue", 299, dt.datetime(2019, 10, 3), dt.datetime(2019, 11, 3), 30),
+            (
+                "a-team",
+                30,
+                300,
+                dt.datetime(2019, 10, 15),
+                dt.datetime(2019, 11, 15),
+                70,
+            ),
+            ("blue", 299, 300, dt.datetime(2019, 10, 3), dt.datetime(2019, 11, 3), 30),
         ]
     )