From 3f6aa21005a7ead0eb6b97ccd2a90f919723ab8c Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Thu, 3 Oct 2019 20:41:26 +0300 Subject: [PATCH] Fix issue w/ Lastable service --- apps/booking/models/services.py | 4 ++-- apps/booking/views.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/booking/models/services.py b/apps/booking/models/services.py index c7f0c928..fd685548 100644 --- a/apps/booking/models/services.py +++ b/apps/booking/models/services.py @@ -141,9 +141,9 @@ class LastableService(AbstractBookingService): super().check_whether_booking_available(restaurant_id, date) url = f'{self.url}v1/restaurant/{restaurant_id}/offers' r = requests.get(url, headers=self.get_common_headers(), proxies=self.proxies) - if not status.is_success(r.status_code): - return False response = json.loads(r.content)['data'] + if not status.is_success(r.status_code) or not response: + return False self.response = response return True diff --git a/apps/booking/views.py b/apps/booking/views.py index 391c45d8..245dbf05 100644 --- a/apps/booking/views.py +++ b/apps/booking/views.py @@ -22,12 +22,12 @@ class CheckWhetherBookingAvailable(generics.GenericAPIView): date = request.query_params.get('date') g_service = GuestonlineService() l_service = LastableService() - if not establishment.lastable_id is None and l_service \ + if (not establishment.lastable_id is None) and l_service \ .check_whether_booking_available(establishment.lastable_id, date): is_booking_available = True service = l_service service.service_id = establishment.lastable_id - elif not establishment.guestonline_id is None and g_service \ + elif (not establishment.guestonline_id is None) and g_service \ .check_whether_booking_available(establishment.guestonline_id, date): is_booking_available = True service = g_service