phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/roles

Browse Source
This commit is contained in:
Виктор Гладких 2019-10-11 14:50:18 +03:00
commit d9fc88e7c6
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/booking/models/services.py
View File

@ -141,7 +141,7 @@ class LastableService(AbstractBookingService):
super().check_whether_booking_available(restaurant_id, date) super().check_whether_booking_available(restaurant_id, date)
url = f'{self.url}v1/restaurant/{restaurant_id}/offers' url = f'{self.url}v1/restaurant/{restaurant_id}/offers'
r = requests.get(url, headers=self.get_common_headers(), proxies=self.proxies) r = requests.get(url, headers=self.get_common_headers(), proxies=self.proxies)
response = json.loads(r.content)['data'] response = json.loads(r.content).get('data')
if not status.is_success(r.status_code) or not response: if not status.is_success(r.status_code) or not response:
return False return False
self.response = response self.response = response

4
apps/booking/views.py
View File

@ -35,9 +35,9 @@ class CheckWhetherBookingAvailable(generics.GenericAPIView):
response = { response = {
'available': is_booking_available, 'available': is_booking_available,
'type': service.service, 'type': service.service if service else None,
} }
response.update({'details': service.response} if service.response else {}) response.update({'details': service.response} if service and service.response else {})
return Response(data=response, status=200) return Response(data=response, status=200)

5
apps/establishment/models.py
View File

@ -14,8 +14,8 @@ from django.utils.translation import gettext_lazy as _
from phonenumber_field.modelfields import PhoneNumberField from phonenumber_field.modelfields import PhoneNumberField
from collection.models import Collection from collection.models import Collection
from main.models import Award, MetaDataContent
from location.models import Address from location.models import Address
from main.models import Award, MetaDataContent
from review.models import Review from review.models import Review
from utils.models import (ProjectBaseMixin, TJSONField, URLImageMixin, from utils.models import (ProjectBaseMixin, TJSONField, URLImageMixin,
TranslatedFieldsMixin, BaseAttributes) TranslatedFieldsMixin, BaseAttributes)
@ -180,7 +180,8 @@ class EstablishmentQuerySet(models.QuerySet):
return self.filter(id__in=subquery_filter_by_distance) \ return self.filter(id__in=subquery_filter_by_distance) \
.annotate_intermediate_public_mark() \ .annotate_intermediate_public_mark() \
.annotate_mark_similarity(mark=establishment.public_mark) \ .annotate_mark_similarity(mark=establishment.public_mark) \
.order_by('mark_similarity') .order_by('mark_similarity') \
.distinct('mark_similarity', 'id')
else: else:
return self.none() return self.none()