From dad4c5f5a38134758dc2454593cba59faf433f4c Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 16 Oct 2019 14:11:07 +0300 Subject: [PATCH 01/11] 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/11] 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/11] 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/11] 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/11] 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 989e80ece6bcaab9bdab36cdac41bc84e1890807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Thu, 31 Oct 2019 16:57:12 +0300 Subject: [PATCH 06/11] First --- apps/collection/management/__init__.py | 0 .../management/commands/__init__.py | 0 .../management/commands/import_collection.py | 80 +++++++++++++++++ apps/collection/transfer.py | 17 +--- apps/location/transfer_data.py | 87 +++++++++++-------- 5 files changed, 134 insertions(+), 50 deletions(-) create mode 100644 apps/collection/management/__init__.py create mode 100644 apps/collection/management/commands/__init__.py create mode 100644 apps/collection/management/commands/import_collection.py diff --git a/apps/collection/management/__init__.py b/apps/collection/management/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/collection/management/commands/__init__.py b/apps/collection/management/commands/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/collection/management/commands/import_collection.py b/apps/collection/management/commands/import_collection.py new file mode 100644 index 00000000..7c6d92f8 --- /dev/null +++ b/apps/collection/management/commands/import_collection.py @@ -0,0 +1,80 @@ +from django.core.management.base import BaseCommand +from establishment.models import Establishment +from location.models import Country +from transfer.models import Collections +from collection.models import Collection +from news.models import News + + +class Command(BaseCommand): + help = 'Import collection' + + def handle(self, *args, **kwargs): + raw_qs = Collections.objects.raw(''' + select + distinct + a.collection_id, + a.establishment_id, + a.title, + a.tag_name, + a.slug, + a.attachment_file_name, + a.attachment_content_type, + a.attachment_file_size, + a.attachment_suffix_url, + active as is_publish,, + a.country_code, + a.geometries, + a.description + from + ( + select distinct + c.id as collection_id, + m.establishment_id, + c.title, c.tag_name, + c.slug, c.attachment_file_name, + c.attachment_content_type, c.attachment_file_size, + c.attachment_suffix_url, + active, + s.country_code_2 as country_code, + c.geometries, + c.title as description + from collections as c + join metadata m on m.value = c.tag_name + join establishments e on e.id = m.establishment_id + join sites s on s.id = c.site_id + where m.`key` = 'collection' + + union + + select distinct + c.id as collection_id, + m.establishment_id, + c.title, c.tag_name, + c.slug, c.attachment_file_name, + c.attachment_content_type, c.attachment_file_size, + c.attachment_suffix_url, + active, + s.country_code_2 as country_code, + c.geometries, + c.title as description + from collections as c + join metadata m on m.value = c.slug + join establishments e on e.id = m.establishment_id + join sites s on s.id = c.site_id + where m.`key` = 'collection' + ) a + ''') + objects = [] + queryset = [vars(query) for query in raw_qs] + for obj in queryset: + establishment = Establishment.objects.filter(old_id=obj['establishment_id']).first() + country = Country.objects.filter(code=obj['country_code']).first() + objects.append( + Collection(name={"en-GB":obj['title']}, collection_type = Collection.ORDINARY, + is_publish=obj['is_publish'], country=country, + description=obj['description'], + slug=obj['slug'] + ) + ) + # self.stdout.write(self.style.WARNING(f'Deleted {count} objects.')) diff --git a/apps/collection/transfer.py b/apps/collection/transfer.py index 6c18c9ae..1f7feb46 100644 --- a/apps/collection/transfer.py +++ b/apps/collection/transfer.py @@ -27,22 +27,7 @@ card = { # "country": "Country", } }, - "Guide": { - # как работать с ForeignKey на самого себя(self), поле "parent" - "data_type": "objects", - "dependencies": ("Collection", "self"), - "fields": { - "Guides": { - # нету аналогов для полей start и end - "name": "title" - } - }, - "relations": { - # аналалог для поля "collection" не найдено - # "parent": "Guide", - # "collection": "Collection" - } - } + } used_apps = ("location", ) diff --git a/apps/location/transfer_data.py b/apps/location/transfer_data.py index b19eb42b..afd964ee 100644 --- a/apps/location/transfer_data.py +++ b/apps/location/transfer_data.py @@ -6,11 +6,13 @@ from pprint import pprint def transfer_countries(): - queryset = Cities.objects.raw("""SELECT cities.id, cities.country_code_2 - FROM cities WHERE - country_code_2 IS NOT NULL AND - country_code_2 != "" - GROUP BY cities.country_code_2""") + queryset = Cities.objects.raw(""" + SELECT cities.id, cities.country_code_2 + FROM cities + WHERE country_code_2 IS NOT NULL AND + country_code_2 != "" + GROUP BY cities.id, cities.country_code_2 + """) queryset = [vars(query) for query in queryset] @@ -22,16 +24,24 @@ def transfer_countries(): def transfer_regions(): - regions_without_subregion_queryset = Cities.objects.raw("""SELECT cities.id, cities.region_code, - cities.country_code_2, cities.subregion_code - FROM cities WHERE - (subregion_code IS NULL OR - subregion_code = "") AND - region_code IS NOT NULL AND - region_code != "" AND - country_code_2 IS NOT NULL AND - country_code_2 != "" - GROUP BY region_code""") + regions_without_subregion_queryset = Cities.objects.raw(""" + SELECT cities.id, + cities.region_code, + cities.country_code_2, + cities.subregion_code + FROM cities + WHERE (subregion_code IS NULL + OR subregion_code = "" + ) + AND region_code IS NOT NULL + AND region_code != "" + AND country_code_2 IS NOT NULL + AND country_code_2 != "" + GROUP BY cities.id, + cities.region_code, + cities.country_code_2, + cities.subregion_code + """) regions_without_subregion_queryset = [vars(query) for query in regions_without_subregion_queryset] @@ -41,25 +51,34 @@ def transfer_regions(): else: pprint(f"Parent regions serializer errors: {serialized_without_subregion.errors}") - regions_with_subregion_queryset = Cities.objects.raw("""SELECT cities.id, cities.region_code, - cities.country_code_2, cities.subregion_code - FROM cities WHERE - subregion_code IS NOT NULL AND - subregion_code != "" AND - region_code IS NOT NULL AND - region_code != "" AND - country_code_2 IS NOT NULL AND - country_code_2 != "" - AND cities.subregion_code in ( - SELECT region_code FROM cities WHERE - (subregion_code IS NULL OR - subregion_code = "") AND - region_code IS NOT NULL AND - region_code != "" AND - country_code_2 IS NOT NULL AND - country_code_2 != "" - ) - GROUP BY region_code""") + regions_with_subregion_queryset = Cities.objects.raw(""" + SELECT + cities.id, + cities.region_code, + cities.country_code_2, + cities.subregion_code + FROM cities + WHERE subregion_code IS NOT NULL AND + subregion_code != "" AND + region_code IS NOT NULL AND + region_code != "" AND + country_code_2 IS NOT NULL AND + country_code_2 != "" + AND cities.subregion_code in + ( + SELECT region_code FROM cities WHERE + (subregion_code IS NULL OR + subregion_code = "") AND + region_code IS NOT NULL AND + region_code != "" AND + country_code_2 IS NOT NULL AND + country_code_2 != "" + ) + GROUP BY cities.id, + cities.region_code, + cities.country_code_2, + cities.subregion_code + """) regions_with_subregion_queryset = [vars(query) for query in regions_with_subregion_queryset] From 7b4837f4f3a1f551eafb47c103660a48048c2bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Thu, 31 Oct 2019 17:04:25 +0300 Subject: [PATCH 07/11] Add --- .../management/commands/import_collection.py | 8 ++--- .../migrations/0017_collection_old_id.py | 18 ++++++++++ apps/collection/models.py | 1 + .../migrations/0003_auto_20191030_1315.py | 29 ++++++++++++++++ .../migrations/0004_auto_20191031_0923.py | 33 +++++++++++++++++++ .../migrations/0005_auto_20191031_0929.py | 19 +++++++++++ .../migrations/0006_auto_20191031_0930.py | 19 +++++++++++ 7 files changed, 123 insertions(+), 4 deletions(-) create mode 100644 apps/collection/migrations/0017_collection_old_id.py create mode 100644 apps/product/migrations/0003_auto_20191030_1315.py create mode 100644 apps/product/migrations/0004_auto_20191031_0923.py create mode 100644 apps/product/migrations/0005_auto_20191031_0929.py create mode 100644 apps/product/migrations/0006_auto_20191031_0930.py diff --git a/apps/collection/management/commands/import_collection.py b/apps/collection/management/commands/import_collection.py index 7c6d92f8..380e856b 100644 --- a/apps/collection/management/commands/import_collection.py +++ b/apps/collection/management/commands/import_collection.py @@ -68,13 +68,13 @@ class Command(BaseCommand): objects = [] queryset = [vars(query) for query in raw_qs] for obj in queryset: - establishment = Establishment.objects.filter(old_id=obj['establishment_id']).first() + # establishment = Establishment.objects.filter(old_id=obj['establishment_id']).first() country = Country.objects.filter(code=obj['country_code']).first() objects.append( - Collection(name={"en-GB":obj['title']}, collection_type = Collection.ORDINARY, + Collection(name={"en-GB":obj['title']}, collection_type=Collection.ORDINARY, is_publish=obj['is_publish'], country=country, description=obj['description'], - slug=obj['slug'] + slug=obj['slug'], old_id=obj['old_id'] ) ) - # self.stdout.write(self.style.WARNING(f'Deleted {count} objects.')) + Collection.objects.bulk_create(objects) diff --git a/apps/collection/migrations/0017_collection_old_id.py b/apps/collection/migrations/0017_collection_old_id.py new file mode 100644 index 00000000..11b84c8a --- /dev/null +++ b/apps/collection/migrations/0017_collection_old_id.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.4 on 2019-10-31 13:58 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('collection', '0016_auto_20191024_1334'), + ] + + operations = [ + migrations.AddField( + model_name='collection', + name='old_id', + field=models.IntegerField(blank=True, null=True), + ), + ] diff --git a/apps/collection/models.py b/apps/collection/models.py index cbcc3842..a051a5c1 100644 --- a/apps/collection/models.py +++ b/apps/collection/models.py @@ -76,6 +76,7 @@ class Collection(ProjectBaseMixin, CollectionDateMixin, slug = models.SlugField(max_length=50, unique=True, verbose_name=_('Collection slug'), editable=True, null=True) + old_id=models.IntegerField(null=True, blank=True) objects = CollectionQuerySet.as_manager() class Meta: diff --git a/apps/product/migrations/0003_auto_20191030_1315.py b/apps/product/migrations/0003_auto_20191030_1315.py new file mode 100644 index 00000000..9aea341e --- /dev/null +++ b/apps/product/migrations/0003_auto_20191030_1315.py @@ -0,0 +1,29 @@ +# Generated by Django 2.2.4 on 2019-10-30 13:15 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('product', '0002_product_slug'), + ] + + operations = [ + migrations.AddField( + model_name='product', + name='old_id', + field=models.IntegerField(blank=True, null=True, verbose_name='Product old id'), + ), + migrations.AddField( + model_name='product', + name='old_id_establishment', + field=models.IntegerField(blank=True, null=True, verbose_name='Establishment old id'), + ), + migrations.AlterField( + model_name='product', + name='establishment', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='products', to='establishment.Establishment', verbose_name='establishment'), + ), + ] diff --git a/apps/product/migrations/0004_auto_20191031_0923.py b/apps/product/migrations/0004_auto_20191031_0923.py new file mode 100644 index 00000000..65d63782 --- /dev/null +++ b/apps/product/migrations/0004_auto_20191031_0923.py @@ -0,0 +1,33 @@ +# Generated by Django 2.2.4 on 2019-10-31 09:23 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('product', '0003_auto_20191030_1315'), + ] + + operations = [ + migrations.RemoveField( + model_name='product', + name='old_id_establishment', + ), + migrations.AlterField( + model_name='product', + name='establishment', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='products', to='establishment.Establishment', verbose_name='establishment'), + ), + migrations.AlterField( + model_name='product', + name='old_id', + field=models.IntegerField(blank=True, null=True), + ), + migrations.AlterField( + model_name='productsubtype', + name='index_name', + field=models.CharField(choices=[('rum', 'Rum'), ('other', 'Other'), ('extra brut', 'extra brut'), ('brut', 'brut'), ('brut nature', 'brut nature'), ('demi-sec', 'demi-sec'), ('Extra Dry', 'Extra Dry'), ('dosage zero', 'dosage zero'), ('sec', 'sec'), ('doux', 'doux'), ('moelleux', 'moelleux')], db_index=True, max_length=50, unique=True, verbose_name='Index name'), + ), + ] diff --git a/apps/product/migrations/0005_auto_20191031_0929.py b/apps/product/migrations/0005_auto_20191031_0929.py new file mode 100644 index 00000000..6dfd4a93 --- /dev/null +++ b/apps/product/migrations/0005_auto_20191031_0929.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.4 on 2019-10-31 09:29 + +import django.contrib.postgres.fields.jsonb +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('product', '0004_auto_20191031_0923'), + ] + + operations = [ + migrations.AlterField( + model_name='product', + name='characteristics', + field=django.contrib.postgres.fields.jsonb.JSONField(null=True, verbose_name='Characteristics'), + ), + ] diff --git a/apps/product/migrations/0006_auto_20191031_0930.py b/apps/product/migrations/0006_auto_20191031_0930.py new file mode 100644 index 00000000..687fa793 --- /dev/null +++ b/apps/product/migrations/0006_auto_20191031_0930.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.4 on 2019-10-31 09:30 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('product', '0005_auto_20191031_0929'), + ] + + operations = [ + migrations.AlterField( + model_name='product', + name='establishment', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='products', to='establishment.Establishment', verbose_name='establishment'), + ), + ] From 1abe280ef7dec737476bd748fe0bd44e0a689c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Thu, 31 Oct 2019 17:51:23 +0300 Subject: [PATCH 08/11] Add unique collection --- .../management/commands/import_collection.py | 54 +++++++++++++------ .../migrations/0007_auto_20191031_1408.py | 29 ++++++++++ .../migrations/0008_auto_20191031_1410.py | 19 +++++++ apps/product/models.py | 3 +- 4 files changed, 88 insertions(+), 17 deletions(-) create mode 100644 apps/product/migrations/0007_auto_20191031_1408.py create mode 100644 apps/product/migrations/0008_auto_20191031_1410.py diff --git a/apps/collection/management/commands/import_collection.py b/apps/collection/management/commands/import_collection.py index 380e856b..f0b7ab8e 100644 --- a/apps/collection/management/commands/import_collection.py +++ b/apps/collection/management/commands/import_collection.py @@ -1,6 +1,6 @@ from django.core.management.base import BaseCommand from establishment.models import Establishment -from location.models import Country +from location.models import Country, Language from transfer.models import Collections from collection.models import Collection from news.models import News @@ -13,22 +13,25 @@ class Command(BaseCommand): raw_qs = Collections.objects.raw(''' select distinct + a.id, a.collection_id, - a.establishment_id, + -- a.establishment_id, a.title, a.tag_name, a.slug, - a.attachment_file_name, - a.attachment_content_type, - a.attachment_file_size, - a.attachment_suffix_url, - active as is_publish,, - a.country_code, - a.geometries, - a.description + -- a.attachment_file_name, + -- a.attachment_content_type, + -- a.attachment_file_size, + -- a.attachment_suffix_url, + -- active as is_publish, + a.country_code, + -- a.geometries, + a.description, + min(a.start) AS start from ( select distinct + c.id, c.id as collection_id, m.establishment_id, c.title, c.tag_name, @@ -38,7 +41,8 @@ class Command(BaseCommand): active, s.country_code_2 as country_code, c.geometries, - c.title as description + c.title as description, + m.created_at as start from collections as c join metadata m on m.value = c.tag_name join establishments e on e.id = m.establishment_id @@ -48,6 +52,7 @@ class Command(BaseCommand): union select distinct + c.id, c.id as collection_id, m.establishment_id, c.title, c.tag_name, @@ -57,24 +62,41 @@ class Command(BaseCommand): active, s.country_code_2 as country_code, c.geometries, - c.title as description + c.title as description, + m.created_at as start from collections as c join metadata m on m.value = c.slug join establishments e on e.id = m.establishment_id join sites s on s.id = c.site_id where m.`key` = 'collection' - ) a + ) a + group by + a.id, + a.collection_id, + -- a.establishment_id, + a.title, + a.tag_name, + a.slug, + -- a.attachment_file_name, + -- a.attachment_content_type, + -- a.attachment_file_size, + -- a.attachment_suffix_url, + -- active as is_publish, + a.country_code, + a.description ''') objects = [] queryset = [vars(query) for query in raw_qs] for obj in queryset: # establishment = Establishment.objects.filter(old_id=obj['establishment_id']).first() - country = Country.objects.filter(code=obj['country_code']).first() + lang = Language.objects.filter(locale=obj['country_code']) + country = Country.objects.filter(languages__in=lang).first() objects.append( Collection(name={"en-GB":obj['title']}, collection_type=Collection.ORDINARY, - is_publish=obj['is_publish'], country=country, + country=country, description=obj['description'], - slug=obj['slug'], old_id=obj['old_id'] + slug=obj['slug'], old_id=obj['collection_id'], + start=obj['start'] ) ) Collection.objects.bulk_create(objects) diff --git a/apps/product/migrations/0007_auto_20191031_1408.py b/apps/product/migrations/0007_auto_20191031_1408.py new file mode 100644 index 00000000..2845f395 --- /dev/null +++ b/apps/product/migrations/0007_auto_20191031_1408.py @@ -0,0 +1,29 @@ +# Generated by Django 2.2.4 on 2019-10-31 14:08 + +import django.contrib.postgres.fields.jsonb +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('product', '0006_auto_20191031_0930'), + ] + + operations = [ + migrations.RemoveField( + model_name='product', + name='old_id', + ), + migrations.AlterField( + model_name='product', + name='characteristics', + field=django.contrib.postgres.fields.jsonb.JSONField(verbose_name='Characteristics', null=True), + ), + migrations.AlterField( + model_name='product', + name='establishment', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='products', to='establishment.Establishment', verbose_name='establishment'), + ), + ] diff --git a/apps/product/migrations/0008_auto_20191031_1410.py b/apps/product/migrations/0008_auto_20191031_1410.py new file mode 100644 index 00000000..af3d17d6 --- /dev/null +++ b/apps/product/migrations/0008_auto_20191031_1410.py @@ -0,0 +1,19 @@ +# Generated by Django 2.2.4 on 2019-10-31 14:10 + +import django.contrib.postgres.fields.jsonb +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('product', '0007_auto_20191031_1408'), + ] + + operations = [ + migrations.AlterField( + model_name='product', + name='characteristics', + field=django.contrib.postgres.fields.jsonb.JSONField(null=True, verbose_name='Characteristics'), + ), + ] diff --git a/apps/product/models.py b/apps/product/models.py index 332a92f6..19d8443c 100644 --- a/apps/product/models.py +++ b/apps/product/models.py @@ -138,7 +138,8 @@ class Product(TranslatedFieldsMixin, BaseAttributes): help_text='{"en-GB":"some text"}') description = TJSONField(_('Description'), null=True, blank=True, default=None, help_text='{"en-GB":"some text"}') - characteristics = JSONField(_('Characteristics')) + #TODO set null=False + characteristics = JSONField(_('Characteristics'), null=True) country = models.ManyToManyField('location.Country', verbose_name=_('Country')) available = models.BooleanField(_('Available'), default=True) From a8861238ac1635a408aaff3fba356b3c5bdc4aff Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 16 Oct 2019 14:11:07 +0300 Subject: [PATCH 09/11] 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 54f2290bbda60c6f934429f3fd2bf128a98cebfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Fri, 1 Nov 2019 10:16:05 +0300 Subject: [PATCH 10/11] exit --- .../management/commands/import_collection.py | 194 ++++++++++++------ apps/transfer/serializers/location.py | 2 +- 2 files changed, 129 insertions(+), 67 deletions(-) diff --git a/apps/collection/management/commands/import_collection.py b/apps/collection/management/commands/import_collection.py index f0b7ab8e..0b85e7da 100644 --- a/apps/collection/management/commands/import_collection.py +++ b/apps/collection/management/commands/import_collection.py @@ -10,93 +10,155 @@ class Command(BaseCommand): help = 'Import collection' def handle(self, *args, **kwargs): + # raw_qs = Collections.objects.raw(''' + # select + # distinct + # a.id, + # a.collection_id, + # -- a.establishment_id, + # a.title, + # a.tag_name, + # a.slug, + # -- a.attachment_file_name, + # -- a.attachment_content_type, + # -- a.attachment_file_size, + # -- a.attachment_suffix_url, + # -- active as is_publish, + # a.country_code, + # -- a.geometries, + # a.description, + # min(a.start) AS start + # from + # ( + # select distinct + # c.id, + # c.id as collection_id, + # m.establishment_id, + # c.title, c.tag_name, + # c.slug, c.attachment_file_name, + # c.attachment_content_type, c.attachment_file_size, + # c.attachment_suffix_url, + # active, + # s.country_code_2 as country_code, + # c.geometries, + # c.title as description, + # m.created_at as start + # from collections as c + # join metadata m on m.value = c.tag_name + # join establishments e on e.id = m.establishment_id + # join sites s on s.id = c.site_id + # where m.`key` = 'collection' + # + # union + # + # select distinct + # c.id, + # c.id as collection_id, + # m.establishment_id, + # c.title, c.tag_name, + # c.slug, c.attachment_file_name, + # c.attachment_content_type, c.attachment_file_size, + # c.attachment_suffix_url, + # active, + # s.country_code_2 as country_code, + # c.geometries, + # c.title as description, + # m.created_at as start + # from collections as c + # join metadata m on m.value = c.slug + # join establishments e on e.id = m.establishment_id + # join sites s on s.id = c.site_id + # where m.`key` = 'collection' + # ) a + # group by + # a.id, + # a.collection_id, + # -- a.establishment_id, + # a.title, + # a.tag_name, + # a.slug, + # -- a.attachment_file_name, + # -- a.attachment_content_type, + # -- a.attachment_file_size, + # -- a.attachment_suffix_url, + # -- active as is_publish, + # a.country_code, + # a.description + # ''') + # objects = [] + # queryset = [vars(query) for query in raw_qs] + # for obj in queryset: + # # establishment = Establishment.objects.filter(old_id=obj['establishment_id']).first() + # lang = Language.objects.filter(locale=obj['country_code']) + # country = Country.objects.filter(languages__in=lang).first() + # if country: + # objects.append( + # Collection(name={"en-GB": obj['title']}, collection_type=Collection.ORDINARY, + # country=country, + # description=obj['description'], + # slug=obj['slug'], old_id=obj['collection_id'], + # start=obj['start'] + # ) + # ) + # Collection.objects.bulk_create(objects) + raw_qs = Collections.objects.raw(''' select distinct a.id, - a.collection_id, - -- a.establishment_id, - a.title, - a.tag_name, - a.slug, - -- a.attachment_file_name, - -- a.attachment_content_type, - -- a.attachment_file_size, - -- a.attachment_suffix_url, - -- active as is_publish, - a.country_code, - -- a.geometries, - a.description, - min(a.start) AS start - from + a.collection_id, + a.establishment_id + from ( select distinct - c.id, - c.id as collection_id, + c.id, + c.id as collection_id, m.establishment_id, - c.title, c.tag_name, - c.slug, c.attachment_file_name, - c.attachment_content_type, c.attachment_file_size, + c.title, c.tag_name, + c.slug, c.attachment_file_name, + c.attachment_content_type, c.attachment_file_size, c.attachment_suffix_url, - active, - s.country_code_2 as country_code, - c.geometries, - c.title as description, - m.created_at as start + active, + s.country_code_2 as country_code, + c.geometries, + c.title as description, + m.created_at as start from collections as c join metadata m on m.value = c.tag_name join establishments e on e.id = m.establishment_id join sites s on s.id = c.site_id where m.`key` = 'collection' - - union - + + union + select distinct - c.id, - c.id as collection_id, + c.id, + c.id as collection_id, m.establishment_id, - c.title, c.tag_name, - c.slug, c.attachment_file_name, - c.attachment_content_type, c.attachment_file_size, + c.title, c.tag_name, + c.slug, c.attachment_file_name, + c.attachment_content_type, c.attachment_file_size, c.attachment_suffix_url, - active, - s.country_code_2 as country_code, - c.geometries, - c.title as description, - m.created_at as start + active, + s.country_code_2 as country_code, + c.geometries, + c.title as description, + m.created_at as start from collections as c join metadata m on m.value = c.slug join establishments e on e.id = m.establishment_id join sites s on s.id = c.site_id where m.`key` = 'collection' ) a - group by - a.id, - a.collection_id, - -- a.establishment_id, - a.title, - a.tag_name, - a.slug, - -- a.attachment_file_name, - -- a.attachment_content_type, - -- a.attachment_file_size, - -- a.attachment_suffix_url, - -- active as is_publish, - a.country_code, - a.description - ''') - objects = [] + ''') + queryset = [vars(query) for query in raw_qs] for obj in queryset: - # establishment = Establishment.objects.filter(old_id=obj['establishment_id']).first() - lang = Language.objects.filter(locale=obj['country_code']) - country = Country.objects.filter(languages__in=lang).first() - objects.append( - Collection(name={"en-GB":obj['title']}, collection_type=Collection.ORDINARY, - country=country, - description=obj['description'], - slug=obj['slug'], old_id=obj['collection_id'], - start=obj['start'] - ) - ) - Collection.objects.bulk_create(objects) + print('COLLECT_ID: {}'.format(obj['collection_id'])) + est = Establishment.objects.filter(old_id=obj['establishment_id']) + if est.exists(): + inst = est.first() + collect = Collection.objects.filter(old_id=obj['collection_id']) + for c in collect: + inst.collections.add(c) + inst.save() diff --git a/apps/transfer/serializers/location.py b/apps/transfer/serializers/location.py index d4ea51cc..4e05897d 100644 --- a/apps/transfer/serializers/location.py +++ b/apps/transfer/serializers/location.py @@ -71,7 +71,7 @@ class RegionSerializer(serializers.ModelSerializer): print(data) if "subregion_code" in data and data["subregion_code"] is not None and data["subregion_code"].strip() != "": try: - parent_region = Region.objects.get(code=str(data['region_code'])) + parent_region = Region.objects.filter(code=str(data['region_code'])).first() except Exception as e: raise ValueError(f"Parent region error with {data}: {e}") From dbee524a31058159239a2d249955181868526da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Fri, 1 Nov 2019 10:17:12 +0300 Subject: [PATCH 11/11] Add --- .../management/commands/import_collection.py | 182 +++++++++--------- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/apps/collection/management/commands/import_collection.py b/apps/collection/management/commands/import_collection.py index 0b85e7da..c3b5d978 100644 --- a/apps/collection/management/commands/import_collection.py +++ b/apps/collection/management/commands/import_collection.py @@ -10,97 +10,97 @@ class Command(BaseCommand): help = 'Import collection' def handle(self, *args, **kwargs): - # raw_qs = Collections.objects.raw(''' - # select - # distinct - # a.id, - # a.collection_id, - # -- a.establishment_id, - # a.title, - # a.tag_name, - # a.slug, - # -- a.attachment_file_name, - # -- a.attachment_content_type, - # -- a.attachment_file_size, - # -- a.attachment_suffix_url, - # -- active as is_publish, - # a.country_code, - # -- a.geometries, - # a.description, - # min(a.start) AS start - # from - # ( - # select distinct - # c.id, - # c.id as collection_id, - # m.establishment_id, - # c.title, c.tag_name, - # c.slug, c.attachment_file_name, - # c.attachment_content_type, c.attachment_file_size, - # c.attachment_suffix_url, - # active, - # s.country_code_2 as country_code, - # c.geometries, - # c.title as description, - # m.created_at as start - # from collections as c - # join metadata m on m.value = c.tag_name - # join establishments e on e.id = m.establishment_id - # join sites s on s.id = c.site_id - # where m.`key` = 'collection' - # - # union - # - # select distinct - # c.id, - # c.id as collection_id, - # m.establishment_id, - # c.title, c.tag_name, - # c.slug, c.attachment_file_name, - # c.attachment_content_type, c.attachment_file_size, - # c.attachment_suffix_url, - # active, - # s.country_code_2 as country_code, - # c.geometries, - # c.title as description, - # m.created_at as start - # from collections as c - # join metadata m on m.value = c.slug - # join establishments e on e.id = m.establishment_id - # join sites s on s.id = c.site_id - # where m.`key` = 'collection' - # ) a - # group by - # a.id, - # a.collection_id, - # -- a.establishment_id, - # a.title, - # a.tag_name, - # a.slug, - # -- a.attachment_file_name, - # -- a.attachment_content_type, - # -- a.attachment_file_size, - # -- a.attachment_suffix_url, - # -- active as is_publish, - # a.country_code, - # a.description - # ''') - # objects = [] - # queryset = [vars(query) for query in raw_qs] - # for obj in queryset: - # # establishment = Establishment.objects.filter(old_id=obj['establishment_id']).first() - # lang = Language.objects.filter(locale=obj['country_code']) - # country = Country.objects.filter(languages__in=lang).first() - # if country: - # objects.append( - # Collection(name={"en-GB": obj['title']}, collection_type=Collection.ORDINARY, - # country=country, - # description=obj['description'], - # slug=obj['slug'], old_id=obj['collection_id'], - # start=obj['start'] - # ) - # ) - # Collection.objects.bulk_create(objects) + raw_qs = Collections.objects.raw(''' + select + distinct + a.id, + a.collection_id, + -- a.establishment_id, + a.title, + a.tag_name, + a.slug, + -- a.attachment_file_name, + -- a.attachment_content_type, + -- a.attachment_file_size, + -- a.attachment_suffix_url, + -- active as is_publish, + a.country_code, + -- a.geometries, + a.description, + min(a.start) AS start + from + ( + select distinct + c.id, + c.id as collection_id, + m.establishment_id, + c.title, c.tag_name, + c.slug, c.attachment_file_name, + c.attachment_content_type, c.attachment_file_size, + c.attachment_suffix_url, + active, + s.country_code_2 as country_code, + c.geometries, + c.title as description, + m.created_at as start + from collections as c + join metadata m on m.value = c.tag_name + join establishments e on e.id = m.establishment_id + join sites s on s.id = c.site_id + where m.`key` = 'collection' + + union + + select distinct + c.id, + c.id as collection_id, + m.establishment_id, + c.title, c.tag_name, + c.slug, c.attachment_file_name, + c.attachment_content_type, c.attachment_file_size, + c.attachment_suffix_url, + active, + s.country_code_2 as country_code, + c.geometries, + c.title as description, + m.created_at as start + from collections as c + join metadata m on m.value = c.slug + join establishments e on e.id = m.establishment_id + join sites s on s.id = c.site_id + where m.`key` = 'collection' + ) a + group by + a.id, + a.collection_id, + -- a.establishment_id, + a.title, + a.tag_name, + a.slug, + -- a.attachment_file_name, + -- a.attachment_content_type, + -- a.attachment_file_size, + -- a.attachment_suffix_url, + -- active as is_publish, + a.country_code, + a.description + ''') + objects = [] + queryset = [vars(query) for query in raw_qs] + for obj in queryset: + # establishment = Establishment.objects.filter(old_id=obj['establishment_id']).first() + lang = Language.objects.filter(locale=obj['country_code']) + country = Country.objects.filter(languages__in=lang).first() + if country: + objects.append( + Collection(name={"en-GB": obj['title']}, collection_type=Collection.ORDINARY, + country=country, + description=obj['description'], + slug=obj['slug'], old_id=obj['collection_id'], + start=obj['start'] + ) + ) + Collection.objects.bulk_create(objects) raw_qs = Collections.objects.raw(''' select