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

Add missing room functionality

This commit is contained in:
Oskar Winkels 2020-12-01 01:27:09 +01:00 committed by Oskar
parent d80497554e
commit 9622bfaf1d
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/API.md
View File

@ -7,6 +7,7 @@ Arrival
POST /arrival POST /arrival
{ {
"room": "roomname",
"name": "Firstname Lastname", "name": "Firstname Lastname",
"agreetoguidelines": true "agreetoguidelines": true
} }
@ -42,9 +43,10 @@ Authorization: Basic < base64 USER:PASSWORD >
[ [
{ {
'name': 'firstname-middlename-lastname', "room": "roomname",
'arrival': 'UTC-ISO-TIMESTAMP', "name": "firstname-middlename-lastname",
'departure': 'UTC-ISO-TIMESTAMP' "arrival": "UTC-ISO-TIMESTAMP",
"departure": "UTC-ISO-TIMESTAMP" || null
}, },
... ...
] ]

1
docs/SCHEMA.md
View File

@ -5,6 +5,7 @@ Default table
``` ```
[ [
{ {
'room': 'roomname',
'name': 'firstname-middlename-lastname', 'name': 'firstname-middlename-lastname',
'arrival': 'UTC-ISO-TIMESTAMP', 'arrival': 'UTC-ISO-TIMESTAMP',
'departure': 'UTC-ISO-TIMESTAMP' 'departure': 'UTC-ISO-TIMESTAMP'

17
ftracker/core.py
View File

@ -35,7 +35,7 @@ def post_arrival():
except ValueError as e: except ValueError as e:
return 'Error: JSON decode error:\n' + str(e), 400 return 'Error: JSON decode error:\n' + str(e), 400
if not ('name' in data and 'agreetoguidelines' in data): if not ('room' in data and 'name' in data and 'agreetoguidelines' in data):
return "Error: Key missing. See docs/API.md for reference.", 400 return "Error: Key missing. See docs/API.md for reference.", 400
if not data['agreetoguidelines']: if not data['agreetoguidelines']:
@ -50,16 +50,19 @@ def post_arrival():
openarrival = db.get((Entry.name == name) & (Entry.departure == None)) openarrival = db.get((Entry.name == name) & (Entry.departure == None))
if openarrival: if openarrival:
# Did not depart last time # Did not depart last time
# TODO: Return structured request to resend departure
return json.dumps({ return json.dumps({
'request': 'departure', 'request': 'departure',
'arrival': openarrival['arrival'], 'arrival': {
'time': openarrival['arrival'],
'room': openarrival['room']
},
'message': "Error: Undeparted arrival exists" 'message': "Error: Undeparted arrival exists"
}, indent=SPACES), 409 }, indent=SPACES), 409
now = datetime.utcnow() now = datetime.utcnow()
db.insert({ db.insert({
'name': name, 'name': name,
'room': data['room'],
'arrival': now.isoformat(), 'arrival': now.isoformat(),
'departure': None 'departure': None
}) })
@ -88,9 +91,9 @@ def post_departure():
return "Error: Name not in permitted list.", 401 return "Error: Name not in permitted list.", 401
Entry = Query() Entry = Query()
if not db.contains((Entry.name == name) & (Entry.departure == None)): openarrival = db.get((Entry.name == name) & (Entry.departure == None))
if not openarrival:
# Did not arrive before # Did not arrive before
# TODO: Return structured request to resend arrival
return json.dumps({ return json.dumps({
'request': 'arrival', 'request': 'arrival',
'message': "Error: No arrival exists" 'message': "Error: No arrival exists"
@ -119,6 +122,7 @@ 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)
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
@ -129,7 +133,8 @@ def get_data():
Entry = Query() Entry = Query()
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))
) )
return json.dumps(r, indent=SPACES), 200 return json.dumps(r, indent=SPACES), 200