From f139bce14e99e465b44be16ac977eb4043eab03e Mon Sep 17 00:00:00 2001 From: Colin Gross Date: Tue, 29 Oct 2024 18:36:54 -0400 Subject: [PATCH] Report running total of new users for months queried. --- bravo_api/blueprints/status/status.py | 23 +++++++++++++++++++---- tests/status/test_usage_status.py | 7 +++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/bravo_api/blueprints/status/status.py b/bravo_api/blueprints/status/status.py index 8ed48f9..6c8dd8a 100644 --- a/bravo_api/blueprints/status/status.py +++ b/bravo_api/blueprints/status/status.py @@ -86,10 +86,23 @@ def total_user_count(collection: pymongo.collection.Collection) -> int: return len([item for item in cursor]) -def new_user_count(collection: pymongo.collection.Collection) -> dict: +def add_running_user_count(user_counts: list) -> list: + """ + Given list of monthly user counts in ascending date order, + return same list with running sum of users added to each month. + """ + acc = 0 + for month in user_counts: + acc = acc + month['new_users'] + month['run_total'] = acc + + return user_counts + + +def new_user_count(collection: pymongo.collection.Collection) -> list: """ Given users collection, query for new users that agreed to terms per month. - Return array of dicts one per month. E.g. + Return array of dicts one per month in date descending order. E.g. [{'month': 10, 'new_users': 20, 'year': 2023}, {'month': 9, 'new_users': 30, 'year': 2023}, @@ -109,11 +122,13 @@ def new_user_count(collection: pymongo.collection.Collection) -> dict: "year": "$_id.year", "month": "$_id.month", "new_users": 1}}, - {"$sort": {"year": -1, "month": -1}} + {"$sort": {"year": 1, "month": 1}} ] user_counts = collection.aggregate(user_counts_pline) - return [item for item in user_counts] + count_list = add_running_user_count([item for item in user_counts]) + + return count_list[::-1] def active_user_count(collection: pymongo.collection.Collection) -> dict: diff --git a/tests/status/test_usage_status.py b/tests/status/test_usage_status.py index 977bdaf..ecdd656 100644 --- a/tests/status/test_usage_status.py +++ b/tests/status/test_usage_status.py @@ -16,10 +16,9 @@ {'max_user_per_day': 1, 'month': 9, 'year': 2023}, {'max_user_per_day': 1, 'month': 8, 'year': 2023}] -NEW_USERS_EXPECTED = [{'month': 10, 'new_users': 1, 'year': 2023}, - {'month': 9, 'new_users': 2, 'year': 2023}, - {'month': 8, 'new_users': 1, 'year': 2023}] - +NEW_USERS_EXPECTED = [{'month': 10, 'new_users': 1, 'run_total': 4, 'year': 2023}, + {'month': 9, 'new_users': 2, 'run_total': 3, 'year': 2023}, + {'month': 8, 'new_users': 1, 'run_total': 1, 'year': 2023}] TOTAL_USERS_EXPECTED = 4