export entire location query logic into mapdata.utils.locations and cache

src/c3nav/mapdata/models/locations.py

@@ -1,11 +1,8 @@
-import operator
 from collections import OrderedDict
 from contextlib import suppress
-from functools import reduce
 
-from django.apps import apps
 from django.db import models
-from django.db.models import Prefetch, Q
+from django.db.models import Prefetch
 from django.utils.functional import cached_property
 from django.utils.text import format_lazy
 from django.utils.translation import ugettext_lazy as _
@@ -69,29 +66,6 @@ class LocationSlug(SerializableMixin, models.Model):
         verbose_name_plural = _('Location with Slug')
         default_related_name = 'locationslugs'
 
-    @classmethod
-    def location_qs_for_request(cls, request, can=None):
-        queryset = cls.objects.all().order_by('id')
-
-        conditions = []
-        for model in get_submodels(Location):
-            related_name = model._meta.default_related_name
-            condition = Q(**{related_name + '__isnull': False})
-            if can:
-                condition &= reduce(operator.or_, (Q(**{related_name+'__can_'+s: True}) for s in can))
-            # noinspection PyUnresolvedReferences
-            condition &= model.q_for_request(request, prefix=related_name + '__')
-            conditions.append(condition)
-        queryset = queryset.filter(reduce(operator.or_, conditions))
-
-        # prefetch locationgroups
-        base_qs = LocationGroup.qs_for_request(request).select_related('category')
-        for model in get_submodels(SpecificLocation):
-            queryset = queryset.prefetch_related(Prefetch(model._meta.default_related_name + '__groups',
-                                                          queryset=base_qs))
-
-        return queryset
-
 
 class Location(LocationSlug, AccessRestrictionMixin, TitledMixin, models.Model):
     can_search = models.BooleanField(default=True, verbose_name=_('can be searched'))
@@ -127,32 +101,6 @@ class Location(LocationSlug, AccessRestrictionMixin, TitledMixin, models.Model):
                 return code+':'+str(self.id)
         return self.slug
 
-    @classmethod
-    def get_by_slug(cls, slug, request=None, can=None):
-        if request is None:
-            queryset = LocationSlug.objects.all()
-        else:
-            queryset = LocationSlug.location_qs_for_request(request, can)
-
-        if ':' in slug:
-            code, pk = slug.split(':', 1)
-            model_name = cls.LOCATION_TYPE_BY_CODE.get(code)
-            if model_name is None or not pk.isdigit():
-                return None
-
-            model = apps.get_model('mapdata', model_name)
-            try:
-                location = model.objects.get(pk=pk)
-            except model.DoesNotExist:
-                return None
-
-            if location.slug is not None:
-                return LocationRedirect(slug=slug, target=location)
-
-            return location
-
-        return queryset.filter(slug=slug).first()
-
     @property
     def title(self):
         if not self.titles and self.slug: