me/breccia-mapper
1
0
Fork 0
mirror of https://github.com/Southampton-RSG/breccia-mapper.git synced 2026-03-03 11:27:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Reverse relationship query in network view

Browse Source
This commit is contained in:
James Graham
2020-04-17 16:03:11 +01:00
parent 75fc169630
commit bf472a69fd
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
people/views/network.py
View File

@@ -3,7 +3,7 @@ Views for displaying networks of :class:`People` and :class:`Relationship`s.
""" """
from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.mixins import LoginRequiredMixin
from django.db.models import Q from django.db.models import F, Q
from django.forms import ValidationError from django.forms import ValidationError
from django.utils import timezone from django.utils import timezone
from django.views.generic import FormView from django.views.generic import FormView
@@ -45,16 +45,16 @@ class NetworkView(LoginRequiredMixin, FormView):
at_time = timezone.now() at_time = timezone.now()
relationship_set = models.Relationship.objects.all() relationship_answerset_set = models.RelationshipAnswerSet.objects.filter(
Q(replaced_timestamp__gt=at_time) | Q(replaced_timestamp__isnull=True),
timestamp__lte=at_time
)
# Filter answers to relationship questions # Filter answers to relationship questions
for field, values in form.cleaned_data.items(): for field, values in form.cleaned_data.items():
if field.startswith('question_') and values: if field.startswith('question_') and values:
relationship_set = relationship_set.filter( relationship_answerset_set = relationship_answerset_set.filter(
# Time filters must be here question_answers__in=values
Q(answer_sets__replaced_timestamp__gt=at_time) | Q(answer_sets__replaced_timestamp__isnull=True),
answer_sets__timestamp__lte=at_time,
answer_sets__question_answers__in=values
) )
context['person_set'] = serializers.PersonSerializer( context['person_set'] = serializers.PersonSerializer(
@@ -63,7 +63,9 @@ class NetworkView(LoginRequiredMixin, FormView):
).data ).data
context['relationship_set'] = serializers.RelationshipSerializer( context['relationship_set'] = serializers.RelationshipSerializer(
relationship_set.distinct(), models.Relationship.objects.filter(
pk__in=relationship_answerset_set.values_list('relationship', flat=True)
),
many=True many=True
).data ).data