aljaz/python-teos
1
0
Fork 0
mirror of https://github.com/aljazceru/python-teos.git synced 2025-12-17 14:14:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed to_json to to_dict in Appointment and Job; added to_json to Appointment to actually return a string

Browse Source
This commit is contained in:
Salvatore Ingala
2019-10-11 10:48:35 +07:00
parent e4e83167b7
commit 7c1d8b69c7
6 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pisa/api.py
View File

@@ -68,7 +68,7 @@ def get_appointment():
if appointment_in_watcher:
for uuid in appointment_in_watcher:
appointment_data = watcher.appointments[uuid].to_json()
appointment_data = watcher.appointments[uuid].to_dict()
appointment_data['status'] = "being_watched"
response.append(appointment_data)
@@ -77,7 +77,7 @@ def get_appointment():
for job in responder_jobs.values():
if job.locator == locator:
job_data = job.to_json()
job_data = job.to_dict()
job_data['status'] = "dispute_responded"
response.append(job_data)
@@ -98,11 +98,11 @@ def get_all_appointments():
if request.remote_addr in request.host or request.remote_addr == '127.0.0.1':
for uuid, appointment in watcher.appointments.items():
watcher_appointments[uuid] = appointment.to_json()
watcher_appointments[uuid] = appointment.to_dict()
if watcher.responder:
for uuid, job in watcher.responder.jobs.items():
responder_jobs[uuid] = job.to_json()
responder_jobs[uuid] = job.to_dict()
response = jsonify({"watcher_appointments": watcher_appointments, "responder_jobs": responder_jobs})