altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

fix: gather interesting years for stats accounting for published rfcs

Browse source
This commit is contained in:
Robert Sparks 2023-12-13 13:14:38 -06:00
parent 18a8b3dfc7
commit e130a301de
No known key found for this signature in database
GPG key ID: 6E2A6A5775F91318
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ietf/stats/views.py
View file

@ -14,7 +14,7 @@ from collections import defaultdict
from django.conf import settings from django.conf import settings
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.core.cache import cache from django.core.cache import cache
from django.db.models import Count, Q from django.db.models import Count, Q, Subquery, OuterRef
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404, render from django.shortcuts import get_object_or_404, render
from django.urls import reverse as urlreverse from django.urls import reverse as urlreverse
@ -34,7 +34,7 @@ from ietf.group.models import Role, Group
from ietf.person.models import Person from ietf.person.models import Person
from ietf.name.models import ReviewResultName, CountryName, DocRelationshipName, ReviewAssignmentStateName from ietf.name.models import ReviewResultName, CountryName, DocRelationshipName, ReviewAssignmentStateName
from ietf.person.name import plain_name from ietf.person.name import plain_name
from ietf.doc.models import Document, State, DocEvent from ietf.doc.models import Document, RelatedDocument, State, DocEvent
from ietf.meeting.models import Meeting from ietf.meeting.models import Meeting
from ietf.stats.models import MeetingRegistration, CountryAlias from ietf.stats.models import MeetingRegistration, CountryAlias
from ietf.stats.utils import get_aliased_affiliations, get_aliased_countries, compute_hirsch_index from ietf.stats.utils import get_aliased_affiliations, get_aliased_countries, compute_hirsch_index
@ -607,15 +607,31 @@ def document_stats(request, stats_type=None):
doc_years = defaultdict(set) doc_years = defaultdict(set)
docevent_qs = DocEvent.objects.filter( draftevent_qs = DocEvent.objects.filter(
doc__type="draft", doc__type="draft",
type__in=["published_rfc", "new_revision"], type = "new_revision",
).values_list("doc", "time").order_by("doc") ).values_list("doc","time").order_by("doc")
for doc_id, time in docevent_qs.iterator(): for doc_id, time in draftevent_qs.iterator():
# RPC_TZINFO is used to match the timezone handling in Document.pub_date() # RPC_TZINFO is used to match the timezone handling in Document.pub_date()
doc_years[doc_id].add(time.astimezone(RPC_TZINFO).year) doc_years[doc_id].add(time.astimezone(RPC_TZINFO).year)
rfcevent_qs = (
DocEvent.objects.filter(doc__type="rfc", type="published_rfc")
.annotate(
draft=Subquery(
RelatedDocument.objects.filter(
target=OuterRef("doc__pk"), relationship_id="became_rfc"
).values_list("source", flat=True)[:1]
)
)
.values_list("draft", "time")
.order_by("draft")
)
for doc_id, time in rfcevent_qs.iterator():
doc_years[doc_id].add(time.astimezone(RPC_TZINFO).year)
person_qs = Person.objects.filter(person_filters) person_qs = Person.objects.filter(person_filters)
if document_type == "rfc": if document_type == "rfc":