From 143beb23a9016fb6602b1daf777f65627939633b Mon Sep 17 00:00:00 2001 From: Bhavesh Heliconia Date: Wed, 24 Sep 2025 12:57:12 +0530 Subject: [PATCH] [FIX] resource_booking: fix test cases and deprecation warnings --- resource_booking/controllers/portal.py | 6 ++++-- resource_booking/tests/test_backend.py | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/resource_booking/controllers/portal.py b/resource_booking/controllers/portal.py index 1c8b0e2f..cf24d82d 100644 --- a/resource_booking/controllers/portal.py +++ b/resource_booking/controllers/portal.py @@ -2,7 +2,7 @@ # Copyright 2022 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from datetime import datetime +from datetime import datetime, timezone from dateutil.parser import isoparse @@ -128,7 +128,9 @@ def portal_booking_confirm(self, booking_id, access_token, when, **kwargs): """Confirm a booking in a given datetime.""" booking_sudo = self._get_booking_sudo(booking_id, access_token) when_tz_aware = isoparse(when) - when_naive = datetime.utcfromtimestamp(when_tz_aware.timestamp()) + when_naive = datetime.fromtimestamp( + when_tz_aware.timestamp(), timezone.utc + ).replace(tzinfo=None) try: booking_sudo.start = when_naive except ValidationError as error: diff --git a/resource_booking/tests/test_backend.py b/resource_booking/tests/test_backend.py index 60ec5e15..a287cbdd 100644 --- a/resource_booking/tests/test_backend.py +++ b/resource_booking/tests/test_backend.py @@ -787,8 +787,11 @@ def test_suggested_and_subscribed_recipients(self): # Requester and combination must be suggested recipients_info = rb._message_get_suggested_recipients() self.assertEqual(len(recipients_info), 1) + recipient_info = recipients_info[0] + if "display_name" in recipient_info: + recipient_info["name"] = recipient_info.pop("display_name") self.assertEqual( - recipients_info[0], + recipient_info, { "lang": None, "partner_id": rb.partner_ids.id,