From 74f78ab95edfce182784e6cee28052ab991903de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Fri, 24 Nov 2023 16:33:57 +0100 Subject: [PATCH] remove unneeded second cache layer for _location_list --- src/c3nav/mapdata/newapi/map.py | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/c3nav/mapdata/newapi/map.py b/src/c3nav/mapdata/newapi/map.py index 5501a752..0fe0d363 100644 --- a/src/c3nav/mapdata/newapi/map.py +++ b/src/c3nav/mapdata/newapi/map.py @@ -56,23 +56,15 @@ class LocationListFilters(BySearchableFilter, RemoveGeometryFilter): def _location_list(request, detailed: bool, filters: LocationListFilters): # todo: cache, visibility, etc… - cache_key = 'mapdata:api:location:list:%d:%s:%d' % ( - filters.searchable + detailed*2 + filters.geometry*4, - AccessPermission.cache_key_for_request(request), - request.user_permissions.can_access_base_mapdata - ) - result = cache.get(cache_key, None) - if result is None: - if filters.searchable: - locations = searchable_locations_for_request(request) - else: - locations = visible_locations_for_request(request).values() + if filters.searchable: + locations = searchable_locations_for_request(request) + else: + locations = visible_locations_for_request(request).values() - result = tuple(obj.serialize(detailed=detailed, search=filters.searchable, - geometry=filters.geometry and can_access_geometry(request), - simple_geometry=True) - for obj in locations) - cache.set(cache_key, result, 300) + result = tuple(obj.serialize(detailed=detailed, search=filters.searchable, + geometry=filters.geometry and can_access_geometry(request), + simple_geometry=True) + for obj in locations) return result