From dad4c5f5a38134758dc2454593cba59faf433f4c Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 16 Oct 2019 14:11:07 +0300 Subject: [PATCH 01/15] Booking pre-payment --- .../migrations/0003_auto_20191025_1613.py | 23 +++++++++++++ .../migrations/0004_booking_stripe_token.py | 18 +++++++++++ apps/booking/models/models.py | 3 ++ apps/booking/models/services.py | 7 ++-- apps/booking/serializers/web.py | 18 ++++++++++- apps/booking/urls.py | 1 + apps/booking/views.py | 32 +++++++++++++++---- 7 files changed, 93 insertions(+), 9 deletions(-) create mode 100644 apps/booking/migrations/0003_auto_20191025_1613.py create mode 100644 apps/booking/migrations/0004_booking_stripe_token.py diff --git a/apps/booking/migrations/0003_auto_20191025_1613.py b/apps/booking/migrations/0003_auto_20191025_1613.py new file mode 100644 index 00000000..37f4f035 --- /dev/null +++ b/apps/booking/migrations/0003_auto_20191025_1613.py @@ -0,0 +1,23 @@ +# Generated by Django 2.2.4 on 2019-10-25 16:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('booking', '0002_auto_20191003_1601'), + ] + + operations = [ + migrations.AddField( + model_name='booking', + name='amount', + field=models.CharField(default=None, max_length=30, null=True, verbose_name='prepayment price'), + ), + migrations.AddField( + model_name='booking', + name='stripe_key', + field=models.TextField(default=None, null=True, verbose_name='stripe service payment key'), + ), + ] diff --git a/apps/booking/migrations/0004_booking_stripe_token.py b/apps/booking/migrations/0004_booking_stripe_token.py new file mode 100644 index 00000000..3fffca33 --- /dev/null +++ b/apps/booking/migrations/0004_booking_stripe_token.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.4 on 2019-10-25 16:50 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('booking', '0003_auto_20191025_1613'), + ] + + operations = [ + migrations.AddField( + model_name='booking', + name='stripe_token', + field=models.TextField(default=None, null=True, verbose_name='stripe service pre-payed booking toking'), + ), + ] diff --git a/apps/booking/models/models.py b/apps/booking/models/models.py index 41cfc6d7..c2220e51 100644 --- a/apps/booking/models/models.py +++ b/apps/booking/models/models.py @@ -24,6 +24,9 @@ class Booking(ProjectBaseMixin): pending_booking_id = models.TextField(verbose_name=_('external service pending booking'), default=None) booking_id = models.TextField(verbose_name=_('external service booking id'), default=None, null=True, db_index=True, ) + stripe_key = models.TextField(null=True, default=None, verbose_name=_('stripe service payment key')) + stripe_token = models.TextField(null=True, default=None, verbose_name=_('stripe service pre-payed booking toking')) + amount = models.CharField(null=True, default=None, verbose_name=_('prepayment price'), max_length=30) user = models.ForeignKey( 'account.User', verbose_name=_('booking owner'), null=True, related_name='bookings', diff --git a/apps/booking/models/services.py b/apps/booking/models/services.py index a3ee17ea..c6b6d7f6 100644 --- a/apps/booking/models/services.py +++ b/apps/booking/models/services.py @@ -79,9 +79,10 @@ class GuestonlineService(AbstractBookingService): self.response = response return True - def commit_booking(self, payload): + def commit_booking(self, payload, stripe_token = None): url = f'{self.url}v1/pending_bookings/{payload}/commit' - r = requests.put(url, headers=self.get_common_headers()) + r = requests.put(url, headers=self.get_common_headers(), + data=json.dumps({'stripe_token': stripe_token} if stripe_token else None)) self.response = json.loads(r.content) if status.is_success(r.status_code) and self.response is None: raise serializers.ValidationError(detail='Booking already committed.') @@ -95,6 +96,8 @@ class GuestonlineService(AbstractBookingService): payload['mobile_phone'] = payload.pop('phone') headers = self.get_common_headers() r = requests.put(url, headers=headers, data=json.dumps({'contact_info': payload})) + response = r.json() + self.response = response.get('prepayment') return status.is_success(r.status_code) def create_booking(self, payload): diff --git a/apps/booking/serializers/web.py b/apps/booking/serializers/web.py index 1094aef8..70440464 100644 --- a/apps/booking/serializers/web.py +++ b/apps/booking/serializers/web.py @@ -42,13 +42,29 @@ class PendingBookingSerializer(serializers.ModelSerializer): 'user', ) +class CommitBookingSerializer(serializers.ModelSerializer): + + class Meta: + model = models.Booking + fields = ( + 'stripe_token', + ) + + def update(self, instance, validated_data): + """Override update method""" + # Update user password from instance + service = instance.get_service_by_type(instance.type) + service.commit_booking(instance.pending_booking_id, validated_data.get('stripe_token')) + instance.stripe_token = validated_data.get('stripe_token') + instance.save() + return instance class UpdateBookingSerializer(serializers.ModelSerializer): id = serializers.ReadOnlyField() class Meta: model = models.Booking - fields = ('booking_id', 'id') + fields = ('booking_id', 'id', 'stripe_key', 'amount') class GetBookingSerializer(serializers.ModelSerializer): diff --git a/apps/booking/urls.py b/apps/booking/urls.py index 900ec8cb..8d5b8619 100644 --- a/apps/booking/urls.py +++ b/apps/booking/urls.py @@ -8,6 +8,7 @@ urlpatterns = [ path('/check/', views.CheckWhetherBookingAvailable.as_view(), name='booking-check'), path('/create/', views.CreatePendingBooking.as_view(), name='create-pending-booking'), path('/', views.UpdatePendingBooking.as_view(), name='update-pending-booking'), + path('/commit/', views.CommitPendingBooking.as_view(), name='update-pending-booking'), path('/cancel/', views.CancelBooking.as_view(), name='cancel-existing-booking'), path('last/', views.LastBooking.as_view(), name='last_booking-for-authorizer-user'), path('retrieve//', views.GetBookingById.as_view(), name='retrieves-booking-by-id'), diff --git a/apps/booking/views.py b/apps/booking/views.py index dfa64bb9..94f39b31 100644 --- a/apps/booking/views.py +++ b/apps/booking/views.py @@ -1,11 +1,11 @@ -from rest_framework import generics, permissions, status, serializers - from django.shortcuts import get_object_or_404 -from establishment.models import Establishment -from booking.models.models import Booking, GuestonlineService, LastableService +from rest_framework import generics, permissions, status, serializers from rest_framework.response import Response -from booking.serializers.web import (PendingBookingSerializer, - UpdateBookingSerializer, GetBookingSerializer, CheckBookingSerializer) + +from booking.models.models import Booking, GuestonlineService, LastableService +from booking.serializers.web import (PendingBookingSerializer, UpdateBookingSerializer, GetBookingSerializer, + CheckBookingSerializer, CommitBookingSerializer) +from establishment.models import Establishment class CheckWhetherBookingAvailable(generics.GenericAPIView): @@ -70,6 +70,13 @@ class CreatePendingBooking(generics.CreateAPIView): return Response(status=status.HTTP_201_CREATED, data=serializer.data) +class CommitPendingBooking(generics.UpdateAPIView): + """ Commit pending booking """ + queryset = Booking.objects.all() + permission_classes = (permissions.AllowAny,) + serializer_class = CommitBookingSerializer + + class UpdatePendingBooking(generics.UpdateAPIView): """ Update pending booking with contacts """ queryset = Booking.objects.all() @@ -84,6 +91,19 @@ class UpdatePendingBooking(generics.UpdateAPIView): service.update_booking(service.get_certain_keys(data, { 'email', 'phone', 'last_name', 'first_name', 'country_code', 'pending_booking_id', })) + if service.response: + # если есть предоплата, возвращаем фронту страйп-ключ для совершения оплаты и цену + amount = service.response.get('amount') + stripe_key = service.response.get('stripe_key') + data = { + 'id': instance.pk, + 'amount': amount, + 'stripe_key': stripe_key, + } + serializer = self.get_serializer(data=data) + serializer.is_valid(raise_exception=True) + serializer.update(instance, data) + return Response(status=status.HTTP_200_OK, data=data) service.commit_booking(data['pending_booking_id']) data = { 'booking_id': service.response.get('id'), From 36282831058342796633cf8839513e5e515e1f52 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 16 Oct 2019 14:11:07 +0300 Subject: [PATCH 02/15] Booking pre-payment more info --- apps/booking/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/booking/views.py b/apps/booking/views.py index 94f39b31..97185eb7 100644 --- a/apps/booking/views.py +++ b/apps/booking/views.py @@ -99,6 +99,7 @@ class UpdatePendingBooking(generics.UpdateAPIView): 'id': instance.pk, 'amount': amount, 'stripe_key': stripe_key, + 'type': instance.type, } serializer = self.get_serializer(data=data) serializer.is_valid(raise_exception=True) From 76841af575f5e6880169a2f82b5ada52861dd565 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 16 Oct 2019 14:11:07 +0300 Subject: [PATCH 03/15] Booking notes & subscriber --- apps/booking/models/services.py | 30 +++++++++++++++++++++++------- apps/booking/views.py | 16 +++++++++++++--- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/apps/booking/models/services.py b/apps/booking/models/services.py index c6b6d7f6..a9a7a1af 100644 --- a/apps/booking/models/services.py +++ b/apps/booking/models/services.py @@ -1,10 +1,13 @@ -from abc import ABC, abstractmethod import json +from abc import ABC, abstractmethod + import requests from django.conf import settings -from rest_framework import status +from django.utils.translation import ugettext_lazy as _ +from rest_framework import serializers, status +from rest_framework.response import Response + import booking.models.models as models -from rest_framework import serializers class AbstractBookingService(ABC): @@ -24,8 +27,12 @@ class AbstractBookingService(ABC): self.url = settings.LASTABLE_SERVICE @staticmethod - def get_certain_keys(d: dict, keys_to_preserve: set) -> dict: + def get_certain_keys(d: dict, keys_to_preserve: set, required=True) -> dict: """ Helper """ + if required: + diff = keys_to_preserve - d.keys() + if diff: + raise serializers.ValidationError({field: _(f'This field is required') for field in diff}) return {key: d[key] for key in d.keys() & keys_to_preserve} @abstractmethod @@ -81,8 +88,11 @@ class GuestonlineService(AbstractBookingService): def commit_booking(self, payload, stripe_token = None): url = f'{self.url}v1/pending_bookings/{payload}/commit' - r = requests.put(url, headers=self.get_common_headers(), - data=json.dumps({'stripe_token': stripe_token} if stripe_token else None)) + if stripe_token: + r = requests.put(url, headers=self.get_common_headers(), + data=json.dumps({'stripe_token': stripe_token})) + else: + r = requests.put(url, headers=self.get_common_headers()) self.response = json.loads(r.content) if status.is_success(r.status_code) and self.response is None: raise serializers.ValidationError(detail='Booking already committed.') @@ -94,10 +104,13 @@ class GuestonlineService(AbstractBookingService): payload['lastname'] = payload.pop('last_name') payload['firstname'] = payload.pop('first_name') payload['mobile_phone'] = payload.pop('phone') + payload['user_locale'] = payload.pop('country_code') headers = self.get_common_headers() r = requests.put(url, headers=headers, data=json.dumps({'contact_info': payload})) response = r.json() self.response = response.get('prepayment') + if not status.is_success(r.status_code): + return Response(status=r.status_code, data=response) return status.is_success(r.status_code) def create_booking(self, payload): @@ -106,7 +119,10 @@ class GuestonlineService(AbstractBookingService): payload['persons'] = payload.pop('booked_persons_number') payload['date'] = payload.pop('booking_date') r = requests.post(url, headers=self.get_common_headers(), data=json.dumps(payload)) - return json.loads(r.content)['id'] if status.is_success(r.status_code) else False + if status.is_success(r.status_code): + return json.loads(r.content)['id'] + else: + return Response(status=r.status_code, data=r.json()) def cancel_booking(self, payload): url = f'{self.url}v1/pending_bookings/{payload}' diff --git a/apps/booking/views.py b/apps/booking/views.py index 97185eb7..996389b1 100644 --- a/apps/booking/views.py +++ b/apps/booking/views.py @@ -6,6 +6,8 @@ from booking.models.models import Booking, GuestonlineService, LastableService from booking.serializers.web import (PendingBookingSerializer, UpdateBookingSerializer, GetBookingSerializer, CheckBookingSerializer, CommitBookingSerializer) from establishment.models import Establishment +from notification.models import Subscriber +from utils.methods import get_user_ip class CheckWhetherBookingAvailable(generics.GenericAPIView): @@ -61,7 +63,9 @@ class CreatePendingBooking(generics.CreateAPIView): } data['pending_booking_id'] = service.create_booking( service.get_certain_keys(data.copy(), service_to_keys[data.get('type')])) - if not data['pending_booking_id']: + if isinstance(data['pending_booking_id'], Response): + return data['pending_booking_id'] + elif not data['pending_booking_id']: return Response(status=status.HTTP_403_FORBIDDEN, data='Unable to create booking') data['booking_id'] = data['pending_booking_id'] if data.get('type') == Booking.LASTABLE else None serializer = self.get_serializer(data=data) @@ -88,9 +92,15 @@ class UpdatePendingBooking(generics.UpdateAPIView): data = request.data.copy() service = Booking.get_service_by_type(instance.type) data['pending_booking_id'] = instance.pending_booking_id - service.update_booking(service.get_certain_keys(data, { - 'email', 'phone', 'last_name', 'first_name', 'country_code', 'pending_booking_id', + r = service.update_booking(service.get_certain_keys(data, { + 'email', 'phone', 'last_name', 'first_name', 'country_code', 'pending_booking_id', 'note', })) + if isinstance(r, Response): + return r + if data.get('newsletter'): + Subscriber.objects.make_subscriber(email=data['email'], country_code=data['country_code'], + locale=request.locale, ip_address=get_user_ip(request), + user=request.user) if service.response: # если есть предоплата, возвращаем фронту страйп-ключ для совершения оплаты и цену amount = service.response.get('amount') From 4cb44aa1fc7a72edf9bbcf73a14d322ce4146827 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 16 Oct 2019 14:11:07 +0300 Subject: [PATCH 04/15] Rename --- apps/booking/migrations/0004_booking_stripe_token.py | 2 +- apps/booking/models/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/booking/migrations/0004_booking_stripe_token.py b/apps/booking/migrations/0004_booking_stripe_token.py index 3fffca33..e4971e47 100644 --- a/apps/booking/migrations/0004_booking_stripe_token.py +++ b/apps/booking/migrations/0004_booking_stripe_token.py @@ -13,6 +13,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='booking', name='stripe_token', - field=models.TextField(default=None, null=True, verbose_name='stripe service pre-payed booking toking'), + field=models.TextField(default=None, null=True, verbose_name='stripe service pre-payed booking token'), ), ] diff --git a/apps/booking/models/models.py b/apps/booking/models/models.py index c2220e51..d1504ecd 100644 --- a/apps/booking/models/models.py +++ b/apps/booking/models/models.py @@ -25,7 +25,7 @@ class Booking(ProjectBaseMixin): booking_id = models.TextField(verbose_name=_('external service booking id'), default=None, null=True, db_index=True, ) stripe_key = models.TextField(null=True, default=None, verbose_name=_('stripe service payment key')) - stripe_token = models.TextField(null=True, default=None, verbose_name=_('stripe service pre-payed booking toking')) + stripe_token = models.TextField(null=True, default=None, verbose_name=_('stripe service pre-payed booking token')) amount = models.CharField(null=True, default=None, verbose_name=_('prepayment price'), max_length=30) user = models.ForeignKey( 'account.User', verbose_name=_('booking owner'), null=True, From 261d70af530bf65b980d650260faa687746b04f7 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 16 Oct 2019 14:11:07 +0300 Subject: [PATCH 05/15] Use another GO endpoint --- apps/booking/models/services.py | 12 ++++-------- apps/booking/views.py | 4 +++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/apps/booking/models/services.py b/apps/booking/models/services.py index a9a7a1af..5f48f15f 100644 --- a/apps/booking/models/services.py +++ b/apps/booking/models/services.py @@ -73,17 +73,13 @@ class GuestonlineService(AbstractBookingService): def get_common_headers(self): return {'X-Token': self.token, 'Content-type': 'application/json', 'Accept': 'application/json'} - def check_whether_booking_available(self, restaurant_id, date: str): - super().check_whether_booking_available(restaurant_id, date) - url = f'{self.url}v1/runtime_services' - params = {'restaurant_id': restaurant_id, 'date': date, 'expands[]': 'table_availabilities'} + def check_whether_booking_available(self, restaurant_id, *args, **kwargs): + url = f'{self.url}v1/periods' + params = {'restaurant_id': restaurant_id, **kwargs} r = requests.get(url, headers=self.get_common_headers(), params=params) if not status.is_success(r.status_code): return False - response = json.loads(r.content)['runtime_services'] - keys_to_preserve = {'left_seats', 'table_availabilities', 'closed', 'start_time', 'end_time', 'last_booking'} - response = map(lambda x: self.get_certain_keys(x, keys_to_preserve), response) - self.response = response + self.response = r.json() return True def commit_booking(self, payload, stripe_token = None): diff --git a/apps/booking/views.py b/apps/booking/views.py index 996389b1..6e850f3b 100644 --- a/apps/booking/views.py +++ b/apps/booking/views.py @@ -30,7 +30,9 @@ class CheckWhetherBookingAvailable(generics.GenericAPIView): service = l_service service.service_id = establishment.lastable_id elif (not establishment.guestonline_id is None) and g_service \ - .check_whether_booking_available(establishment.guestonline_id, date): + .check_whether_booking_available(establishment.guestonline_id, + **g_service.get_certain_keys(request.query_params, + {'date', 'persons'})): is_booking_available = True service = g_service service.service_id = establishment.guestonline_id From a8861238ac1635a408aaff3fba356b3c5bdc4aff Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 16 Oct 2019 14:11:07 +0300 Subject: [PATCH 06/15] Time format for country --- apps/location/models.py | 11 +++++++++++ apps/main/serializers.py | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/apps/location/models.py b/apps/location/models.py index fc81ec37..c33675d3 100644 --- a/apps/location/models.py +++ b/apps/location/models.py @@ -15,6 +15,13 @@ class Country(TranslatedFieldsMixin, SVGImageMixin, ProjectBaseMixin): STR_FIELD_NAME = 'name' + TWENTEEN_HOURS_FORMAT_COUNTRIES = [ + 'ca', # Canada + 'au', # Australia + 'us', # USA + 'nz', # New Zeland + ] + name = TJSONField(null=True, blank=True, default=None, verbose_name=_('Name'), help_text='{"en-GB":"some text"}') code = models.CharField(max_length=255, unique=True, verbose_name=_('Code')) @@ -23,6 +30,10 @@ class Country(TranslatedFieldsMixin, SVGImageMixin, ProjectBaseMixin): languages = models.ManyToManyField(Language, verbose_name=_('Languages')) old_id = models.IntegerField(null=True, blank=True, default=None) + @property + def time_format(self): + return 'hh:mmA' if self.code.lower() in self.TWENTEEN_HOURS_FORMAT_COUNTRIES else 'hh:mm' + @property def country_id(self): return self.id diff --git a/apps/main/serializers.py b/apps/main/serializers.py index f939c448..c5ce9b25 100644 --- a/apps/main/serializers.py +++ b/apps/main/serializers.py @@ -64,6 +64,7 @@ class SiteSettingsSerializer(serializers.ModelSerializer): country_code = serializers.CharField(source='subdomain', read_only=True) country_name = serializers.CharField(source='country.name_translated', read_only=True) + time_format = serializers.CharField(source='country.time_format', read_only=True) class Meta: """Meta class.""" @@ -71,6 +72,7 @@ class SiteSettingsSerializer(serializers.ModelSerializer): model = models.SiteSettings fields = ( 'country_code', + 'time_format', 'subdomain', 'pinterest_page_url', 'twitter_page_url', @@ -81,7 +83,7 @@ class SiteSettingsSerializer(serializers.ModelSerializer): 'ad_config', 'published_features', 'currency', - 'country_name' + 'country_name', ) From b3bd2a714127dfa9ae513ea778dd6e0075823246 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 1 Nov 2019 10:48:46 +0300 Subject: [PATCH 07/15] add_establishment_social command --- .../commands/add_establishment_social.py | 56 +++++++++++++++++++ .../migrations/0050_socialnetwork_old_id.py | 18 ++++++ .../migrations/0051_auto_20191101_0732.py | 18 ++++++ apps/establishment/models.py | 3 +- apps/transfer/models.py | 1 + 5 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 apps/establishment/management/commands/add_establishment_social.py create mode 100644 apps/establishment/migrations/0050_socialnetwork_old_id.py create mode 100644 apps/establishment/migrations/0051_auto_20191101_0732.py diff --git a/apps/establishment/management/commands/add_establishment_social.py b/apps/establishment/management/commands/add_establishment_social.py new file mode 100644 index 00000000..647d8764 --- /dev/null +++ b/apps/establishment/management/commands/add_establishment_social.py @@ -0,0 +1,56 @@ +from django.core.management.base import BaseCommand + +from establishment.models import Establishment, SocialNetwork +from transfer.models import EstablishmentInfos + + +class Command(BaseCommand): + help = 'Add social links values from old db to new db' + + def handle(self, *args, **kwargs): + count = 0 + + queryset = EstablishmentInfos.objects.exclude( + establishment_id__isnull=True + ).values_list('id', 'establishment_id', 'facebook', 'twitter', 'instagram') + + for id, es_id, facebook, twitter, instagram in queryset: + try: + establishment = Establishment.objects.get(old_id=es_id) + except Establishment.DoesNotExist: + continue + except Establishment.MultipleObjectsReturned: + establishment = Establishment.objects.filter(old_id=es_id).first() + else: + if facebook: + if 'facebook.com/' not in facebook: + facebook = 'https://www.facebook.com/' + facebook + obj, _ = SocialNetwork.objects.get_or_create( + old_id=id, + establishment=establishment, + title='facebook', + url=facebook, + ) + count += 1 + if twitter: + if 'twitter.com/' not in twitter: + twitter = 'https://www.twitter.com/' + twitter + obj, _ = SocialNetwork.objects.get_or_create( + old_id=id, + establishment=establishment, + title='twitter', + url=twitter, + ) + count += 1 + if instagram: + if 'instagram.com/' not in instagram: + instagram = 'https://www.instagram.com/' + instagram + obj, _ = SocialNetwork.objects.get_or_create( + old_id=id, + establishment=establishment, + title='instagram', + url=instagram, + ) + count += 1 + + self.stdout.write(self.style.WARNING(f'Created/updated {count} objects.')) diff --git a/apps/establishment/migrations/0050_socialnetwork_old_id.py b/apps/establishment/migrations/0050_socialnetwork_old_id.py new file mode 100644 index 00000000..0a057703 --- /dev/null +++ b/apps/establishment/migrations/0050_socialnetwork_old_id.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.4 on 2019-11-01 07:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('establishment', '0049_auto_20191031_1616'), + ] + + operations = [ + migrations.AddField( + model_name='socialnetwork', + name='old_id', + field=models.PositiveIntegerField(blank=True, default=None, null=True, verbose_name='old id'), + ), + ] diff --git a/apps/establishment/migrations/0051_auto_20191101_0732.py b/apps/establishment/migrations/0051_auto_20191101_0732.py new file mode 100644 index 00000000..ff834f46 --- /dev/null +++ b/apps/establishment/migrations/0051_auto_20191101_0732.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.4 on 2019-11-01 07:32 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('establishment', '0050_socialnetwork_old_id'), + ] + + operations = [ + migrations.AlterField( + model_name='socialnetwork', + name='url', + field=models.URLField(max_length=255, verbose_name='URL'), + ), + ] diff --git a/apps/establishment/models.py b/apps/establishment/models.py index 957333ac..3488e4e7 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -661,11 +661,12 @@ class Menu(TranslatedFieldsMixin, BaseAttributes): class SocialNetwork(models.Model): + old_id = models.PositiveIntegerField(_('old id'), blank=True, null=True, default=None) establishment = models.ForeignKey( 'Establishment', verbose_name=_('establishment'), related_name='socials', on_delete=models.CASCADE) title = models.CharField(_('title'), max_length=255) - url = models.URLField(_('URL')) + url = models.URLField(_('URL'), max_length=255) class Meta: verbose_name = _('social network') diff --git a/apps/transfer/models.py b/apps/transfer/models.py index d81479a7..0ac0ee8a 100644 --- a/apps/transfer/models.py +++ b/apps/transfer/models.py @@ -553,6 +553,7 @@ class EstablishmentInfos(MigrateMixin): website = models.CharField(max_length=255, blank=True, null=True) facebook = models.CharField(max_length=255, blank=True, null=True) twitter = models.CharField(max_length=255, blank=True, null=True) + instagram = models.TextField(blank=True, null=True) lafourchette = models.CharField(max_length=255, blank=True, null=True) pub = models.IntegerField(blank=True, null=True) created_at = models.DateTimeField() From 04afd4d913010fdbbef9f15c42e9fad71cbc8230 Mon Sep 17 00:00:00 2001 From: evgeniy-st Date: Fri, 1 Nov 2019 11:34:48 +0300 Subject: [PATCH 08/15] update country time_format and __str__ method --- apps/location/models.py | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/apps/location/models.py b/apps/location/models.py index c33675d3..6df1b7cb 100644 --- a/apps/location/models.py +++ b/apps/location/models.py @@ -7,7 +7,8 @@ from django.dispatch import receiver from django.utils.translation import gettext_lazy as _ from translation.models import Language -from utils.models import ProjectBaseMixin, SVGImageMixin, TranslatedFieldsMixin, TJSONField +from utils.models import (ProjectBaseMixin, SVGImageMixin, TJSONField, + TranslatedFieldsMixin, get_current_locale) class Country(TranslatedFieldsMixin, SVGImageMixin, ProjectBaseMixin): @@ -15,11 +16,11 @@ class Country(TranslatedFieldsMixin, SVGImageMixin, ProjectBaseMixin): STR_FIELD_NAME = 'name' - TWENTEEN_HOURS_FORMAT_COUNTRIES = [ - 'ca', # Canada - 'au', # Australia - 'us', # USA - 'nz', # New Zeland + TWELVE_HOURS_FORMAT_COUNTRIES = [ + 'ca', # Canada + 'au', # Australia + 'us', # USA + 'nz', # New Zealand ] name = TJSONField(null=True, blank=True, default=None, @@ -32,7 +33,9 @@ class Country(TranslatedFieldsMixin, SVGImageMixin, ProjectBaseMixin): @property def time_format(self): - return 'hh:mmA' if self.code.lower() in self.TWENTEEN_HOURS_FORMAT_COUNTRIES else 'hh:mm' + if self.code.lower() not in self.TWELVE_HOURS_FORMAT_COUNTRIES: + return 'hh:mm' + return 'hh:mmA' @property def country_id(self): @@ -44,6 +47,14 @@ class Country(TranslatedFieldsMixin, SVGImageMixin, ProjectBaseMixin): verbose_name_plural = _('Countries') verbose_name = _('Country') + def __str__(self): + str_name = self.code + if isinstance(self.name, dict): + translated_name = self.name.get(get_current_locale()) + if translated_name: + str_name = translated_name + return str_name + class Region(models.Model): """Region model.""" From 623934438ff6e81bc9504b7346010dc60e12f0b2 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Fri, 1 Nov 2019 12:00:51 +0300 Subject: [PATCH 09/15] fixed svg path --- apps/utils/methods.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/utils/methods.py b/apps/utils/methods.py index bea8fec7..28ac55df 100644 --- a/apps/utils/methods.py +++ b/apps/utils/methods.py @@ -64,7 +64,7 @@ def image_path(instance, filename): def svg_image_path(instance, filename): """Determine SVG path method.""" filename = '%s.svg' % generate_code() - return 'image/svg/%s/%s/%s' % ( + return 'svg/%s/%s/%s' % ( instance._meta.model_name, datetime.now().strftime(settings.REST_DATE_FORMAT), filename) From 0352615200b122bc23ff9df4c35cb32c345feae0 Mon Sep 17 00:00:00 2001 From: littlewolf Date: Fri, 1 Nov 2019 12:12:51 +0300 Subject: [PATCH 10/15] Fix country_code svg --- apps/location/transfer_data.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/location/transfer_data.py b/apps/location/transfer_data.py index 2b0c15c8..5be39b7a 100644 --- a/apps/location/transfer_data.py +++ b/apps/location/transfer_data.py @@ -1,11 +1,11 @@ -from django.db.models import Q, QuerySet - from transfer.serializers.location import CountrySerializer, RegionSerializer, \ CitySerializer, AddressSerializer, \ Country from transfer.models import Cities, Locations from pprint import pprint +from requests import get + def transfer_countries(): queryset = Cities.objects.raw("""SELECT cities.id, cities.country_code_2 @@ -116,10 +116,14 @@ def transfer_addresses(): def update_flags(): queryset = Country.objects.only("id", "code", "svg_image").filter(old_id__isnull=False) + link_to_request = "https://s3.eu-central-1.amazonaws.com/gm-test.com/media" for query in queryset: - query.svg_image = f"/image/image/10-31-2019/{query.code}.svg" - query.save() + svg_link = f"/svg/country/10-31-2019/{query.code}.svg" + resp = get(f"{link_to_request}{svg_link}") + if resp.status_code == 200: + query.svg_image = svg_link + query.save() data_types = { From e4c9d8f9bce7259ea50280a97ba9f2323947d20f Mon Sep 17 00:00:00 2001 From: Dmitriy Kuzmenko Date: Fri, 1 Nov 2019 12:30:07 +0300 Subject: [PATCH 11/15] fix develop settings --- project/settings/development.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/project/settings/development.py b/project/settings/development.py index a9cfe5be..16965e22 100644 --- a/project/settings/development.py +++ b/project/settings/development.py @@ -60,4 +60,6 @@ DATABASES = { 'USER': os.environ.get('MYSQL_USER'), 'PASSWORD': os.environ.get('MYSQL_PASSWORD') } -} \ No newline at end of file +} + +BROKER_URL = 'redis://localhost:6379/1' \ No newline at end of file From 8d8cd09d64754dca3d55d5590ab98d821d158d95 Mon Sep 17 00:00:00 2001 From: Dmitriy Kuzmenko Date: Fri, 1 Nov 2019 12:32:48 +0300 Subject: [PATCH 12/15] fix develop settings --- project/settings/development.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/project/settings/development.py b/project/settings/development.py index 16965e22..3472e544 100644 --- a/project/settings/development.py +++ b/project/settings/development.py @@ -62,4 +62,6 @@ DATABASES = { } } -BROKER_URL = 'redis://localhost:6379/1' \ No newline at end of file +BROKER_URL = 'redis://redis:6379/1' +CELERY_RESULT_BACKEND = BROKER_URL +CELERY_BROKER_URL = BROKER_URL \ No newline at end of file From 11f091c069c453d03c3edfd9b7e4ff952f2d5542 Mon Sep 17 00:00:00 2001 From: Dmitriy Kuzmenko Date: Fri, 1 Nov 2019 12:36:53 +0300 Subject: [PATCH 13/15] fix develop settings --- project/settings/development.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/settings/development.py b/project/settings/development.py index 3472e544..a6f45b2f 100644 --- a/project/settings/development.py +++ b/project/settings/development.py @@ -62,6 +62,6 @@ DATABASES = { } } -BROKER_URL = 'redis://redis:6379/1' +BROKER_URL = 'redis://localhost:6379/1' CELERY_RESULT_BACKEND = BROKER_URL CELERY_BROKER_URL = BROKER_URL \ No newline at end of file From 0e04b9d04418a80182635de6cc2e9ff2a687a55b Mon Sep 17 00:00:00 2001 From: evgeniy-st Date: Fri, 1 Nov 2019 12:57:57 +0300 Subject: [PATCH 14/15] update toque calculating --- apps/establishment/models.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index 3488e4e7..038beae4 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -309,6 +309,7 @@ class Establishment(ProjectBaseMixin, URLImageMixin, TranslatedFieldsMixin): public_mark = models.PositiveIntegerField(blank=True, null=True, default=None, verbose_name=_('public mark'),) + # todo: set default 0 toque_number = models.PositiveIntegerField(blank=True, null=True, default=None, verbose_name=_('toque number'),) @@ -383,7 +384,7 @@ class Establishment(ProjectBaseMixin, URLImageMixin, TranslatedFieldsMixin): # todo: recalculate toque_number def recalculate_toque_number(self): - toque_number = None + toque_number = 0 if self.address and self.public_mark: toque_number = RatingStrategy.objects. \ get_toque_number(country=self.address.city.country, @@ -687,7 +688,7 @@ class RatingStrategyManager(models.Manager): obj = qs.for_public_mark(public_mark).first() if obj: return obj.toque_number - return None + return 0 class RatingStrategyQuerySet(models.QuerySet): From 84cefefa0b2030e7db81927a311e0c4c61a3e218 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 1 Nov 2019 14:14:16 +0300 Subject: [PATCH 15/15] fix add_establishment_description --- .../management/commands/add_establishment_description.py | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/establishment/management/commands/add_establishment_description.py b/apps/establishment/management/commands/add_establishment_description.py index 1748d81d..00c300f8 100644 --- a/apps/establishment/management/commands/add_establishment_description.py +++ b/apps/establishment/management/commands/add_establishment_description.py @@ -26,6 +26,5 @@ class Command(BaseCommand): establishment.description = description establishment.save() count += 1 - break self.stdout.write(self.style.WARNING(f'Updated {count} objects.'))