Skip to content

Commit 6dc25ca

Browse files
committed
Bring time series stats back into line with what was before. Note there was an off-by-one-day bug in the month-binning in prior releases.
- Legacy-Id: 16075
1 parent 81c5b50 commit 6dc25ca

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

ietf/review/utils.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ def extract_review_assignment_data(teams=None, reviewers=None, time_from=None, t
180180
filters &= Q(reviewer__person__in=reviewers)
181181

182182
if time_from:
183-
filters &= Q(assigned_on__gte=time_from)
183+
filters &= Q(review_request__time__gte=time_from)
184184

185185
if time_to:
186-
filters &= Q(assigned_on__lte=time_to)
186+
filters &= Q(review_request__time__lte=time_to)
187187

188188
# This doesn't do the left-outer join on docevent that the previous code did. These variables could be renamed
189189
event_qs = ReviewAssignment.objects.filter(filters)
@@ -193,7 +193,7 @@ def extract_review_assignment_data(teams=None, reviewers=None, time_from=None, t
193193
"reviewer__person", "assigned_on", "completed_on"
194194
)
195195

196-
event_qs = event_qs.order_by(*[o.replace("reviewer", "reviewer__person").replace("team","review_request__team") for o in ordering] + ["assigned_on", "pk", "completed_on"])
196+
event_qs = event_qs.order_by(*[o.replace("reviewer", "reviewer__person").replace("team","review_request__team") for o in ordering] + ["review_request__time", "assigned_on", "pk", "completed_on"])
197197

198198
def positive_days(time_from, time_to):
199199
if time_from is None or time_to is None:

ietf/stats/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,8 @@ def add_if_exists_else_subtract(element, l):
11431143
def time_key_fn(t):
11441144
d = t[req_time_index].date()
11451145
#d -= datetime.timedelta(days=d.weekday()) # weekly
1146-
d -= datetime.timedelta(days=d.day) # monthly
1146+
# NOTE: Earlier releases had an off-by-one error here - some stat counts may move a month.
1147+
d -= datetime.timedelta(days=d.day-1) # monthly
11471148
return d
11481149

11491150
found_results = set()

0 commit comments

Comments
 (0)