Skip to content

Commit 7151494

Browse files
committed
Run code_checks
1 parent 01c59d4 commit 7151494

File tree

6 files changed

+31
-25
lines changed

6 files changed

+31
-25
lines changed

ureport/polls/models.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,9 +1170,7 @@ def calculate_results(self, segment=None):
11701170
.annotate(label=F("flow_result_category__category"), count=Sum("count"))
11711171
.values("label", "count")
11721172
)
1173-
categories_results_dict = {
1174-
elt["label"].lower(): elt["count"] for elt in categories_results
1175-
}
1173+
categories_results_dict = {elt["label"].lower(): elt["count"] for elt in categories_results}
11761174

11771175
unset_count_stats = (
11781176
PollStatsCounter.objects.filter(
@@ -1234,9 +1232,7 @@ def calculate_results(self, segment=None):
12341232
.annotate(label=F("flow_result_category__category"), count=Sum("count"))
12351233
.values("label", "count")
12361234
)
1237-
categories_results_dict = {
1238-
elt["label"].lower(): elt["count"] for elt in categories_results
1239-
}
1235+
categories_results_dict = {elt["label"].lower(): elt["count"] for elt in categories_results}
12401236

12411237
unset_count_stats = (
12421238
PollStatsCounter.objects.filter(
@@ -1285,9 +1281,7 @@ def calculate_results(self, segment=None):
12851281
.annotate(label=F("flow_result_category__category"), count=Sum("count"))
12861282
.values("label", "count")
12871283
)
1288-
categories_results_dict = {
1289-
elt["label"].lower(): elt["count"] for elt in categories_results
1290-
}
1284+
categories_results_dict = {elt["label"].lower(): elt["count"] for elt in categories_results}
12911285
categories = []
12921286

12931287
unset_count_stats = (

ureport/polls/tests.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2204,8 +2204,6 @@ def test_squash_poll_stats_counters(self):
22042204
age_segment_20 = AgeSegment.objects.filter(min_age=20).first()
22052205
age_segment_25 = AgeSegment.objects.filter(min_age=25).first()
22062206

2207-
now = timezone.now().replace(hour=0, minute=0, second=0, microsecond=0)
2208-
22092207
PollStatsCounter.objects.all().delete()
22102208
self.assertEqual(0, PollStatsCounter.objects.all().count())
22112209

@@ -2444,7 +2442,6 @@ def test_squash_poll_stats_counters(self):
24442442
self.assertEqual(11, PollStatsCounter.objects.all().count())
24452443
self.assertEqual(poll_question1.calculate_results(segment=dict(age="Age")), calculated_results)
24462444

2447-
24482445
def test_tasks(self):
24492446
self.org = self.create_org("burundi", zoneinfo.ZoneInfo("Africa/Bujumbura"), self.admin)
24502447

@@ -2630,7 +2627,10 @@ def verify_counts():
26302627
)
26312628

26322629
activities = (
2633-
ContactActivity.objects.filter(org=self.nigeria).values("date").annotate(count__sum=Count("id")).order_by("date")
2630+
ContactActivity.objects.filter(org=self.nigeria)
2631+
.values("date")
2632+
.annotate(count__sum=Count("id"))
2633+
.order_by("date")
26342634
)
26352635
self.assertEqual(12, activity_counts.count())
26362636
self.assertEqual(12, activities.count())

ureport/public/views.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
from ureport.locations.models import Boundary
3939
from ureport.news.models import NewsItem
4040
from ureport.polls.models import Poll, PollQuestion
41-
from ureport.stats.models import GenderSegment, PollStatsCounter, PollEngagementDailyCount
41+
from ureport.stats.models import GenderSegment, PollEngagementDailyCount, PollStatsCounter
4242
from ureport.utils import (
4343
get_global_count,
4444
get_shared_countries_number,
@@ -488,7 +488,9 @@ def render_to_response(self, context, **kwargs):
488488
segment_slug = results_params.get("segment")
489489
time_filter = int(results_params.get("filter", "12"))
490490

491-
output_data = PollEngagementDailyCount.get_engagement_data(self.get_object(), metric, segment_slug, time_filter)
491+
output_data = PollEngagementDailyCount.get_engagement_data(
492+
self.get_object(), metric, segment_slug, time_filter
493+
)
492494
except json.JSONDecodeError:
493495
output_data = []
494496
pass
@@ -534,7 +536,8 @@ def get_context_data(self, **kwargs):
534536
context["average_response_rate"] = PollStatsCounter.get_average_response_rate(org)
535537

536538
context["data_time_filters"] = [
537-
dict(time_filter_number=key, label=str(val)) for key, val in PollEngagementDailyCount.DATA_TIME_FILTERS.items()
539+
dict(time_filter_number=key, label=str(val))
540+
for key, val in PollEngagementDailyCount.DATA_TIME_FILTERS.items()
538541
]
539542

540543
backend_options = org.backends.filter(is_active=True).values_list("slug", flat=True)
@@ -548,7 +551,9 @@ def get_context_data(self, **kwargs):
548551
if (key != "location" or show_maps)
549552
]
550553

551-
context["data_metrics"] = [dict(slug=key, title=str(val)) for key, val in PollEngagementDailyCount.DATA_METRICS.items()]
554+
context["data_metrics"] = [
555+
dict(slug=key, title=str(val)) for key, val in PollEngagementDailyCount.DATA_METRICS.items()
556+
]
552557

553558
context["hide_charts_breakdown"] = org.get_config("common.has_charts_hidden", False) and not (
554559
(user.is_authenticated and org in user.get_user_orgs()) or user.is_superuser

ureport/stats/models.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,11 @@ def get_all_opinion_responses(cls, org, time_filter):
401401
.values(date=Cast("day", output_field=models.DateTimeField()))
402402
.annotate(Sum("count"))
403403
)
404-
return [dict(name=str(_("Opinion Responses")), data=PollEngagementDailyCount.get_counts_data(responses, time_filter))]
404+
return [
405+
dict(
406+
name=str(_("Opinion Responses")), data=PollEngagementDailyCount.get_counts_data(responses, time_filter)
407+
)
408+
]
405409

406410
@classmethod
407411
def get_gender_opinion_responses(cls, org, time_filter):
@@ -678,7 +682,9 @@ def get_scheme_response_rate_series(cls, org, time_filter):
678682
.annotate(Sum("count"))
679683
)
680684

681-
gender_rate_series = PollEngagementDailyCount.get_response_rate_data(polled_stats, responded_stats, time_filter)
685+
gender_rate_series = PollEngagementDailyCount.get_response_rate_data(
686+
polled_stats, responded_stats, time_filter
687+
)
682688

683689
name = SchemeSegment.SCHEME_DISPLAY.get(scheme["scheme"], scheme["scheme"].upper())
684690
if not name:
@@ -728,7 +734,9 @@ def get_gender_response_rate_series(cls, org, time_filter):
728734
.annotate(Sum("count"))
729735
)
730736

731-
gender_rate_series = PollEngagementDailyCount.get_response_rate_data(polled_stats, responded_stats, time_filter)
737+
gender_rate_series = PollEngagementDailyCount.get_response_rate_data(
738+
polled_stats, responded_stats, time_filter
739+
)
732740
output_data.append(dict(name=org_gender_labels.get(gender["gender"]), data=gender_rate_series))
733741

734742
return output_data
@@ -778,7 +786,9 @@ def get_age_response_rate_series(cls, org, time_filter):
778786
.annotate(Sum("count"))
779787
)
780788

781-
age_rate_series = PollEngagementDailyCount.get_response_rate_data(polled_stats, responded_stats, time_filter)
789+
age_rate_series = PollEngagementDailyCount.get_response_rate_data(
790+
polled_stats, responded_stats, time_filter
791+
)
782792
output_data.append(dict(name=data_key, data=age_rate_series))
783793
return output_data
784794

@@ -811,8 +821,6 @@ def get_response_rate_data(cls, polled_qs, responded_qs, time_filter):
811821

812822
return data
813823

814-
815-
816824
class Meta:
817825
indexes = [
818826
models.Index(fields=["org", "flow_result"], name="stats_pedc_org_flowresult_idx"),

ureport/stats/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
@org_task("refresh-engagement-data", 60 * 60 * 4)
1818
def refresh_engagement_data(org, since, until):
19-
from .models import PollStatsCounter, PollEngagementDailyCount
19+
from .models import PollEngagementDailyCount, PollStatsCounter
2020

2121
start = time.time()
2222

ureport/utils/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,6 @@ def get_ureporters_locations_response_rates(org, segment):
915915
else:
916916
location_scopes.append(f"ward:{elt['osm_id'].upper()}")
917917

918-
boundaries_ids = [elt["id"] for elt in boundaries]
919918
polled_stats = (
920919
PollEngagementDailyCount.objects.filter(org=org, day__gte=year_ago, scope__in=location_scopes)
921920
.values("scope")

0 commit comments

Comments
 (0)