Skip to content

New stats 6 #1322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
norkans7 merged 4 commits into from
Dec 8, 2025
Merged

New stats 6 #1322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
632173e
Switch to use PollStatsCounter model stats
norkans7 Dec 4, 2025
9c488d6
Switch to use PollEngagementDailyCount model engagement stats
norkans7 Dec 4, 2025
c0014c4
Run code_checks
norkans7 Dec 4, 2025
c1c9a68
Fix variable name
norkans7 Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 19 additions & 139 deletions ureport/polls/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from django.contrib.auth import get_user_model
from django.core.cache import cache
from django.db import connection, models
from django.db.models import Count, F, Prefetch, Q, Sum
from django.db.models import Count, F, Prefetch, Sum
from django.db.models.functions import Lower
from django.utils import timezone
from django.utils.html import strip_tags
Expand Down Expand Up @@ -1103,7 +1103,7 @@ def generate_word_cloud(self):
def calculate_results(self, segment=None):
from stop_words import safe_get_stop_words

from ureport.stats.models import AgeSegment, GenderSegment, PollStats, PollStatsCounter, PollWordCloud
from ureport.stats.models import AgeSegment, GenderSegment, PollStatsCounter, PollWordCloud

org = self.poll.org
open_ended = self.is_open_ended()
Expand Down Expand Up @@ -1160,32 +1160,6 @@ def calculate_results(self, segment=None):
osm_id = boundary.get("osm_id").upper()

categories_results = (
PollStats.get_question_stats(org.id, self)
.filter(
Q(location__id=boundary["id"])
| Q(location__parent__id=boundary["id"])
| Q(location__parent__parent__id=boundary["id"])
)
.exclude(flow_result_category=None)
.values("flow_result_category__category")
.annotate(label=F("flow_result_category__category"), count=Sum("count"))
.values("label", "count")
)
categories_results_dict = {elt["label"].lower(): elt["count"] for elt in categories_results}

unset_count_stats = (
PollStats.get_question_stats(org.id, self)
.filter(flow_result_category=None)
.filter(
Q(location__id=boundary["id"])
| Q(location__parent__id=boundary["id"])
| Q(location__parent__parent__id=boundary["id"])
)
.aggregate(Sum("count"))
)
unset_count = unset_count_stats.get("count__sum", 0) or 0

new_categories_results = (
PollStatsCounter.objects.filter(
org_id=org.id,
flow_result=self.flow_result,
Expand All @@ -1196,11 +1170,9 @@ def calculate_results(self, segment=None):
.annotate(label=F("flow_result_category__category"), count=Sum("count"))
.values("label", "count")
)
new_categories_results_dict = {
elt["label"].lower(): elt["count"] for elt in new_categories_results
}
categories_results_dict = {elt["label"].lower(): elt["count"] for elt in categories_results}

new_unset_count_stats = (
unset_count_stats = (
PollStatsCounter.objects.filter(
org_id=org.id,
flow_result=self.flow_result,
Expand All @@ -1209,17 +1181,7 @@ def calculate_results(self, segment=None):
.filter(flow_result_category=None)
.aggregate(Sum("count"))
)
new_unset_count = new_unset_count_stats.get("count__sum", 0) or 0

self._log_stats_comparison(
categories_results_dict,
new_categories_results_dict,
unset_count,
new_unset_count,
"location",
f"{location_part}:{osm_id}",
org.id,
)
unset_count = unset_count_stats.get("count__sum", 0) or 0

for category_obj in categories_qs:
key = category_obj.flow_result_category.category.lower()
Expand Down Expand Up @@ -1260,23 +1222,6 @@ def calculate_results(self, segment=None):
data_key = "35+"

categories_results = (
PollStats.get_question_stats(org.id, self)
.filter(age_segment_id=age["id"])
.exclude(flow_result_category=None)
.values("flow_result_category__category")
.annotate(label=F("flow_result_category__category"), count=Sum("count"))
.values("label", "count")
)
categories_results_dict = {elt["label"].lower(): elt["count"] for elt in categories_results}

unset_count_stats = (
PollStats.get_question_stats(org.id, self)
.filter(flow_result_category=None, age_segment_id=age["id"])
.aggregate(Sum("count"))
)
unset_count = unset_count_stats.get("count__sum", 0) or 0

new_categories_results = (
PollStatsCounter.objects.filter(
org_id=org.id,
flow_result=self.flow_result,
Expand All @@ -1287,11 +1232,9 @@ def calculate_results(self, segment=None):
.annotate(label=F("flow_result_category__category"), count=Sum("count"))
.values("label", "count")
)
new_categories_results_dict = {
elt["label"].lower(): elt["count"] for elt in new_categories_results
}
categories_results_dict = {elt["label"].lower(): elt["count"] for elt in categories_results}

new_unset_count_stats = (
unset_count_stats = (
PollStatsCounter.objects.filter(
org_id=org.id,
flow_result=self.flow_result,
Expand All @@ -1300,17 +1243,7 @@ def calculate_results(self, segment=None):
.filter(flow_result_category=None)
.aggregate(Sum("count"))
)
new_unset_count = new_unset_count_stats.get("count__sum", 0) or 0

self._log_stats_comparison(
categories_results_dict,
new_categories_results_dict,
unset_count,
new_unset_count,
"age",
f"{age['min_age']}:{age['max_age']}",
org.id,
)
unset_count = unset_count_stats.get("count__sum", 0) or 0

categories = []
for category_obj in categories_qs:
Expand Down Expand Up @@ -1338,24 +1271,6 @@ def calculate_results(self, segment=None):
results = []
for gender in genders:
categories_results = (
PollStats.get_question_stats(org.id, self)
.filter(gender_segment_id=gender["id"])
.exclude(flow_result_category=None)
.values("flow_result_category__category")
.annotate(label=F("flow_result_category__category"), count=Sum("count"))
.values("label", "count")
)
categories_results_dict = {elt["label"].lower(): elt["count"] for elt in categories_results}
categories = []

unset_count_stats = (
PollStats.get_question_stats(org.id, self)
.filter(flow_result_category=None, gender_segment_id=gender["id"])
.aggregate(Sum("count"))
)
unset_count = unset_count_stats.get("count__sum", 0) or 0

new_categories_results = (
PollStatsCounter.objects.filter(
org_id=org.id,
flow_result=self.flow_result,
Expand All @@ -1366,11 +1281,10 @@ def calculate_results(self, segment=None):
.annotate(label=F("flow_result_category__category"), count=Sum("count"))
.values("label", "count")
)
new_categories_results_dict = {
elt["label"].lower(): elt["count"] for elt in new_categories_results
}
categories_results_dict = {elt["label"].lower(): elt["count"] for elt in categories_results}
categories = []

new_unset_count_stats = (
unset_count_stats = (
PollStatsCounter.objects.filter(
org_id=org.id,
flow_result=self.flow_result,
Expand All @@ -1379,17 +1293,7 @@ def calculate_results(self, segment=None):
.filter(flow_result_category=None)
.aggregate(Sum("count"))
)
new_unset_count = new_unset_count_stats.get("count__sum", 0) or 0

self._log_stats_comparison(
categories_results_dict,
new_categories_results_dict,
unset_count,
new_unset_count,
"gender",
gender["gender"],
org.id,
)
unset_count = unset_count_stats.get("count__sum", 0) or 0

for category_obj in categories_qs:
key = category_obj.flow_result_category.category.lower()
Expand All @@ -1411,27 +1315,14 @@ def calculate_results(self, segment=None):
)

else:
categories_results = (
PollStats.get_question_stats(org.id, self)
.exclude(flow_result_category=None)
.values("flow_result_category__category")
.annotate(label=F("flow_result_category__category"), count=Sum("count"))
.values("label", "count")
)
categories_results_dict = {elt["label"].lower(): elt["count"] for elt in categories_results}

new_stats_count = (
stats_count = (
PollStatsCounter.objects.filter(org_id=org.id, flow_result=self.flow_result, scope="all")
.exclude(flow_result_category=None)
.values("flow_result_category__category")
.annotate(label=F("flow_result_category__category"), count=Sum("count"))
.values("label", "count")
)
new_categories_results_dict = {elt["label"].lower(): elt["count"] for elt in new_stats_count}

self._log_stats_comparison(
categories_results_dict, new_categories_results_dict, None, None, "total", "all", org.id
)
categories_results_dict = {elt["label"].lower(): elt["count"] for elt in stats_count}

categories = []

Expand Down Expand Up @@ -1482,23 +1373,16 @@ def get_responded(self):
return self.calculate_responded()

def calculate_responded(self):
from ureport.stats.models import PollStats, PollStatsCounter
from ureport.stats.models import PollStatsCounter

key = PollQuestion.POLL_QUESTION_RESPONDED_CACHE_KEY % (self.poll.org.pk, self.poll.pk, self.pk)
responded_stats = (
PollStats.get_question_stats(self.poll.org_id, question=self)
.exclude(flow_result_category=None)
.aggregate(Sum("count"))
)

new_responded_stats = (
responded_stats = (
PollStatsCounter.objects.filter(org_id=self.poll.org_id, flow_result=self.flow_result, scope="all")
.exclude(flow_result_category=None)
.aggregate(Sum("count"))
)

self._log_stats_comparison(responded_stats, new_responded_stats, None, None, "total", "all", self.poll.org_id)

results = responded_stats.get("count__sum", 0) or 0
cache.set(key, {"results": results}, None)
return results
Expand All @@ -1514,18 +1398,14 @@ def get_polled(self):
return self.calculate_polled()

def calculate_polled(self):
from ureport.stats.models import PollStats, PollStatsCounter
from ureport.stats.models import PollStatsCounter

key = PollQuestion.POLL_QUESTION_POLLED_CACHE_KEY % (self.poll.org.pk, self.poll.pk, self.pk)

polled_stats = PollStats.get_question_stats(self.poll.org_id, question=self).aggregate(Sum("count"))
results = polled_stats.get("count__sum", 0) or 0

new_polled_stats = PollStatsCounter.objects.filter(
polled_stats = PollStatsCounter.objects.filter(
org_id=self.poll.org_id, flow_result=self.flow_result, scope="all"
).aggregate(Sum("count"))

self._log_stats_comparison(polled_stats, new_polled_stats, None, None, "total", "all", self.poll.org_id)
results = polled_stats.get("count__sum", 0) or 0

cache.set(key, {"results": results}, None)
return results
Expand Down
Loading