2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

only prefetch groups if detailed serialization was queried

Browse source
This commit is contained in:
Laura Klünder 2017-06-22 19:53:25 +02:00
parent 37d95700d3
commit 4d544610e5
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/c3nav/mapdata/api.py
View file

@ -154,17 +154,19 @@ class LocationViewSet(RetrieveModelMixin, GenericViewSet):
lookup_field = 'slug' lookup_field = 'slug'
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
queryset = self.get_queryset() detailed = 'detailed' in request.GET
queryset = self.get_queryset().order_by('id')
queryset = queryset.filter(reduce(operator.or_, (Q(**{model._meta.default_related_name+'__isnull': False}) queryset = queryset.filter(reduce(operator.or_, (Q(**{model._meta.default_related_name+'__isnull': False})
for model in get_submodels(Location)))) for model in get_submodels(Location))))
for model in get_submodels(Location): if detailed:
if model == LocationGroup: for model in get_submodels(Location):
continue if model == LocationGroup:
queryset = queryset.prefetch_related(Prefetch(model._meta.default_related_name+'__groups', continue
queryset=LocationGroup.objects.only('id', 'titles'))) queryset = queryset.prefetch_related(Prefetch(model._meta.default_related_name+'__groups',
queryset=LocationGroup.objects.only('id', 'titles')))
return Response([obj.get_child().serialize(include_type=True, detailed='detailed' in request.GET) return Response([obj.get_child().serialize(include_type=True, detailed=detailed) for obj in queryset])
for obj in queryset])
def retrieve(self, request, slug=None, *args, **kwargs): def retrieve(self, request, slug=None, *args, **kwargs):
result = Location.get_by_slug(slug, self.get_queryset()) result = Location.get_by_slug(slug, self.get_queryset())

9
src/c3nav/mapdata/models/locations.py
View file

@ -68,7 +68,7 @@ class Location(LocationSlug, SerializableMixin, models.Model):
self.titles = self.titles.copy() self.titles = self.titles.copy()
def serialize(self, detailed=True, **kwargs): def serialize(self, detailed=True, **kwargs):
result = super().serialize(**kwargs) result = super().serialize(detailed=detailed, **kwargs)
if not detailed: if not detailed:
for key in set(result.keys()) - {'type', 'id', 'slug', 'title', 'target'}: for key in set(result.keys()) - {'type', 'id', 'slug', 'title', 'target'}:
result.pop(key) result.pop(key)
@ -150,9 +150,10 @@ class SpecificLocation(Location, models.Model):
class Meta: class Meta:
abstract = True abstract = True
def _serialize(self, **kwargs): def _serialize(self, detailed=True, **kwargs):
result = super()._serialize(**kwargs) result = super()._serialize(detailed=detailed, **kwargs)
result['groups'] = list(g.pk for g in self.groups.all()) if detailed:
result['groups'] = list(g.pk for g in self.groups.all())
return result return result