diff --git a/analytics/lib/counts.py b/analytics/lib/counts.py index a20eb8f680..a11e9f59e2 100644 --- a/analytics/lib/counts.py +++ b/analytics/lib/counts.py @@ -135,14 +135,6 @@ def do_delete_counts_at_hour(stat, end_time): RealmCount.objects.filter(property=stat.property, end_time=end_time).delete() InstallationCount.objects.filter(property=stat.property, end_time=end_time).delete() -def do_delete_count_stat(property): - # type: (str) -> None - UserCount.objects.filter(property=property).delete() - StreamCount.objects.filter(property=property).delete() - RealmCount.objects.filter(property=property).delete() - InstallationCount.objects.filter(property=property).delete() - FillState.objects.filter(property=property).delete() - def do_drop_all_analytics_tables(): # type: () -> None UserCount.objects.all().delete() diff --git a/analytics/migrations/0009_remove_messages_to_stream_stat.py b/analytics/migrations/0009_remove_messages_to_stream_stat.py index 7d3da10e76..4570ca7ef9 100644 --- a/analytics/migrations/0009_remove_messages_to_stream_stat.py +++ b/analytics/migrations/0009_remove_messages_to_stream_stat.py @@ -3,11 +3,21 @@ from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor from django.db.migrations.state import StateApps from django.db import migrations -from analytics.lib.counts import do_delete_count_stat def delete_messages_sent_to_stream_stat(apps, schema_editor): # type: (StateApps, DatabaseSchemaEditor) -> None - do_delete_count_stat('messages_sent_to_stream:is_bot') + UserCount = apps.get_model('analytics', 'UserCount') + StreamCount = apps.get_model('analytics', 'StreamCount') + RealmCount = apps.get_model('analytics', 'RealmCount') + InstallationCount = apps.get_model('analytics', 'InstallationCount') + FillState = apps.get_model('analytics', 'FillState') + + property = 'messages_sent_to_stream:is_bot' + UserCount.objects.filter(property=property).delete() + StreamCount.objects.filter(property=property).delete() + RealmCount.objects.filter(property=property).delete() + InstallationCount.objects.filter(property=property).delete() + FillState.objects.filter(property=property).delete() class Migration(migrations.Migration):