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

remove unneeded second cache layer for _location_list

Browse source
This commit is contained in:
Laura Klünder 2023-11-24 16:33:57 +01:00
parent 62cffe9644
commit 74f78ab95e
1 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/c3nav/mapdata/newapi/map.py
View file

@ -56,23 +56,15 @@ class LocationListFilters(BySearchableFilter, RemoveGeometryFilter):
def _location_list(request, detailed: bool, filters: LocationListFilters): def _location_list(request, detailed: bool, filters: LocationListFilters):
# todo: cache, visibility, etc… # todo: cache, visibility, etc…
cache_key = 'mapdata:api:location:list:%d:%s:%d' % ( if filters.searchable:
filters.searchable + detailed*2 + filters.geometry*4, locations = searchable_locations_for_request(request)
AccessPermission.cache_key_for_request(request), else:
request.user_permissions.can_access_base_mapdata locations = visible_locations_for_request(request).values()
)
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()
result = tuple(obj.serialize(detailed=detailed, search=filters.searchable, result = tuple(obj.serialize(detailed=detailed, search=filters.searchable,
geometry=filters.geometry and can_access_geometry(request), geometry=filters.geometry and can_access_geometry(request),
simple_geometry=True) simple_geometry=True)
for obj in locations) for obj in locations)
cache.set(cache_key, result, 300)
return result return result