diff --git a/apiserver/apiserver/api/management/commands/run_hourly.py b/apiserver/apiserver/api/management/commands/run_hourly.py index 57ad634..7a85b47 100644 --- a/apiserver/apiserver/api/management/commands/run_hourly.py +++ b/apiserver/apiserver/api/management/commands/run_hourly.py @@ -9,7 +9,7 @@ class Command(BaseCommand): def generate_stats(self): utils_stats.calc_next_events() - member_count, green_count, six_month_plus_count = utils_stats.calc_member_counts() + member_count, green_count, six_month_plus_count, vetted_count = utils_stats.calc_member_counts() signup_count = utils_stats.calc_signup_counts() # do this hourly in case an admin causes a change @@ -19,6 +19,7 @@ class Command(BaseCommand): member_count=member_count, green_count=green_count, six_month_plus_count=six_month_plus_count, + vetted_count=vetted_count, ), ) diff --git a/apiserver/apiserver/api/models.py b/apiserver/apiserver/api/models.py index 70c437c..40e0b0c 100644 --- a/apiserver/apiserver/api/models.py +++ b/apiserver/apiserver/api/models.py @@ -143,6 +143,7 @@ class StatsMemberCount(models.Model): member_count = models.IntegerField() green_count = models.IntegerField() six_month_plus_count = models.IntegerField() + vetted_count = models.IntegerField() class StatsSignupCount(models.Model): month = models.DateField() diff --git a/apiserver/apiserver/api/utils_stats.py b/apiserver/apiserver/api/utils_stats.py index ddfd37d..d447eb4 100644 --- a/apiserver/apiserver/api/utils_stats.py +++ b/apiserver/apiserver/api/utils_stats.py @@ -67,11 +67,13 @@ def calc_member_counts(): six_months_ago = today_alberta_tz() - timedelta(days=183) six_month_plus_count = not_paused.filter(application_date__lte=six_months_ago).count() + vetted_count = not_paused.filter(vetted_date__isnull=False).count() + cache.set('member_count', member_count) cache.set('paused_count', paused_count) cache.set('green_count', green_count) - return member_count, green_count, six_month_plus_count + return member_count, green_count, six_month_plus_count, vetted_count def calc_signup_counts(): month_beginning = today_alberta_tz().replace(day=1)