FaSTTUBe/ftracker
51
1
Fork 0
Code Issues 2 Pull Requests Releases 1 Wiki Activity

Skip DB search on /data for efficiency on default case

Browse Source
This commit is contained in:
Oskar Winkels
2020-12-05 16:50:35 +01:00
parent 6aed013796
commit fade25b71d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ftracker/core.py
View File

@ -125,7 +125,12 @@ def get_data():
start = request.args.get('start', default = None, type = str) start = request.args.get('start', default = None, type = str)
end = request.args.get('end' , default = None, type = str) end = request.args.get('end' , default = None, type = str)
room = request.args.get('room' , default = ".*", type = str) room = request.args.get('room' , default = None, type = str)
# Skip DB query if no parameters given
# (Which is currently every request)
if not (start or end or room):
return json.dumps(db.all(), indent=SPACES), 200
def is_after(val, iso): def is_after(val, iso):
return (val >= iso if val else True ) if iso else True return (val >= iso if val else True ) if iso else True
@ -137,7 +142,7 @@ def get_data():
r = db.search( r = db.search(
(Entry.departure.test(is_after, start)) & (Entry.departure.test(is_after, start)) &
(Entry.arrival.test(is_before, end)) & (Entry.arrival.test(is_before, end)) &
(Entry.room.search(room)) (Entry.room.search(room or ".*"))
) )
return json.dumps(r, indent=SPACES), 200 return json.dumps(r, indent=SPACES), 200