From fb144b0ce8ea42bb93921968ed09b619f37c128c Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Fri, 2 Aug 2024 07:54:04 +0200 Subject: [PATCH] booking.id --- src/design/plone/ioprenoto/restapi/services/booking/add.py | 4 ++-- src/design/plone/ioprenoto/restapi/services/booking/get.py | 4 ++-- src/design/plone/ioprenoto/tests/test_booking_info.py | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/design/plone/ioprenoto/restapi/services/booking/add.py b/src/design/plone/ioprenoto/restapi/services/booking/add.py index 395a74a..5820527 100644 --- a/src/design/plone/ioprenoto/restapi/services/booking/add.py +++ b/src/design/plone/ioprenoto/restapi/services/booking/add.py @@ -21,10 +21,10 @@ def reply(self): )(fullobjects=True) # BBB: - response["UID"] = response["booking_id"] response["@type"] = booking.portal_type + response["id"] = booking.getId() # response["@id"].split("/")[-1] + response["UID"] = response["booking_id"] response["gate"] = response["booking_gate"] - response["id"] = response["@id"].split("/")[-1] response["booking_folder_uid"] = ( response["booking_folder"]["uid"] if "booking_folder" in response else None ) diff --git a/src/design/plone/ioprenoto/restapi/services/booking/get.py b/src/design/plone/ioprenoto/restapi/services/booking/get.py index 408235b..1f95e30 100644 --- a/src/design/plone/ioprenoto/restapi/services/booking/get.py +++ b/src/design/plone/ioprenoto/restapi/services/booking/get.py @@ -50,10 +50,10 @@ def reply(self): )(fullobjects=True) # BBB: - response["UID"] = response["booking_id"] response["@type"] = booking.portal_type + response["id"] = booking.getId() # response["@id"].split("/")[-1] + response["UID"] = response["booking_id"] response["gate"] = response["booking_gate"] - response["id"] = response["@id"].split("/")[-1] response["booking_folder_uid"] = ( response["booking_folder"]["uid"] if "booking_folder" in response else None ) diff --git a/src/design/plone/ioprenoto/tests/test_booking_info.py b/src/design/plone/ioprenoto/tests/test_booking_info.py index ad6752d..83714d5 100644 --- a/src/design/plone/ioprenoto/tests/test_booking_info.py +++ b/src/design/plone/ioprenoto/tests/test_booking_info.py @@ -188,6 +188,8 @@ def test_get_bookings(self): ) self.assertEqual(res.status_code, 200) booking = res.json() + self.assertIn("@id", booking) + self.assertEqual(booking["id"], "mario-rossi") self.assertEqual( booking["booking_folder"]["@id"], self.prenotazioni_folder.absolute_url(), @@ -204,6 +206,7 @@ def test_get_bookings(self): self.assertEqual(res.status_code, 200) self.assertEqual(len(res.json()["items"]), 1) booking_info = res.json()["items"][0] + self.assertIn("@id", booking_info) self.assertEqual( booking_info["booking_folder"]["@id"], self.prenotazioni_folder.absolute_url(),