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

Fixes get_appointment response structure: {"locator": l, "status": s, "data": appointment_data}

Browse Source
This commit is contained in:
Sergi Delgado Segura
2020-03-30 16:05:13 +02:00
parent 709a40dc64
commit 495ea3800e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
teos/api.py
View File

@@ -108,7 +108,7 @@ class API:
request_data = get_request_data_json(request) request_data = get_request_data_json(request)
except TypeError as e: except TypeError as e:
logger.info("Received invalid get_appointment request", from_addr="{}".format(remote_addr)) logger.info("Received invalid register request", from_addr="{}".format(remote_addr))
return abort(HTTP_BAD_REQUEST, e) return abort(HTTP_BAD_REQUEST, e)
client_pk = request_data.get("public_key") client_pk = request_data.get("public_key")
@@ -267,20 +267,20 @@ class API:
# If the appointment has been triggered, it should be in the locator (default else just in case). # If the appointment has been triggered, it should be in the locator (default else just in case).
if uuid in triggered_appointments: if uuid in triggered_appointments:
response = self.watcher.db_manager.load_responder_tracker(uuid) appointment_data = self.watcher.db_manager.load_responder_tracker(uuid)
if response: if appointment_data:
rcode = HTTP_OK rcode = HTTP_OK
response["status"] = "dispute_responded" response = {"locator": locator, "status": "dispute_responded", "appointment": appointment_data}
else: else:
rcode = HTTP_NOT_FOUND rcode = HTTP_NOT_FOUND
response = {"locator": locator, "status": "not_found"} response = {"locator": locator, "status": "not_found"}
# Otherwise it should be either in the watcher, or not in the system. # Otherwise it should be either in the watcher, or not in the system.
else: else:
response = self.watcher.db_manager.load_watcher_appointment(uuid) appointment_data = self.watcher.db_manager.load_watcher_appointment(uuid)
if response: if appointment_data:
rcode = HTTP_OK rcode = HTTP_OK
response["status"] = "being_watched" response = {"locator": locator, "status": "being_watched", "appointment": appointment_data}
else: else:
rcode = HTTP_NOT_FOUND rcode = HTTP_NOT_FOUND
response = {"locator": locator, "status": "not_found"} response = {"locator": locator, "status": "not_found"}