Skip to content

Commit d817496

Browse files
flodoloflodolo
committed
Reduce code duplication
1 parent 4d31a7b commit d817496

3 files changed

Lines changed: 58 additions & 83 deletions

File tree

‎pontoon/base/models/entity.py‎

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from django.contrib.postgres.fields import ArrayField
99
from django.db import models
10-
from django.db.models import Count, F, Prefetch, Q
10+
from django.db.models import F, Prefetch, Q
1111
from django.utils import timezone
1212

1313
from pontoon.base import utils
@@ -16,6 +16,7 @@
1616
from pontoon.base.models.project_locale import ProjectLocale
1717
from pontoon.base.models.resource import Resource
1818
from pontoon.base.models.section import Section
19+
from pontoon.base.models.stats import aggregate_translation_stats
1920

2021

2122
def combine_entity_filters(entities, filter_choices, filters, *args):
@@ -290,48 +291,7 @@ def get_stats(self, locale) -> dict[str, int]:
290291
:arg Locale locale: filter translations for this locale.
291292
:return: a dictionary with stats for the Entity+Locale
292293
"""
293-
stats = self.translation_set.filter(locale=locale).aggregate(
294-
approved_count=Count(
295-
"pk",
296-
filter=Q(approved=True, errors__isnull=True, warnings__isnull=True),
297-
),
298-
pretranslated_count=Count(
299-
"pk",
300-
filter=Q(
301-
pretranslated=True, errors__isnull=True, warnings__isnull=True
302-
),
303-
),
304-
errors_count=Count(
305-
"pk",
306-
distinct=True,
307-
filter=Q(
308-
Q(Q(approved=True) | Q(pretranslated=True) | Q(fuzzy=True))
309-
& Q(errors__isnull=False)
310-
),
311-
),
312-
warnings_count=Count(
313-
"pk",
314-
distinct=True,
315-
filter=Q(
316-
Q(Q(approved=True) | Q(pretranslated=True) | Q(fuzzy=True))
317-
& Q(warnings__isnull=False)
318-
),
319-
),
320-
unreviewed_count=Count(
321-
"pk",
322-
distinct=True,
323-
filter=Q(
324-
approved=False, rejected=False, pretranslated=False, fuzzy=False
325-
),
326-
),
327-
)
328-
return {
329-
"approved": stats["approved_count"],
330-
"pretranslated": stats["pretranslated_count"],
331-
"errors": stats["errors_count"],
332-
"warnings": stats["warnings_count"],
333-
"unreviewed": stats["unreviewed_count"],
334-
}
294+
return aggregate_translation_stats(self.translation_set.filter(locale=locale))
335295

336296
def has_changed(self, locale):
337297
"""

‎pontoon/base/models/stats.py‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
from django.db.models import Count, Q
2+
3+
4+
def aggregate_translation_stats(queryset) -> dict[str, int]:
5+
"""
6+
Aggregate translation stats for a given Translation queryset.
7+
8+
:return: a dictionary with approved, pretranslated, errors, warnings,
9+
and unreviewed counts.
10+
"""
11+
stats = queryset.aggregate(
12+
approved_count=Count(
13+
"pk",
14+
filter=Q(approved=True, errors__isnull=True, warnings__isnull=True),
15+
),
16+
pretranslated_count=Count(
17+
"pk",
18+
filter=Q(pretranslated=True, errors__isnull=True, warnings__isnull=True),
19+
),
20+
errors_count=Count(
21+
"pk",
22+
distinct=True,
23+
filter=Q(
24+
Q(Q(approved=True) | Q(pretranslated=True) | Q(fuzzy=True))
25+
& Q(errors__isnull=False)
26+
),
27+
),
28+
warnings_count=Count(
29+
"pk",
30+
distinct=True,
31+
filter=Q(
32+
Q(Q(approved=True) | Q(pretranslated=True) | Q(fuzzy=True))
33+
& Q(warnings__isnull=False)
34+
),
35+
),
36+
unreviewed_count=Count(
37+
"pk",
38+
filter=Q(approved=False, rejected=False, pretranslated=False, fuzzy=False),
39+
),
40+
)
41+
return {
42+
"approved": stats["approved_count"],
43+
"pretranslated": stats["pretranslated_count"],
44+
"errors": stats["errors_count"],
45+
"warnings": stats["warnings_count"],
46+
"unreviewed": stats["unreviewed_count"],
47+
}

‎pontoon/base/models/translated_resource.py‎

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import logging
22

33
from django.db import models
4-
from django.db.models import Count, F, Q, Sum
4+
from django.db.models import F, Sum
55

66
from .locale import Locale
77
from .project import Project
88
from .resource import Resource
9+
from .stats import aggregate_translation_stats
910
from .translation import Translation
1011
from .user import User
1112

@@ -158,46 +159,13 @@ def calculate_stats(self, save=True):
158159
locale=self.locale,
159160
)
160161

161-
stats = translations.aggregate(
162-
approved_count=Count(
163-
"pk",
164-
filter=Q(approved=True, errors__isnull=True, warnings__isnull=True),
165-
),
166-
pretranslated_count=Count(
167-
"pk",
168-
filter=Q(
169-
pretranslated=True, errors__isnull=True, warnings__isnull=True
170-
),
171-
),
172-
errors_count=Count(
173-
"pk",
174-
distinct=True,
175-
filter=Q(
176-
Q(Q(approved=True) | Q(pretranslated=True) | Q(fuzzy=True))
177-
& Q(errors__isnull=False)
178-
),
179-
),
180-
warnings_count=Count(
181-
"pk",
182-
distinct=True,
183-
filter=Q(
184-
Q(Q(approved=True) | Q(pretranslated=True) | Q(fuzzy=True))
185-
& Q(warnings__isnull=False)
186-
),
187-
),
188-
unreviewed_count=Count(
189-
"pk",
190-
filter=Q(
191-
approved=False, rejected=False, pretranslated=False, fuzzy=False
192-
),
193-
),
194-
)
162+
stats = aggregate_translation_stats(translations)
195163

196-
self.approved_strings = stats["approved_count"]
197-
self.pretranslated_strings = stats["pretranslated_count"]
198-
self.strings_with_errors = stats["errors_count"]
199-
self.strings_with_warnings = stats["warnings_count"]
200-
self.unreviewed_strings = stats["unreviewed_count"]
164+
self.approved_strings = stats["approved"]
165+
self.pretranslated_strings = stats["pretranslated"]
166+
self.strings_with_errors = stats["errors"]
167+
self.strings_with_warnings = stats["warnings"]
168+
self.unreviewed_strings = stats["unreviewed"]
201169

202170
if save:
203171
self.save(

0 commit comments

Comments
 (0)