From c2e111f75b0e72e6ed398009c8c452f69720446a Mon Sep 17 00:00:00 2001 From: littlewolf Date: Wed, 27 Nov 2019 18:12:22 +0300 Subject: [PATCH 01/75] Fix queryset --- apps/partner/views/common.py | 2 +- docker-compose.mysql.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/partner/views/common.py b/apps/partner/views/common.py index a5d0338c..3c45fb6b 100644 --- a/apps/partner/views/common.py +++ b/apps/partner/views/common.py @@ -8,7 +8,7 @@ from partner.serializers import common as serializers # Mixins class PartnerViewMixin(generics.GenericAPIView): """View mixin for Partner views""" - queryset = models.Partner.objects.all() + queryset = models.Partner.objects.distinct("name") # Views diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml index bd81ecb2..106cabb3 100644 --- a/docker-compose.mysql.yml +++ b/docker-compose.mysql.yml @@ -13,6 +13,9 @@ services: MYSQL_ROOT_PASSWORD: rootPassword volumes: - gm-mysql_db:/var/lib/mysql + - .:/code + + # PostgreSQL database From eaeebae72a1655f4c3a0b0d2cd6c909c65190a76 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Thu, 28 Nov 2019 15:31:47 +0300 Subject: [PATCH 02/75] in progress --- .../commands/check_guide_dependencies.py | 120 ++++++++ .../migrations/0018_auto_20191127_1047.py | 78 +++++ apps/collection/models.py | 134 ++++++++- apps/collection/transfer_data.py | 37 +++ apps/transfer/management/commands/transfer.py | 2 + apps/transfer/models.py | 8 + apps/transfer/serializers/guide.py | 283 ++++++++++++++++++ requirements/base.txt | 3 + 8 files changed, 652 insertions(+), 13 deletions(-) create mode 100644 apps/collection/management/commands/check_guide_dependencies.py create mode 100644 apps/collection/migrations/0018_auto_20191127_1047.py create mode 100644 apps/collection/transfer_data.py create mode 100644 apps/transfer/serializers/guide.py diff --git a/apps/collection/management/commands/check_guide_dependencies.py b/apps/collection/management/commands/check_guide_dependencies.py new file mode 100644 index 00000000..1f2afb9d --- /dev/null +++ b/apps/collection/management/commands/check_guide_dependencies.py @@ -0,0 +1,120 @@ +import re +from pprint import pprint + +from django.core.management.base import BaseCommand +from tqdm import tqdm + +from establishment.models import Establishment +from location.models import City +from location.models import WineRegion +from product.models import Product +from review.models import Review +from tag.models import Tag +from transfer.models import GuideElements + + +def decorator(f): + def decorate(self): + print(f'{"-"*20}start {f.__name__}{"-"*20}') + f(self) + print(f'{"-"*20}end {f.__name__}{"-"*20}\n') + return decorate + + +class Command(BaseCommand): + help = """Check guide dependencies.""" + + @decorator + def count_of_guide_relative_dependencies(self): + for field in GuideElements._meta.fields: + if field.name not in ['id', 'lft', 'rgt', 'depth', + 'children_count', 'parent', 'order_number']: + filters = {f'{field.name}__isnull': False, } + qs = GuideElements.objects.filter(**filters).values_list(field.name, flat=True) + print(f"COUNT OF {field.name}'s: {len(set(qs))}") + + @decorator + def check_regions(self): + wine_region_old_ids = set(GuideElements.objects.filter(wine_region_id__isnull=False) + .values_list('wine_region_id', flat=True)) + not_existed_wine_regions = [] + for old_id in tqdm(wine_region_old_ids): + if not WineRegion.objects.filter(old_id=old_id).exists(): + not_existed_wine_regions.append(old_id) + print(f'NOT EXISTED WINE REGIONS: {len(not_existed_wine_regions)}') + pprint(f'{not_existed_wine_regions}') + + @decorator + def check_establishments(self): + establishment_old_ids = set(GuideElements.objects.filter(establishment_id__isnull=False) + .values_list('establishment_id', flat=True)) + not_existed_establishments = [] + for old_id in tqdm(establishment_old_ids): + if not Establishment.objects.filter(old_id=old_id).exists(): + not_existed_establishments.append(old_id) + print(f'NOT EXISTED ESTABLISHMENTS: {len(not_existed_establishments)}') + pprint(f'{not_existed_establishments}') + + @decorator + def check_reviews(self): + review_old_ids = set(GuideElements.objects.filter(review_id__isnull=False) + .values_list('review_id', flat=True)) + not_existed_reviews = [] + for old_id in tqdm(review_old_ids): + if not Review.objects.filter(old_id=old_id).exists(): + not_existed_reviews.append(old_id) + print(f'NOT EXISTED REVIEWS: {len(not_existed_reviews)}') + pprint(f'{not_existed_reviews}') + + @decorator + def check_wines(self): + wine_old_ids = set(GuideElements.objects.filter(wine_id__isnull=False) + .values_list('wine_id', flat=True)) + not_existed_wines = [] + for old_id in tqdm(wine_old_ids): + if not Product.objects.filter(old_id=old_id).exists(): + not_existed_wines.append(old_id) + print(f'NOT EXISTED WINES: {len(not_existed_wines)}') + pprint(f'{not_existed_wines}') + + @decorator + def check_wine_color(self): + raw_wine_color_nodes = set(GuideElements.objects.exclude(color__iexact='') + .filter(color__isnull=False) + .values_list('color', flat=True)) + raw_wine_colors = [i[:-11] for i in raw_wine_color_nodes] + raw_wine_color_index_names = [] + re_exp = '[A-Z][^A-Z]*' + for raw_wine_color in tqdm(raw_wine_colors): + result = re.findall(re_exp, rf'{raw_wine_color}') + if result and len(result) >= 2: + wine_color = '-'.join(result) + else: + wine_color = result[0] + raw_wine_color_index_names.append(wine_color.lower()) + not_existed_wine_colors = [] + for index_name in raw_wine_color_index_names: + if not Tag.objects.filter(value=index_name).exists(): + not_existed_wine_colors.append(index_name) + print(f'NOT EXISTED WINE COLOR: {len(not_existed_wine_colors)}') + pprint(f'{not_existed_wine_colors}') + + @decorator + def check_cities(self): + city_old_ids = set(GuideElements.objects.filter(city_id__isnull=False) + .values_list('city_id', flat=True)) + not_existed_cities = [] + for old_id in tqdm(city_old_ids): + if not City.objects.filter(old_id=old_id).exists(): + not_existed_cities.append(old_id) + print(f'NOT EXISTED CITIES: {len(not_existed_cities)}') + pprint(f'{not_existed_cities}') + + def handle(self, *args, **kwargs): + self.count_of_guide_relative_dependencies() + self.check_regions() + self.check_establishments() + self.check_reviews() + self.check_wines() + self.check_wine_color() + self.check_cities() diff --git a/apps/collection/migrations/0018_auto_20191127_1047.py b/apps/collection/migrations/0018_auto_20191127_1047.py new file mode 100644 index 00000000..c6f54ee2 --- /dev/null +++ b/apps/collection/migrations/0018_auto_20191127_1047.py @@ -0,0 +1,78 @@ +# Generated by Django 2.2.7 on 2019-11-27 10:47 + +import django.contrib.postgres.fields.jsonb +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0039_sitefeature_old_id'), + ('collection', '0017_collection_old_id'), + ] + + operations = [ + migrations.CreateModel( + name='GuideType', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateTimeField(default=django.utils.timezone.now, editable=False, verbose_name='Date created')), + ('modified', models.DateTimeField(auto_now=True, verbose_name='Date updated')), + ('name', models.SlugField(max_length=255, unique=True, verbose_name='code')), + ], + options={ + 'verbose_name': 'guide type', + 'verbose_name_plural': 'guide types', + }, + ), + migrations.RemoveField( + model_name='guide', + name='advertorials', + ), + migrations.RemoveField( + model_name='guide', + name='collection', + ), + migrations.RemoveField( + model_name='guide', + name='parent', + ), + migrations.AddField( + model_name='guide', + name='old_id', + field=models.IntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='guide', + name='site', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='main.SiteSettings', verbose_name='site settings'), + ), + migrations.AddField( + model_name='guide', + name='slug', + field=models.SlugField(max_length=255, null=True, unique=True, verbose_name='slug'), + ), + migrations.AddField( + model_name='guide', + name='state', + field=models.PositiveSmallIntegerField(choices=[(0, 'built'), (1, 'waiting'), (2, 'removing'), (3, 'building')], default=1, verbose_name='state'), + ), + migrations.AddField( + model_name='guide', + name='vintage', + field=models.IntegerField(null=True, validators=[django.core.validators.MinValueValidator(1900), django.core.validators.MaxValueValidator(2100)], verbose_name='guide vintage year'), + ), + migrations.AddField( + model_name='guide', + name='guide_type', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='collection.GuideType', verbose_name='type'), + ), + migrations.AlterField( + model_name='guide', + name='start', + field=models.DateTimeField(null=True, verbose_name='start'), + ), + ] diff --git a/apps/collection/models.py b/apps/collection/models.py index d98f8a59..af8b2a33 100644 --- a/apps/collection/models.py +++ b/apps/collection/models.py @@ -1,6 +1,8 @@ from django.contrib.contenttypes.fields import ContentType from django.contrib.postgres.fields import JSONField +from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models +import re from django.utils.translation import gettext_lazy as _ from utils.models import ProjectBaseMixin, URLImageMixin @@ -85,26 +87,64 @@ class Collection(ProjectBaseMixin, CollectionDateMixin, verbose_name_plural = _('collections') +class GuideTypeQuerySet(models.QuerySet): + """QuerySet for model GuideType.""" + + +class GuideType(ProjectBaseMixin): + """GuideType model.""" + + name = models.SlugField(max_length=255, unique=True, + verbose_name=_('code')) + + objects = GuideTypeQuerySet.as_manager() + + class Meta: + """Meta class.""" + verbose_name = _('guide type') + verbose_name_plural = _('guide types') + + def __str__(self): + """Overridden str dunder method.""" + return self.name + + class GuideQuerySet(models.QuerySet): """QuerySet for Guide.""" - def by_collection_id(self, collection_id): - """Filter by collection id""" - return self.filter(collection=collection_id) - class Guide(ProjectBaseMixin, CollectionNameMixin, CollectionDateMixin): """Guide model.""" - parent = models.ForeignKey( - 'self', verbose_name=_('parent'), on_delete=models.CASCADE, - null=True, blank=True, default=None + BUILT = 0 + WAITING = 1 + REMOVING = 2 + BUILDING = 3 + + STATE_CHOICES = ( + (BUILT, 'built'), + (WAITING, 'waiting'), + (REMOVING, 'removing'), + (BUILDING, 'building'), + ) - advertorials = JSONField( - _('advertorials'), null=True, blank=True, - default=None, help_text='{"key":"value"}') - collection = models.ForeignKey(Collection, on_delete=models.CASCADE, - null=True, blank=True, default=None, - verbose_name=_('collection')) + + start = models.DateTimeField(null=True, + verbose_name=_('start')) + vintage = models.IntegerField(validators=[MinValueValidator(1900), + MaxValueValidator(2100)], + null=True, + verbose_name=_('guide vintage year')) + slug = models.SlugField(max_length=255, unique=True, null=True, + verbose_name=_('slug')) + guide_type = models.ForeignKey('GuideType', on_delete=models.PROTECT, + null=True, + verbose_name=_('type')) + site = models.ForeignKey('main.SiteSettings', on_delete=models.SET_NULL, + null=True, + verbose_name=_('site settings')) + state = models.PositiveSmallIntegerField(default=WAITING, choices=STATE_CHOICES, + verbose_name=_('state')) + old_id = models.IntegerField(blank=True, null=True) objects = GuideQuerySet.as_manager() @@ -116,3 +156,71 @@ class Guide(ProjectBaseMixin, CollectionNameMixin, CollectionDateMixin): def __str__(self): """String method.""" return f'{self.name}' + + +class AdvertorialQuerySet(models.QuerySet): + """QuerySet for model Advertorial.""" + + +class Advertorial(ProjectBaseMixin): + """Guide advertorial model.""" + number_of_pages = models.PositiveIntegerField( + verbose_name=_('number of pages'), + help_text=_('the total number of reserved pages')) + right_pages = models.PositiveIntegerField( + verbose_name=_('number of right pages'), + help_text=_('the number of right pages (which are part of total number).')) + old_id = models.IntegerField(blank=True, null=True) + + objects = AdvertorialQuerySet.as_manager() + + class Meta: + """Meta class.""" + verbose_name = _('advertorial') + verbose_name_plural = _('advertorials') + + +class GuideFilterQuerySet(models.QuerySet): + """QuerySet for model GuideFilter.""" + + +class GuideFilter(ProjectBaseMixin): + """Guide filter model.""" + establishment_type_json = JSONField(blank=True, null=True, + verbose_name='establishment types') + country_code_json = JSONField(blank=True, null=True, + verbose_name='countries') + region_code_json = JSONField(blank=True, null=True, + verbose_name='regions') + sub_region_code_json = JSONField(blank=True, null=True, + verbose_name='sub regions') + wine_region_json = JSONField(blank=True, null=True, + verbose_name='wine regions') + wine_classification_json = JSONField(blank=True, null=True, + verbose_name='wine classifications') + wine_color_json = JSONField(blank=True, null=True, + verbose_name='wine colors') + wine_type_json = JSONField(blank=True, null=True, + verbose_name='wine types') + with_mark = models.BooleanField(default=True, + verbose_name=_('with mark'), + help_text=_('exclude empty marks?')) + locale_json = JSONField(blank=True, null=True, + verbose_name='locales') + max_mark = models.PositiveSmallIntegerField(verbose_name=_('max mark'), + help_text=_('mark under')) + min_mark = models.PositiveSmallIntegerField(verbose_name=_('min mark'), + help_text=_('mark over')) + review_vintage_json = JSONField(verbose_name='review vintage years') + review_state_json = JSONField(blank=True, null=True, + verbose_name='review states') + guide = models.OneToOneField(Guide, on_delete=models.CASCADE, + verbose_name=_('guide')) + old_id = models.IntegerField(blank=True, null=True) + + objects = GuideFilterQuerySet.as_manager() + + class Meta: + """Meta class.""" + verbose_name = _('guide filter') + verbose_name_plural = _('guide filters') diff --git a/apps/collection/transfer_data.py b/apps/collection/transfer_data.py new file mode 100644 index 00000000..9307e6a0 --- /dev/null +++ b/apps/collection/transfer_data.py @@ -0,0 +1,37 @@ +from pprint import pprint +from transfer.models import Guides, GuideFilters +from transfer.serializers.guide import GuideSerializer, GuideFilterSerializer + + +def transfer_guide(): + """Transfer Guide model.""" + queryset = Guides.objects.exclude(title__icontains='test') + serialized_data = GuideSerializer( + data=list(queryset.values()), + many=True) + if serialized_data.is_valid(): + serialized_data.save() + else: + pprint(f"transfer guide errors: {serialized_data.errors}") + + +def transfer_guide_filter(): + """Transfer GuideFilter model.""" + queryset = GuideFilters.objects.all() + serialized_data = GuideFilterSerializer( + data=list(queryset.values()), + many=True) + if serialized_data.is_valid(): + serialized_data.save() + else: + pprint(f"transfer guide filter errors: {serialized_data.errors}") + + +data_types = { + 'guides': [ + transfer_guide, + ], + 'guide_filters': [ + transfer_guide_filter, + ] +} diff --git a/apps/transfer/management/commands/transfer.py b/apps/transfer/management/commands/transfer.py index 2d0ce399..3b562b0d 100644 --- a/apps/transfer/management/commands/transfer.py +++ b/apps/transfer/management/commands/transfer.py @@ -41,6 +41,8 @@ class Command(BaseCommand): 'newsletter_subscriber', # подписчики на рассылку - переносить после переноса пользователей №1 'purchased_plaques', # №6 - перенос купленных тарелок 'fill_city_gallery', # №3 - перенос галереи городов + 'guides', + 'guide_filters', ] def handle(self, *args, **options): diff --git a/apps/transfer/models.py b/apps/transfer/models.py index 37f9217a..1ac40e80 100644 --- a/apps/transfer/models.py +++ b/apps/transfer/models.py @@ -5,11 +5,19 @@ # * Make sure each ForeignKey has `on_delete` set to the desired behavior. # * Remove `managed = False` lines if you wish to allow Django to create, modify, and delete the table # Feel free to rename the models, but don't rename db_table values or field names. +import yaml from django.contrib.gis.db import models from transfer.mixins import MigrateMixin +def convert_entry(loader, node): + return {e[0]: e[1] for e in loader.construct_pairs(node)} + + +yaml.add_constructor('!ruby/hash:ActiveSupport::HashWithIndifferentAccess', convert_entry) + + # models.ForeignKey(ForeignModel, models.DO_NOTHING, blank=True, null=True) class Sites(MigrateMixin): diff --git a/apps/transfer/serializers/guide.py b/apps/transfer/serializers/guide.py new file mode 100644 index 00000000..5accbe64 --- /dev/null +++ b/apps/transfer/serializers/guide.py @@ -0,0 +1,283 @@ +from itertools import chain + +import yaml +from pycountry import countries, subdivisions +from rest_framework import serializers + +from collection.models import Guide, GuideType, GuideFilter +from establishment.models import EstablishmentType +from location.models import Country, Region +from main.models import SiteSettings +from transfer.mixins import TransferSerializerMixin + + +class GuideSerializer(TransferSerializerMixin): + id = serializers.IntegerField() + title = serializers.CharField() + vintage = serializers.IntegerField() + slug = serializers.CharField() + state = serializers.CharField() + site_id = serializers.IntegerField() + inserter_field = serializers.CharField() + + class Meta: + model = Guide + fields = ( + 'id', + 'title', + 'vintage', + 'slug', + 'state', + 'site_id', + 'inserter_field', + ) + + def validate(self, attrs): + """Overridden validate method.""" + attrs['old_id'] = attrs.pop('id') + attrs['name'] = attrs.pop('title') + attrs['vintage'] = int(attrs.pop('vintage')) + attrs['state'] = self.get_state(attrs.pop('state')) + attrs['site'] = self.get_site(attrs.pop('site_id')) + attrs['guide_type'] = self.get_guide_type(attrs.pop('inserter_field')) + return attrs + + def get_state(self, state: str): + if state == 'built': + return Guide.BUILT + elif state == 'removing': + return Guide.REMOVING + elif state == 'building': + return Guide.BUILDING + else: + return Guide.WAITING + + def get_site(self, site_id): + qs = SiteSettings.objects.filter(old_id=site_id) + if qs.exists(): + return qs.first() + + def get_guide_type(self, inserter_field): + guide_type, _ = GuideType.objects.get_or_create(name=inserter_field) + return guide_type + + +class GuideFilterSerializer(TransferSerializerMixin): + id = serializers.IntegerField() + year = serializers.CharField() + establishment_type = serializers.CharField(allow_null=True) + countries = serializers.CharField(allow_null=True) + regions = serializers.CharField(allow_null=True) + subregions = serializers.CharField(allow_null=True) + wine_regions = serializers.CharField(allow_null=True) + wine_classifications = serializers.CharField(allow_null=True) + wine_colors = serializers.CharField(allow_null=True) + wine_types = serializers.CharField(allow_null=True) + locales = serializers.CharField(allow_null=True) + states = serializers.CharField(allow_null=True) + + max_mark = serializers.IntegerField(allow_null=True) + min_mark = serializers.IntegerField(allow_null=True) + marks_only = serializers.NullBooleanField() + guide_id = serializers.IntegerField() + + class Meta: + model = GuideFilter + fields = ( + 'id', + 'year', + 'establishment_type', + 'countries', + 'regions', + 'subregions', + 'wine_regions', + 'wine_classifications', + 'wine_colors', + 'wine_types', + 'max_mark', + 'min_mark', + 'marks_only', + 'locales', + 'states', + 'guide_id', + ) + + @staticmethod + def parse_ruby_helper(raw_value: str): + """Parse RubyActiveSupport records""" + def convert_entry(loader, node): + return {e[0]: e[1] for e in loader.construct_pairs(node)} + + loader = yaml.Loader + loader.add_constructor('!ruby/hash:ActiveSupport::HashWithIndifferentAccess', convert_entry) + return yaml.load(raw_value, Loader=loader) if raw_value else None + + @staticmethod + def get_country_alpha_2(country_code_alpha3: str): + country = countries.get(alpha_3=country_code_alpha3.upper()) + return {'code_alpha_2': country.alpha2.lower() if country else None, + 'name': country.name if country else None,} + + @staticmethod + def parse_dictionary(dictionary: dict): + """ + Exclude root values from dictionary. + Convert {key_2: [value_1, value_2]} into + [value_1, value_2] + """ + return list(chain.from_iterable(dictionary.values())) + + @staticmethod + def parse_nested_dictionary(dictionary: dict): + """ + Exclude root values from dictionary. + Convert {key_1: {key_2: [value_1, value_2]}} into + [value_1, value_2] + """ + l = [] + for i in dictionary: + l.append(list(chain.from_iterable(list(dictionary[i].values())))) + return list(chain.from_iterable(l)) + + def get_country(self, code_alpha_3: str) -> Country: + country = self.get_country_alpha_2(code_alpha_3) + country_name = country['name'] + country_code = country['code_alpha_2'] + if country_name and country_code: + country, _ = Country.objects.get_or_create( + code__icontains=country_code, + name__contains={'en-GB': country_name}, + defaults={ + 'code': country_code, + 'name': {'en-GB': country_name} + } + ) + return country + + def get_region(self, region_code_alpha_3: str, + country_code_alpha_3: str, + sub_region_code_alpha_3: str = None): + country = self.get_country(country_code_alpha_3) + country_code_alpha_2 = country.code.upper() + region_qs = Region.objects.filter(code__iexact=region_code_alpha_3, + country__code__iexact=country_code_alpha_2) + + # If region isn't existed, check sub region for parent_code (region code) + if not region_qs.exists() and sub_region_code_alpha_3: + # sub region + subdivision = subdivisions.get( + code=f"{country_code_alpha_2}-{sub_region_code_alpha_3}") + if subdivision: + subdivision_region = subdivisions.get(parent_code=subdivision.parent_code) + obj = Region.objects.create( + name=subdivision_region.name, + code=subdivision_region.code, + country=country) + return obj + else: + return region_qs.first() + + def validate_year(self, value): + return self.parse_ruby_helper(value) + + def validate_establishment_type(self, value): + return self.parse_ruby_helper(value) + + def validate_countries(self, value): + return self.parse_ruby_helper(value) + + def validate_regions(self, value): + return self.parse_ruby_helper(value) + + def validate_sub_regions(self, value): + return self.parse_ruby_helper(value) + + def validate_wine_regions(self, value): + return self.parse_ruby_helper(value) + + def validate_wine_classifications(self, value): + return self.parse_ruby_helper(value) + + def validate_wine_colors(self, value): + return self.parse_ruby_helper(value) + + def validate_wine_types(self, value): + return self.parse_ruby_helper(value) + + def validate_locales(self, value): + return self.parse_ruby_helper(value) + + def validate_states(self, value): + return self.parse_ruby_helper(value) + + def validate(self, attrs): + sub_regions = attrs.pop('subregions') + regions = attrs.pop('regions') + + attrs['old_id'] = attrs.pop('id') + attrs['review_vintage_json'] = self.get_review_vintage(self.attrs.pop('year')) + attrs['establishment_type_json'] = self.get_establishment_type_ids( + self.attrs.pop('establishment_type')) + attrs['country_code_json'] = self.get_country_ids(attrs.pop('country_json')) + attrs['region_json'] = self.get_region_ids(regions, sub_regions) + attrs['sub_region_json'] = self.get_sub_region_ids(regions, sub_regions) + return attrs + + def get_review_vintage(self, year): + return {'vintage': [int(i) for i in set(year) if i.isdigit()]} + + def get_establishment_type_ids(self, establishment_types): + establishment_type_ids = [] + for establishment_type in establishment_types: + establishment_type_qs = EstablishmentType.objects.filter(index_name__iexact=establishment_type) + if not establishment_type_qs.exists(): + obj = EstablishmentType.objects.create( + name={'en-GB': establishment_type.capitalize}, + index_name=establishment_type.lower()) + establishment_type_ids.append(obj.id) + return {'id': establishment_type_ids} + + def get_country_ids(self, country_codes_alpha_3): + country_ids = [] + for code_alpha_3 in country_codes_alpha_3: + country_ids.append(self.get_country(code_alpha_3).id) + return {'id': country_ids} + + def get_region_ids(self, regions, sub_regions): + region_ids = [] + for country_code_alpha_3 in regions: + region_codes = regions[country_code_alpha_3] + for region_code_alpha_3 in region_codes: + region = self.get_region( + region_code_alpha_3=region_code_alpha_3, + country_code_alpha_3=country_code_alpha_3, + sub_region_code_alpha_3=sub_regions[country_code_alpha_3][region_code_alpha_3]) + if region: + region_ids.append(region.id) + return {'id': region_ids} + + def get_sub_region_ids(self, sub_regions): + sub_region_ids = [] + for country_code_alpha_3 in sub_regions: + for region_code_alpha_3 in sub_regions[country_code_alpha_3]: + region_codes = sub_regions[country_code_alpha_3][region_code_alpha_3] + for sub_region_code_alpha_3 in region_codes: + region = self.get_region( + region_code_alpha_3=region_code_alpha_3, + country_code_alpha_3=country_code_alpha_3, + sub_region_code_alpha_3=sub_region_code_alpha_3) + if region: + subdivision = subdivisions.get(parent_code=region.code.upper()) + if subdivision: + sub_region = Region.objects.create( + name=subdivision.name, + code=subdivisions.code, + parent_region=region, + country=region.country) + sub_region_ids.append(sub_region.id) + + return {'id': sub_region_ids} + + +# {'FRA': ['H', 'U']} REGIONS +# {'FRA': {'N': ['32']}} SUB REGIONS diff --git a/requirements/base.txt b/requirements/base.txt index 94e7ca27..aadc7301 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -57,3 +57,6 @@ redis==3.2.0 django_redis==4.10.0 # used byes indexing cache kombu==4.6.6 celery==4.3.0 + +# country information +pycountry==19.8.18 From 0fb28467fbb99fa51a2ebf2cf5bc8afcac2b5d29 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Fri, 29 Nov 2019 13:26:05 +0300 Subject: [PATCH 03/75] updated serializer --- _dockerfiles/db/Dockerfile | 2 +- apps/location/models.py | 2 +- apps/transfer/serializers/guide.py | 207 ++++++++++++++++++----------- 3 files changed, 133 insertions(+), 78 deletions(-) diff --git a/_dockerfiles/db/Dockerfile b/_dockerfiles/db/Dockerfile index 45c707d9..e8a9ded3 100644 --- a/_dockerfiles/db/Dockerfile +++ b/_dockerfiles/db/Dockerfile @@ -1,3 +1,3 @@ -FROM mdillon/postgis:9.5 +FROM mdillon/postgis:latest RUN localedef -i ru_RU -c -f UTF-8 -A /usr/share/locale/locale.alias ru_RU.UTF-8 ENV LANG ru_RU.utf8 diff --git a/apps/location/models.py b/apps/location/models.py index 3f104644..50f09b92 100644 --- a/apps/location/models.py +++ b/apps/location/models.py @@ -197,7 +197,7 @@ class WineRegionQuerySet(models.QuerySet): return self.exclude(wines__isnull=value) -class WineRegion(models.Model, TranslatedFieldsMixin): +class WineRegion(TranslatedFieldsMixin, models.Model): """Wine region model.""" name = models.CharField(_('name'), max_length=255) country = models.ForeignKey(Country, on_delete=models.PROTECT, diff --git a/apps/transfer/serializers/guide.py b/apps/transfer/serializers/guide.py index 5accbe64..692ebedc 100644 --- a/apps/transfer/serializers/guide.py +++ b/apps/transfer/serializers/guide.py @@ -6,9 +6,11 @@ from rest_framework import serializers from collection.models import Guide, GuideType, GuideFilter from establishment.models import EstablishmentType -from location.models import Country, Region +from location.models import Country, Region, WineRegion from main.models import SiteSettings from transfer.mixins import TransferSerializerMixin +from translation.models import Language +from review.models import Review class GuideSerializer(TransferSerializerMixin): @@ -70,9 +72,6 @@ class GuideFilterSerializer(TransferSerializerMixin): regions = serializers.CharField(allow_null=True) subregions = serializers.CharField(allow_null=True) wine_regions = serializers.CharField(allow_null=True) - wine_classifications = serializers.CharField(allow_null=True) - wine_colors = serializers.CharField(allow_null=True) - wine_types = serializers.CharField(allow_null=True) locales = serializers.CharField(allow_null=True) states = serializers.CharField(allow_null=True) @@ -91,9 +90,6 @@ class GuideFilterSerializer(TransferSerializerMixin): 'regions', 'subregions', 'wine_regions', - 'wine_classifications', - 'wine_colors', - 'wine_types', 'max_mark', 'min_mark', 'marks_only', @@ -112,12 +108,6 @@ class GuideFilterSerializer(TransferSerializerMixin): loader.add_constructor('!ruby/hash:ActiveSupport::HashWithIndifferentAccess', convert_entry) return yaml.load(raw_value, Loader=loader) if raw_value else None - @staticmethod - def get_country_alpha_2(country_code_alpha3: str): - country = countries.get(alpha_3=country_code_alpha3.upper()) - return {'code_alpha_2': country.alpha2.lower() if country else None, - 'name': country.name if country else None,} - @staticmethod def parse_dictionary(dictionary: dict): """ @@ -140,19 +130,20 @@ class GuideFilterSerializer(TransferSerializerMixin): return list(chain.from_iterable(l)) def get_country(self, code_alpha_3: str) -> Country: - country = self.get_country_alpha_2(code_alpha_3) - country_name = country['name'] - country_code = country['code_alpha_2'] - if country_name and country_code: - country, _ = Country.objects.get_or_create( - code__icontains=country_code, - name__contains={'en-GB': country_name}, - defaults={ - 'code': country_code, - 'name': {'en-GB': country_name} - } - ) - return country + country = countries.get(alpha_3=code_alpha_3.upper()) + if country: + country_name = country.name + country_code = country.alpha_2 + if country_name and country_code: + country, _ = Country.objects.get_or_create( + code__icontains=country_code, + name__contains={'en-GB': country_name}, + defaults={ + 'code': country_code, + 'name': {'en-GB': country_name} + } + ) + return country def get_region(self, region_code_alpha_3: str, country_code_alpha_3: str, @@ -162,20 +153,21 @@ class GuideFilterSerializer(TransferSerializerMixin): region_qs = Region.objects.filter(code__iexact=region_code_alpha_3, country__code__iexact=country_code_alpha_2) + if region_qs.exists(): + return region_qs.first() + # If region isn't existed, check sub region for parent_code (region code) - if not region_qs.exists() and sub_region_code_alpha_3: + if sub_region_code_alpha_3: # sub region subdivision = subdivisions.get( code=f"{country_code_alpha_2}-{sub_region_code_alpha_3}") if subdivision: - subdivision_region = subdivisions.get(parent_code=subdivision.parent_code) + subdivision_region = subdivisions.get(code=subdivision.parent_code) obj = Region.objects.create( name=subdivision_region.name, code=subdivision_region.code, country=country) return obj - else: - return region_qs.first() def validate_year(self, value): return self.parse_ruby_helper(value) @@ -189,7 +181,7 @@ class GuideFilterSerializer(TransferSerializerMixin): def validate_regions(self, value): return self.parse_ruby_helper(value) - def validate_sub_regions(self, value): + def validate_subregions(self, value): return self.parse_ruby_helper(value) def validate_wine_regions(self, value): @@ -215,69 +207,132 @@ class GuideFilterSerializer(TransferSerializerMixin): regions = attrs.pop('regions') attrs['old_id'] = attrs.pop('id') - attrs['review_vintage_json'] = self.get_review_vintage(self.attrs.pop('year')) + attrs['review_vintage_json'] = self.get_review_vintage(attrs.pop('year')) attrs['establishment_type_json'] = self.get_establishment_type_ids( - self.attrs.pop('establishment_type')) - attrs['country_code_json'] = self.get_country_ids(attrs.pop('country_json')) - attrs['region_json'] = self.get_region_ids(regions, sub_regions) - attrs['sub_region_json'] = self.get_sub_region_ids(regions, sub_regions) + attrs.pop('establishment_type')) + attrs['country_code_json'] = self.get_country_ids(attrs.pop('countries')) + attrs['region_json'] = self.get_region_ids(regions=regions, + sub_regions=sub_regions) + attrs['sub_region_json'] = self.get_sub_region_ids(sub_regions) + attrs['wine_region_json'] = self.get_wine_region_ids(attrs.pop('wine_regions')) + attrs['with_mark'] = attrs.pop('marks_only') + attrs['locale_json'] = self.get_locale_ids(attrs.pop('locales')) + attrs['review_state_json'] = self.get_review_state(attrs.pop('states')) + attrs['guide'] = self.get_guide(attrs.pop('guide_id')) return attrs def get_review_vintage(self, year): - return {'vintage': [int(i) for i in set(year) if i.isdigit()]} + if hasattr(year, '__iter__'): + return {'vintage': set(int(i) for i in set(year) if i.isdigit())} + return {'vintage': {year}} def get_establishment_type_ids(self, establishment_types): establishment_type_ids = [] - for establishment_type in establishment_types: - establishment_type_qs = EstablishmentType.objects.filter(index_name__iexact=establishment_type) - if not establishment_type_qs.exists(): - obj = EstablishmentType.objects.create( - name={'en-GB': establishment_type.capitalize}, - index_name=establishment_type.lower()) + if establishment_types: + for establishment_type in establishment_types: + establishment_type_qs = EstablishmentType.objects.filter(index_name__iexact=establishment_type) + if not establishment_type_qs.exists(): + obj = EstablishmentType.objects.create( + name={'en-GB': establishment_type.capitalize()}, + index_name=establishment_type.lower()) + else: + obj = establishment_type_qs.first() establishment_type_ids.append(obj.id) - return {'id': establishment_type_ids} + return {'id': set(establishment_type_ids)} def get_country_ids(self, country_codes_alpha_3): country_ids = [] - for code_alpha_3 in country_codes_alpha_3: - country_ids.append(self.get_country(code_alpha_3).id) - return {'id': country_ids} + if country_codes_alpha_3: + for code_alpha_3 in country_codes_alpha_3: + country = self.get_country(code_alpha_3) + if not country: + raise serializers.ValidationError({'detail': f'Country with alpha code 3 -' + f'{code_alpha_3}, is not found.'}) + country_ids.append(country.id) + return {'id': set(country_ids)} def get_region_ids(self, regions, sub_regions): region_ids = [] - for country_code_alpha_3 in regions: - region_codes = regions[country_code_alpha_3] - for region_code_alpha_3 in region_codes: - region = self.get_region( - region_code_alpha_3=region_code_alpha_3, - country_code_alpha_3=country_code_alpha_3, - sub_region_code_alpha_3=sub_regions[country_code_alpha_3][region_code_alpha_3]) - if region: - region_ids.append(region.id) + if regions: + for country_code_alpha_3 in regions: + for region_code_alpha_3 in regions[country_code_alpha_3]: + # Get region from sub region code. + if not sub_regions or country_code_alpha_3 not in sub_regions: + raise serializers.ValidationError({'detail': f'Sub regions is blanked.'}) + if region_code_alpha_3 in sub_regions[country_code_alpha_3]: + for sub_region_code_alpha_3 in sub_regions[country_code_alpha_3][region_code_alpha_3]: + region = self.get_region( + region_code_alpha_3=region_code_alpha_3, + country_code_alpha_3=country_code_alpha_3, + sub_region_code_alpha_3=sub_region_code_alpha_3) + if region: + region_ids.append(region.id) return {'id': region_ids} def get_sub_region_ids(self, sub_regions): sub_region_ids = [] - for country_code_alpha_3 in sub_regions: - for region_code_alpha_3 in sub_regions[country_code_alpha_3]: - region_codes = sub_regions[country_code_alpha_3][region_code_alpha_3] - for sub_region_code_alpha_3 in region_codes: - region = self.get_region( - region_code_alpha_3=region_code_alpha_3, - country_code_alpha_3=country_code_alpha_3, - sub_region_code_alpha_3=sub_region_code_alpha_3) - if region: - subdivision = subdivisions.get(parent_code=region.code.upper()) - if subdivision: - sub_region = Region.objects.create( - name=subdivision.name, - code=subdivisions.code, - parent_region=region, - country=region.country) - sub_region_ids.append(sub_region.id) + if sub_regions: + for country_code_alpha_3 in sub_regions: + # FRA etc. + for region_code_alpha_3 in sub_regions[country_code_alpha_3]: + # B, C, A etc. + for sub_region_code_alpha_3 in sub_regions[country_code_alpha_3][region_code_alpha_3]: + # 24, 32 etc. + # Get parent region + region = self.get_region( + region_code_alpha_3=region_code_alpha_3, + country_code_alpha_3=country_code_alpha_3, + sub_region_code_alpha_3=sub_region_code_alpha_3) + if region: + sub_region_qs = Region.objects.filter(parent_region__code=region.code) + if sub_region_qs.exists(): + sub_region_ids.append(sub_region_qs.first().id) + else: + subdivision = subdivisions.get(code=region.code.upper()) + if subdivision: + sub_region = Region.objects.get_or_create( + name=subdivision.name, + code=subdivisions.parent_code, + parent_region=region, + country=region.country) + sub_region_ids.append(sub_region.id) + return {'id': set(sub_region_ids)} - return {'id': sub_region_ids} + def get_wine_region_ids(self, wine_regions): + wine_region_ids = [] + if wine_regions: + for wine_region in wine_regions: + qs = WineRegion.objects.filter(name__iexact=wine_region) + if not qs.exists(): + raise serializers.ValidationError({ + 'detail': f'Wine region - {wine_region}, is not found.'}) + wine_region_ids.append(qs.first().id) + return {'id': set(wine_region_ids)} + def get_locale_ids(self, locales): + locale_ids = [] + if locales: + for locale in [locale for locale in locales if locale]: + qs = Language.objects.filter(locale=locale) + if not qs.exists(): + raise serializers.ValidationError({ + 'detail': f'{locale} is not found.'}) + return {'id': set(locale_ids)} -# {'FRA': ['H', 'U']} REGIONS -# {'FRA': {'N': ['32']}} SUB REGIONS + def get_review_state(self, states): + review_states = [] + if states: + for state in [state for state in states if state]: + if state == 'published': + review_states.append(Review.READY) + else: + review_states.append(Review.TO_INVESTIGATE) + return {'state': set(review_states)} + + def get_guide(self, old_guide_id: int): + qs = Guide.objects.filter(old_id=old_guide_id) + if not qs.exists(): + raise serializers.ValidationError({'detail': f'Guide with old id - ' + f'{old_guide_id}, ' + f'is not found.'}) + return qs.first() From 52872ce364100254a0eee5fbc77eb1f68f8aac0f Mon Sep 17 00:00:00 2001 From: Anatoly Date: Fri, 29 Nov 2019 14:09:00 +0300 Subject: [PATCH 04/75] updated --- .gitignore | 2 + apps/transfer/serializers/guide.py | 70 +++++++++++++++--------------- project/settings/local.py | 19 ++++++-- 3 files changed, 53 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 78187ac0..1bb5c4b0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ logs/ celerybeat-schedule local_files celerybeat.pid +/gm_viktor.dump +/docker-compose.dump.yml diff --git a/apps/transfer/serializers/guide.py b/apps/transfer/serializers/guide.py index 692ebedc..3fd5cc32 100644 --- a/apps/transfer/serializers/guide.py +++ b/apps/transfer/serializers/guide.py @@ -257,16 +257,15 @@ class GuideFilterSerializer(TransferSerializerMixin): for country_code_alpha_3 in regions: for region_code_alpha_3 in regions[country_code_alpha_3]: # Get region from sub region code. - if not sub_regions or country_code_alpha_3 not in sub_regions: - raise serializers.ValidationError({'detail': f'Sub regions is blanked.'}) - if region_code_alpha_3 in sub_regions[country_code_alpha_3]: - for sub_region_code_alpha_3 in sub_regions[country_code_alpha_3][region_code_alpha_3]: - region = self.get_region( - region_code_alpha_3=region_code_alpha_3, - country_code_alpha_3=country_code_alpha_3, - sub_region_code_alpha_3=sub_region_code_alpha_3) - if region: - region_ids.append(region.id) + if sub_regions and country_code_alpha_3 in sub_regions: + if region_code_alpha_3 in sub_regions[country_code_alpha_3]: + for sub_region_code_alpha_3 in sub_regions[country_code_alpha_3][region_code_alpha_3]: + region = self.get_region( + region_code_alpha_3=region_code_alpha_3, + country_code_alpha_3=country_code_alpha_3, + sub_region_code_alpha_3=sub_region_code_alpha_3) + if region: + region_ids.append(region.id) return {'id': region_ids} def get_sub_region_ids(self, sub_regions): @@ -274,28 +273,30 @@ class GuideFilterSerializer(TransferSerializerMixin): if sub_regions: for country_code_alpha_3 in sub_regions: # FRA etc. - for region_code_alpha_3 in sub_regions[country_code_alpha_3]: - # B, C, A etc. - for sub_region_code_alpha_3 in sub_regions[country_code_alpha_3][region_code_alpha_3]: - # 24, 32 etc. - # Get parent region - region = self.get_region( - region_code_alpha_3=region_code_alpha_3, - country_code_alpha_3=country_code_alpha_3, - sub_region_code_alpha_3=sub_region_code_alpha_3) - if region: - sub_region_qs = Region.objects.filter(parent_region__code=region.code) - if sub_region_qs.exists(): - sub_region_ids.append(sub_region_qs.first().id) - else: - subdivision = subdivisions.get(code=region.code.upper()) - if subdivision: - sub_region = Region.objects.get_or_create( - name=subdivision.name, - code=subdivisions.parent_code, - parent_region=region, - country=region.country) - sub_region_ids.append(sub_region.id) + if country_code_alpha_3 in sub_regions: + for region_code_alpha_3 in sub_regions[country_code_alpha_3]: + # B, C, A etc. + if region_code_alpha_3 in sub_regions[country_code_alpha_3]: + for sub_region_code_alpha_3 in sub_regions[country_code_alpha_3][region_code_alpha_3]: + # 24, 32 etc. + # Get parent region + region = self.get_region( + region_code_alpha_3=region_code_alpha_3, + country_code_alpha_3=country_code_alpha_3, + sub_region_code_alpha_3=sub_region_code_alpha_3) + if region: + sub_region_qs = Region.objects.filter(parent_region__code=region.code) + if sub_region_qs.exists(): + sub_region_ids.append(sub_region_qs.first().id) + else: + subdivision = subdivisions.get(code=region.code.upper()) + if subdivision: + sub_region = Region.objects.get_or_create( + name=subdivision.name, + code=subdivisions.parent_code, + parent_region=region, + country=region.country) + sub_region_ids.append(sub_region.id) return {'id': set(sub_region_ids)} def get_wine_region_ids(self, wine_regions): @@ -316,7 +317,7 @@ class GuideFilterSerializer(TransferSerializerMixin): qs = Language.objects.filter(locale=locale) if not qs.exists(): raise serializers.ValidationError({ - 'detail': f'{locale} is not found.'}) + 'detail': f'Language with locale - {locale}, is not found.'}) return {'id': set(locale_ids)} def get_review_state(self, states): @@ -332,7 +333,6 @@ class GuideFilterSerializer(TransferSerializerMixin): def get_guide(self, old_guide_id: int): qs = Guide.objects.filter(old_id=old_guide_id) if not qs.exists(): - raise serializers.ValidationError({'detail': f'Guide with old id - ' - f'{old_guide_id}, ' + raise serializers.ValidationError({'detail': f'Guide with old_id - {old_guide_id}, ' f'is not found.'}) return qs.first() diff --git a/project/settings/local.py b/project/settings/local.py index c8974c40..b610aba2 100644 --- a/project/settings/local.py +++ b/project/settings/local.py @@ -30,10 +30,21 @@ MEDIA_ROOT = os.path.join(PUBLIC_ROOT, MEDIA_LOCATION) THUMBNAIL_DEBUG = True # ADDED TRANSFER APP -# INSTALLED_APPS.append('transfer.apps.TransferConfig') +INSTALLED_APPS.append('transfer.apps.TransferConfig') # DATABASES -DATABASES.update({ +DATABASES = { + 'default': { + 'ENGINE': 'django.contrib.gis.db.backends.postgis', + 'NAME': os.environ.get('DB_NAME'), + 'USER': os.environ.get('DB_USERNAME'), + 'PASSWORD': os.environ.get('DB_PASSWORD'), + 'HOST': os.environ.get('DB_HOSTNAME'), + 'PORT': os.environ.get('DB_PORT'), + 'OPTIONS': { + 'options': '-c search_path=gm' + }, + }, 'legacy': { 'ENGINE': 'django.db.backends.mysql', # 'HOST': '172.22.0.1', @@ -41,7 +52,9 @@ DATABASES.update({ 'PORT': 3306, 'NAME': 'dev', 'USER': 'dev', - 'PASSWORD': 'octosecret123'}}) + 'PASSWORD': 'octosecret123' + }, +} # LOGGING From 076d14fd5bf29eef97d09a0dc783ca0fbec904c4 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Mon, 2 Dec 2019 13:51:48 +0300 Subject: [PATCH 05/75] added filter model --- .gitignore | 2 +- .../0019_advertorial_guidefilter.py | 41 +++++++ apps/collection/models.py | 28 +++-- apps/collection/transfer_data.py | 12 ++- apps/transfer/mixins.py | 6 ++ apps/transfer/models.py | 2 +- apps/transfer/serializers/guide.py | 102 ++++++++++-------- 7 files changed, 127 insertions(+), 66 deletions(-) create mode 100644 apps/collection/migrations/0019_advertorial_guidefilter.py diff --git a/.gitignore b/.gitignore index 1bb5c4b0..90e4f23f 100644 --- a/.gitignore +++ b/.gitignore @@ -22,9 +22,9 @@ logs/ # dev ./docker-compose.override.yml - celerybeat-schedule local_files celerybeat.pid /gm_viktor.dump /docker-compose.dump.yml +/gm_production_20191029.sql diff --git a/apps/collection/migrations/0019_advertorial_guidefilter.py b/apps/collection/migrations/0019_advertorial_guidefilter.py new file mode 100644 index 00000000..180a1e0e --- /dev/null +++ b/apps/collection/migrations/0019_advertorial_guidefilter.py @@ -0,0 +1,41 @@ +# Generated by Django 2.2.7 on 2019-12-02 10:11 + +import django.contrib.postgres.fields.jsonb +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('collection', '0018_auto_20191127_1047'), + ] + + operations = [ + migrations.CreateModel( + name='GuideFilter', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateTimeField(default=django.utils.timezone.now, editable=False, verbose_name='Date created')), + ('modified', models.DateTimeField(auto_now=True, verbose_name='Date updated')), + ('establishment_type_json', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='establishment types')), + ('country_json', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='countries')), + ('region_json', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='regions')), + ('sub_region_json', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='sub regions')), + ('wine_region_json', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='wine regions')), + ('with_mark', models.BooleanField(default=True, help_text='exclude empty marks?', verbose_name='with mark')), + ('locale_json', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='locales')), + ('max_mark', models.FloatField(help_text='mark under', null=True, verbose_name='max mark')), + ('min_mark', models.FloatField(help_text='mark over', null=True, verbose_name='min mark')), + ('review_vintage_json', django.contrib.postgres.fields.jsonb.JSONField(verbose_name='review vintage years')), + ('review_state_json', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='review states')), + ('old_id', models.IntegerField(blank=True, null=True)), + ('guide', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='collection.Guide', verbose_name='guide')), + ], + options={ + 'verbose_name': 'guide filter', + 'verbose_name_plural': 'guide filters', + }, + ), + ] diff --git a/apps/collection/models.py b/apps/collection/models.py index af8b2a33..7d037a85 100644 --- a/apps/collection/models.py +++ b/apps/collection/models.py @@ -188,29 +188,25 @@ class GuideFilter(ProjectBaseMixin): """Guide filter model.""" establishment_type_json = JSONField(blank=True, null=True, verbose_name='establishment types') - country_code_json = JSONField(blank=True, null=True, - verbose_name='countries') - region_code_json = JSONField(blank=True, null=True, - verbose_name='regions') - sub_region_code_json = JSONField(blank=True, null=True, - verbose_name='sub regions') + country_json = JSONField(blank=True, null=True, + verbose_name='countries') + region_json = JSONField(blank=True, null=True, + verbose_name='regions') + sub_region_json = JSONField(blank=True, null=True, + verbose_name='sub regions') wine_region_json = JSONField(blank=True, null=True, verbose_name='wine regions') - wine_classification_json = JSONField(blank=True, null=True, - verbose_name='wine classifications') - wine_color_json = JSONField(blank=True, null=True, - verbose_name='wine colors') - wine_type_json = JSONField(blank=True, null=True, - verbose_name='wine types') with_mark = models.BooleanField(default=True, verbose_name=_('with mark'), help_text=_('exclude empty marks?')) locale_json = JSONField(blank=True, null=True, verbose_name='locales') - max_mark = models.PositiveSmallIntegerField(verbose_name=_('max mark'), - help_text=_('mark under')) - min_mark = models.PositiveSmallIntegerField(verbose_name=_('min mark'), - help_text=_('mark over')) + max_mark = models.FloatField(verbose_name=_('max mark'), + null=True, + help_text=_('mark under')) + min_mark = models.FloatField(verbose_name=_('min mark'), + null=True, + help_text=_('mark over')) review_vintage_json = JSONField(verbose_name='review vintage years') review_state_json = JSONField(blank=True, null=True, verbose_name='review states') diff --git a/apps/collection/transfer_data.py b/apps/collection/transfer_data.py index 9307e6a0..9eeec541 100644 --- a/apps/collection/transfer_data.py +++ b/apps/collection/transfer_data.py @@ -5,6 +5,7 @@ from transfer.serializers.guide import GuideSerializer, GuideFilterSerializer def transfer_guide(): """Transfer Guide model.""" + errors = [] queryset = Guides.objects.exclude(title__icontains='test') serialized_data = GuideSerializer( data=list(queryset.values()), @@ -12,19 +13,24 @@ def transfer_guide(): if serialized_data.is_valid(): serialized_data.save() else: - pprint(f"transfer guide errors: {serialized_data.errors}") + for d in serialized_data.errors: errors.append(d) if d else None + pprint(f"transfer_guide errors: {errors}") def transfer_guide_filter(): """Transfer GuideFilter model.""" - queryset = GuideFilters.objects.all() + errors = [] + queryset = GuideFilters.objects.exclude(guide__title__icontains='test') \ + .exclude(guide__id__isnull=True) serialized_data = GuideFilterSerializer( data=list(queryset.values()), many=True) if serialized_data.is_valid(): serialized_data.save() else: - pprint(f"transfer guide filter errors: {serialized_data.errors}") + for d in serialized_data.errors: errors.append(d) if d else None + pprint(f"transfer_guide_filter errors: {errors}\n" + f"COUNT: {len(errors)}") data_types = { diff --git a/apps/transfer/mixins.py b/apps/transfer/mixins.py index 7b43b210..30537a14 100644 --- a/apps/transfer/mixins.py +++ b/apps/transfer/mixins.py @@ -39,6 +39,12 @@ class TransferSerializerMixin(serializers.ModelSerializer): qs = self.Meta.model.objects.filter(**validated_data) if not qs.exists(): return super().create(validated_data) + # try: + # qs = self.Meta.model.objects.filter(**validated_data) + # if not qs.exists(): + # return super().create(validated_data) + # except Exception: + # breakpoint() @property def tag_category(self): diff --git a/apps/transfer/models.py b/apps/transfer/models.py index 1ac40e80..fa3d898b 100644 --- a/apps/transfer/models.py +++ b/apps/transfer/models.py @@ -370,7 +370,7 @@ class GuideFilters(MigrateMixin): states = models.CharField(max_length=255, blank=True, null=True) created_at = models.DateTimeField() updated_at = models.DateTimeField() - guide_id = models.IntegerField(blank=True, null=True) + guide = models.ForeignKey(Guides, models.DO_NOTHING, blank=True, null=True) class Meta: managed = False diff --git a/apps/transfer/serializers/guide.py b/apps/transfer/serializers/guide.py index 3fd5cc32..c49e34b2 100644 --- a/apps/transfer/serializers/guide.py +++ b/apps/transfer/serializers/guide.py @@ -1,5 +1,5 @@ from itertools import chain - +from django.utils.text import slugify import yaml from pycountry import countries, subdivisions from rest_framework import serializers @@ -66,7 +66,7 @@ class GuideSerializer(TransferSerializerMixin): class GuideFilterSerializer(TransferSerializerMixin): id = serializers.IntegerField() - year = serializers.CharField() + year = serializers.CharField(allow_null=True) establishment_type = serializers.CharField(allow_null=True) countries = serializers.CharField(allow_null=True) regions = serializers.CharField(allow_null=True) @@ -75,8 +75,8 @@ class GuideFilterSerializer(TransferSerializerMixin): locales = serializers.CharField(allow_null=True) states = serializers.CharField(allow_null=True) - max_mark = serializers.IntegerField(allow_null=True) - min_mark = serializers.IntegerField(allow_null=True) + max_mark = serializers.FloatField(allow_null=True) + min_mark = serializers.FloatField(allow_null=True) marks_only = serializers.NullBooleanField() guide_id = serializers.IntegerField() @@ -149,25 +149,33 @@ class GuideFilterSerializer(TransferSerializerMixin): country_code_alpha_3: str, sub_region_code_alpha_3: str = None): country = self.get_country(country_code_alpha_3) - country_code_alpha_2 = country.code.upper() - region_qs = Region.objects.filter(code__iexact=region_code_alpha_3, - country__code__iexact=country_code_alpha_2) + if country: + country_code_alpha_2 = country.code.upper() + region_qs = Region.objects.filter(code__iexact=region_code_alpha_3, + country__code__iexact=country_code_alpha_2) - if region_qs.exists(): - return region_qs.first() + if region_qs.exists(): + return region_qs.first() - # If region isn't existed, check sub region for parent_code (region code) - if sub_region_code_alpha_3: - # sub region - subdivision = subdivisions.get( - code=f"{country_code_alpha_2}-{sub_region_code_alpha_3}") - if subdivision: - subdivision_region = subdivisions.get(code=subdivision.parent_code) - obj = Region.objects.create( - name=subdivision_region.name, - code=subdivision_region.code, - country=country) - return obj + # If region isn't existed, check sub region for parent_code (region code) + if sub_region_code_alpha_3: + # sub region + subdivision = subdivisions.get( + code=f"{country_code_alpha_2}-{sub_region_code_alpha_3}") + if subdivision: + # try with parent code + subdivision_region = subdivisions.get(code=subdivision.__dict__.get('_fields') + .get('parent_code')) + if not subdivision_region: + # try with parent + subdivision_region = subdivisions.get(code=subdivision.__dict__.get('_fields') + .get('parent')) + if subdivision_region: + obj = Region.objects.create( + name=subdivision_region.name, + code=subdivision_region.code, + country=country) + return obj def validate_year(self, value): return self.parse_ruby_helper(value) @@ -210,12 +218,12 @@ class GuideFilterSerializer(TransferSerializerMixin): attrs['review_vintage_json'] = self.get_review_vintage(attrs.pop('year')) attrs['establishment_type_json'] = self.get_establishment_type_ids( attrs.pop('establishment_type')) - attrs['country_code_json'] = self.get_country_ids(attrs.pop('countries')) + attrs['country_json'] = self.get_country_ids(attrs.pop('countries')) attrs['region_json'] = self.get_region_ids(regions=regions, sub_regions=sub_regions) attrs['sub_region_json'] = self.get_sub_region_ids(sub_regions) attrs['wine_region_json'] = self.get_wine_region_ids(attrs.pop('wine_regions')) - attrs['with_mark'] = attrs.pop('marks_only') + attrs['with_mark'] = attrs.pop('marks_only') or True attrs['locale_json'] = self.get_locale_ids(attrs.pop('locales')) attrs['review_state_json'] = self.get_review_state(attrs.pop('states')) attrs['guide'] = self.get_guide(attrs.pop('guide_id')) @@ -223,8 +231,8 @@ class GuideFilterSerializer(TransferSerializerMixin): def get_review_vintage(self, year): if hasattr(year, '__iter__'): - return {'vintage': set(int(i) for i in set(year) if i.isdigit())} - return {'vintage': {year}} + return {'vintage': list(set(int(i) for i in set(year) if i.isdigit()))} + return {'vintage': [year, ]} def get_establishment_type_ids(self, establishment_types): establishment_type_ids = [] @@ -234,22 +242,24 @@ class GuideFilterSerializer(TransferSerializerMixin): if not establishment_type_qs.exists(): obj = EstablishmentType.objects.create( name={'en-GB': establishment_type.capitalize()}, - index_name=establishment_type.lower()) + index_name=slugify(establishment_type)) else: obj = establishment_type_qs.first() establishment_type_ids.append(obj.id) - return {'id': set(establishment_type_ids)} + return {'id': list(set(establishment_type_ids))} def get_country_ids(self, country_codes_alpha_3): country_ids = [] if country_codes_alpha_3: for code_alpha_3 in country_codes_alpha_3: - country = self.get_country(code_alpha_3) - if not country: - raise serializers.ValidationError({'detail': f'Country with alpha code 3 -' - f'{code_alpha_3}, is not found.'}) - country_ids.append(country.id) - return {'id': set(country_ids)} + # Code can be an empty string. + if code_alpha_3 and not code_alpha_3 == 'AAA': + country = self.get_country(code_alpha_3) + if not country: + raise serializers.ValidationError({'detail': f'Country with alpha code 3 -' + f'{code_alpha_3}, is not found.'}) + country_ids.append(country.id) + return {'id': list(set(country_ids))} def get_region_ids(self, regions, sub_regions): region_ids = [] @@ -266,7 +276,7 @@ class GuideFilterSerializer(TransferSerializerMixin): sub_region_code_alpha_3=sub_region_code_alpha_3) if region: region_ids.append(region.id) - return {'id': region_ids} + return {'id': list(set(region_ids))} def get_sub_region_ids(self, sub_regions): sub_region_ids = [] @@ -291,13 +301,13 @@ class GuideFilterSerializer(TransferSerializerMixin): else: subdivision = subdivisions.get(code=region.code.upper()) if subdivision: - sub_region = Region.objects.get_or_create( + sub_region, _ = Region.objects.get_or_create( name=subdivision.name, - code=subdivisions.parent_code, + code=subdivision.code, parent_region=region, country=region.country) sub_region_ids.append(sub_region.id) - return {'id': set(sub_region_ids)} + return {'id': list(set(sub_region_ids))} def get_wine_region_ids(self, wine_regions): wine_region_ids = [] @@ -308,17 +318,21 @@ class GuideFilterSerializer(TransferSerializerMixin): raise serializers.ValidationError({ 'detail': f'Wine region - {wine_region}, is not found.'}) wine_region_ids.append(qs.first().id) - return {'id': set(wine_region_ids)} + return {'id': list(set(wine_region_ids))} def get_locale_ids(self, locales): locale_ids = [] if locales: for locale in [locale for locale in locales if locale]: - qs = Language.objects.filter(locale=locale) + if len(locale) == 2: + qs = Language.objects.filter(locale__startswith=locale) + else: + qs = Language.objects.filter(locale=locale) if not qs.exists(): raise serializers.ValidationError({ 'detail': f'Language with locale - {locale}, is not found.'}) - return {'id': set(locale_ids)} + locale_ids.extend(qs.values_list('id', flat=True)) + return {'id': list(set(locale_ids))} def get_review_state(self, states): review_states = [] @@ -328,11 +342,9 @@ class GuideFilterSerializer(TransferSerializerMixin): review_states.append(Review.READY) else: review_states.append(Review.TO_INVESTIGATE) - return {'state': set(review_states)} + return {'state': list(set(review_states))} def get_guide(self, old_guide_id: int): qs = Guide.objects.filter(old_id=old_guide_id) - if not qs.exists(): - raise serializers.ValidationError({'detail': f'Guide with old_id - {old_guide_id}, ' - f'is not found.'}) - return qs.first() + if qs.exists(): + return qs.first() From 6d9686b64a96f9ffe52fa40ef55afe576ea063a1 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: Mon, 2 Dec 2019 15:12:17 +0300 Subject: [PATCH 06/75] Fix error --- apps/account/models.py | 4 +++- apps/account/serializers/back.py | 19 ++++++++++--------- apps/account/views/back.py | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/apps/account/models.py b/apps/account/models.py index c212ffda..956baa56 100644 --- a/apps/account/models.py +++ b/apps/account/models.py @@ -287,7 +287,9 @@ class User(AbstractUser): class UserRole(ProjectBaseMixin): """UserRole model.""" - user = models.ForeignKey(User, verbose_name=_('User'), on_delete=models.CASCADE) + user = models.ForeignKey('account.User', + verbose_name=_('User'), + on_delete=models.CASCADE) role = models.ForeignKey(Role, verbose_name=_('Role'), on_delete=models.SET_NULL, null=True) establishment = models.ForeignKey(Establishment, verbose_name=_('Establishment'), on_delete=models.SET_NULL, null=True, blank=True) diff --git a/apps/account/serializers/back.py b/apps/account/serializers/back.py index 57c3fb42..b2316734 100644 --- a/apps/account/serializers/back.py +++ b/apps/account/serializers/back.py @@ -13,15 +13,6 @@ class RoleSerializer(serializers.ModelSerializer): ] -class UserRoleSerializer(serializers.ModelSerializer): - class Meta: - model = models.UserRole - fields = [ - 'user', - 'role' - ] - - class BackUserSerializer(serializers.ModelSerializer): class Meta: model = User @@ -49,3 +40,13 @@ class BackDetailUserSerializer(BackUserSerializer): user.set_password(validated_data['password']) user.save() return user + + +class UserRoleSerializer(serializers.ModelSerializer): + class Meta: + model = models.UserRole + fields = [ + 'role', + 'user', + 'establishment' + ] diff --git a/apps/account/views/back.py b/apps/account/views/back.py index b3d77d1e..80775b3a 100644 --- a/apps/account/views/back.py +++ b/apps/account/views/back.py @@ -13,7 +13,7 @@ class RoleLstView(generics.ListCreateAPIView): class UserRoleLstView(generics.ListCreateAPIView): serializer_class = serializers.UserRoleSerializer - queryset = models.Role.objects.all() + queryset = models.UserRole.objects.all() class UserLstView(generics.ListCreateAPIView): From fdc63f2677f34c2f5c4543fdd8f1ae6de2c2f5b4 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: Tue, 3 Dec 2019 10:20:13 +0300 Subject: [PATCH 07/75] Add API methods for site-feature --- apps/main/serializers.py | 55 +++++++++++++--------------------------- apps/main/urls/back.py | 8 +++++- apps/main/views/back.py | 10 ++++++++ 3 files changed, 35 insertions(+), 38 deletions(-) diff --git a/apps/main/serializers.py b/apps/main/serializers.py index 561a50c0..b93382d5 100644 --- a/apps/main/serializers.py +++ b/apps/main/serializers.py @@ -21,27 +21,6 @@ class FeatureSerializer(serializers.ModelSerializer): ) -class SiteFeatureSerializer(serializers.ModelSerializer): - id = serializers.IntegerField(source='feature.id') - slug = serializers.CharField(source='feature.slug') - priority = serializers.IntegerField(source='feature.priority') - route = serializers.CharField(source='feature.route.name') - source = serializers.IntegerField(source='feature.source') - nested = RecursiveFieldSerializer(many=True, allow_null=True) - - class Meta: - """Meta class.""" - model = models.SiteFeature - fields = ('main', - 'id', - 'slug', - 'priority', - 'route', - 'source', - 'nested', - ) - - class CurrencySerializer(ProjectModelSerializer): """Currency serializer.""" @@ -56,6 +35,23 @@ class CurrencySerializer(ProjectModelSerializer): ] +class SiteFeatureSerializer(serializers.ModelSerializer): + """Site feature serializer.""" + + class Meta: + """Meta class.""" + + model = models.SiteFeature + fields = ( + 'id', + 'site_settings', + 'feature', + 'published', + 'main', + 'nested' + ) + + class SiteSettingsSerializer(serializers.ModelSerializer): """Site settings serializer.""" @@ -140,7 +136,7 @@ class SiteBackOfficeSerializer(SiteSerializer): class FeatureSerializer(serializers.ModelSerializer): - """Site feature serializer.""" + """Feature serializer.""" class Meta: """Meta class.""" @@ -155,21 +151,6 @@ class FeatureSerializer(serializers.ModelSerializer): ) -# class SiteFeatureSerializer(serializers.ModelSerializer): -# """Site feature serializer.""" -# -# class Meta: -# """Meta class.""" -# -# model = models.SiteFeature -# fields = ( -# 'id', -# 'published', -# 'site_settings', -# 'feature', -# ) - - class AwardBaseSerializer(serializers.ModelSerializer): """Award base serializer.""" diff --git a/apps/main/urls/back.py b/apps/main/urls/back.py index 99e6a50f..609e61f7 100644 --- a/apps/main/urls/back.py +++ b/apps/main/urls/back.py @@ -13,5 +13,11 @@ urlpatterns = [ path('site-settings//', views.SiteSettingsBackOfficeView.as_view(), name='site-settings'), path('feature/', views.FeatureBackView.as_view(), name='feature-list-create'), - path('feature//', views.FeatureRUDBackView.as_view(), name='feature-rud') + path('feature//', views.FeatureRUDBackView.as_view(), name='feature-rud'), + path('site-feature/', views.SiteFeatureBackView.as_view(), + name='site-feature-list-create'), + path('site-feature//', views.SiteFeatureRUDBackView.as_view(), + name='site-feature-rud'), ] + + diff --git a/apps/main/views/back.py b/apps/main/views/back.py index 76c99e3d..adc0196a 100644 --- a/apps/main/views/back.py +++ b/apps/main/views/back.py @@ -44,11 +44,21 @@ class FeatureBackView(generics.ListCreateAPIView): serializer_class = serializers.FeatureSerializer +class SiteFeatureBackView(generics.ListCreateAPIView): + """Feature list or create View.""" + serializer_class = serializers.SiteFeatureSerializer + + class FeatureRUDBackView(generics.RetrieveUpdateDestroyAPIView): """Feature RUD View.""" serializer_class = serializers.FeatureSerializer +class SiteFeatureRUDBackView(generics.RetrieveUpdateDestroyAPIView): + """Feature RUD View.""" + serializer_class = serializers.SiteFeatureSerializer + + class SiteSettingsBackOfficeView(SiteSettingsView): """Site settings View.""" serializer_class = serializers.SiteSettingsBackOfficeSerializer From 4b9561fe752e55c851316923e8b84f11b8841295 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Tue, 3 Dec 2019 11:50:36 +0300 Subject: [PATCH 08/75] Fix typo --- apps/establishment/views/web.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/establishment/views/web.py b/apps/establishment/views/web.py index cfd4880e..15421ee7 100644 --- a/apps/establishment/views/web.py +++ b/apps/establishment/views/web.py @@ -38,7 +38,7 @@ class EstablishmentListView(EstablishmentMixinView, generics.ListAPIView): .with_extended_address_related().with_currency_related() \ .with_certain_tag_category_related('category', 'restaurant_category') \ .with_certain_tag_category_related('cuisine', 'restaurant_cuisine') \ - .with_ceratin_tag_category_related('shop_category', 'artisan_category') + .with_certain_tag_category_related('shop_category', 'artisan_category') class EstablishmentRetrieveView(EstablishmentMixinView, generics.RetrieveAPIView): From 201e02b4b794a37050769b01008372d9c186c23a Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Tue, 3 Dec 2019 13:29:37 +0300 Subject: [PATCH 09/75] remove empty favs --- apps/tag/filters.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/tag/filters.py b/apps/tag/filters.py index 5e2b31a7..46470ca1 100644 --- a/apps/tag/filters.py +++ b/apps/tag/filters.py @@ -73,7 +73,10 @@ class TagsFilterSet(TagsBaseFilterSet): def by_establishment_type(self, queryset, name, value): if value == EstablishmentType.ARTISAN: - return models.Tag.objects.by_category_index_name('shop_category')[0:8] + qs = models.Tag.objects.by_category_index_name('shop_category') + if self.request.country_code and self.request.country_code not in settings.INTERNATIONAL_COUNTRY_CODES: + qs = qs.filter(establishments__address__city__country__code=self.request.country_code).distinct('id') + return qs.exclude(establishments__isnull=True)[0:8] return queryset.by_establishment_type(value) # TMP TODO remove it later From e7de51373d99a8b3d9a31f13545488fb84c0e287 Mon Sep 17 00:00:00 2001 From: dormantman Date: Tue, 3 Dec 2019 14:39:25 +0300 Subject: [PATCH 10/75] Correction of finding the visual center of points --- apps/search_indexes/filters.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index 7a3993c0..4537124d 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -11,7 +11,7 @@ class CustomGeoSpatialFilteringFilterBackend(GeoSpatialFilteringFilterBackend): @staticmethod def calculate_center(first, second): - if second[1] < 0 <= first[1]: + if second[1] < 0 < first[1]: reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1]) diff = (reverse_first + reverse_second) / 2 @@ -21,6 +21,16 @@ class CustomGeoSpatialFilteringFilterBackend(GeoSpatialFilteringFilterBackend): else: result_part = 180 - (180 - first[1] - diff) + elif second[1] < 0 > first[1]: + diff = abs(abs(second[1]) - abs(first[1])) + + if diff > 90: + reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1]) + result_part = (reverse_first + reverse_second) / 2 + + else: + result_part = (first[1] + second[1]) / 2 + else: result_part = (first[1] + second[1]) / 2 From 637903e6135304021d28c443e4dc8e1bfbe1a43a Mon Sep 17 00:00:00 2001 From: Dmitriy Kuzmenko Date: Tue, 3 Dec 2019 15:15:02 +0300 Subject: [PATCH 11/75] fix scheduler --- apps/account/serializers/common.py | 4 +++ .../management/commands/fix_scheduler.py | 36 +++++++++++++++++++ apps/transfer/serializers/establishment.py | 2 +- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 apps/establishment/management/commands/fix_scheduler.py diff --git a/apps/account/serializers/common.py b/apps/account/serializers/common.py index d2933747..d2ce0974 100644 --- a/apps/account/serializers/common.py +++ b/apps/account/serializers/common.py @@ -92,7 +92,11 @@ class UserBaseSerializer(serializers.ModelSerializer): model = models.User fields = ( + 'id', 'fullname', + 'first_name', + 'last_name', + 'email', 'cropped_image_url', 'image_url', ) diff --git a/apps/establishment/management/commands/fix_scheduler.py b/apps/establishment/management/commands/fix_scheduler.py new file mode 100644 index 00000000..78422935 --- /dev/null +++ b/apps/establishment/management/commands/fix_scheduler.py @@ -0,0 +1,36 @@ +from django.core.management.base import BaseCommand +from tqdm import tqdm + +from establishment.models import Establishment +from transfer.models import Establishments +from transfer.serializers.establishment import EstablishmentSerializer +from timetable.models import Timetable +from django.db import transaction + + +class Command(BaseCommand): + help = 'Fix scheduler' + + @transaction.atomic + def handle(self, *args, **kwargs): + count = 0 + establishments = Establishment.objects.all() + old_est_list = Establishments.objects.prefetch_related( + 'schedules_set', + ) + # remove old records of Timetable + Timetable.objects.all().delete() + + for est in tqdm(establishments, desc="Fix scheduler"): + old_est = old_est_list.filter(id=est.old_id).first() + + if old_est and old_est.schedules_set.exists(): + old_schedule = old_est.schedules_set.first() + timetable = old_schedule.timetable + if timetable: + new_schedules = EstablishmentSerializer.get_schedules(timetable) + est.schedule.add(*new_schedules) + est.save() + count += 1 + + self.stdout.write(self.style.WARNING(f'Update {count} objects.')) diff --git a/apps/transfer/serializers/establishment.py b/apps/transfer/serializers/establishment.py index 0e5f55d4..a287d61b 100644 --- a/apps/transfer/serializers/establishment.py +++ b/apps/transfer/serializers/establishment.py @@ -125,7 +125,7 @@ class EstablishmentSerializer(serializers.ModelSerializer): weekdays = { 'su': Timetable.SUNDAY, 'mo': Timetable.MONDAY, - 'tu': Timetable.THURSDAY, + 'tu': Timetable.TUESDAY, 'we': Timetable.WEDNESDAY, 'th': Timetable.THURSDAY, 'fr': Timetable.FRIDAY, From f5d5ce922fe398d6ef68ea96614c43ee9fba66b3 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: Tue, 3 Dec 2019 15:23:41 +0300 Subject: [PATCH 12/75] Old role migrate --- apps/account/migrations/0021_oldrole.py | 24 +++++++++++++++++++ .../migrations/0022_auto_20191203_1149.py | 18 ++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 apps/account/migrations/0021_oldrole.py create mode 100644 apps/account/migrations/0022_auto_20191203_1149.py diff --git a/apps/account/migrations/0021_oldrole.py b/apps/account/migrations/0021_oldrole.py new file mode 100644 index 00000000..9a8fd4e9 --- /dev/null +++ b/apps/account/migrations/0021_oldrole.py @@ -0,0 +1,24 @@ +# Generated by Django 2.2.7 on 2019-12-03 10:01 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('account', '0020_role_site'), + ] + + operations = [ + migrations.CreateModel( + name='OldRole', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('new_role', models.CharField(max_length=512, verbose_name='New role')), + ('old_role', models.CharField(max_length=512, verbose_name='Old role')), + ], + options={ + 'unique_together': {('new_role', 'old_role')}, + }, + ), + ] diff --git a/apps/account/migrations/0022_auto_20191203_1149.py b/apps/account/migrations/0022_auto_20191203_1149.py new file mode 100644 index 00000000..f6b554ba --- /dev/null +++ b/apps/account/migrations/0022_auto_20191203_1149.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.7 on 2019-12-03 11:49 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('account', '0021_oldrole'), + ] + + operations = [ + migrations.AlterField( + model_name='oldrole', + name='old_role', + field=models.CharField(max_length=512, null=True, verbose_name='Old role'), + ), + ] From 5ecb5d214b51df9c8058edc1995099096db2e0de 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: Tue, 3 Dec 2019 15:24:02 +0300 Subject: [PATCH 13/75] Old role migrate1 --- .../management/commands/add_affilations.py | 45 +++++++++++++++++++ apps/account/models.py | 8 ++++ 2 files changed, 53 insertions(+) create mode 100644 apps/account/management/commands/add_affilations.py diff --git a/apps/account/management/commands/add_affilations.py b/apps/account/management/commands/add_affilations.py new file mode 100644 index 00000000..4485d6f1 --- /dev/null +++ b/apps/account/management/commands/add_affilations.py @@ -0,0 +1,45 @@ +from account.models import OldRole +from django.core.management.base import BaseCommand +from django.db import connections +from establishment.management.commands.add_position import namedtuplefetchall +from tqdm import tqdm + + +class Command(BaseCommand): + help = '''Add site affilations from old db to new db. + Run after migrate {}!!!''' + + def map_role_sql(self): + with connections['legacy'].cursor() as cursor: + cursor.execute(''' + select distinct + case when role = 'news_editor' then 'CONTENT_PAGE_MANAGER' + when role in ('reviewer', 'reviwer', 'reviewer_manager') then 'REVIEWER_MANGER' + when role = 'admin' then 'SUPERUSER' + when role ='community_manager' then 'COUNTRY_ADMIN' + when role = 'site_admin' then 'COUNTRY_ADMIN' + when role = 'wine_reviewer' then 'WINERY_REVIEWER' + when role in ('salesman', 'sales_man') then 'SALES_MAN' + when role = 'seller' then 'SELLER' + else role + end as new_role, + case when role = 'GUEST' then null else role end as role + from + ( + SELECT + DISTINCT + COALESCE(role, 'GUEST') as role + FROM site_affiliations AS sa + ) t + ''') + return namedtuplefetchall(cursor) + + def handle(self, *args, **kwargs): + objects = [] + OldRole.objects.all().delete() + for s in tqdm(self.map_role_sql(), desc='Add permissions old'): + objects.append( + OldRole(new_role=s.new_role, old_role=s.role) + ) + OldRole.objects.bulk_create(objects) + self.stdout.write(self.style.WARNING(f'Migrated old roles.')) \ No newline at end of file diff --git a/apps/account/models.py b/apps/account/models.py index c212ffda..d422b772 100644 --- a/apps/account/models.py +++ b/apps/account/models.py @@ -291,3 +291,11 @@ class UserRole(ProjectBaseMixin): role = models.ForeignKey(Role, verbose_name=_('Role'), on_delete=models.SET_NULL, null=True) establishment = models.ForeignKey(Establishment, verbose_name=_('Establishment'), on_delete=models.SET_NULL, null=True, blank=True) + + +class OldRole(models.Model): + new_role = models.CharField(verbose_name=_('New role'), max_length=512) + old_role = models.CharField(verbose_name=_('Old role'), max_length=512, null=True) + + class Meta: + unique_together = ('new_role', 'old_role') \ No newline at end of file From 4940a4472db324a19faa01aa7a0be04ef575ee3e Mon Sep 17 00:00:00 2001 From: Dmitriy Kuzmenko Date: Tue, 3 Dec 2019 15:54:15 +0300 Subject: [PATCH 14/75] add additional fields to UserBaseSerializer --- apps/account/serializers/common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/account/serializers/common.py b/apps/account/serializers/common.py index d2ce0974..09136934 100644 --- a/apps/account/serializers/common.py +++ b/apps/account/serializers/common.py @@ -93,6 +93,7 @@ class UserBaseSerializer(serializers.ModelSerializer): model = models.User fields = ( 'id', + 'username', 'fullname', 'first_name', 'last_name', From 4797225beb75f8d19b34fb838c2d371537bd5805 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: Tue, 3 Dec 2019 16:40:50 +0300 Subject: [PATCH 15/75] model --- apps/account/models.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/account/models.py b/apps/account/models.py index d422b772..0a3cd3a6 100644 --- a/apps/account/models.py +++ b/apps/account/models.py @@ -32,6 +32,9 @@ class Role(ProjectBaseMixin): ESTABLISHMENT_MANAGER = 5 REVIEWER_MANGER = 6 RESTAURANT_REVIEWER = 7 + SALES_MAN = 8 + WINERY_REVIEWER = 9 + SELLER = 10 ROLE_CHOICES = ( (STANDARD_USER, 'Standard user'), @@ -40,7 +43,10 @@ class Role(ProjectBaseMixin): (CONTENT_PAGE_MANAGER, 'Content page manager'), (ESTABLISHMENT_MANAGER, 'Establishment manager'), (REVIEWER_MANGER, 'Reviewer manager'), - (RESTAURANT_REVIEWER, 'Restaurant reviewer') + (RESTAURANT_REVIEWER, 'Restaurant reviewer'), + (SALES_MAN, 'Sales man'), + (WINERY_REVIEWER, 'Winery reviewer'), + (SELLER, 'Seller') ) role = models.PositiveIntegerField(verbose_name=_('Role'), choices=ROLE_CHOICES, null=False, blank=False) From fee8a3b1209e165e988975e9a21c5e04842d93a0 Mon Sep 17 00:00:00 2001 From: dormantman Date: Tue, 3 Dec 2019 17:16:02 +0300 Subject: [PATCH 16/75] Correction of finding the center of points with positive --- apps/search_indexes/filters.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index 4537124d..ce77bc06 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -21,15 +21,9 @@ class CustomGeoSpatialFilteringFilterBackend(GeoSpatialFilteringFilterBackend): else: result_part = 180 - (180 - first[1] - diff) - elif second[1] < 0 > first[1]: - diff = abs(abs(second[1]) - abs(first[1])) - - if diff > 90: - reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1]) - result_part = (reverse_first + reverse_second) / 2 - - else: - result_part = (first[1] + second[1]) / 2 + elif second[1] < 0 > first[1] or second[1] > 0 < first[1]: + reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1]) + result_part = ((reverse_first + reverse_second) / 2) * (-1 + (second[1] < 0) * 2) else: result_part = (first[1] + second[1]) / 2 From cc7754a9d78cba712fad35afdd4581c7289e8fa5 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: Tue, 3 Dec 2019 17:58:46 +0300 Subject: [PATCH 17/75] Old role migrate1 --- .../management/commands/add_affilations.py | 52 ++++++++++++++++--- 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/apps/account/management/commands/add_affilations.py b/apps/account/management/commands/add_affilations.py index 4485d6f1..550847f2 100644 --- a/apps/account/management/commands/add_affilations.py +++ b/apps/account/management/commands/add_affilations.py @@ -1,4 +1,5 @@ -from account.models import OldRole +from account.models import OldRole, Role +from main.models import SiteSettings from django.core.management.base import BaseCommand from django.db import connections from establishment.management.commands.add_position import namedtuplefetchall @@ -34,12 +35,51 @@ class Command(BaseCommand): ''') return namedtuplefetchall(cursor) - def handle(self, *args, **kwargs): + def add_old_roles(self): objects = [] OldRole.objects.all().delete() for s in tqdm(self.map_role_sql(), desc='Add permissions old'): - objects.append( - OldRole(new_role=s.new_role, old_role=s.role) - ) + objects.append( + OldRole(new_role=s.new_role, old_role=s.role) + ) OldRole.objects.bulk_create(objects) - self.stdout.write(self.style.WARNING(f'Migrated old roles.')) \ No newline at end of file + self.stdout.write(self.style.WARNING(f'Migrated old roles.')) + + def site_role_sql(self): + with connections['legacy'].cursor() as cursor: + cursor.execute(''' + select site_id, + role + from + ( + SELECT + DISTINCT + site_id, + COALESCE(role, 'GUEST') as role + FROM site_affiliations AS sa + ) t + where t.role not in ('admin', 'GUEST') + ''') + return namedtuplefetchall(cursor) + + def add_site_role(self): + objects = [] + for s in tqdm(self.site_role_sql(), desc='Add site role'): + old_role = OldRole.objects.get(old_role=s.role) + role_choice = getattr(Role, old_role.new_role) + sites = SiteSettings.objects.filter(old_id=s.site_id) + for site in sites: + role = Role.objects.filter(site=site, role=role_choice) + if not role.exists(): + objects.append( + Role(site=site, role=role_choice) + ) + + Role.objects.bulk_create(objects) + self.stdout.write(self.style.WARNING(f'Added site roles.')) + + + + def handle(self, *args, **kwargs): + # self.add_old_roles() + self.add_site_role() \ No newline at end of file From 7cf34f0741738ac03c16980e001c46adc38f1668 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: Tue, 3 Dec 2019 18:30:33 +0300 Subject: [PATCH 18/75] fix --- apps/main/serializers.py | 69 ++++++++++++---------------------------- apps/main/views/back.py | 4 +-- 2 files changed, 23 insertions(+), 50 deletions(-) diff --git a/apps/main/serializers.py b/apps/main/serializers.py index b93382d5..a41a643f 100644 --- a/apps/main/serializers.py +++ b/apps/main/serializers.py @@ -17,10 +17,11 @@ class FeatureSerializer(serializers.ModelSerializer): fields = ( 'id', 'slug', - 'priority' + 'priority', + 'route', + 'site_settings', ) - class CurrencySerializer(ProjectModelSerializer): """Currency serializer.""" @@ -36,20 +37,24 @@ class CurrencySerializer(ProjectModelSerializer): class SiteFeatureSerializer(serializers.ModelSerializer): - """Site feature serializer.""" + id = serializers.IntegerField(source='feature.id') + slug = serializers.CharField(source='feature.slug') + priority = serializers.IntegerField(source='feature.priority') + route = serializers.CharField(source='feature.route.name') + source = serializers.IntegerField(source='feature.source') + nested = RecursiveFieldSerializer(many=True, allow_null=True) class Meta: """Meta class.""" - model = models.SiteFeature - fields = ( - 'id', - 'site_settings', - 'feature', - 'published', - 'main', - 'nested' - ) + fields = ('main', + 'id', + 'slug', + 'priority', + 'route', + 'source', + 'nested', + ) class SiteSettingsSerializer(serializers.ModelSerializer): @@ -95,23 +100,15 @@ class SiteSettingsBackOfficeSerializer(SiteSettingsSerializer): ] -class SiteSerializer(serializers.ModelSerializer): +class SiteSerializer(SiteSettingsSerializer): country = CountrySerializer() class Meta: """Meta class.""" model = models.SiteSettings - fields = [ - 'subdomain', - 'site_url', - 'country', - 'default_site', - 'pinterest_page_url', - 'twitter_page_url', - 'facebook_page_url', - 'instagram_page_url', - 'contact_email', - 'currency' + fields = SiteSettingsSerializer.Meta.fields + [ + 'id', + 'country' ] @@ -125,30 +122,6 @@ class SiteShortSerializer(serializers.ModelSerializer): ] -class SiteBackOfficeSerializer(SiteSerializer): - """Serializer for back office.""" - - class Meta(SiteSerializer.Meta): - """Meta class.""" - fields = SiteSerializer.Meta.fields + [ - 'id', - ] - - -class FeatureSerializer(serializers.ModelSerializer): - """Feature serializer.""" - - class Meta: - """Meta class.""" - - model = models.Feature - fields = ( - 'id', - 'slug', - 'priority', - 'route', - 'site_settings', - ) class AwardBaseSerializer(serializers.ModelSerializer): diff --git a/apps/main/views/back.py b/apps/main/views/back.py index adc0196a..1faf79a0 100644 --- a/apps/main/views/back.py +++ b/apps/main/views/back.py @@ -61,9 +61,9 @@ class SiteFeatureRUDBackView(generics.RetrieveUpdateDestroyAPIView): class SiteSettingsBackOfficeView(SiteSettingsView): """Site settings View.""" - serializer_class = serializers.SiteSettingsBackOfficeSerializer + serializer_class = serializers.SiteSerializer class SiteListBackOfficeView(SiteListView): """Site settings View.""" - serializer_class = serializers.SiteBackOfficeSerializer + serializer_class = serializers.SiteSerializer From 848008cae13c05b15b04cebd3540174529487584 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Tue, 3 Dec 2019 19:02:41 +0300 Subject: [PATCH 19/75] tags dynamic filters --- apps/search_indexes/filters.py | 122 ++++++++++++++++++++++++++------- 1 file changed, 99 insertions(+), 23 deletions(-) diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index ce77bc06..3101fdc2 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -4,6 +4,7 @@ from django_elasticsearch_dsl_drf.filter_backends import SearchFilterBackend, \ FacetedSearchFilterBackend, GeoSpatialFilteringFilterBackend from search_indexes.utils import OBJECT_FIELD_PROPERTIES from six import iteritems +from functools import reduce class CustomGeoSpatialFilteringFilterBackend(GeoSpatialFilteringFilterBackend): @@ -56,10 +57,30 @@ class CustomFacetedSearchFilterBackend(FacetedSearchFilterBackend): :param view: :return: """ - def makefilter(cur_facet): - def myfilter(x): + def make_filter(cur_facet): + def _filter(x): return cur_facet['facet']._params['field'] != next(iter(x._params)) - return myfilter + return _filter + + def make_tags_filter(cur_facet, tags_to_remove_ids): + def _filter(x): + if hasattr(x, '_params') and (x._params.get('must') or x._params.get('should')): + ret = [] + for t in ['must', 'should']: + terms = x._params.get(t) + if terms: + for term in terms: + if cur_facet['facet']._params['field'] != next(iter(term._params)): + return True # different fields. preserve filter + else: + ret.append(next(iter(term._params.values())) not in tags_to_remove_ids) + return all(ret) + if cur_facet['facet']._params['field'] != next(iter(x._params)): + return True # different fields. preserve filter + else: + return next(iter(x._params.values())) not in tags_to_remove_ids + return _filter + __facets = self.construct_facets(request, view) setattr(view.paginator, 'facets_computed', {}) for __field, __facet in iteritems(__facets): @@ -71,29 +92,84 @@ class CustomFacetedSearchFilterBackend(FacetedSearchFilterBackend): 'global' ).bucket(__field, agg) else: - qs = queryset.__copy__() - qs.query = queryset.query._clone() - filterer = makefilter(__facet) - for param_type in ['must', 'must_not', 'should']: - if qs.query._proxied._params.get(param_type): - qs.query._proxied._params[param_type] = list( - filter( - filterer, qs.query._proxied._params[param_type] + if __field != 'tag' or not request.query_params.getlist('tags_id__in'): + qs = queryset.__copy__() + qs.query = queryset.query._clone() + filterer = make_filter(__facet) + for param_type in ['must', 'must_not', 'should']: + if qs.query._proxied._params.get(param_type): + qs.query._proxied._params[param_type] = list( + filter( + filterer, qs.query._proxied._params[param_type] + ) ) - ) - sh = qs.query._proxied._params.get('should') - if (not sh or not len(sh)) \ - and qs.query._proxied._params.get('minimum_should_match'): - qs.query._proxied._params.pop('minimum_should_match') - facet_name = '_filter_' + __field - qs.aggs.bucket( - facet_name, - 'filter', - filter=agg_filter - ).bucket(__field, agg) - view.paginator.facets_computed.update({facet_name: qs.execute().aggregations[facet_name]}) + sh = qs.query._proxied._params.get('should') + if (not sh or not len(sh)) \ + and qs.query._proxied._params.get('minimum_should_match'): + qs.query._proxied._params.pop('minimum_should_match') + facet_name = '_filter_' + __field + qs.aggs.bucket( + facet_name, + 'filter', + filter=agg_filter + ).bucket(__field, agg) + view.paginator.facets_computed.update({facet_name: qs.execute().aggregations[facet_name]}) + else: + tag_facets = [] + facet_name = '_filter_' + __field + for category_tags_ids in request.query_params.getlist('tags_id__in'): + tags_to_remove = category_tags_ids.split('__') + qs = queryset.__copy__() + qs.query = queryset.query._clone() + filterer = make_tags_filter(__facet, tags_to_remove) + for param_type in ['must', 'should']: + if qs.query._proxied._params.get(param_type): + if qs.query._proxied._params.get(param_type): + qs.query._proxied._params[param_type] = list( + filter( + filterer, qs.query._proxied._params[param_type] + ) + ) + sh = qs.query._proxied._params.get('should') + if (not sh or not len(sh)) \ + and qs.query._proxied._params.get('minimum_should_match'): + qs.query._proxied._params.pop('minimum_should_match') + qs.aggs.bucket( + facet_name, + 'filter', + filter=agg_filter + ).bucket(__field, agg) + tag_facets.append(qs.execute().aggregations[facet_name]) + view.paginator.facets_computed.update({facet_name: self.merge_buckets(tag_facets)}) return queryset + @staticmethod + def merge_buckets(buckets: list): + """Reduces all buckets preserving class""" + result_bucket = buckets[0] + for bucket in buckets[1:]: + for tag in bucket.tag.buckets._l_: + if tag not in result_bucket.tag.buckets._l_: + result_bucket.tag.buckets._l_.append(tag) + def reducer(prev, cur): + try: + index = list(map(lambda x: x['key'], prev)).index(cur['key']) + if cur['doc_count'] < prev[index]['doc_count']: + prev[index]['doc_count'] = cur['doc_count'] + except ValueError: + prev.append(cur) + return prev + + result_bucket.tag.buckets._l_ = list(reduce( + reducer, result_bucket.tag.buckets._l_, [] + )) + result_bucket.doc_count = reduce( + lambda prev, cur: prev + cur['doc_count'], + result_bucket.tag.buckets._l_, + 0 + ) + return result_bucket + class CustomSearchFilterBackend(SearchFilterBackend): """Custom SearchFilterBackend.""" From 7596652a3f3d5944fec5528baa991e836f58fd95 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 3 Dec 2019 19:31:05 +0300 Subject: [PATCH 20/75] category tag tags filter by obj type --- apps/tag/serializers.py | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/apps/tag/serializers.py b/apps/tag/serializers.py index 2cc818a9..5b6f390c 100644 --- a/apps/tag/serializers.py +++ b/apps/tag/serializers.py @@ -1,9 +1,12 @@ """Tag serializers.""" from rest_framework import serializers +from rest_framework.fields import SerializerMethodField + from establishment.models import (Establishment, EstablishmentType, EstablishmentSubType) from news.models import News, NewsType from tag import models +from tag.models import Tag from utils.exceptions import (ObjectAlreadyAdded, BindingObjectNotFound, RemovedBindingObjectNotFound) from utils.serializers import TranslatedField @@ -12,6 +15,9 @@ from utils.serializers import TranslatedField class TagBaseSerializer(serializers.ModelSerializer): """Serializer for model Tag.""" + def get_extra_kwargs(self): + return super().get_extra_kwargs() + label_translated = TranslatedField() index_name = serializers.CharField(source='value', read_only=True, allow_null=True) @@ -37,6 +43,7 @@ class TagBackOfficeSerializer(TagBaseSerializer): 'category' ) + class TagCategoryProductSerializer(serializers.ModelSerializer): """SHORT Serializer for TagCategory""" @@ -57,7 +64,7 @@ class TagCategoryBaseSerializer(serializers.ModelSerializer): """Serializer for model TagCategory.""" label_translated = TranslatedField() - tags = TagBaseSerializer(many=True, read_only=True) + tags = SerializerMethodField() class Meta: """Meta class.""" @@ -70,6 +77,22 @@ class TagCategoryBaseSerializer(serializers.ModelSerializer): 'tags', ) + def get_tags(self, obj): + query_params = dict(self.context['request'].query_params) + if len(query_params) > 1: + return None + + tags = Tag.objects.all() + + if 'establishment_type' in query_params: + types = query_params['establishment_type'] + tags = tags.filter(establishments__establishment_type__index_name__in=types).distinct() + elif 'product_type' in query_params: + types = query_params['product_type'] + tags = tags.filter(products__product_type__index_name__in=types).distinct() + + return TagBaseSerializer(instance=tags, many=True, read_only=True).data + class TagCategoryShortSerializer(serializers.ModelSerializer): """Serializer for model TagCategory.""" @@ -174,15 +197,15 @@ class TagCategoryBindObjectSerializer(serializers.Serializer): attrs['tag_category'] = tag_category if obj_type == self.ESTABLISHMENT_TYPE: - establishment_type = EstablishmentType.objects.filter(pk=obj_id).\ + establishment_type = EstablishmentType.objects.filter(pk=obj_id). \ first() if not establishment_type: raise BindingObjectNotFound() - if request.method == 'POST' and tag_category.establishment_types.\ + if request.method == 'POST' and tag_category.establishment_types. \ filter(pk=establishment_type.pk).exists(): raise ObjectAlreadyAdded() - if request.method == 'DELETE' and not tag_category.\ - establishment_types.filter(pk=establishment_type.pk).\ + if request.method == 'DELETE' and not tag_category. \ + establishment_types.filter(pk=establishment_type.pk). \ exists(): raise RemovedBindingObjectNotFound() attrs['related_object'] = establishment_type @@ -190,10 +213,10 @@ class TagCategoryBindObjectSerializer(serializers.Serializer): news_type = NewsType.objects.filter(pk=obj_id).first() if not news_type: raise BindingObjectNotFound() - if request.method == 'POST' and tag_category.news_types.\ + if request.method == 'POST' and tag_category.news_types. \ filter(pk=news_type.pk).exists(): raise ObjectAlreadyAdded() - if request.method == 'DELETE' and not tag_category.news_types.\ + if request.method == 'DELETE' and not tag_category.news_types. \ filter(pk=news_type.pk).exists(): raise RemovedBindingObjectNotFound() attrs['related_object'] = news_type From c00075feec564c87e13cdb6fbe8da998c89c45dd Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Tue, 3 Dec 2019 19:39:20 +0300 Subject: [PATCH 21/75] empty booking response --- apps/booking/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/booking/views.py b/apps/booking/views.py index 06ef9273..b3f85bff 100644 --- a/apps/booking/views.py +++ b/apps/booking/views.py @@ -34,7 +34,7 @@ class CheckWhetherBookingAvailable(generics.GenericAPIView): periods = response['periods'] periods_by_name = {period['period']: period for period in periods if 'period' in period} if not periods_by_name: - return None + return response period_template = iter(periods_by_name.values()).__next__().copy() period_template.pop('total_left_seats') From 013cd864c29d621a1e25cddb821d384e5fa6a935 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Tue, 3 Dec 2019 20:48:35 +0300 Subject: [PATCH 22/75] tags dynamic filters #2 --- apps/search_indexes/filters.py | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index 3101fdc2..a12c37f7 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -149,25 +149,23 @@ class CustomFacetedSearchFilterBackend(FacetedSearchFilterBackend): result_bucket = buckets[0] for bucket in buckets[1:]: for tag in bucket.tag.buckets._l_: - if tag not in result_bucket.tag.buckets._l_: - result_bucket.tag.buckets._l_.append(tag) + result_bucket.tag.buckets.append(tag) + def reducer(prev, cur): - try: - index = list(map(lambda x: x['key'], prev)).index(cur['key']) - if cur['doc_count'] < prev[index]['doc_count']: - prev[index]['doc_count'] = cur['doc_count'] - except ValueError: + """Unique by key""" + if not len(list(filter(lambda x: x['key'] == cur['key'], prev))): prev.append(cur) return prev - result_bucket.tag.buckets._l_ = list(reduce( - reducer, result_bucket.tag.buckets._l_, [] - )) - result_bucket.doc_count = reduce( - lambda prev, cur: prev + cur['doc_count'], + buckets_count = len(buckets) + result_bucket.tag.buckets = list(filter(lambda t: t is not None, [ + tag if len(list(filter(lambda t: t['key'] == tag['key'], result_bucket.tag.buckets._l_))) == buckets_count else None + for tag in result_bucket.tag.buckets._l_])) # here we remove tags which don't present in any bucket + result_bucket.tag.buckets = list(reduce( + reducer, result_bucket.tag.buckets._l_, - 0 - ) + [] + )) return result_bucket From 9c84842c111fd5a65a970369f36ad34ed2d6344c Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Tue, 3 Dec 2019 22:35:38 +0300 Subject: [PATCH 23/75] tags dynamic filters #3 --- apps/search_indexes/filters.py | 37 ++++++++++++---------------------- 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index a12c37f7..ec67fe7a 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -4,7 +4,7 @@ from django_elasticsearch_dsl_drf.filter_backends import SearchFilterBackend, \ FacetedSearchFilterBackend, GeoSpatialFilteringFilterBackend from search_indexes.utils import OBJECT_FIELD_PROPERTIES from six import iteritems -from functools import reduce +from tag.models import TagCategory class CustomGeoSpatialFilteringFilterBackend(GeoSpatialFilteringFilterBackend): @@ -92,7 +92,7 @@ class CustomFacetedSearchFilterBackend(FacetedSearchFilterBackend): 'global' ).bucket(__field, agg) else: - if __field != 'tag' or not request.query_params.getlist('tags_id__in'): + if __field != 'tag': qs = queryset.__copy__() qs.query = queryset.query._clone() filterer = make_filter(__facet) @@ -116,9 +116,11 @@ class CustomFacetedSearchFilterBackend(FacetedSearchFilterBackend): view.paginator.facets_computed.update({facet_name: qs.execute().aggregations[facet_name]}) else: tag_facets = [] + preserve_ids = [] facet_name = '_filter_' + __field - for category_tags_ids in request.query_params.getlist('tags_id__in'): - tags_to_remove = category_tags_ids.split('__') + for category in TagCategory.objects.prefetch_related('tags').filter(public=True, + value_type=TagCategory.LIST): + tags_to_remove = list(map(lambda t: t.id, category.tags.all())) qs = queryset.__copy__() qs.query = queryset.query._clone() filterer = make_tags_filter(__facet, tags_to_remove) @@ -140,32 +142,19 @@ class CustomFacetedSearchFilterBackend(FacetedSearchFilterBackend): filter=agg_filter ).bucket(__field, agg) tag_facets.append(qs.execute().aggregations[facet_name]) - view.paginator.facets_computed.update({facet_name: self.merge_buckets(tag_facets)}) + preserve_ids.append(tags_to_remove) + view.paginator.facets_computed.update({facet_name: self.merge_buckets(tag_facets, preserve_ids)}) return queryset @staticmethod - def merge_buckets(buckets: list): + def merge_buckets(buckets: list, presrve_ids: list): """Reduces all buckets preserving class""" result_bucket = buckets[0] - for bucket in buckets[1:]: + result_bucket.tag.buckets = list(filter(lambda x: x in presrve_ids[0], result_bucket.tag.buckets._l_)) + for bucket, ids in list(zip(buckets, presrve_ids))[1:]: for tag in bucket.tag.buckets._l_: - result_bucket.tag.buckets.append(tag) - - def reducer(prev, cur): - """Unique by key""" - if not len(list(filter(lambda x: x['key'] == cur['key'], prev))): - prev.append(cur) - return prev - - buckets_count = len(buckets) - result_bucket.tag.buckets = list(filter(lambda t: t is not None, [ - tag if len(list(filter(lambda t: t['key'] == tag['key'], result_bucket.tag.buckets._l_))) == buckets_count else None - for tag in result_bucket.tag.buckets._l_])) # here we remove tags which don't present in any bucket - result_bucket.tag.buckets = list(reduce( - reducer, - result_bucket.tag.buckets._l_, - [] - )) + if tag['key'] in ids: + result_bucket.tag.buckets.append(tag) return result_bucket From eaf5c41e1db19fbfc60246f2eef04a55be0b8b3b Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Tue, 3 Dec 2019 22:53:31 +0300 Subject: [PATCH 24/75] tags dynamic filters #4 --- apps/search_indexes/filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index ec67fe7a..8040e4b4 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -150,7 +150,7 @@ class CustomFacetedSearchFilterBackend(FacetedSearchFilterBackend): def merge_buckets(buckets: list, presrve_ids: list): """Reduces all buckets preserving class""" result_bucket = buckets[0] - result_bucket.tag.buckets = list(filter(lambda x: x in presrve_ids[0], result_bucket.tag.buckets._l_)) + result_bucket.tag.buckets = list(filter(lambda x: x['key'] in presrve_ids[0], result_bucket.tag.buckets._l_)) for bucket, ids in list(zip(buckets, presrve_ids))[1:]: for tag in bucket.tag.buckets._l_: if tag['key'] in ids: From f9fb2aa17ea661f7a1aae97872d624b9f8e0bd5b Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Tue, 3 Dec 2019 23:49:45 +0300 Subject: [PATCH 25/75] tags dynamic filters #4 --- apps/search_indexes/filters.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index 8040e4b4..bc48b029 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -120,7 +120,7 @@ class CustomFacetedSearchFilterBackend(FacetedSearchFilterBackend): facet_name = '_filter_' + __field for category in TagCategory.objects.prefetch_related('tags').filter(public=True, value_type=TagCategory.LIST): - tags_to_remove = list(map(lambda t: t.id, category.tags.all())) + tags_to_remove = list(map(lambda t: str(t.id), category.tags.all())) qs = queryset.__copy__() qs.query = queryset.query._clone() filterer = make_tags_filter(__facet, tags_to_remove) @@ -142,16 +142,16 @@ class CustomFacetedSearchFilterBackend(FacetedSearchFilterBackend): filter=agg_filter ).bucket(__field, agg) tag_facets.append(qs.execute().aggregations[facet_name]) - preserve_ids.append(tags_to_remove) + preserve_ids.append(list(map(int, tags_to_remove))) view.paginator.facets_computed.update({facet_name: self.merge_buckets(tag_facets, preserve_ids)}) return queryset @staticmethod - def merge_buckets(buckets: list, presrve_ids: list): + def merge_buckets(buckets: list, preserve_ids: list): """Reduces all buckets preserving class""" result_bucket = buckets[0] - result_bucket.tag.buckets = list(filter(lambda x: x['key'] in presrve_ids[0], result_bucket.tag.buckets._l_)) - for bucket, ids in list(zip(buckets, presrve_ids))[1:]: + result_bucket.tag.buckets = list(filter(lambda x: x['key'] in preserve_ids[0], result_bucket.tag.buckets._l_)) + for bucket, ids in list(zip(buckets, preserve_ids))[1:]: for tag in bucket.tag.buckets._l_: if tag['key'] in ids: result_bucket.tag.buckets.append(tag) From 9f882ca65643aa0455b2892737f89588f51d2107 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 4 Dec 2019 00:33:18 +0300 Subject: [PATCH 26/75] tags dynamic filters #4 (boost search via ES) --- apps/search_indexes/documents/__init__.py | 2 ++ apps/search_indexes/documents/tag_category.py | 33 +++++++++++++++++++ apps/search_indexes/filters.py | 9 +++-- project/settings/development.py | 1 + project/settings/local.py | 1 + project/settings/production.py | 1 + project/settings/stage.py | 1 + 7 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 apps/search_indexes/documents/tag_category.py diff --git a/apps/search_indexes/documents/__init__.py b/apps/search_indexes/documents/__init__.py index c357f29e..60a9b580 100644 --- a/apps/search_indexes/documents/__init__.py +++ b/apps/search_indexes/documents/__init__.py @@ -1,6 +1,7 @@ from search_indexes.documents.establishment import EstablishmentDocument from search_indexes.documents.news import NewsDocument from search_indexes.documents.product import ProductDocument +from search_indexes.documents.tag_category import TagCategoryDocument from search_indexes.tasks import es_update # todo: make signal to update documents on related fields @@ -8,5 +9,6 @@ __all__ = [ 'EstablishmentDocument', 'NewsDocument', 'ProductDocument', + 'TagCategoryDocument', 'es_update', ] \ No newline at end of file diff --git a/apps/search_indexes/documents/tag_category.py b/apps/search_indexes/documents/tag_category.py new file mode 100644 index 00000000..ed69c8b7 --- /dev/null +++ b/apps/search_indexes/documents/tag_category.py @@ -0,0 +1,33 @@ +"""Product app documents.""" +from django.conf import settings +from django_elasticsearch_dsl import Document, Index, fields +from tag import models + +TagCategoryIndex = Index(settings.ELASTICSEARCH_INDEX_NAMES.get(__name__, 'tag_category')) +TagCategoryIndex.settings(number_of_shards=2, number_of_replicas=2) + + +@TagCategoryIndex.doc_type +class TagCategoryDocument(Document): + """TagCategory document.""" + + tags = fields.ListField(fields.ObjectField( + properties={ + 'id': fields.IntegerField(), + 'value': fields.KeywordField(), + }, + )) + + class Django: + model = models.TagCategory + fields = ( + 'id', + 'index_name', + 'public', + 'value_type' + ) + related_models = [models.Tag] + + + def get_queryset(self): + return super().get_queryset().with_base_related() diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index bc48b029..27df0699 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -4,6 +4,7 @@ from django_elasticsearch_dsl_drf.filter_backends import SearchFilterBackend, \ FacetedSearchFilterBackend, GeoSpatialFilteringFilterBackend from search_indexes.utils import OBJECT_FIELD_PROPERTIES from six import iteritems +from search_indexes.documents import TagCategoryDocument from tag.models import TagCategory @@ -118,9 +119,11 @@ class CustomFacetedSearchFilterBackend(FacetedSearchFilterBackend): tag_facets = [] preserve_ids = [] facet_name = '_filter_' + __field - for category in TagCategory.objects.prefetch_related('tags').filter(public=True, - value_type=TagCategory.LIST): - tags_to_remove = list(map(lambda t: str(t.id), category.tags.all())) + all_tag_categories = TagCategoryDocument.search() \ + .filter('term', public=True) \ + .filter('term', value_type=TagCategory.LIST) + for category in all_tag_categories: + tags_to_remove = list(map(lambda t: str(t.id), category.tags)) qs = queryset.__copy__() qs.query = queryset.query._clone() filterer = make_tags_filter(__facet, tags_to_remove) diff --git a/project/settings/development.py b/project/settings/development.py index f850aad7..88b88789 100644 --- a/project/settings/development.py +++ b/project/settings/development.py @@ -42,6 +42,7 @@ ELASTICSEARCH_INDEX_NAMES = { 'search_indexes.documents.news': 'development_news', 'search_indexes.documents.establishment': 'development_establishment', 'search_indexes.documents.product': 'development_product', + 'search_indexes.documents.tag_category': 'development_tag_category', } # ELASTICSEARCH_DSL_AUTOSYNC = False diff --git a/project/settings/local.py b/project/settings/local.py index 6a592a46..644098bb 100644 --- a/project/settings/local.py +++ b/project/settings/local.py @@ -92,6 +92,7 @@ ELASTICSEARCH_INDEX_NAMES = { # 'search_indexes.documents.news': 'local_news', 'search_indexes.documents.establishment': 'local_establishment', 'search_indexes.documents.product': 'local_product', + 'search_indexes.documents.tag_category': 'local_tag_category', } ELASTICSEARCH_DSL_AUTOSYNC = False diff --git a/project/settings/production.py b/project/settings/production.py index 7ef2dc62..3020c6f0 100644 --- a/project/settings/production.py +++ b/project/settings/production.py @@ -36,6 +36,7 @@ ELASTICSEARCH_INDEX_NAMES = { 'search_indexes.documents.news': 'development_news', # temporarily disabled 'search_indexes.documents.establishment': 'development_establishment', 'search_indexes.documents.product': 'development_product', + 'search_indexes.documents.tag_category': 'development_tag_category', } sentry_sdk.init( diff --git a/project/settings/stage.py b/project/settings/stage.py index 95285034..dbc6844a 100644 --- a/project/settings/stage.py +++ b/project/settings/stage.py @@ -23,6 +23,7 @@ ELASTICSEARCH_DSL = { ELASTICSEARCH_INDEX_NAMES = { # 'search_indexes.documents.news': 'stage_news', #temporarily disabled 'search_indexes.documents.establishment': 'stage_establishment', + 'search_indexes.documents.tag_category': 'stage_tag_category', } COOKIE_DOMAIN = '.id-east.ru' From f5079940148d135ba361a0dbc084a3aa31588075 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 4 Dec 2019 00:49:46 +0300 Subject: [PATCH 27/75] tags dynamic filters #5 (add wine-colors) --- apps/search_indexes/filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index 27df0699..644b47fd 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -121,7 +121,7 @@ class CustomFacetedSearchFilterBackend(FacetedSearchFilterBackend): facet_name = '_filter_' + __field all_tag_categories = TagCategoryDocument.search() \ .filter('term', public=True) \ - .filter('term', value_type=TagCategory.LIST) + .filter(Q('term', value_type=TagCategory.LIST) | Q('match', index_name='wine-color')) for category in all_tag_categories: tags_to_remove = list(map(lambda t: str(t.id), category.tags)) qs = queryset.__copy__() From 7590a73c5de31145658c6c114a8bce8ab91ad2b7 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 4 Dec 2019 09:23:21 +0300 Subject: [PATCH 28/75] tags fix mtm --- apps/tag/models.py | 2 +- apps/tag/serializers.py | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/apps/tag/models.py b/apps/tag/models.py index 12517815..b718d83c 100644 --- a/apps/tag/models.py +++ b/apps/tag/models.py @@ -47,7 +47,7 @@ class Tag(TranslatedFieldsMixin, models.Model): old_id = models.PositiveIntegerField(_('old id'), blank=True, null=True, default=None) old_id_meta_product = models.PositiveIntegerField(_('old id metadata product'), - blank=True, null=True, default=None) + blank=True, null=True, default=None) objects = TagQuerySet.as_manager() diff --git a/apps/tag/serializers.py b/apps/tag/serializers.py index 5b6f390c..eb73291f 100644 --- a/apps/tag/serializers.py +++ b/apps/tag/serializers.py @@ -2,11 +2,9 @@ from rest_framework import serializers from rest_framework.fields import SerializerMethodField -from establishment.models import (Establishment, EstablishmentType, - EstablishmentSubType) +from establishment.models import (Establishment, EstablishmentType) from news.models import News, NewsType from tag import models -from tag.models import Tag from utils.exceptions import (ObjectAlreadyAdded, BindingObjectNotFound, RemovedBindingObjectNotFound) from utils.serializers import TranslatedField @@ -79,18 +77,21 @@ class TagCategoryBaseSerializer(serializers.ModelSerializer): def get_tags(self, obj): query_params = dict(self.context['request'].query_params) + if len(query_params) > 1: - return None - - tags = Tag.objects.all() + return [] + params = {} if 'establishment_type' in query_params: - types = query_params['establishment_type'] - tags = tags.filter(establishments__establishment_type__index_name__in=types).distinct() + params = { + 'establishments__isnull': False, + } elif 'product_type' in query_params: - types = query_params['product_type'] - tags = tags.filter(products__product_type__index_name__in=types).distinct() + params = { + 'products__isnull': False, + } + tags = obj.tags.filter(**params).distinct() return TagBaseSerializer(instance=tags, many=True, read_only=True).data From 96e08a0900cd492669e3e3ab3a629b6738649731 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: Wed, 4 Dec 2019 12:24:23 +0300 Subject: [PATCH 29/75] Migrate complete --- .../management/commands/add_affilations.py | 77 +++++++++++++++++-- .../migrations/0023_auto_20191204_0916.py | 22 ++++++ apps/account/models.py | 2 + 3 files changed, 96 insertions(+), 5 deletions(-) create mode 100644 apps/account/migrations/0023_auto_20191204_0916.py diff --git a/apps/account/management/commands/add_affilations.py b/apps/account/management/commands/add_affilations.py index 550847f2..591e676d 100644 --- a/apps/account/management/commands/add_affilations.py +++ b/apps/account/management/commands/add_affilations.py @@ -1,14 +1,15 @@ -from account.models import OldRole, Role +from account.models import OldRole, Role, User, UserRole from main.models import SiteSettings from django.core.management.base import BaseCommand -from django.db import connections +from django.db import connections, transaction +from django.db.models import Prefetch from establishment.management.commands.add_position import namedtuplefetchall from tqdm import tqdm class Command(BaseCommand): help = '''Add site affilations from old db to new db. - Run after migrate {}!!!''' + Run after migrate account models!!!''' def map_role_sql(self): with connections['legacy'].cursor() as cursor: @@ -78,8 +79,74 @@ class Command(BaseCommand): Role.objects.bulk_create(objects) self.stdout.write(self.style.WARNING(f'Added site roles.')) + def update_site_role(self): + roles = Role.objects.filter(country__isnull=True).select_related('site')\ + .filter(site__id__isnull=False).select_for_update() + with transaction.atomic(): + for role in tqdm(roles, desc='Update role country'): + role.country = role.site.country + role.save() + self.stdout.write(self.style.WARNING(f'Updated site roles.')) + def user_role_sql(self): + with connections['legacy'].cursor() as cursor: + cursor.execute(''' + select t.* + from + ( + SELECT + site_id, + account_id, + COALESCE(role, 'GUEST') as role + FROM site_affiliations AS sa + ) t + join accounts a on a.id = t.account_id + where t.role not in ('admin', 'GUEST') + ''') + return namedtuplefetchall(cursor) + + def add_role_user(self): + for s in tqdm(self.user_role_sql(), desc='Add role to user'): + sites = SiteSettings.objects.filter(old_id=s.site_id) + old_role = OldRole.objects.get(old_role=s.role) + role_choice = getattr(Role, old_role.new_role) + roles = Role.objects.filter(site__in=[site for site in sites], role=role_choice) + users = User.objects.filter(old_id=s.account_id) + for user in users: + for role in roles: + user_role = UserRole.objects.get_or_create(user=user, + role=role) + self.stdout.write(self.style.WARNING(f'Added users roles.')) + + def superuser_role_sql(self): + with connections['legacy'].cursor() as cursor: + cursor.execute(''' + select t.* + from + ( + SELECT + site_id, + account_id, + COALESCE(role, 'GUEST') as role + FROM site_affiliations AS sa + ) t + join accounts a on a.id = t.account_id + where t.role in ('admin') + ''') + return namedtuplefetchall(cursor) + + def add_superuser(self): + for s in tqdm(self.superuser_role_sql(), desc='Add superuser'): + users = User.objects.filter(old_id=s.account_id).select_for_update() + with transaction.atomic(): + for user in users: + user.is_superuser = True + user.save() + self.stdout.write(self.style.WARNING(f'Added superuser.')) def handle(self, *args, **kwargs): - # self.add_old_roles() - self.add_site_role() \ No newline at end of file + self.add_old_roles() + self.add_site_role() + self.update_site_role() + self.add_role_user() + self.add_superuser() \ No newline at end of file diff --git a/apps/account/migrations/0023_auto_20191204_0916.py b/apps/account/migrations/0023_auto_20191204_0916.py new file mode 100644 index 00000000..68d313a0 --- /dev/null +++ b/apps/account/migrations/0023_auto_20191204_0916.py @@ -0,0 +1,22 @@ +# Generated by Django 2.2.7 on 2019-12-04 09:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('account', '0022_auto_20191203_1149'), + ] + + operations = [ + migrations.AlterField( + model_name='role', + name='role', + field=models.PositiveIntegerField(choices=[(1, 'Standard user'), (2, 'Comments moderator'), (3, 'Country admin'), (4, 'Content page manager'), (5, 'Establishment manager'), (6, 'Reviewer manager'), (7, 'Restaurant reviewer'), (8, 'Sales man'), (9, 'Winery reviewer'), (10, 'Seller')], verbose_name='Role'), + ), + migrations.AlterUniqueTogether( + name='userrole', + unique_together={('user', 'role')}, + ), + ] diff --git a/apps/account/models.py b/apps/account/models.py index 0a3cd3a6..3d3de56e 100644 --- a/apps/account/models.py +++ b/apps/account/models.py @@ -297,6 +297,8 @@ class UserRole(ProjectBaseMixin): role = models.ForeignKey(Role, verbose_name=_('Role'), on_delete=models.SET_NULL, null=True) establishment = models.ForeignKey(Establishment, verbose_name=_('Establishment'), on_delete=models.SET_NULL, null=True, blank=True) + class Meta: + unique_together = ['user', 'role'] class OldRole(models.Model): From 4d36fc0f0cf6b953324f9ff12181cd5c7f51d005 Mon Sep 17 00:00:00 2001 From: Dmitriy Kuzmenko Date: Wed, 4 Dec 2019 12:38:07 +0300 Subject: [PATCH 30/75] fix fabric --- fabfile.py | 2 +- make_data_migration.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fabfile.py b/fabfile.py index e8a52f85..f9896200 100644 --- a/fabfile.py +++ b/fabfile.py @@ -54,7 +54,7 @@ def collectstatic(): def deploy(branch=None): role = env.roles[0] - if env.roledefs[role]['branch'] != 'develop': + if env.roledefs[role]['branch'] == 'develop': fetch() install_requirements() migrate() diff --git a/make_data_migration.sh b/make_data_migration.sh index c92f74e7..bed1afb7 100755 --- a/make_data_migration.sh +++ b/make_data_migration.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash ./manage.py transfer -a -#./manage.py transfer -d +./manage.py transfer -d ./manage.py transfer -e ./manage.py transfer --fill_city_gallery ./manage.py transfer -l From a81f3f079ae873da6795c75a7fd49b91e3be6635 Mon Sep 17 00:00:00 2001 From: dormantman Date: Wed, 4 Dec 2019 13:37:49 +0300 Subject: [PATCH 31/75] Changed url id to slug in back-office --- apps/establishment/serializers/back.py | 6 +++- apps/establishment/serializers/common.py | 4 ++- apps/establishment/tests.py | 36 ++++++++++++------------ apps/establishment/urls/back.py | 20 ++++++------- apps/establishment/views/back.py | 25 ++++++++++------ apps/timetable/serialziers.py | 8 +++++- apps/utils/serializers.py | 4 +++ apps/utils/views.py | 6 +++- 8 files changed, 69 insertions(+), 40 deletions(-) diff --git a/apps/establishment/serializers/back.py b/apps/establishment/serializers/back.py index dd16e861..a1b6cc4a 100644 --- a/apps/establishment/serializers/back.py +++ b/apps/establishment/serializers/back.py @@ -232,9 +232,13 @@ class EstablishmentBackOfficeGallerySerializer(serializers.ModelSerializer): def validate(self, attrs): """Override validate method.""" establishment_pk = self.get_request_kwargs().get('pk') + establishment_slug = self.get_request_kwargs().get('slug') + + search_kwargs = {'pk': establishment_pk} if establishment_pk else {'slug': establishment_slug} + image_id = self.get_request_kwargs().get('image_id') - establishment_qs = models.Establishment.objects.filter(pk=establishment_pk) + establishment_qs = models.Establishment.objects.filter(**search_kwargs) image_qs = Image.objects.filter(id=image_id) if not establishment_qs.exists(): diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index 7364d02c..e8a68cc0 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -486,7 +486,9 @@ class EstablishmentCarouselCreateSerializer(CarouselCreateSerializer): """Serializer to carousel object w/ model News.""" def validate(self, attrs): - establishment = models.Establishment.objects.filter(pk=self.pk).first() + search_kwargs = {'pk': self.pk} if self.pk else {'slug': self.slug} + + establishment = models.Establishment.objects.filter(**search_kwargs).first() if not establishment: raise serializers.ValidationError({'detail': _('Object not found.')}) diff --git a/apps/establishment/tests.py b/apps/establishment/tests.py index bd96b052..6bc23ccc 100644 --- a/apps/establishment/tests.py +++ b/apps/establishment/tests.py @@ -104,18 +104,18 @@ class EstablishmentBTests(BaseTestCase): response = self.client.post('/api/back/establishments/', data=data, format='json') self.assertEqual(response.status_code, status.HTTP_201_CREATED) - response = self.client.get(f'/api/back/establishments/{self.establishment.id}/', format='json') + response = self.client.get(f'/api/back/establishments/slug/{self.establishment.slug}/', format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) update_data = { 'name': 'Test new establishment' } - response = self.client.patch(f'/api/back/establishments/{self.establishment.id}/', + response = self.client.patch(f'/api/back/establishments/slug/{self.establishment.slug}/', data=update_data) self.assertEqual(response.status_code, status.HTTP_200_OK) - response = self.client.delete(f'/api/back/establishments/{self.establishment.id}/', + response = self.client.delete(f'/api/back/establishments/slug/{self.establishment.slug}/', format='json') self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) @@ -372,22 +372,22 @@ class EstablishmentShedulerTests(ChildTestCase): 'weekday': 1 } - response = self.client.post(f'/api/back/establishments/{self.establishment.id}/schedule/', data=data) + response = self.client.post(f'/api/back/establishments/slug/{self.establishment.slug}/schedule/', data=data) self.assertEqual(response.status_code, status.HTTP_201_CREATED) schedule = response.data - response = self.client.get(f'/api/back/establishments/{self.establishment.id}/schedule/{schedule["id"]}/') + response = self.client.get(f'/api/back/establishments/slug/{self.establishment.slug}/schedule/{schedule["id"]}/') self.assertEqual(response.status_code, status.HTTP_200_OK) update_data = { 'weekday': 2 } - response = self.client.patch(f'/api/back/establishments/{self.establishment.id}/schedule/{schedule["id"]}/', + response = self.client.patch(f'/api/back/establishments/slug/{self.establishment.slug}/schedule/{schedule["id"]}/', data=update_data) self.assertEqual(response.status_code, status.HTTP_200_OK) - response = self.client.delete(f'/api/back/establishments/{self.establishment.id}/schedule/{schedule["id"]}/') + response = self.client.delete(f'/api/back/establishments/slug/{self.establishment.slug}/schedule/{schedule["id"]}/') self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) @@ -410,21 +410,21 @@ class EstablishmentWebTagTests(BaseTestCase): class EstablishmentWebSlugTests(ChildTestCase): def test_slug_Read(self): - response = self.client.get(f'/api/web/establishments/slug/{self.establishment.slug}/', format='json') + response = self.client.get(f'/api/web/establishments/{self.establishment.id}/', format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) class EstablishmentWebSimilarTests(ChildTestCase): def test_similar_Read(self): - response = self.client.get(f'/api/web/establishments/slug/{self.establishment.slug}/similar/', format='json') + response = self.client.get(f'/api/web/establishments/{self.establishment.id}/similar/', format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) class EstablishmentWebCommentsTests(ChildTestCase): def test_comments_CRUD(self): - response = self.client.get(f'/api/web/establishments/slug/{self.establishment.slug}/comments/', format='json') + response = self.client.get(f'/api/web/establishments/{self.establishment.id}/comments/', format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) data = { @@ -433,13 +433,13 @@ class EstablishmentWebCommentsTests(ChildTestCase): 'mark': 4 } - response = self.client.post(f'/api/web/establishments/slug/{self.establishment.slug}/comments/create/', + response = self.client.post(f'/api/web/establishments/{self.establishment.id}/comments/create/', data=data) comment = response.json() self.assertEqual(response.status_code, status.HTTP_201_CREATED) - response = self.client.get(f'/api/web/establishments/slug/{self.establishment.slug}/comments/{comment["id"]}/', + response = self.client.get(f'/api/web/establishments/{self.establishment.id}/comments/{comment["id"]}/', format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) @@ -448,12 +448,12 @@ class EstablishmentWebCommentsTests(ChildTestCase): } response = self.client.patch( - f'/api/web/establishments/slug/{self.establishment.slug}/comments/{comment["id"]}/', + f'/api/web/establishments/{self.establishment.id}/comments/{comment["id"]}/', data=update_data) self.assertEqual(response.status_code, status.HTTP_200_OK) response = self.client.delete( - f'/api/web/establishments/slug/{self.establishment.slug}/comments/{comment["id"]}/', + f'/api/web/establishments/{self.establishment.id}/comments/{comment["id"]}/', format='json') self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) @@ -466,13 +466,13 @@ class EstablishmentWebFavoriteTests(ChildTestCase): "object_id": self.establishment.id } - response = self.client.post(f'/api/web/establishments/slug/{self.establishment.slug}/favorites/', + response = self.client.post(f'/api/web/establishments/{self.establishment.id}/favorites/', data=data) self.assertEqual(response.status_code, status.HTTP_201_CREATED) response = self.client.delete( - f'/api/web/establishments/slug/{self.establishment.slug}/favorites/', + f'/api/web/establishments/{self.establishment.id}/favorites/', format='json') self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) @@ -484,8 +484,8 @@ class EstablishmentCarouselTests(ChildTestCase): "object_id": self.establishment.id } - response = self.client.post(f'/api/back/establishments/{self.establishment.id}/carousels/', data=data) + response = self.client.post(f'/api/back/establishments/slug/{self.establishment.slug}/carousels/', data=data) self.assertEqual(response.status_code, status.HTTP_201_CREATED) - response = self.client.delete(f'/api/back/establishments/{self.establishment.id}/carousels/') + response = self.client.delete(f'/api/back/establishments/slug/{self.establishment.slug}/carousels/') self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) diff --git a/apps/establishment/urls/back.py b/apps/establishment/urls/back.py index d9b2fbd7..ce1c7b27 100644 --- a/apps/establishment/urls/back.py +++ b/apps/establishment/urls/back.py @@ -8,25 +8,25 @@ app_name = 'establishment' urlpatterns = [ path('', views.EstablishmentListCreateView.as_view(), name='list'), - path('/', views.EstablishmentRUDView.as_view(), name='detail'), - path('/carousels/', views.EstablishmentCarouselCreateDestroyView.as_view(), + path('slug//', views.EstablishmentRUDView.as_view(), name='detail'), + path('slug//carousels/', views.EstablishmentCarouselCreateDestroyView.as_view(), name='create-destroy-carousels'), - path('/schedule//', views.EstablishmentScheduleRUDView.as_view(), + path('slug//schedule//', views.EstablishmentScheduleRUDView.as_view(), name='schedule-rud'), - path('/schedule/', views.EstablishmentScheduleCreateView.as_view(), + path('slug//schedule/', views.EstablishmentScheduleCreateView.as_view(), name='schedule-create'), - path('/gallery/', views.EstablishmentGalleryListView.as_view(), + path('slug//gallery/', views.EstablishmentGalleryListView.as_view(), name='gallery-list'), - path('/gallery//', + path('slug//gallery//', views.EstablishmentGalleryCreateDestroyView.as_view(), name='gallery-create-destroy'), - path('/companies/', views.EstablishmentCompanyListCreateView.as_view(), + path('slug//companies/', views.EstablishmentCompanyListCreateView.as_view(), name='company-list-create'), - path('/companies//', views.EstablishmentCompanyRUDView.as_view(), + path('slug//companies//', views.EstablishmentCompanyRUDView.as_view(), name='company-rud'), - path('/notes/', views.EstablishmentNoteListCreateView.as_view(), + path('slug//notes/', views.EstablishmentNoteListCreateView.as_view(), name='note-list-create'), - path('/notes//', views.EstablishmentNoteRUDView.as_view(), + path('slug//notes//', views.EstablishmentNoteRUDView.as_view(), name='note-rud'), path('menus/', views.MenuListCreateView.as_view(), name='menu-list'), path('menus//', views.MenuRUDView.as_view(), name='menu-rud'), diff --git a/apps/establishment/views/back.py b/apps/establishment/views/back.py index d3afbf2e..b92929c1 100644 --- a/apps/establishment/views/back.py +++ b/apps/establishment/views/back.py @@ -31,6 +31,7 @@ class EstablishmentListCreateView(EstablishmentMixinViews, generics.ListCreateAP class EstablishmentRUDView(generics.RetrieveUpdateDestroyAPIView): + lookup_field = 'slug' queryset = models.Establishment.objects.all() serializer_class = serializers.EstablishmentRUDSerializer permission_classes = [IsCountryAdmin | IsEstablishmentManager] @@ -38,6 +39,7 @@ class EstablishmentRUDView(generics.RetrieveUpdateDestroyAPIView): class EstablishmentScheduleRUDView(generics.RetrieveUpdateDestroyAPIView): """Establishment schedule RUD view""" + lookup_field = 'slug' serializer_class = ScheduleRUDSerializer permission_classes = [IsEstablishmentManager] @@ -45,11 +47,11 @@ class EstablishmentScheduleRUDView(generics.RetrieveUpdateDestroyAPIView): """ Returns the object the view is displaying. """ - establishment_pk = self.kwargs['pk'] + establishment_slug = self.kwargs['slug'] schedule_id = self.kwargs['schedule_id'] establishment = get_object_or_404(klass=models.Establishment.objects.all(), - pk=establishment_pk) + slug=establishment_slug) schedule = get_object_or_404(klass=establishment.schedule, id=schedule_id) @@ -62,6 +64,7 @@ class EstablishmentScheduleRUDView(generics.RetrieveUpdateDestroyAPIView): class EstablishmentScheduleCreateView(generics.CreateAPIView): """Establishment schedule Create view""" + lookup_field = 'slug' serializer_class = ScheduleCreateSerializer queryset = Timetable.objects.all() permission_classes = [IsEstablishmentManager] @@ -210,6 +213,7 @@ class EstablishmentSubtypeRUDView(generics.RetrieveUpdateDestroyAPIView): class EstablishmentGalleryCreateDestroyView(EstablishmentMixinViews, CreateDestroyGalleryViewMixin): """Resource for a create|destroy gallery for establishment for back-office users.""" + lookup_field = 'slug' serializer_class = serializers.EstablishmentBackOfficeGallerySerializer def get_object(self): @@ -218,7 +222,7 @@ class EstablishmentGalleryCreateDestroyView(EstablishmentMixinViews, """ establishment_qs = self.filter_queryset(self.get_queryset()) - establishment = get_object_or_404(establishment_qs, pk=self.kwargs.get('pk')) + establishment = get_object_or_404(establishment_qs, slug=self.kwargs.get('slug')) gallery = get_object_or_404(establishment.establishment_gallery, image_id=self.kwargs.get('image_id')) @@ -231,12 +235,13 @@ class EstablishmentGalleryCreateDestroyView(EstablishmentMixinViews, class EstablishmentGalleryListView(EstablishmentMixinViews, generics.ListAPIView): """Resource for returning gallery for establishment for back-office users.""" + lookup_field = 'slug' serializer_class = serializers.ImageBaseSerializer def get_object(self): """Override get_object method.""" qs = super(EstablishmentGalleryListView, self).get_queryset() - establishment = get_object_or_404(qs, pk=self.kwargs.get('pk')) + establishment = get_object_or_404(qs, slug=self.kwargs.get('slug')) # May raise a permission denied self.check_object_permissions(self.request, establishment) @@ -252,6 +257,7 @@ class EstablishmentCompanyListCreateView(EstablishmentMixinViews, generics.ListCreateAPIView): """List|Create establishment company view.""" + lookup_field = 'slug' serializer_class = serializers.EstablishmentCompanyListCreateSerializer def get_object(self): @@ -259,7 +265,7 @@ class EstablishmentCompanyListCreateView(EstablishmentMixinViews, establishment_qs = models.Establishment.objects.all() filtered_ad_qs = self.filter_queryset(establishment_qs) - establishment = get_object_or_404(filtered_ad_qs, pk=self.kwargs.get('pk')) + establishment = get_object_or_404(filtered_ad_qs, slug=self.kwargs.get('slug')) # May raise a permission denied self.check_object_permissions(self.request, establishment) @@ -275,6 +281,7 @@ class EstablishmentCompanyRUDView(EstablishmentMixinViews, generics.RetrieveUpdateDestroyAPIView): """Create|Retrieve|Update|Destroy establishment company view.""" + lookup_field = 'slug' serializer_class = serializers.CompanyBaseSerializer def get_object(self): @@ -282,7 +289,7 @@ class EstablishmentCompanyRUDView(EstablishmentMixinViews, establishment_qs = models.Establishment.objects.all() filtered_ad_qs = self.filter_queryset(establishment_qs) - establishment = get_object_or_404(filtered_ad_qs, pk=self.kwargs.get('pk')) + establishment = get_object_or_404(filtered_ad_qs, slug=self.kwargs.get('slug')) company = get_object_or_404(establishment.companies.all(), pk=self.kwargs.get('company_pk')) # May raise a permission denied @@ -295,6 +302,7 @@ class EstablishmentNoteListCreateView(EstablishmentMixinViews, generics.ListCreateAPIView): """Retrieve|Update|Destroy establishment note view.""" + lookup_field = 'slug' serializer_class = serializers.EstablishmentNoteListCreateSerializer def get_object(self): @@ -302,7 +310,7 @@ class EstablishmentNoteListCreateView(EstablishmentMixinViews, establishment_qs = models.Establishment.objects.all() filtered_establishment_qs = self.filter_queryset(establishment_qs) - establishment = get_object_or_404(filtered_establishment_qs, pk=self.kwargs.get('pk')) + establishment = get_object_or_404(filtered_establishment_qs, slug=self.kwargs.get('slug')) # May raise a permission denied self.check_object_permissions(self.request, establishment) @@ -318,6 +326,7 @@ class EstablishmentNoteRUDView(EstablishmentMixinViews, generics.RetrieveUpdateDestroyAPIView): """Create|Retrieve|Update|Destroy establishment note view.""" + lookup_field = 'slug' serializer_class = serializers.EstablishmentNoteBaseSerializer def get_object(self): @@ -325,7 +334,7 @@ class EstablishmentNoteRUDView(EstablishmentMixinViews, establishment_qs = models.Establishment.objects.all() filtered_establishment_qs = self.filter_queryset(establishment_qs) - establishment = get_object_or_404(filtered_establishment_qs, pk=self.kwargs.get('pk')) + establishment = get_object_or_404(filtered_establishment_qs, slug=self.kwargs.get('slug')) note = get_object_or_404(establishment.notes.all(), pk=self.kwargs['note_pk']) # May raise a permission denied diff --git a/apps/timetable/serialziers.py b/apps/timetable/serialziers.py index 48c8374d..305be0ec 100644 --- a/apps/timetable/serialziers.py +++ b/apps/timetable/serialziers.py @@ -45,8 +45,14 @@ class ScheduleRUDSerializer(serializers.ModelSerializer): .parser_context.get('view')\ .kwargs.get('pk') + establishment_slug = self.context.get('request')\ + .parser_context.get('view')\ + .kwargs.get('slug') + + search_kwargs = {'pk': establishment_pk} if establishment_pk else {'slug': establishment_slug} + # Check if establishment exists. - establishment_qs = Establishment.objects.filter(pk=establishment_pk) + establishment_qs = Establishment.objects.filter(**search_kwargs) if not establishment_qs.exists(): raise serializers.ValidationError({'detail': _('Establishment not found.')}) attrs['establishment'] = establishment_qs.first() diff --git a/apps/utils/serializers.py b/apps/utils/serializers.py index f55b69bc..15a58f7b 100644 --- a/apps/utils/serializers.py +++ b/apps/utils/serializers.py @@ -118,6 +118,10 @@ class CarouselCreateSerializer(serializers.ModelSerializer): def pk(self): return self.request.parser_context.get('kwargs').get('pk') + @property + def slug(self): + return self.request.parser_context.get('kwargs').get('slug') + class RecursiveFieldSerializer(serializers.Serializer): def to_representation(self, value): diff --git a/apps/utils/views.py b/apps/utils/views.py index 478a3cb2..db10dbfd 100644 --- a/apps/utils/views.py +++ b/apps/utils/views.py @@ -158,7 +158,11 @@ class CarouselCreateDestroyMixinView(BaseCreateDestroyMixinView): lookup_field = 'id' def get_base_object(self): - return get_object_or_404(self._model, id=self.kwargs['pk']) + search_kwargs = { + 'id': self.kwargs.get('pk'), + 'slug': self.kwargs.get('slug'), + } + return get_object_or_404(self._model, **search_kwargs) def get_object(self): """ From c5992afec0e096b7f477d574652aeba74b29cfe0 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 4 Dec 2019 13:50:55 +0300 Subject: [PATCH 32/75] add opening_at to schedule search results --- apps/search_indexes/serializers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/search_indexes/serializers.py b/apps/search_indexes/serializers.py index 67a2bff0..7bd3995a 100644 --- a/apps/search_indexes/serializers.py +++ b/apps/search_indexes/serializers.py @@ -168,6 +168,7 @@ class ScheduleDocumentSerializer(serializers.Serializer): weekday = serializers.IntegerField() weekday_display = serializers.CharField() closed_at = serializers.CharField() + opening_at = serializers.CharField() class InFavoritesMixin(DocumentSerializer): From 552e08e24249de183d24a966a5d4adeed96d28b9 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 4 Dec 2019 13:52:39 +0300 Subject: [PATCH 33/75] opening_at for establishment --- apps/search_indexes/documents/establishment.py | 1 + apps/timetable/models.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/apps/search_indexes/documents/establishment.py b/apps/search_indexes/documents/establishment.py index 9e1d0a82..aca81f3f 100644 --- a/apps/search_indexes/documents/establishment.py +++ b/apps/search_indexes/documents/establishment.py @@ -116,6 +116,7 @@ class EstablishmentDocument(Document): 'weekday': fields.IntegerField(attr='weekday'), 'weekday_display': fields.KeywordField(attr='get_weekday_display'), 'closed_at': fields.KeywordField(attr='closed_at_str'), + 'opening_at': fields.KeywordField(attr='opening_at_str'), } )) address = fields.ObjectField( diff --git a/apps/timetable/models.py b/apps/timetable/models.py index cf7f8d94..90a6ae38 100644 --- a/apps/timetable/models.py +++ b/apps/timetable/models.py @@ -39,6 +39,10 @@ class Timetable(ProjectBaseMixin): def closed_at_str(self): return str(self.closed_at) if self.closed_at else None + @property + def opening_at_str(self): + return str(self.opening_at) if self.opening_at else None + @property def opening_time(self): return self.opening_at or self.lunch_start or self.dinner_start From 627f7562ec2fcdacc84013139d7ee594d68f45b8 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Wed, 4 Dec 2019 14:21:54 +0300 Subject: [PATCH 34/75] finalizing transfer guides --- apps/collection/admin.py | 21 ++ ...ntsectioncategory_guidewinecolorsection.py | 56 ++++ .../migrations/0021_guideelementtype.py | 24 ++ .../migrations/0022_guideelement.py | 48 +++ .../collection/migrations/0023_advertorial.py | 31 ++ apps/collection/models.py | 126 +++++++- apps/collection/transfer_data.py | 286 +++++++++++++++++- apps/transfer/management/commands/transfer.py | 6 + apps/transfer/mixins.py | 6 - apps/transfer/models.py | 4 +- apps/transfer/serializers/guide.py | 28 +- project/settings/base.py | 1 + requirements/base.txt | 3 + 13 files changed, 615 insertions(+), 25 deletions(-) create mode 100644 apps/collection/migrations/0020_guideelementsection_guideelementsectioncategory_guidewinecolorsection.py create mode 100644 apps/collection/migrations/0021_guideelementtype.py create mode 100644 apps/collection/migrations/0022_guideelement.py create mode 100644 apps/collection/migrations/0023_advertorial.py diff --git a/apps/collection/admin.py b/apps/collection/admin.py index 2e2c22e2..1b876e91 100644 --- a/apps/collection/admin.py +++ b/apps/collection/admin.py @@ -1,4 +1,6 @@ from django.contrib.gis import admin +from mptt.admin import DraggableMPTTAdmin, TreeRelatedFieldListFilter +from utils.admin import BaseModelAdminMixin from collection import models @@ -11,3 +13,22 @@ class CollectionAdmin(admin.ModelAdmin): @admin.register(models.Guide) class GuideAdmin(admin.ModelAdmin): """Guide admin.""" + + +@admin.register(models.GuideElementType) +class GuideElementType(admin.ModelAdmin): + """Guide element admin.""" + + +@admin.register(models.GuideElement) +class GuideElementAdmin(DraggableMPTTAdmin, BaseModelAdminMixin, admin.ModelAdmin): + """Guide element admin.""" + raw_id_fields = [ + 'guide_element_type', 'establishment', 'review', + 'wine_region', 'product', 'city', + 'wine_color_section', 'section', 'guide', + 'parent', + ] + # list_filter = ( + # ('parent', TreeRelatedFieldListFilter), + # ) diff --git a/apps/collection/migrations/0020_guideelementsection_guideelementsectioncategory_guidewinecolorsection.py b/apps/collection/migrations/0020_guideelementsection_guideelementsectioncategory_guidewinecolorsection.py new file mode 100644 index 00000000..06aaddfb --- /dev/null +++ b/apps/collection/migrations/0020_guideelementsection_guideelementsectioncategory_guidewinecolorsection.py @@ -0,0 +1,56 @@ +# Generated by Django 2.2.7 on 2019-12-02 14:05 + +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('collection', '0019_advertorial_guidefilter'), + ] + + operations = [ + migrations.CreateModel( + name='GuideElementSectionCategory', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateTimeField(default=django.utils.timezone.now, editable=False, verbose_name='Date created')), + ('modified', models.DateTimeField(auto_now=True, verbose_name='Date updated')), + ('name', models.CharField(max_length=255, verbose_name='category name')), + ], + options={ + 'verbose_name': 'guide element section category', + 'verbose_name_plural': 'guide element section categories', + }, + ), + migrations.CreateModel( + name='GuideWineColorSection', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateTimeField(default=django.utils.timezone.now, editable=False, verbose_name='Date created')), + ('modified', models.DateTimeField(auto_now=True, verbose_name='Date updated')), + ('name', models.CharField(max_length=255, verbose_name='section name')), + ], + options={ + 'verbose_name': 'guide wine color section', + 'verbose_name_plural': 'guide wine color sections', + }, + ), + migrations.CreateModel( + name='GuideElementSection', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateTimeField(default=django.utils.timezone.now, editable=False, verbose_name='Date created')), + ('modified', models.DateTimeField(auto_now=True, verbose_name='Date updated')), + ('name', models.CharField(max_length=255, verbose_name='section name')), + ('old_id', models.PositiveIntegerField(blank=True, default=None, null=True, verbose_name='old id')), + ('category', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='collection.GuideElementSectionCategory', verbose_name='category')), + ], + options={ + 'verbose_name': 'guide element section', + 'verbose_name_plural': 'guide element sections', + }, + ), + ] diff --git a/apps/collection/migrations/0021_guideelementtype.py b/apps/collection/migrations/0021_guideelementtype.py new file mode 100644 index 00000000..7a199051 --- /dev/null +++ b/apps/collection/migrations/0021_guideelementtype.py @@ -0,0 +1,24 @@ +# Generated by Django 2.2.7 on 2019-12-02 14:35 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('collection', '0020_guideelementsection_guideelementsectioncategory_guidewinecolorsection'), + ] + + operations = [ + migrations.CreateModel( + name='GuideElementType', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=50, verbose_name='name')), + ], + options={ + 'verbose_name': 'guide element type', + 'verbose_name_plural': 'guide element types', + }, + ), + ] diff --git a/apps/collection/migrations/0022_guideelement.py b/apps/collection/migrations/0022_guideelement.py new file mode 100644 index 00000000..77c2220c --- /dev/null +++ b/apps/collection/migrations/0022_guideelement.py @@ -0,0 +1,48 @@ +# Generated by Django 2.2.7 on 2019-12-02 14:44 + +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone +import mptt.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('review', '0018_auto_20191117_1117'), + ('product', '0018_purchasedproduct'), + ('location', '0030_auto_20191120_1010'), + ('establishment', '0067_auto_20191122_1244'), + ('collection', '0021_guideelementtype'), + ] + + operations = [ + migrations.CreateModel( + name='GuideElement', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateTimeField(default=django.utils.timezone.now, editable=False, verbose_name='Date created')), + ('modified', models.DateTimeField(auto_now=True, verbose_name='Date updated')), + ('priority', models.IntegerField(blank=True, default=None, null=True)), + ('old_id', models.PositiveIntegerField(blank=True, default=None, null=True, verbose_name='old id')), + ('lft', models.PositiveIntegerField(db_index=True, editable=False)), + ('rght', models.PositiveIntegerField(db_index=True, editable=False)), + ('tree_id', models.PositiveIntegerField(db_index=True, editable=False)), + ('level', models.PositiveIntegerField(db_index=True, editable=False)), + ('city', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='location.City')), + ('establishment', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='establishment.Establishment')), + ('guide', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='collection.Guide')), + ('guide_element_type', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='collection.GuideElementType', verbose_name='guide element type')), + ('parent', mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='collection.GuideElement')), + ('product', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='product.Product')), + ('review', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='review.Review')), + ('section', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='collection.GuideElementSection')), + ('wine_color_section', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='collection.GuideWineColorSection')), + ('wine_region', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='location.WineRegion')), + ], + options={ + 'verbose_name': 'guide element', + 'verbose_name_plural': 'guide elements', + }, + ), + ] diff --git a/apps/collection/migrations/0023_advertorial.py b/apps/collection/migrations/0023_advertorial.py new file mode 100644 index 00000000..4917729f --- /dev/null +++ b/apps/collection/migrations/0023_advertorial.py @@ -0,0 +1,31 @@ +# Generated by Django 2.2.7 on 2019-12-03 13:20 + +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('collection', '0022_guideelement'), + ] + + operations = [ + migrations.CreateModel( + name='Advertorial', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateTimeField(default=django.utils.timezone.now, editable=False, verbose_name='Date created')), + ('modified', models.DateTimeField(auto_now=True, verbose_name='Date updated')), + ('number_of_pages', models.PositiveIntegerField(help_text='the total number of reserved pages', verbose_name='number of pages')), + ('right_pages', models.PositiveIntegerField(help_text='the number of right pages (which are part of total number).', verbose_name='number of right pages')), + ('old_id', models.IntegerField(blank=True, null=True)), + ('guide_element', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='advertorial', to='collection.GuideElement', verbose_name='guide element')), + ], + options={ + 'verbose_name': 'advertorial', + 'verbose_name_plural': 'advertorials', + }, + ), + ] diff --git a/apps/collection/models.py b/apps/collection/models.py index 7d037a85..58ca9f07 100644 --- a/apps/collection/models.py +++ b/apps/collection/models.py @@ -1,8 +1,9 @@ +import re +from mptt.models import MPTTModel, TreeForeignKey from django.contrib.contenttypes.fields import ContentType from django.contrib.postgres.fields import JSONField from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models -import re from django.utils.translation import gettext_lazy as _ from utils.models import ProjectBaseMixin, URLImageMixin @@ -170,6 +171,9 @@ class Advertorial(ProjectBaseMixin): right_pages = models.PositiveIntegerField( verbose_name=_('number of right pages'), help_text=_('the number of right pages (which are part of total number).')) + guide_element = models.OneToOneField('GuideElement', on_delete=models.CASCADE, + related_name='advertorial', + verbose_name=_('guide element')) old_id = models.IntegerField(blank=True, null=True) objects = AdvertorialQuerySet.as_manager() @@ -220,3 +224,123 @@ class GuideFilter(ProjectBaseMixin): """Meta class.""" verbose_name = _('guide filter') verbose_name_plural = _('guide filters') + + +class GuideElementType(models.Model): + """Model for type of guide elements.""" + + name = models.CharField(max_length=50, + verbose_name=_('name')) + + class Meta: + """Meta class.""" + verbose_name = _('guide element type') + verbose_name_plural = _('guide element types') + + def __str__(self): + """Overridden str dunder.""" + return self.name + + +class GuideWineColorSectionQuerySet(models.QuerySet): + """QuerySet for model GuideWineColorSection.""" + + +class GuideWineColorSection(ProjectBaseMixin): + """Sections for wine colors.""" + + name = models.CharField(max_length=255, verbose_name=_('section name')) + + objects = GuideWineColorSectionQuerySet.as_manager() + + class Meta: + """Meta class.""" + verbose_name = _('guide wine color section') + verbose_name_plural = _('guide wine color sections') + + +class GuideElementSectionCategoryQuerySet(models.QuerySet): + """QuerySet for model GuideElementSectionCategory.""" + + +class GuideElementSectionCategory(ProjectBaseMixin): + """Section category for guide element.""" + + name = models.CharField(max_length=255, + verbose_name=_('category name')) + + objects = GuideElementSectionCategoryQuerySet.as_manager() + + class Meta: + """Meta class.""" + verbose_name = _('guide element section category') + verbose_name_plural = _('guide element section categories') + + +class GuideElementSectionQuerySet(models.QuerySet): + """QuerySet for model GuideElementSection.""" + + +class GuideElementSection(ProjectBaseMixin): + """Sections for guide element.""" + + name = models.CharField(max_length=255, verbose_name=_('section name')) + category = models.ForeignKey(GuideElementSectionCategory, on_delete=models.PROTECT, + verbose_name=_('category')) + old_id = models.PositiveIntegerField(blank=True, null=True, default=None, + verbose_name=_('old id')) + + objects = GuideElementSectionQuerySet.as_manager() + + class Meta: + """Meta class.""" + verbose_name = _('guide element section') + verbose_name_plural = _('guide element sections') + + +class GuideElementQuerySet(models.QuerySet): + """QuerySet for model Guide elements.""" + + +class GuideElement(ProjectBaseMixin, MPTTModel): + """Frozen state of elements of guide instance.""" + + guide_element_type = models.ForeignKey('GuideElementType', on_delete=models.SET_NULL, + null=True, + verbose_name=_('guide element type')) + establishment = models.ForeignKey('establishment.Establishment', on_delete=models.SET_NULL, + null=True, blank=True, default=None) + review = models.ForeignKey('review.Review', on_delete=models.SET_NULL, + null=True, blank=True, default=None) + wine_region = models.ForeignKey('location.WineRegion', on_delete=models.SET_NULL, + null=True, blank=True, default=None) + product = models.ForeignKey('product.Product', on_delete=models.SET_NULL, + null=True, blank=True, default=None) + priority = models.IntegerField(null=True, blank=True, default=None) + city = models.ForeignKey('location.City', on_delete=models.SET_NULL, + null=True, blank=True, default=None) + wine_color_section = models.ForeignKey('GuideWineColorSection', on_delete=models.SET_NULL, + null=True, blank=True, default=None) + section = models.ForeignKey('GuideElementSection', on_delete=models.SET_NULL, + null=True, blank=True, default=None) + guide = models.ForeignKey('Guide', on_delete=models.SET_NULL, + null=True, blank=True, default=None) + parent = TreeForeignKey('self', on_delete=models.CASCADE, + null=True, blank=True, + related_name='children') + old_id = models.PositiveIntegerField(blank=True, null=True, default=None, + verbose_name=_('old id')) + + objects = GuideElementQuerySet.as_manager() + + class Meta: + """Meta class.""" + verbose_name = _('guide element') + verbose_name_plural = _('guide elements') + + class MPTTMeta: + order_insertion_by = ['guide_element_type'] + + def __str__(self): + """Overridden dunder method.""" + return self.guide_element_type.name if self.guide_element_type else self.id diff --git a/apps/collection/transfer_data.py b/apps/collection/transfer_data.py index 9eeec541..5d705b53 100644 --- a/apps/collection/transfer_data.py +++ b/apps/collection/transfer_data.py @@ -1,6 +1,15 @@ from pprint import pprint -from transfer.models import Guides, GuideFilters +from tqdm import tqdm +from establishment.models import Establishment +from review.models import Review +from location.models import WineRegion, City +from product.models import Product +from transfer.models import Guides, GuideFilters, GuideSections, GuideElements, \ + GuideAds from transfer.serializers.guide import GuideSerializer, GuideFilterSerializer +from collection.models import GuideElementSection, GuideElementSectionCategory, \ + GuideWineColorSection, GuideElementType, GuideElement, \ + Guide, Advertorial def transfer_guide(): @@ -14,14 +23,15 @@ def transfer_guide(): serialized_data.save() else: for d in serialized_data.errors: errors.append(d) if d else None - pprint(f"transfer_guide errors: {errors}") + pprint(f"ERRORS: {errors}") + print(f'COUNT OF SERIALIZED OBJECTS: {queryset.values().count()}') def transfer_guide_filter(): """Transfer GuideFilter model.""" errors = [] queryset = GuideFilters.objects.exclude(guide__title__icontains='test') \ - .exclude(guide__id__isnull=True) + .exclude(guide__isnull=True) serialized_data = GuideFilterSerializer( data=list(queryset.values()), many=True) @@ -29,8 +39,250 @@ def transfer_guide_filter(): serialized_data.save() else: for d in serialized_data.errors: errors.append(d) if d else None - pprint(f"transfer_guide_filter errors: {errors}\n" - f"COUNT: {len(errors)}") + pprint(f'ERRORS: {errors}') + print(f"COUNT: {len(errors)}") + print(f'COUNT OF SERIALIZED OBJECTS: {queryset.values().count()}') + + +def transfer_guide_element_section(): + """Transfer GuideSections model.""" + created_count = 0 + category, _ = GuideElementSectionCategory.objects.get_or_create( + name='shop_category') + queryset_values = GuideSections.objects.values_list('id', 'value_name') + for old_id, section_name in tqdm(queryset_values): + obj, created = GuideElementSection.objects.get_or_create( + name=section_name, + category=category, + old_id=old_id, + ) + if created: created_count += 1 + print(f'OBJECTS CREATED: {created_count}') + + +def transfer_guide_wine_color_section(): + """Transfer GuideElements model (only wine color sections).""" + created_count = 0 + queryset_values = GuideElements.objects.raw( + """ + select distinct(color), + 1 as id + from guide_elements where color is not null; + """ + ) + for section_name in tqdm([i.color for i in queryset_values]): + obj, created = GuideWineColorSection.objects.get_or_create( + name=section_name + ) + if created: created_count += 1 + print(f'OBJECTS CREATED: {created_count}') + + +def transfer_guide_element_type(): + """Transfer GuideElements model (only element types).""" + created_count = 0 + queryset_values = GuideElements.objects.raw( + """ + select distinct(type), + 1 as id + from guide_elements; + """ + ) + for element_type in tqdm([i.type for i in queryset_values]): + obj, created = GuideElementType.objects.get_or_create( + name=element_type + ) + if created: created_count += 1 + print(f'OBJECTS CREATED: {created_count}') + + +def transfer_guide_elements_bulk(): + """Transfer Guide elements via bulk_create.""" + def get_guide_element_type(guide_element_type: str): + if guide_element_type: + qs = GuideElementType.objects.filter(name__iexact=guide_element_type) + if qs.exists(): + return qs.first() + + def get_establishment(old_id: int): + if old_id: + qs = Establishment.objects.filter(old_id=old_id) + if qs.exists(): + return qs.first() + + def get_review(old_id: int): + if old_id: + qs = Review.objects.filter(old_id=old_id) + if qs.exists(): + return qs.first() + + def get_wine_region(old_id: int): + if old_id: + qs = WineRegion.objects.filter(old_id=old_id) + if qs.exists(): + return qs.first() + + def get_wine(old_id: int): + if old_id: + qs = Product.objects.filter(old_id=old_id) + if qs.exists(): + return qs.first() + + def get_wine_color_section(color_section: str): + if color_section: + qs = GuideWineColorSection.objects.filter(name__iexact=color_section) + if qs.exists(): + return qs.first() + + def get_city(old_id: int): + if old_id: + qs = City.objects.filter(old_id=old_id) + if qs.exists(): + return qs.first() + + def get_guide_element_section(old_id: int): + if old_id: + qs = GuideElementSection.objects.filter(old_id=old_id) + if qs.exists(): + return qs.first() + + def get_guide(old_id): + if old_id: + qs = Guide.objects.filter(old_id=old_id) + if qs.exists(): + return qs.first() + + def get_parent(old_id): + if old_id: + qs = GuideElement.objects.filter(old_id=old_id) + if qs.exists(): + return qs.first() + + objects_to_update = [] + base_queryset = GuideElements.objects.all() + + for old_id, type, establishment_id, review_id, wine_region_id, \ + wine_id, color, order_number, city_id, section_id, guide_id \ + in tqdm(base_queryset.filter(parent_id__isnull=True) + .values_list('id', 'type', 'establishment_id', + 'review_id', 'wine_region_id', 'wine_id', + 'color', 'order_number', 'city_id', + 'section_id', 'guide_id'), + desc='Check parent guide elements'): + if not GuideElement.objects.filter(old_id=old_id).exists(): + guide = GuideElement( + old_id=old_id, + guide_element_type=get_guide_element_type(type), + establishment=get_establishment(establishment_id), + review=get_review(review_id), + wine_region=get_wine_region(wine_region_id), + product=get_wine(wine_id), + wine_color_section=get_wine_color_section(color), + priority=order_number, + city=get_city(city_id), + section=get_guide_element_section(section_id), + parent=None, + lft=1, + rght=1, + tree_id=1, + level=1, + ) + # check old guide + if not guide_id: + objects_to_update.append(guide) + else: + old_guide = Guides.objects.exclude(title__icontains='test') \ + .filter(id=guide_id) + if old_guide.exists(): + guide.guide = get_guide(guide_id) + objects_to_update.append(guide) + + # create parents + GuideElement.objects.bulk_create(objects_to_update) + pprint(f'CREATED PARENT GUIDE ELEMENTS W/ OLD_ID: {[i.old_id for i in objects_to_update]}') + print(f'COUNT OF CREATED OBJECTS: {len(objects_to_update)}') + + # attach child guide elements + queryset_values = base_queryset.filter(parent_id__isnull=False) \ + .order_by('-parent_id') \ + .values_list('id', 'type', 'establishment_id', + 'review_id', 'wine_region_id', 'wine_id', + 'color', 'order_number', 'city_id', + 'section_id', 'guide_id', 'parent_id') + for old_id, type, establishment_id, review_id, wine_region_id, \ + wine_id, color, order_number, city_id, section_id, guide_id, parent_id \ + in tqdm(sorted(queryset_values, key=lambda value: value[len(value)-1]), + desc='Check child guide elements'): + if not GuideElement.objects.filter(old_id=old_id).exists(): + # check old guide + if guide_id: + old_guide = Guides.objects.exclude(title__icontains='test') \ + .filter(id=guide_id) + if old_guide.exists(): + GuideElement.objects.create( + old_id=old_id, + guide_element_type=get_guide_element_type(type), + establishment=get_establishment(establishment_id), + review=get_review(review_id), + wine_region=get_wine_region(wine_region_id), + product=get_wine(wine_id), + wine_color_section=get_wine_color_section(color), + priority=order_number, + city=get_city(city_id), + section=get_guide_element_section(section_id), + parent=get_parent(parent_id), + lft=1, + rght=1, + tree_id=1, + level=1, + guide=get_guide(guide_id), + ) + + pprint(f'CREATED CHILD GUIDE ELEMENTS W/ OLD_ID: {[i.old_id for i in objects_to_update]}') + print(f'COUNT OF CREATED OBJECTS: {len(objects_to_update)}') + + # rebuild trees + GuideElement._tree_manager.rebuild() + + +def transfer_guide_element_advertorials(): + """Transfer Guide Advertorials model.""" + def get_guide_element(old_id: int): + if old_id: + qs = GuideElement.objects.filter(old_id=old_id) + legacy_qs = GuideElements.objects.exclude(guide__isnull=True) \ + .exclude(guide__title__icontains='test') \ + .filter(id=guide_ad_node_id) + if qs.exists() and legacy_qs.exists(): + return qs.first() + elif legacy_qs.exists() and not qs.exists(): + raise ValueError(f'Guide element was not transfer correctly - {old_id}.') + + objects_to_update = [] + advertorials = GuideAds.objects.exclude(nb_pages__isnull=True) \ + .exclude(nb_right_pages__isnull=True) \ + .exclude(guide_ad_node_id__isnull=True) \ + .values_list('id', 'nb_pages', 'nb_right_pages', + 'guide_ad_node_id') + for old_id, nb_pages, nb_right_pages, guide_ad_node_id in tqdm(advertorials): + # check guide element + guide_element = get_guide_element(guide_ad_node_id) + + if not Advertorial.objects.filter(old_id=old_id).exists() and guide_element: + objects_to_update.append( + Advertorial( + old_id=old_id, + number_of_pages=nb_pages, + right_pages=nb_right_pages, + guide_element=guide_element, + ) + ) + + # create related child + Advertorial.objects.bulk_create(objects_to_update) + + pprint(f'CREATED ADVERTORIALS W/ OLD_ID: {[i.old_id for i in objects_to_update]}') + print(f'COUNT OF CREATED OBJECTS: {len(objects_to_update)}') data_types = { @@ -39,5 +291,29 @@ data_types = { ], 'guide_filters': [ transfer_guide_filter, + ], + 'guide_element_sections': [ + transfer_guide_element_section, + ], + 'guide_wine_color_sections': [ + transfer_guide_wine_color_section, + ], + 'guide_element_types': [ + transfer_guide_element_type, + ], + 'guide_elements_bulk': [ + transfer_guide_elements_bulk, + ], + 'guide_element_advertorials': [ + transfer_guide_element_advertorials + ], + 'guide_complete': [ + transfer_guide, # transfer guides from Guides + transfer_guide_filter, # transfer guide filters from GuideFilters + transfer_guide_element_section, # partial transfer element section from GuideSections + transfer_guide_wine_color_section, # partial transfer wine color section from GuideSections + transfer_guide_element_type, # partial transfer section types from GuideElements + transfer_guide_elements_bulk, # transfer result of GuideFilters from GuideElements + transfer_guide_element_advertorials, # transfer advertorials that linked to GuideElements ] } diff --git a/apps/transfer/management/commands/transfer.py b/apps/transfer/management/commands/transfer.py index 3b562b0d..d59bacfc 100644 --- a/apps/transfer/management/commands/transfer.py +++ b/apps/transfer/management/commands/transfer.py @@ -43,6 +43,12 @@ class Command(BaseCommand): 'fill_city_gallery', # №3 - перенос галереи городов 'guides', 'guide_filters', + 'guide_element_sections', + 'guide_wine_color_sections', + 'guide_element_types', + 'guide_elements_bulk', + 'guide_element_advertorials', + 'guide_complete', ] def handle(self, *args, **options): diff --git a/apps/transfer/mixins.py b/apps/transfer/mixins.py index 30537a14..7b43b210 100644 --- a/apps/transfer/mixins.py +++ b/apps/transfer/mixins.py @@ -39,12 +39,6 @@ class TransferSerializerMixin(serializers.ModelSerializer): qs = self.Meta.model.objects.filter(**validated_data) if not qs.exists(): return super().create(validated_data) - # try: - # qs = self.Meta.model.objects.filter(**validated_data) - # if not qs.exists(): - # return super().create(validated_data) - # except Exception: - # breakpoint() @property def tag_category(self): diff --git a/apps/transfer/models.py b/apps/transfer/models.py index fa3d898b..2ebcfb65 100644 --- a/apps/transfer/models.py +++ b/apps/transfer/models.py @@ -389,7 +389,7 @@ class GuideSections(MigrateMixin): class Meta: managed = False - db_table = 'guide_elements' + db_table = 'guide_sections' class GuideElements(MigrateMixin): @@ -406,7 +406,7 @@ class GuideElements(MigrateMixin): guide_ad = models.ForeignKey(GuideAds, models.DO_NOTHING, blank=True, null=True) city = models.ForeignKey(Cities, models.DO_NOTHING, blank=True, null=True) section = models.ForeignKey('GuideSections', models.DO_NOTHING, blank=True, null=True) - guide_id = models.IntegerField(blank=True, null=True) + guide = models.ForeignKey('Guides', models.DO_NOTHING, blank=True, null=True) parent = models.ForeignKey('self', models.DO_NOTHING, blank=True, null=True) lft = models.IntegerField() rgt = models.IntegerField() diff --git a/apps/transfer/serializers/guide.py b/apps/transfer/serializers/guide.py index c49e34b2..f0cddd02 100644 --- a/apps/transfer/serializers/guide.py +++ b/apps/transfer/serializers/guide.py @@ -1,16 +1,17 @@ from itertools import chain -from django.utils.text import slugify + import yaml +from django.utils.text import slugify from pycountry import countries, subdivisions from rest_framework import serializers -from collection.models import Guide, GuideType, GuideFilter +from collection import models from establishment.models import EstablishmentType from location.models import Country, Region, WineRegion from main.models import SiteSettings +from review.models import Review from transfer.mixins import TransferSerializerMixin from translation.models import Language -from review.models import Review class GuideSerializer(TransferSerializerMixin): @@ -23,7 +24,7 @@ class GuideSerializer(TransferSerializerMixin): inserter_field = serializers.CharField() class Meta: - model = Guide + model = models.Guide fields = ( 'id', 'title', @@ -46,13 +47,13 @@ class GuideSerializer(TransferSerializerMixin): def get_state(self, state: str): if state == 'built': - return Guide.BUILT + return models.Guide.BUILT elif state == 'removing': - return Guide.REMOVING + return models.Guide.REMOVING elif state == 'building': - return Guide.BUILDING + return models.Guide.BUILDING else: - return Guide.WAITING + return models.Guide.WAITING def get_site(self, site_id): qs = SiteSettings.objects.filter(old_id=site_id) @@ -60,7 +61,7 @@ class GuideSerializer(TransferSerializerMixin): return qs.first() def get_guide_type(self, inserter_field): - guide_type, _ = GuideType.objects.get_or_create(name=inserter_field) + guide_type, _ = models.GuideType.objects.get_or_create(name=inserter_field) return guide_type @@ -81,7 +82,7 @@ class GuideFilterSerializer(TransferSerializerMixin): guide_id = serializers.IntegerField() class Meta: - model = GuideFilter + model = models.GuideFilter fields = ( 'id', 'year', @@ -98,6 +99,11 @@ class GuideFilterSerializer(TransferSerializerMixin): 'guide_id', ) + def create(self, validated_data): + qs = self.Meta.model.objects.filter(guide=validated_data.get('guide')) + if not qs.exists(): + return super().create(validated_data) + @staticmethod def parse_ruby_helper(raw_value: str): """Parse RubyActiveSupport records""" @@ -345,6 +351,6 @@ class GuideFilterSerializer(TransferSerializerMixin): return {'state': list(set(review_states))} def get_guide(self, old_guide_id: int): - qs = Guide.objects.filter(old_id=old_guide_id) + qs = models.Guide.objects.filter(old_id=old_guide_id) if qs.exists(): return qs.first() diff --git a/project/settings/base.py b/project/settings/base.py index 2c6f0cf0..6648f0af 100644 --- a/project/settings/base.py +++ b/project/settings/base.py @@ -99,6 +99,7 @@ EXTERNAL_APPS = [ 'storages', 'sorl.thumbnail', 'timezonefinder', + 'mptt', ] diff --git a/requirements/base.txt b/requirements/base.txt index aadc7301..90e5b2d5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -60,3 +60,6 @@ celery==4.3.0 # country information pycountry==19.8.18 + +# sql-tree +django-mptt==0.9.1 From 4202eb679b5a938d0a454cfcffa11b429cd05578 Mon Sep 17 00:00:00 2001 From: dormantman Date: Wed, 4 Dec 2019 15:48:54 +0300 Subject: [PATCH 35/75] Corrections for tests --- apps/establishment/tests.py | 18 +++++++++--------- apps/establishment/views/web.py | 1 + apps/tag/serializers.py | 1 + apps/utils/views.py | 11 +++++++---- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/apps/establishment/tests.py b/apps/establishment/tests.py index 6bc23ccc..f46cccc3 100644 --- a/apps/establishment/tests.py +++ b/apps/establishment/tests.py @@ -410,21 +410,21 @@ class EstablishmentWebTagTests(BaseTestCase): class EstablishmentWebSlugTests(ChildTestCase): def test_slug_Read(self): - response = self.client.get(f'/api/web/establishments/{self.establishment.id}/', format='json') + response = self.client.get(f'/api/web/establishments/slug/{self.establishment.slug}/', format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) class EstablishmentWebSimilarTests(ChildTestCase): def test_similar_Read(self): - response = self.client.get(f'/api/web/establishments/{self.establishment.id}/similar/', format='json') + response = self.client.get(f'/api/web/establishments/slug/{self.establishment.slug}/similar/', format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) class EstablishmentWebCommentsTests(ChildTestCase): def test_comments_CRUD(self): - response = self.client.get(f'/api/web/establishments/{self.establishment.id}/comments/', format='json') + response = self.client.get(f'/api/web/establishments/slug/{self.establishment.slug}/comments/', format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) data = { @@ -433,13 +433,13 @@ class EstablishmentWebCommentsTests(ChildTestCase): 'mark': 4 } - response = self.client.post(f'/api/web/establishments/{self.establishment.id}/comments/create/', + response = self.client.post(f'/api/web/establishments/slug/{self.establishment.slug}/comments/create/', data=data) comment = response.json() self.assertEqual(response.status_code, status.HTTP_201_CREATED) - response = self.client.get(f'/api/web/establishments/{self.establishment.id}/comments/{comment["id"]}/', + response = self.client.get(f'/api/web/establishments/slug/{self.establishment.slug}/comments/{comment["id"]}/', format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) @@ -448,12 +448,12 @@ class EstablishmentWebCommentsTests(ChildTestCase): } response = self.client.patch( - f'/api/web/establishments/{self.establishment.id}/comments/{comment["id"]}/', + f'/api/web/establishments/slug/{self.establishment.slug}/comments/{comment["id"]}/', data=update_data) self.assertEqual(response.status_code, status.HTTP_200_OK) response = self.client.delete( - f'/api/web/establishments/{self.establishment.id}/comments/{comment["id"]}/', + f'/api/web/establishments/slug/{self.establishment.slug}/comments/{comment["id"]}/', format='json') self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) @@ -466,13 +466,13 @@ class EstablishmentWebFavoriteTests(ChildTestCase): "object_id": self.establishment.id } - response = self.client.post(f'/api/web/establishments/{self.establishment.id}/favorites/', + response = self.client.post(f'/api/web/establishments/slug/{self.establishment.slug}/favorites/', data=data) self.assertEqual(response.status_code, status.HTTP_201_CREATED) response = self.client.delete( - f'/api/web/establishments/{self.establishment.id}/favorites/', + f'/api/web/establishments/slug/{self.establishment.slug}/favorites/', format='json') self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) diff --git a/apps/establishment/views/web.py b/apps/establishment/views/web.py index bd826e4e..65a56a5b 100644 --- a/apps/establishment/views/web.py +++ b/apps/establishment/views/web.py @@ -142,6 +142,7 @@ class EstablishmentFavoritesCreateDestroyView(FavoritesCreateDestroyMixinView): class EstablishmentCarouselCreateDestroyView(CarouselCreateDestroyMixinView): """View for create/destroy establishment from carousel.""" + lookup_field = 'slug' _model = models.Establishment serializer_class = serializers.EstablishmentCarouselCreateSerializer diff --git a/apps/tag/serializers.py b/apps/tag/serializers.py index 2cc818a9..27590b18 100644 --- a/apps/tag/serializers.py +++ b/apps/tag/serializers.py @@ -37,6 +37,7 @@ class TagBackOfficeSerializer(TagBaseSerializer): 'category' ) + class TagCategoryProductSerializer(serializers.ModelSerializer): """SHORT Serializer for TagCategory""" diff --git a/apps/utils/views.py b/apps/utils/views.py index db10dbfd..e158357e 100644 --- a/apps/utils/views.py +++ b/apps/utils/views.py @@ -158,10 +158,10 @@ class CarouselCreateDestroyMixinView(BaseCreateDestroyMixinView): lookup_field = 'id' def get_base_object(self): - search_kwargs = { - 'id': self.kwargs.get('pk'), - 'slug': self.kwargs.get('slug'), - } + establishment_pk = self.kwargs.get('pk') + establishment_slug = self.kwargs.get('slug') + + search_kwargs = {'id': establishment_pk} if establishment_pk else {'slug': establishment_slug} return get_object_or_404(self._model, **search_kwargs) def get_object(self): @@ -175,6 +175,9 @@ class CarouselCreateDestroyMixinView(BaseCreateDestroyMixinView): # self.check_object_permissions(self.request, carousels) return carousels + def perform_destroy(self, instance): + instance.delete() + self.es_update_base_object() # BackOffice user`s views & viewsets class BindObjectMixin: From 72d52e5c19747094183e4c115e3f34d40c967dc9 Mon Sep 17 00:00:00 2001 From: dormantman Date: Wed, 4 Dec 2019 15:51:03 +0300 Subject: [PATCH 36/75] Removed unusable destroy function --- apps/utils/views.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/apps/utils/views.py b/apps/utils/views.py index e158357e..9ac8ca60 100644 --- a/apps/utils/views.py +++ b/apps/utils/views.py @@ -175,9 +175,6 @@ class CarouselCreateDestroyMixinView(BaseCreateDestroyMixinView): # self.check_object_permissions(self.request, carousels) return carousels - def perform_destroy(self, instance): - instance.delete() - self.es_update_base_object() # BackOffice user`s views & viewsets class BindObjectMixin: From b2fb341c101e28410a71624b7ecf014c78a23347 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 4 Dec 2019 17:13:38 +0300 Subject: [PATCH 37/75] fix wines faceted search --- apps/search_indexes/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/search_indexes/views.py b/apps/search_indexes/views.py index a5b952d7..5fa845f2 100644 --- a/apps/search_indexes/views.py +++ b/apps/search_indexes/views.py @@ -346,7 +346,7 @@ class ProductDocumentViewSet(BaseDocumentViewSet): faceted_search_fields = { 'tag': { - 'field': 'wine_colors.id', + 'field': 'tags.id', 'enabled': True, 'facet': TermsFacet, 'options': { From 1ae11f0b617894edb71d3ebdf904cafa0b152386 Mon Sep 17 00:00:00 2001 From: dormantman Date: Wed, 4 Dec 2019 17:27:49 +0300 Subject: [PATCH 38/75] System tags removed --- apps/establishment/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index 140188d7..b708de63 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -447,7 +447,7 @@ class Establishment(GalleryModelMixin, ProjectBaseMixin, URLImageMixin, def visible_tags(self): return super().visible_tags \ .exclude(category__index_name__in=['guide', 'collection', 'purchased_item', - 'business_tag', 'business_tags_de']) \ + 'business_tag', 'business_tags_de', 'tag', ]) \ \ # todo: recalculate toque_number From d0378ad14e49700971b1bfc34fbba6546870b345 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: Wed, 4 Dec 2019 17:27:51 +0300 Subject: [PATCH 39/75] Fix options --- apps/establishment/views/back.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/establishment/views/back.py b/apps/establishment/views/back.py index d3afbf2e..6fa4d821 100644 --- a/apps/establishment/views/back.py +++ b/apps/establishment/views/back.py @@ -165,7 +165,7 @@ class EmployeeListCreateView(generics.ListCreateAPIView): pagination_class = None -class EstablishmentEmployeeListView(generics.ListAPIView): +class EstablishmentEmployeeListView(generics.ListCreateAPIView): """Establishment emplyoees list view.""" permission_classes = (permissions.AllowAny, ) serializer_class = serializers.EstablishmentEmployeeBackSerializer From dee353199dd38340ed3dead4a740817a23e3c16c Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 4 Dec 2019 17:30:54 +0300 Subject: [PATCH 40/75] add schedule to establishments list --- apps/establishment/serializers/common.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index 37432a21..e6e489ee 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -405,6 +405,12 @@ class EstablishmentSimilarSerializer(EstablishmentBaseSerializer): """Serializer for Establishment model.""" address = AddressDetailSerializer(read_only=True) + schedule = ScheduleRUDSerializer(many=True, allow_null=True) + + class Meta(EstablishmentBaseSerializer.Meta): + fields = EstablishmentBaseSerializer.Meta.fields + [ + 'schedule', + ] class EstablishmentCommentCreateSerializer(comment_serializers.CommentSerializer): From 69b40f21b7b1683839c844675d66b11949531c3a Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 4 Dec 2019 18:26:03 +0300 Subject: [PATCH 41/75] last comment for mobile establishment detail --- apps/establishment/models.py | 14 ++++++++++++++ apps/establishment/serializers/common.py | 13 +++++++++++++ apps/establishment/urls/common.py | 1 - apps/establishment/urls/mobile.py | 3 ++- apps/establishment/urls/web.py | 6 +++++- apps/establishment/views/web.py | 7 +++++++ 6 files changed, 41 insertions(+), 3 deletions(-) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index b708de63..6c9080f0 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -251,6 +251,15 @@ class EstablishmentQuerySet(models.QuerySet): return self.filter(id__in=subquery_filter_by_distance) \ .order_by('-reviews__published_at') + def prefetch_comments(self): + """Prefetch last comment.""" + from comment.models import Comment + return self.prefetch_related( + models.Prefetch('comments', + queryset=Comment.objects.exclude(is_publish=False).order_by('-created'), + to_attr='comments_prefetched') + ) + def prefetch_actual_employees(self): """Prefetch actual employees.""" return self.prefetch_related( @@ -614,6 +623,11 @@ class Establishment(GalleryModelMixin, ProjectBaseMixin, URLImageMixin, def artisan_category_indexing(self): return self.tags.filter(category__index_name='shop_category') + @property + def last_comment(self): + if hasattr(self, 'comments_prefetched'): + return self.comments_prefetched[0] + class EstablishmentNoteQuerySet(models.QuerySet): """QuerySet for model EstablishmentNote.""" diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index e6e489ee..042a0a96 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -401,6 +401,19 @@ class EstablishmentDetailSerializer(EstablishmentBaseSerializer): ] +class MobileEstablishmentDetailSerializer(EstablishmentDetailSerializer): + """Serializer for Establishment model for mobiles.""" + + last_comment = comment_serializers.CommentRUDSerializer(allow_null=True) + + class Meta(EstablishmentDetailSerializer.Meta): + """Meta class.""" + + fields = EstablishmentDetailSerializer.Meta.fields + [ + 'last_comment', + ] + + class EstablishmentSimilarSerializer(EstablishmentBaseSerializer): """Serializer for Establishment model.""" diff --git a/apps/establishment/urls/common.py b/apps/establishment/urls/common.py index e37c38f8..faa34bd9 100644 --- a/apps/establishment/urls/common.py +++ b/apps/establishment/urls/common.py @@ -9,7 +9,6 @@ urlpatterns = [ path('', views.EstablishmentListView.as_view(), name='list'), path('recent-reviews/', views.EstablishmentRecentReviewListView.as_view(), name='recent-reviews'), - path('slug//', views.EstablishmentRetrieveView.as_view(), name='detail'), path('slug//similar/', views.EstablishmentSimilarListView.as_view(), name='similar'), path('slug//comments/', views.EstablishmentCommentListView.as_view(), name='list-comments'), path('slug//comments/create/', views.EstablishmentCommentCreateView.as_view(), diff --git a/apps/establishment/urls/mobile.py b/apps/establishment/urls/mobile.py index 2803be18..165323a9 100644 --- a/apps/establishment/urls/mobile.py +++ b/apps/establishment/urls/mobile.py @@ -5,7 +5,8 @@ from establishment import views from establishment.urls.common import urlpatterns as common_urlpatterns urlpatterns = [ - path('geo/', views.EstablishmentNearestRetrieveView.as_view(), name='nearest-establishments-list') + path('geo/', views.EstablishmentNearestRetrieveView.as_view(), name='nearest-establishments-list'), + path('slug//', views.EstablishmentMobileRetrieveView.as_view(), name='mobile-detail'), ] urlpatterns.extend(common_urlpatterns) diff --git a/apps/establishment/urls/web.py b/apps/establishment/urls/web.py index b4d1942d..4fa6595e 100644 --- a/apps/establishment/urls/web.py +++ b/apps/establishment/urls/web.py @@ -1,7 +1,11 @@ """Establishment app web urlconf.""" from establishment.urls.common import urlpatterns as common_urlpatterns +from django.urls import path +from establishment import views -urlpatterns = [] +urlpatterns = [ + path('slug//', views.EstablishmentRetrieveView.as_view(), name='web-detail'), +] urlpatterns.extend(common_urlpatterns) diff --git a/apps/establishment/views/web.py b/apps/establishment/views/web.py index 15421ee7..ba5cb23b 100644 --- a/apps/establishment/views/web.py +++ b/apps/establishment/views/web.py @@ -51,6 +51,13 @@ class EstablishmentRetrieveView(EstablishmentMixinView, generics.RetrieveAPIView return super().get_queryset().with_extended_related() +class EstablishmentMobileRetrieveView(EstablishmentRetrieveView): + serializer_class = serializers.MobileEstablishmentDetailSerializer + + def get_queryset(self): + return super().get_queryset().prefetch_comments() + + class EstablishmentRecentReviewListView(EstablishmentListView): """List view for last reviewed establishments.""" From e0ad819caa943a2731d5ef788d0ca220a2419823 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 4 Dec 2019 18:50:13 +0300 Subject: [PATCH 42/75] fix empty comments --- apps/establishment/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index 6c9080f0..c598de55 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -625,7 +625,7 @@ class Establishment(GalleryModelMixin, ProjectBaseMixin, URLImageMixin, @property def last_comment(self): - if hasattr(self, 'comments_prefetched'): + if hasattr(self, 'comments_prefetched') and len(self.comments_prefetched): return self.comments_prefetched[0] From f44a4bb29d0626edbeedcf10e193d103b64fc649 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 4 Dec 2019 19:37:05 +0300 Subject: [PATCH 43/75] Establishments favs type --- apps/establishment/serializers/common.py | 2 ++ apps/favorites/views.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index 042a0a96..da58225b 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -419,10 +419,12 @@ class EstablishmentSimilarSerializer(EstablishmentBaseSerializer): address = AddressDetailSerializer(read_only=True) schedule = ScheduleRUDSerializer(many=True, allow_null=True) + establishment_type = EstablishmentTypeGeoSerializer() class Meta(EstablishmentBaseSerializer.Meta): fields = EstablishmentBaseSerializer.Meta.fields + [ 'schedule', + 'establishment_type', ] diff --git a/apps/favorites/views.py b/apps/favorites/views.py index 444048ff..53a05469 100644 --- a/apps/favorites/views.py +++ b/apps/favorites/views.py @@ -29,7 +29,7 @@ class FavoritesEstablishmentListView(generics.ListAPIView): def get_queryset(self): """Override get_queryset method""" return Establishment.objects.filter(favorites__user=self.request.user) \ - .order_by('-favorites') + .order_by('-favorites').with_base_related() class FavoritesProductListView(generics.ListAPIView): From 29ff10fb4becbbf8ab329c3a35ef33e94db2c0a6 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Wed, 4 Dec 2019 20:13:09 +0300 Subject: [PATCH 44/75] added wine origins --- apps/establishment/admin.py | 1 + .../commands/add_establishment_wine_origin.py | 30 +++++++++++ apps/establishment/models.py | 7 ++- apps/establishment/serializers/common.py | 7 +++ apps/location/admin.py | 12 +++++ ...mentwineoriginaddress_wineoriginaddress.py | 42 +++++++++++++++ apps/location/models.py | 53 +++++++++++++++++- apps/location/serializers/common.py | 54 +++++++++++++++++-- apps/product/admin.py | 1 + .../commands/add_wine_origin_address.py | 44 +++++++++++++++ .../migrations/0019_auto_20191204_1420.py | 21 ++++++++ apps/product/models.py | 15 ++---- apps/product/serializers/common.py | 10 ++-- apps/transfer/serializers/product.py | 24 +++++++-- 14 files changed, 294 insertions(+), 27 deletions(-) create mode 100644 apps/establishment/management/commands/add_establishment_wine_origin.py create mode 100644 apps/location/migrations/0031_establishmentwineoriginaddress_wineoriginaddress.py create mode 100644 apps/product/management/commands/add_wine_origin_address.py create mode 100644 apps/product/migrations/0019_auto_20191204_1420.py diff --git a/apps/establishment/admin.py b/apps/establishment/admin.py index 45716f32..2c94676f 100644 --- a/apps/establishment/admin.py +++ b/apps/establishment/admin.py @@ -136,3 +136,4 @@ class SocialNetworkAdmin(BaseModelAdminMixin, admin.ModelAdmin): class CompanyAdmin(BaseModelAdminMixin, admin.ModelAdmin): """Admin conf for Company model.""" raw_id_fields = ['establishment', 'address', ] + diff --git a/apps/establishment/management/commands/add_establishment_wine_origin.py b/apps/establishment/management/commands/add_establishment_wine_origin.py new file mode 100644 index 00000000..cbb37907 --- /dev/null +++ b/apps/establishment/management/commands/add_establishment_wine_origin.py @@ -0,0 +1,30 @@ +from django.core.management.base import BaseCommand + +from location.models import WineOriginAddress, EstablishmentWineOriginAddress +from product.models import Product + + +class Command(BaseCommand): + help = 'Add to establishment wine origin object.' + + def handle(self, *args, **kwarg): + create_counter = 0 + + for product in Product.objects.exclude(establishment__isnull=True): + establishment = product.establishment + if product.wine_origins.exists(): + for wine_origin in product.wine_origins.all(): + wine_region = wine_origin.wine_region + wine_sub_region = wine_origin.wine_sub_region + if not EstablishmentWineOriginAddress.objects.filter(establishment=establishment, + wine_region=wine_region, + wine_sub_region=wine_sub_region) \ + .exists(): + EstablishmentWineOriginAddress.objects.create( + establishment=establishment, + wine_region=wine_origin.wine_region, + wine_sub_region=wine_origin.wine_sub_region, + ) + create_counter += 1 + + self.stdout.write(self.style.WARNING(f'COUNT CREATED OBJECTS: {create_counter}')) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index cb490aa4..7b028365 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -1,8 +1,8 @@ """Establishment models.""" from datetime import datetime from functools import reduce -from typing import List from operator import or_ +from typing import List import elasticsearch_dsl from django.conf import settings @@ -22,6 +22,7 @@ from timezone_field import TimeZoneField from collection.models import Collection from location.models import Address +from location.models import WineOriginAddressMixin from main.models import Award, Currency from review.models import Review from utils.models import (ProjectBaseMixin, TJSONField, URLImageMixin, @@ -590,6 +591,10 @@ class Establishment(GalleryModelMixin, ProjectBaseMixin, URLImageMixin, if qs.exists(): return qs.first().image + @property + def wine_origins_unique(self): + return self.wine_origins.distinct('wine_region') + class EstablishmentNoteQuerySet(models.QuerySet): """QuerySet for model EstablishmentNote.""" diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index cb102ff1..6822e1e1 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -16,6 +16,8 @@ from utils import exceptions as utils_exceptions from utils.serializers import ImageBaseSerializer, CarouselCreateSerializer from utils.serializers import (ProjectModelSerializer, TranslatedField, FavoritesCreateSerializer) +from location.serializers import EstablishmentWineRegionBaseSerializer, \ + EstablishmentWineOriginBaseSerializer class ContactPhonesSerializer(serializers.ModelSerializer): @@ -283,6 +285,8 @@ class EstablishmentBaseSerializer(ProjectModelSerializer): type = EstablishmentTypeBaseSerializer(source='establishment_type', read_only=True) subtypes = EstablishmentSubTypeBaseSerializer(many=True, source='establishment_subtypes') image = serializers.URLField(source='image_url', read_only=True) + wine_regions = EstablishmentWineRegionBaseSerializer(many=True, source='wine_origins_unique', + read_only=True, allow_null=True) preview_image = serializers.URLField(source='preview_image_url', allow_null=True, read_only=True) @@ -311,6 +315,7 @@ class EstablishmentBaseSerializer(ProjectModelSerializer): 'image', 'preview_image', 'new_image', + 'wine_regions', ] @@ -365,6 +370,7 @@ class EstablishmentDetailSerializer(EstablishmentBaseSerializer): range_price_carte = RangePriceSerializer(read_only=True) vintage_year = serializers.ReadOnlyField() gallery = ImageBaseSerializer(read_only=True, source='crop_gallery', many=True) + wine_origins = EstablishmentWineOriginBaseSerializer(many=True, read_only=True) class Meta(EstablishmentBaseSerializer.Meta): """Meta class.""" @@ -391,6 +397,7 @@ class EstablishmentDetailSerializer(EstablishmentBaseSerializer): 'transportation', 'vintage_year', 'gallery', + 'wine_origins', ] diff --git a/apps/location/admin.py b/apps/location/admin.py index a7610a65..0f7a3a8d 100644 --- a/apps/location/admin.py +++ b/apps/location/admin.py @@ -45,3 +45,15 @@ class AddressAdmin(admin.OSMGeoAdmin): def geo_lat(self, item): if isinstance(item.coordinates, Point): return item.coordinates.y + + +@admin.register(models.EstablishmentWineOriginAddress) +class EstablishmentWineOriginAddress(admin.ModelAdmin): + """Admin model for EstablishmentWineOriginAddress.""" + raw_id_fields = ['establishment', ] + + +@admin.register(models.WineOriginAddress) +class WineOriginAddress(admin.ModelAdmin): + """Admin page for model WineOriginAddress.""" + raw_id_fields = ['product', ] diff --git a/apps/location/migrations/0031_establishmentwineoriginaddress_wineoriginaddress.py b/apps/location/migrations/0031_establishmentwineoriginaddress_wineoriginaddress.py new file mode 100644 index 00000000..c583399e --- /dev/null +++ b/apps/location/migrations/0031_establishmentwineoriginaddress_wineoriginaddress.py @@ -0,0 +1,42 @@ +# Generated by Django 2.2.7 on 2019-12-04 14:20 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('establishment', '0067_auto_20191122_1244'), + ('product', '0019_auto_20191204_1420'), + ('location', '0030_auto_20191120_1010'), + ] + + operations = [ + migrations.CreateModel( + name='WineOriginAddress', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='wine_origins', to='product.Product', verbose_name='product')), + ('wine_region', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='location.WineRegion', verbose_name='wine region')), + ('wine_sub_region', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='location.WineSubRegion', verbose_name='wine sub region')), + ], + options={ + 'verbose_name': 'wine origin address', + 'verbose_name_plural': 'wine origin addresses', + }, + ), + migrations.CreateModel( + name='EstablishmentWineOriginAddress', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('establishment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='wine_origins', to='establishment.Establishment', verbose_name='product')), + ('wine_region', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='location.WineRegion', verbose_name='wine region')), + ('wine_sub_region', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='location.WineSubRegion', verbose_name='wine sub region')), + ], + options={ + 'verbose_name': 'establishment wine origin address', + 'verbose_name_plural': 'establishment wine origin addresses', + }, + ), + ] diff --git a/apps/location/models.py b/apps/location/models.py index 50f09b92..fd023443 100644 --- a/apps/location/models.py +++ b/apps/location/models.py @@ -192,9 +192,9 @@ class WineRegionQuerySet(models.QuerySet): def with_sub_region_related(self): return self.prefetch_related('wine_sub_region') - def having_wines(self, value = True): + def having_wines(self, value=True): """Return qs with regions, which have any wine related to them""" - return self.exclude(wines__isnull=value) + return self.exclude(wineoriginaddress__product__isnull=value) class WineRegion(TranslatedFieldsMixin, models.Model): @@ -278,6 +278,55 @@ class WineVillage(models.Model): return self.name +class WineOriginAddressMixin(models.Model): + """Model for wine origin address.""" + wine_region = models.ForeignKey('location.WineRegion', on_delete=models.CASCADE, + verbose_name=_('wine region')) + wine_sub_region = models.ForeignKey('location.WineSubRegion', on_delete=models.CASCADE, + blank=True, null=True, default=None, + verbose_name=_('wine sub region')) + + class Meta: + """Meta class.""" + abstract = True + + +class EstablishmentWineOriginAddressQuerySet(models.QuerySet): + """QuerySet for EstablishmentWineOriginAddress model.""" + + +class EstablishmentWineOriginAddress(WineOriginAddressMixin): + """Establishment wine origin address model.""" + establishment = models.ForeignKey('establishment.Establishment', on_delete=models.CASCADE, + related_name='wine_origins', + verbose_name=_('product')) + + objects = EstablishmentWineOriginAddressQuerySet.as_manager() + + class Meta: + """Meta class.""" + verbose_name = _('establishment wine origin address') + verbose_name_plural = _('establishment wine origin addresses') + + +class WineOriginAddressQuerySet(models.QuerySet): + """QuerySet for WineOriginAddress model.""" + + +class WineOriginAddress(WineOriginAddressMixin): + """Wine origin address model.""" + product = models.ForeignKey('product.Product', on_delete=models.CASCADE, + related_name='wine_origins', + verbose_name=_('product')) + + objects = WineOriginAddressQuerySet.as_manager() + + class Meta: + """Meta class.""" + verbose_name = _('wine origin address') + verbose_name_plural = _('wine origin addresses') + + # todo: Make recalculate price levels @receiver(post_save, sender=Country) def run_recalculate_price_levels(sender, instance, **kwargs): diff --git a/apps/location/serializers/common.py b/apps/location/serializers/common.py index fadb6f6c..6255e67f 100644 --- a/apps/location/serializers/common.py +++ b/apps/location/serializers/common.py @@ -191,10 +191,58 @@ class WineSubRegionBaseSerializer(serializers.ModelSerializer): ] -class WineRegionSerializer(WineRegionBaseSerializer): - """Wine region w/ subregion serializer""" +class EstablishmentWineRegionBaseSerializer(serializers.ModelSerializer): + """Establishment wine region origin serializer.""" - wine_sub_region = WineSubRegionBaseSerializer(allow_null=True, many=True) + id = serializers.IntegerField(source='wine_region.id') + name = serializers.CharField(source='wine_region.name') + country = CountrySerializer(source='wine_region.country') + + class Meta: + """Meta class.""" + model = models.EstablishmentWineOriginAddress + fields = [ + 'id', + 'name', + 'country', + ] + + +class EstablishmentWineOriginBaseSerializer(serializers.ModelSerializer): + """Serializer for intermediate model EstablishmentWineOrigin.""" + wine_region = WineRegionBaseSerializer() + wine_sub_region = WineSubRegionBaseSerializer(allow_null=True) + + class Meta: + """Meta class.""" + model = models.EstablishmentWineOriginAddress + fields = [ + 'wine_region', + 'wine_sub_region', + ] + + +class WineOriginRegionBaseSerializer(EstablishmentWineRegionBaseSerializer): + """Product wine region origin serializer.""" + + class Meta(EstablishmentWineRegionBaseSerializer.Meta): + """Meta class.""" + model = models.WineOriginAddress + + +class WineOriginBaseSerializer(EstablishmentWineOriginBaseSerializer): + """Serializer for intermediate model ProductWineOrigin.""" + + class Meta(EstablishmentWineOriginBaseSerializer.Meta): + """Meta class.""" + model = models.WineOriginAddress + + +class WineRegionSerializer(serializers.ModelSerializer): + """Wine region w/ sub region serializer""" + + wine_sub_region = WineSubRegionBaseSerializer(source='wine_region.wine_sub_region', + allow_null=True, many=True) class Meta(WineRegionBaseSerializer.Meta): fields = WineRegionBaseSerializer.Meta.fields + [ diff --git a/apps/product/admin.py b/apps/product/admin.py index 3becfb2d..182be5c3 100644 --- a/apps/product/admin.py +++ b/apps/product/admin.py @@ -1,5 +1,6 @@ """Product admin conf.""" from django.contrib import admin + from utils.admin import BaseModelAdminMixin from .models import Product, ProductType, ProductSubType, ProductGallery, Unit diff --git a/apps/product/management/commands/add_wine_origin_address.py b/apps/product/management/commands/add_wine_origin_address.py new file mode 100644 index 00000000..d47d7412 --- /dev/null +++ b/apps/product/management/commands/add_wine_origin_address.py @@ -0,0 +1,44 @@ +from django.core.management.base import BaseCommand +from tqdm import tqdm + +from location.models import WineOriginAddress +from product.models import Product +from transfer.models import Products +from transfer.serializers.product import ProductSerializer + + +class Command(BaseCommand): + help = 'Add to product wine origin object.' + + def handle(self, *args, **kwarg): + def get_product(old_id: int): + if old_id: + qs = Product.objects.filter(old_id=old_id) + if qs.exists(): + return qs.first() + + objects_to_create = [] + products = Products.objects.exclude(wine_region_id__isnull=True) \ + .values_list('id', 'wine_sub_region_id', 'wine_region_id') + for old_id, wine_sub_region_id, wine_region_id in tqdm(products): + product = get_product(old_id) + if product: + wine_sub_region = ProductSerializer.get_wine_sub_region(wine_sub_region_id) + wine_region = ProductSerializer.get_wine_region(wine_region_id) + if wine_region: + filters = { + 'product': product, + 'wine_region': wine_region} + wine_origin_address = WineOriginAddress( + product=product, + wine_region=wine_region) + + if wine_sub_region: + filters.update({'wine_sub_region': wine_sub_region}) + wine_origin_address.wine_sub_region = wine_sub_region + + if not WineOriginAddress.objects.filter(**filters).exists(): + objects_to_create.append(wine_origin_address) + + WineOriginAddress.objects.bulk_create(objects_to_create) + self.stdout.write(self.style.WARNING(f'COUNT CREATED OBJECTS: {len(objects_to_create)}')) diff --git a/apps/product/migrations/0019_auto_20191204_1420.py b/apps/product/migrations/0019_auto_20191204_1420.py new file mode 100644 index 00000000..514fdd61 --- /dev/null +++ b/apps/product/migrations/0019_auto_20191204_1420.py @@ -0,0 +1,21 @@ +# Generated by Django 2.2.7 on 2019-12-04 14:20 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('product', '0018_purchasedproduct'), + ] + + operations = [ + migrations.RemoveField( + model_name='product', + name='wine_region', + ), + migrations.RemoveField( + model_name='product', + name='wine_sub_region', + ), + ] diff --git a/apps/product/models.py b/apps/product/models.py index 561280fc..a6129c48 100644 --- a/apps/product/models.py +++ b/apps/product/models.py @@ -2,11 +2,12 @@ from django.contrib.contenttypes import fields as generic from django.contrib.gis.db import models as gis_models from django.core.exceptions import ValidationError +from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models from django.db.models import Case, When from django.utils.translation import gettext_lazy as _ -from django.core.validators import MaxValueValidator, MinValueValidator +from location.models import WineOriginAddressMixin from utils.models import (BaseAttributes, ProjectBaseMixin, HasTagsMixin, TranslatedFieldsMixin, TJSONField, FavoritesMixin, GalleryModelMixin, IntermediateGalleryModelMixin) @@ -89,8 +90,8 @@ class ProductQuerySet(models.QuerySet): 'establishment__address__city', 'establishment__address__city__country', 'establishment__establishment_subtypes', 'product_gallery', 'gallery', 'product_type', 'subtypes', - 'classifications__classification_type', 'classifications__tags') \ - .select_related('wine_region', 'wine_sub_region') + 'classifications__classification_type', 'classifications__tags', + 'wine_origins__wine_region', 'wine_origins__wine_sub_region', ) def common(self): return self.filter(category=self.model.COMMON) @@ -176,14 +177,6 @@ class Product(GalleryModelMixin, TranslatedFieldsMixin, BaseAttributes, verbose_name=_('establishment')) public_mark = models.PositiveIntegerField(blank=True, null=True, default=None, verbose_name=_('public mark'), ) - wine_region = models.ForeignKey('location.WineRegion', on_delete=models.PROTECT, - related_name='wines', - blank=True, null=True, default=None, - verbose_name=_('wine region')) - wine_sub_region = models.ForeignKey('location.WineSubRegion', on_delete=models.PROTECT, - related_name='wines', - blank=True, null=True, default=None, - verbose_name=_('wine sub region')) classifications = models.ManyToManyField('ProductClassification', blank=True, verbose_name=_('classifications')) diff --git a/apps/product/serializers/common.py b/apps/product/serializers/common.py index 14eff642..983cc2ab 100644 --- a/apps/product/serializers/common.py +++ b/apps/product/serializers/common.py @@ -11,7 +11,7 @@ from review.serializers import ReviewShortSerializer from utils import exceptions as utils_exceptions from utils.serializers import TranslatedField, FavoritesCreateSerializer, ImageBaseSerializer from main.serializers import AwardSerializer -from location.serializers import WineRegionBaseSerializer, WineSubRegionBaseSerializer +from location.serializers import WineOriginRegionBaseSerializer, WineOriginBaseSerializer from tag.serializers import TagBaseSerializer, TagCategoryProductSerializer @@ -90,7 +90,7 @@ class ProductBaseSerializer(serializers.ModelSerializer): subtypes = ProductSubTypeBaseSerializer(many=True, read_only=True) establishment_detail = EstablishmentProductShortSerializer(source='establishment', read_only=True) tags = ProductTagSerializer(source='related_tags', many=True, read_only=True) - wine_region = WineRegionBaseSerializer(read_only=True) + wine_regions = WineOriginRegionBaseSerializer(many=True, source='wine_origins', read_only=True) wine_colors = TagBaseSerializer(many=True, read_only=True) preview_image_url = serializers.URLField(allow_null=True, read_only=True) @@ -110,7 +110,7 @@ class ProductBaseSerializer(serializers.ModelSerializer): 'vintage', 'tags', 'preview_image_url', - 'wine_region', + 'wine_regions', 'wine_colors', 'in_favorites', ] @@ -124,7 +124,7 @@ class ProductDetailSerializer(ProductBaseSerializer): awards = AwardSerializer(many=True, read_only=True) classifications = ProductClassificationBaseSerializer(many=True, read_only=True) standards = ProductStandardBaseSerializer(many=True, read_only=True) - wine_sub_region = WineSubRegionBaseSerializer(read_only=True) + wine_origins = WineOriginBaseSerializer(many=True, read_only=True) bottles_produced = TagBaseSerializer(many=True, read_only=True) sugar_contents = TagBaseSerializer(many=True, read_only=True) grape_variety = TagBaseSerializer(many=True, read_only=True) @@ -141,7 +141,7 @@ class ProductDetailSerializer(ProductBaseSerializer): 'awards', 'classifications', 'standards', - 'wine_sub_region', + 'wine_origins', 'bottles_produced', 'sugar_contents', 'image_url', diff --git a/apps/transfer/serializers/product.py b/apps/transfer/serializers/product.py index 86c6720a..90a3c884 100644 --- a/apps/transfer/serializers/product.py +++ b/apps/transfer/serializers/product.py @@ -340,6 +340,9 @@ class ProductSerializer(TransferSerializerMixin): def create(self, validated_data): qs = self.Meta.model.objects.filter(old_id=validated_data.get('old_id')) + wine_region = validated_data.pop('wine_region') + wine_sub_region = validated_data.pop('wine_sub_region') + # classifications classifications = [validated_data.pop('wine_classification', None)] # standards @@ -361,6 +364,11 @@ class ProductSerializer(TransferSerializerMixin): obj.standards.add(*[i for i in standards if i and i not in obj.standards.all()]) # adding tags obj.tags.add(*[i for i in tags if i and i not in obj.tags.all()]) + # checking wine origin address + wine_origin_address, _ = location_models.WineOriginAddress.objects.get_or_create( + product=obj, + wine_region=wine_region, + wine_sub_region=wine_sub_region) return obj def get_name(self, name, brand): @@ -390,17 +398,23 @@ class ProductSerializer(TransferSerializerMixin): if classification_qs.exists(): return classification_qs.first() - def get_wine_region(self, wine_region): + @staticmethod + def get_wine_region(wine_region): if wine_region: + old_id = wine_region if not isinstance(wine_region, transfer_models.WineLocations) \ + else wine_region.id wine_region_qs = location_models.WineRegion.objects.filter( - old_id=wine_region.id) + old_id=old_id) if wine_region_qs.exists(): return wine_region_qs.first() - def get_wine_sub_region(self, wine_sub_region_id): - if wine_sub_region_id: + @staticmethod + def get_wine_sub_region(wine_sub_region): + if wine_sub_region: + old_id = wine_sub_region if not isinstance(wine_sub_region, transfer_models.WineLocations) \ + else wine_sub_region.id sub_region_qs = location_models.WineSubRegion.objects.filter( - old_id=wine_sub_region_id) + old_id=old_id) if sub_region_qs.exists(): return sub_region_qs.first() From 1da7c40a9db257f21dc17a0b10873981462a75c8 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Wed, 4 Dec 2019 20:18:47 +0300 Subject: [PATCH 45/75] fix merge --- project/settings/local.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/project/settings/local.py b/project/settings/local.py index 5a89823d..c56f9042 100644 --- a/project/settings/local.py +++ b/project/settings/local.py @@ -113,6 +113,3 @@ TESTING = sys.argv[1:2] == ['test'] if TESTING: ELASTICSEARCH_INDEX_NAMES = {} ELASTICSEARCH_DSL_AUTOSYNC = False - -# INSTALLED APPS -INSTALLED_APPS.append('transfer.apps.TransferConfig') \ No newline at end of file From c0bc66c749f089b82a935654b90150a691540dc2 Mon Sep 17 00:00:00 2001 From: dormantman Date: Wed, 4 Dec 2019 21:02:08 +0300 Subject: [PATCH 46/75] Hide unusable tags --- apps/establishment/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index c5da4094..e19135e5 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -440,6 +440,7 @@ class Establishment(GalleryModelMixin, ProjectBaseMixin, URLImageMixin, return super().visible_tags \ .exclude(category__index_name__in=['guide', 'collection', 'purchased_item', 'business_tag', 'business_tags_de']) \ + .exclude(value__in=['rss', 'rss_selection']) \ \ # todo: recalculate toque_number From 1d9ee76a5c622c497630f6de775f1fe269fcba59 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Thu, 5 Dec 2019 09:43:55 +0300 Subject: [PATCH 47/75] fix es for establishments --- apps/collection/serializers/common.py | 3 - apps/product/serializers/back.py | 5 +- .../search_indexes/documents/establishment.py | 64 +++++++++++++------ apps/search_indexes/documents/product.py | 38 ++++++----- apps/search_indexes/serializers.py | 21 ++++++ apps/search_indexes/views.py | 36 ++++++++--- 6 files changed, 117 insertions(+), 50 deletions(-) diff --git a/apps/collection/serializers/common.py b/apps/collection/serializers/common.py index 846236d5..1b043f3c 100644 --- a/apps/collection/serializers/common.py +++ b/apps/collection/serializers/common.py @@ -56,7 +56,4 @@ class GuideSerializer(serializers.ModelSerializer): 'name', 'start', 'end', - 'parent', - 'advertorials', - 'collection' ] diff --git a/apps/product/serializers/back.py b/apps/product/serializers/back.py index ffbf690d..55dc5ebc 100644 --- a/apps/product/serializers/back.py +++ b/apps/product/serializers/back.py @@ -62,8 +62,9 @@ class ProductBackOfficeDetailSerializer(ProductDetailSerializer): 'available', 'product_type', 'establishment', - 'wine_region', - 'wine_sub_region', + # todo: need fix + # 'wine_region', + # 'wine_sub_region', 'wine_village', 'state', ] diff --git a/apps/search_indexes/documents/establishment.py b/apps/search_indexes/documents/establishment.py index aca81f3f..c6b68ed4 100644 --- a/apps/search_indexes/documents/establishment.py +++ b/apps/search_indexes/documents/establishment.py @@ -83,33 +83,59 @@ class EstablishmentDocument(Document): multi=True) products = fields.ObjectField( properties={ - 'wine_region': fields.ObjectField(properties={ - 'id': fields.IntegerField(), - 'name': fields.KeywordField(), - 'country': fields.ObjectField(properties={ - 'id': fields.IntegerField(), - 'name': fields.ObjectField(attr='name_indexing', - properties=OBJECT_FIELD_PROPERTIES), - 'code': fields.KeywordField(), - }), - # 'coordinates': fields.GeoPointField(), - 'description': fields.ObjectField(attr='description_indexing', properties=OBJECT_FIELD_PROPERTIES), - }), + 'wine_origins': fields.ListField( + fields.ObjectField( + properties={ + 'wine_region': fields.ObjectField(properties={ + 'id': fields.IntegerField(), + 'name': fields.KeywordField(), + 'country': fields.ObjectField(properties={ + 'id': fields.IntegerField(), + 'name': fields.ObjectField(attr='name_indexing', + properties=OBJECT_FIELD_PROPERTIES), + 'code': fields.KeywordField(), + }), + # 'coordinates': fields.GeoPointField(), + 'description': fields.ObjectField(attr='description_indexing', + properties=OBJECT_FIELD_PROPERTIES) + + }), + 'wine_sub_region': fields.ObjectField(properties={ + 'id': fields.IntegerField(), + 'name': fields.KeywordField(), + }), + })), 'wine_colors': fields.ObjectField( properties={ 'id': fields.IntegerField(), 'label': fields.ObjectField(attr='label_indexing', properties=OBJECT_FIELD_PROPERTIES), 'value': fields.KeywordField(), }, - multi=True, - ), - 'wine_sub_region': fields.ObjectField(properties={ - 'id': fields.IntegerField(), - 'name': fields.KeywordField(), - }), - }, + multi=True,)}, multi=True ) + wine_origins = fields.ListField( + fields.ObjectField( + properties={ + 'wine_region': fields.ObjectField(properties={ + 'id': fields.IntegerField(), + 'name': fields.KeywordField(), + 'country': fields.ObjectField(properties={ + 'id': fields.IntegerField(), + 'name': fields.ObjectField(attr='name_indexing', + properties=OBJECT_FIELD_PROPERTIES), + 'code': fields.KeywordField(), + }), + # 'coordinates': fields.GeoPointField(), + 'description': fields.ObjectField(attr='description_indexing', + properties=OBJECT_FIELD_PROPERTIES) + + }), + 'wine_sub_region': fields.ObjectField(properties={ + 'id': fields.IntegerField(), + 'name': fields.KeywordField(), + })}) + ) schedule = fields.ListField(fields.ObjectField( properties={ 'id': fields.IntegerField(attr='id'), diff --git a/apps/search_indexes/documents/product.py b/apps/search_indexes/documents/product.py index 853f72a2..c9459dd8 100644 --- a/apps/search_indexes/documents/product.py +++ b/apps/search_indexes/documents/product.py @@ -83,22 +83,28 @@ class ProductDocument(Document): }, multi=True, ) - wine_region = fields.ObjectField(properties={ - 'id': fields.IntegerField(), - 'name': fields.KeywordField(), - 'country': fields.ObjectField(properties={ - 'id': fields.IntegerField(), - 'name': fields.ObjectField(attr='name_indexing', - properties=OBJECT_FIELD_PROPERTIES), - 'code': fields.KeywordField(), - }), - # 'coordinates': fields.GeoPointField(), - 'description': fields.ObjectField(attr='description_indexing', properties=OBJECT_FIELD_PROPERTIES), - }) - wine_sub_region = fields.ObjectField(properties={ - 'id': fields.IntegerField(), - 'name': fields.KeywordField(), - }) + wine_origins = fields.ListField( + fields.ObjectField( + properties={ + 'wine_region': fields.ObjectField(properties={ + 'id': fields.IntegerField(), + 'name': fields.KeywordField(), + 'country': fields.ObjectField(properties={ + 'id': fields.IntegerField(), + 'name': fields.ObjectField(attr='name_indexing', + properties=OBJECT_FIELD_PROPERTIES), + 'code': fields.KeywordField(), + }), + # 'coordinates': fields.GeoPointField(), + 'description': fields.ObjectField(attr='description_indexing', + properties=OBJECT_FIELD_PROPERTIES) + + }), + 'wine_sub_region': fields.ObjectField(properties={ + 'id': fields.IntegerField(), + 'name': fields.KeywordField(), + })}) + ) classifications = fields.ObjectField( # TODO properties={ 'classification_type': fields.ObjectField(properties={}), diff --git a/apps/search_indexes/serializers.py b/apps/search_indexes/serializers.py index 7bd3995a..4357d8c1 100644 --- a/apps/search_indexes/serializers.py +++ b/apps/search_indexes/serializers.py @@ -69,6 +69,16 @@ class WineRegionDocumentSerializer(serializers.Serializer): return instance.wine_region if instance and instance.wine_region else None +class WineSubRegionDocumentSerializer(serializers.Serializer): + """Wine region ES document serializer.""" + + id = serializers.IntegerField() + name = serializers.CharField() + + def get_attribute(self, instance): + return instance.wine_sub_region if instance and instance.wine_sub_region else None + + class TagDocumentSerializer(serializers.Serializer): """Tag ES document serializer,""" @@ -223,6 +233,13 @@ class NewsDocumentSerializer(InFavoritesMixin, DocumentSerializer): return get_translated_value(obj.subtitle) +class WineOriginSerializer(serializers.Serializer): + """Wine origin serializer.""" + + wine_region = WineRegionDocumentSerializer() + wine_sub_region = WineSubRegionDocumentSerializer(allow_null=True) + + class EstablishmentDocumentSerializer(InFavoritesMixin, DocumentSerializer): """Establishment document serializer.""" @@ -234,6 +251,7 @@ class EstablishmentDocumentSerializer(InFavoritesMixin, DocumentSerializer): restaurant_cuisine = TagsDocumentSerializer(many=True, allow_null=True) artisan_category = TagsDocumentSerializer(many=True, allow_null=True) schedule = ScheduleDocumentSerializer(many=True, allow_null=True) + wine_origins = WineOriginSerializer(many=True) class Meta: """Meta class.""" @@ -259,6 +277,7 @@ class EstablishmentDocumentSerializer(InFavoritesMixin, DocumentSerializer): 'works_evening', 'works_at_weekday', 'tz', + 'wine_origins', # 'works_now', # 'collections', # 'establishment_type', @@ -276,6 +295,7 @@ class ProductDocumentSerializer(InFavoritesMixin, DocumentSerializer): grape_variety = TagDocumentSerializer(many=True) product_type = ProductTypeDocumentSerializer(allow_null=True) establishment_detail = ProductEstablishmentDocumentSerializer(source='establishment', allow_null=True) + wine_origins = WineOriginSerializer(many=True) class Meta: """Meta class.""" @@ -302,4 +322,5 @@ class ProductDocumentSerializer(InFavoritesMixin, DocumentSerializer): 'establishment_detail', 'average_price', 'created', + 'wine_origins', ) diff --git a/apps/search_indexes/views.py b/apps/search_indexes/views.py index 5fa845f2..0e93d8fc 100644 --- a/apps/search_indexes/views.py +++ b/apps/search_indexes/views.py @@ -158,7 +158,15 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet): }, }, 'wine_region_id': { - 'field': 'products.wine_region.id', + 'field': 'wine_origins.wine_region.id', + 'facet': TermsFacet, + 'enabled': True, + 'options': { + 'size': utils.FACET_MAX_RESPONSE, + }, + }, + 'wine_sub_region_id': { + 'field': 'wine_origins.wine_sub_region.id', 'facet': TermsFacet, 'enabled': True, 'options': { @@ -213,14 +221,14 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet): ], }, 'wine_region_id': { - 'field': 'products.wine_region.id', + 'field': 'wine_origins.wine_region.id', 'lookups': [ constants.LOOKUP_QUERY_IN, constants.LOOKUP_QUERY_EXCLUDE, ], }, 'wine_sub_region_id': { - 'field': 'products.wine_sub_region_id', + 'field': 'wine_origins.wine_sub_region.id', 'lookups': [ constants.LOOKUP_QUERY_IN, constants.LOOKUP_QUERY_EXCLUDE, @@ -354,13 +362,21 @@ class ProductDocumentViewSet(BaseDocumentViewSet): }, }, 'wine_region_id': { - 'field': 'wine_region.id', - 'enabled': True, + 'field': 'wine_origins.wine_region.id', 'facet': TermsFacet, + 'enabled': True, 'options': { 'size': utils.FACET_MAX_RESPONSE, }, }, + 'wine_sub_region_id': { + 'field': 'wine_origins.wine_sub_region.id', + 'facet': TermsFacet, + 'enabled': True, + 'options': { + 'size': utils.FACET_MAX_RESPONSE, + }, + } } translated_search_fields = ( @@ -384,14 +400,14 @@ class ProductDocumentViewSet(BaseDocumentViewSet): ], }, 'wine_region_id': { - 'field': 'wine_region.id', + 'field': 'wine_origins.wine_region.id', 'lookups': [ constants.LOOKUP_QUERY_IN, constants.LOOKUP_QUERY_EXCLUDE, ], }, 'wine_sub_region_id': { - 'field': 'wine_sub_region_id', + 'field': 'wine_origins.wine_sub_region.id', 'lookups': [ constants.LOOKUP_QUERY_IN, constants.LOOKUP_QUERY_EXCLUDE, @@ -404,9 +420,9 @@ class ProductDocumentViewSet(BaseDocumentViewSet): constants.LOOKUP_QUERY_EXCLUDE, ] }, - 'wine_from_country_code': { - 'field': 'wine_region.country.code', - }, + # 'wine_from_country_code': { + # 'field': 'wine_origins.wine_region.country.code', + # }, 'for_establishment': { 'field': 'establishment.slug', }, From d114b93b14445e2b313b0486a4106488ca60c65e Mon Sep 17 00:00:00 2001 From: Anatoly Date: Thu, 5 Dec 2019 09:48:09 +0300 Subject: [PATCH 48/75] fix es for products --- apps/search_indexes/serializers.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/search_indexes/serializers.py b/apps/search_indexes/serializers.py index 4357d8c1..a43ebaf7 100644 --- a/apps/search_indexes/serializers.py +++ b/apps/search_indexes/serializers.py @@ -290,7 +290,6 @@ class ProductDocumentSerializer(InFavoritesMixin, DocumentSerializer): tags = TagsDocumentSerializer(many=True, source='related_tags') subtypes = ProductSubtypeDocumentSerializer(many=True, allow_null=True) - wine_region = WineRegionDocumentSerializer(allow_null=True) wine_colors = TagDocumentSerializer(many=True) grape_variety = TagDocumentSerializer(many=True) product_type = ProductTypeDocumentSerializer(allow_null=True) @@ -316,7 +315,6 @@ class ProductDocumentSerializer(InFavoritesMixin, DocumentSerializer): 'tags', 'product_type', 'subtypes', - 'wine_region', 'wine_colors', 'grape_variety', 'establishment_detail', From 1e0044cbd154729b29d52c7c56103a1d2cab1d48 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Thu, 5 Dec 2019 12:11:44 +0300 Subject: [PATCH 49/75] artisans tags for favs (cherry picked from commit 7081e52) --- apps/establishment/serializers/common.py | 2 ++ apps/favorites/views.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index 4a419fee..23fc24df 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -427,11 +427,13 @@ class EstablishmentSimilarSerializer(EstablishmentBaseSerializer): address = AddressDetailSerializer(read_only=True) schedule = ScheduleRUDSerializer(many=True, allow_null=True) establishment_type = EstablishmentTypeGeoSerializer() + artisan_category = TagBaseSerializer(many=True, allow_null=True) class Meta(EstablishmentBaseSerializer.Meta): fields = EstablishmentBaseSerializer.Meta.fields + [ 'schedule', 'establishment_type', + 'artisan_category', ] diff --git a/apps/favorites/views.py b/apps/favorites/views.py index 53a05469..bee25ced 100644 --- a/apps/favorites/views.py +++ b/apps/favorites/views.py @@ -29,7 +29,8 @@ class FavoritesEstablishmentListView(generics.ListAPIView): def get_queryset(self): """Override get_queryset method""" return Establishment.objects.filter(favorites__user=self.request.user) \ - .order_by('-favorites').with_base_related() + .order_by('-favorites').with_base_related() \ + .with_certain_tag_category_related('shop_category', 'artisan_category') class FavoritesProductListView(generics.ListAPIView): From ca80f7a7971b1f6b04233c29faa53f3854c8c153 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Thu, 5 Dec 2019 13:14:27 +0300 Subject: [PATCH 50/75] possible fix center calculation --- apps/search_indexes/filters.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index 644b47fd..cc2bb55a 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -13,24 +13,24 @@ class CustomGeoSpatialFilteringFilterBackend(GeoSpatialFilteringFilterBackend): @staticmethod def calculate_center(first, second): - if second[1] < 0 < first[1]: - reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1]) + if second[0] < 0 < first[0]: + reverse_first, reverse_second = 180 - abs(first[0]), 180 - abs(second[0]) diff = (reverse_first + reverse_second) / 2 if reverse_first < reverse_second: - result_part = -180 + (180 + second[1] - diff) + result_part = -180 + (180 + second[0] - diff) else: - result_part = 180 - (180 - first[1] - diff) + result_part = 180 - (180 - first[0] - diff) - elif second[1] < 0 > first[1] or second[1] > 0 < first[1]: + elif second[0] < 0 > first[0] or second[0] > 0 < first[0]: reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1]) result_part = ((reverse_first + reverse_second) / 2) * (-1 + (second[1] < 0) * 2) else: - result_part = (first[1] + second[1]) / 2 + result_part = (first[0] + second[0]) / 2 - return (first[0] + second[0]) / 2, result_part + return result_part, (first[1] + second[1]) / 2 def filter_queryset(self, request, queryset, view): ret = super().filter_queryset(request, queryset, view) From 66fc2fae995d3dc5a61d69a1414c732261dd2609 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Thu, 5 Dec 2019 13:15:51 +0300 Subject: [PATCH 51/75] Revert "possible fix center calculation" This reverts commit ca80f7a --- apps/search_indexes/filters.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index cc2bb55a..644b47fd 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -13,24 +13,24 @@ class CustomGeoSpatialFilteringFilterBackend(GeoSpatialFilteringFilterBackend): @staticmethod def calculate_center(first, second): - if second[0] < 0 < first[0]: - reverse_first, reverse_second = 180 - abs(first[0]), 180 - abs(second[0]) + if second[1] < 0 < first[1]: + reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1]) diff = (reverse_first + reverse_second) / 2 if reverse_first < reverse_second: - result_part = -180 + (180 + second[0] - diff) + result_part = -180 + (180 + second[1] - diff) else: - result_part = 180 - (180 - first[0] - diff) + result_part = 180 - (180 - first[1] - diff) - elif second[0] < 0 > first[0] or second[0] > 0 < first[0]: + elif second[1] < 0 > first[1] or second[1] > 0 < first[1]: reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1]) result_part = ((reverse_first + reverse_second) / 2) * (-1 + (second[1] < 0) * 2) else: - result_part = (first[0] + second[0]) / 2 + result_part = (first[1] + second[1]) / 2 - return result_part, (first[1] + second[1]) / 2 + return (first[0] + second[0]) / 2, result_part def filter_queryset(self, request, queryset, view): ret = super().filter_queryset(request, queryset, view) From 3e7922e0fcae0a978979637f3194725f07bb0a68 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Thu, 5 Dec 2019 13:30:43 +0300 Subject: [PATCH 52/75] temp fix --- apps/search_indexes/filters.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index 644b47fd..3d55bdb4 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -30,7 +30,8 @@ class CustomGeoSpatialFilteringFilterBackend(GeoSpatialFilteringFilterBackend): else: result_part = (first[1] + second[1]) / 2 - return (first[0] + second[0]) / 2, result_part + # return (first[0] + second[0]) / 2, result_part + return (first[0] + second[0]) / 2, (first[1] + second[1]) / 2 def filter_queryset(self, request, queryset, view): ret = super().filter_queryset(request, queryset, view) From 3afb51d4728b9d760f31bdbd40c49899d03546a5 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Thu, 5 Dec 2019 14:11:46 +0300 Subject: [PATCH 53/75] fix establishment admin page --- apps/establishment/admin.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/apps/establishment/admin.py b/apps/establishment/admin.py index 2c94676f..81301ddc 100644 --- a/apps/establishment/admin.py +++ b/apps/establishment/admin.py @@ -35,6 +35,7 @@ class ContactPhoneInline(admin.TabularInline): class GalleryImageInline(admin.TabularInline): """Gallery image inline admin.""" model = models.EstablishmentGallery + raw_id_fields = ['image', ] extra = 0 @@ -61,17 +62,20 @@ class ProductInline(admin.TabularInline): class CompanyInline(admin.TabularInline): model = models.Company + raw_id_fields = ['establishment', 'address'] extra = 0 class EstablishmentNote(admin.TabularInline): model = models.EstablishmentNote extra = 0 + raw_id_fields = ['user', ] -class PurchasedProduct(admin.TabularInline): +class PurchasedProductInline(admin.TabularInline): model = PurchasedProduct extra = 0 + raw_id_fields = ['product', ] @admin.register(models.Establishment) @@ -80,13 +84,12 @@ class EstablishmentAdmin(BaseModelAdminMixin, admin.ModelAdmin): list_display = ['id', '__str__', 'image_tag', ] search_fields = ['id', 'name', 'index_name', 'slug'] list_filter = ['public_mark', 'toque_number'] - inlines = [GalleryImageInline, CompanyInline, EstablishmentNote, - PurchasedProduct] - + inlines = [CompanyInline, EstablishmentNote, GalleryImageInline, + PurchasedProductInline, ] # inlines = [ # AwardInline, ContactPhoneInline, ContactEmailInline, # ReviewInline, CommentInline, ProductInline] - raw_id_fields = ('address',) + raw_id_fields = ('address', 'collections', 'tags', 'schedule') @admin.register(models.Position) From fe101f3cb062945340175eabefff2ba41f2a4225 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Thu, 5 Dec 2019 14:16:44 +0300 Subject: [PATCH 54/75] try another calc strategy (cherry picked from commit 9ab17f7) --- apps/search_indexes/filters.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index 3d55bdb4..857d44d2 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -13,25 +13,13 @@ class CustomGeoSpatialFilteringFilterBackend(GeoSpatialFilteringFilterBackend): @staticmethod def calculate_center(first, second): - if second[1] < 0 < first[1]: - reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1]) - diff = (reverse_first + reverse_second) / 2 - - if reverse_first < reverse_second: - result_part = -180 + (180 + second[1] - diff) - - else: - result_part = 180 - (180 - first[1] - diff) - - elif second[1] < 0 > first[1] or second[1] > 0 < first[1]: - reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1]) - result_part = ((reverse_first + reverse_second) / 2) * (-1 + (second[1] < 0) * 2) - + if second[1] < first[1]: + res_longtitude = first[1] + (first[1] - second[1]) / 2 else: - result_part = (first[1] + second[1]) / 2 + res_longtitude = first[1] + (second[1] - first[1]) / 2 # return (first[0] + second[0]) / 2, result_part - return (first[0] + second[0]) / 2, (first[1] + second[1]) / 2 + return (first[0] + second[0]) / 2, res_longtitude def filter_queryset(self, request, queryset, view): ret = super().filter_queryset(request, queryset, view) From aa8304acaf4a9ebf2d5d3a9b3d65b959c344ef9c Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Thu, 5 Dec 2019 14:19:56 +0300 Subject: [PATCH 55/75] Revert "try another calc strategy" This reverts commit fe101f3 --- apps/search_indexes/filters.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index 857d44d2..3d55bdb4 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -13,13 +13,25 @@ class CustomGeoSpatialFilteringFilterBackend(GeoSpatialFilteringFilterBackend): @staticmethod def calculate_center(first, second): - if second[1] < first[1]: - res_longtitude = first[1] + (first[1] - second[1]) / 2 + if second[1] < 0 < first[1]: + reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1]) + diff = (reverse_first + reverse_second) / 2 + + if reverse_first < reverse_second: + result_part = -180 + (180 + second[1] - diff) + + else: + result_part = 180 - (180 - first[1] - diff) + + elif second[1] < 0 > first[1] or second[1] > 0 < first[1]: + reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1]) + result_part = ((reverse_first + reverse_second) / 2) * (-1 + (second[1] < 0) * 2) + else: - res_longtitude = first[1] + (second[1] - first[1]) / 2 + result_part = (first[1] + second[1]) / 2 # return (first[0] + second[0]) / 2, result_part - return (first[0] + second[0]) / 2, res_longtitude + return (first[0] + second[0]) / 2, (first[1] + second[1]) / 2 def filter_queryset(self, request, queryset, view): ret = super().filter_queryset(request, queryset, view) From f9479dd7a61e0761e3d8ab5322c5c932a76372c0 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Thu, 5 Dec 2019 14:30:41 +0300 Subject: [PATCH 56/75] calc center again --- apps/search_indexes/filters.py | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/apps/search_indexes/filters.py b/apps/search_indexes/filters.py index 3d55bdb4..63f1dbb8 100644 --- a/apps/search_indexes/filters.py +++ b/apps/search_indexes/filters.py @@ -13,25 +13,13 @@ class CustomGeoSpatialFilteringFilterBackend(GeoSpatialFilteringFilterBackend): @staticmethod def calculate_center(first, second): - if second[1] < 0 < first[1]: - reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1]) - diff = (reverse_first + reverse_second) / 2 - - if reverse_first < reverse_second: - result_part = -180 + (180 + second[1] - diff) - - else: - result_part = 180 - (180 - first[1] - diff) - - elif second[1] < 0 > first[1] or second[1] > 0 < first[1]: - reverse_first, reverse_second = 180 - abs(first[1]), 180 - abs(second[1]) - result_part = ((reverse_first + reverse_second) / 2) * (-1 + (second[1] < 0) * 2) - + if second[1] < first[1]: + res_longtitude = first[1] + (360 + abs(first[1]) - abs(second[1])) / 2 else: - result_part = (first[1] + second[1]) / 2 + res_longtitude = first[1] + (second[1] - first[1]) / 2 # return (first[0] + second[0]) / 2, result_part - return (first[0] + second[0]) / 2, (first[1] + second[1]) / 2 + return (first[0] + second[0]) / 2, res_longtitude def filter_queryset(self, request, queryset, view): ret = super().filter_queryset(request, queryset, view) From f06596b5b64cc6539ab5729ec4164cc5f17c7d31 Mon Sep 17 00:00:00 2001 From: Dmitriy Kuzmenko Date: Thu, 5 Dec 2019 15:23:16 +0300 Subject: [PATCH 57/75] fix review --- apps/review/transfer_data.py | 4 ---- apps/transfer/serializers/reviews.py | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/apps/review/transfer_data.py b/apps/review/transfer_data.py index af70873e..20c5712d 100644 --- a/apps/review/transfer_data.py +++ b/apps/review/transfer_data.py @@ -115,12 +115,8 @@ def transfer_product_reviews(): products = Product.objects.filter( old_id__isnull=False).values_list('old_id', flat=True) - users = User.objects.filter( - old_id__isnull=False).values_list('old_id', flat=True) - queryset = Reviews.objects.filter( product_id__in=list(products), - reviewer_id__in=list(users), ).values('id', 'reviewer_id', 'aasm_state', 'created_at', 'product_id', 'mark', 'vintage') serialized_data = ProductReviewSerializer(data=list(queryset.values()), many=True) diff --git a/apps/transfer/serializers/reviews.py b/apps/transfer/serializers/reviews.py index 6e0db860..6d3f50b4 100644 --- a/apps/transfer/serializers/reviews.py +++ b/apps/transfer/serializers/reviews.py @@ -55,7 +55,7 @@ class ProductReviewSerializer(ReviewSerializer): product_id = serializers.IntegerField() created_at = serializers.DateTimeField(format='%m-%d-%Y %H:%M:%S') aasm_state = serializers.CharField(allow_null=True) - reviewer_id = serializers.IntegerField() + reviewer_id = serializers.IntegerField(allow_null=True) id = serializers.IntegerField() def validate(self, data): @@ -82,9 +82,8 @@ class ProductReviewSerializer(ReviewSerializer): @staticmethod def get_reviewer(data): user = User.objects.filter(old_id=data['reviewer_id']).first() - if not user: - raise ValueError(f"User account not found with old_id {data['reviewer_id']}") - return user + if user: + return user @staticmethod def get_product(data): From 202f5715f3058a79f5e6f1be5881e83bb2587fbd Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Thu, 5 Dec 2019 17:12:43 +0300 Subject: [PATCH 58/75] remove `tag` category from detail --- apps/establishment/models.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index 2d5ba007..3cdef691 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -457,9 +457,7 @@ class Establishment(GalleryModelMixin, ProjectBaseMixin, URLImageMixin, def visible_tags(self): return super().visible_tags \ .exclude(category__index_name__in=['guide', 'collection', 'purchased_item', - 'business_tag', 'business_tags_de']) \ - .exclude(value__in=['rss', 'rss_selection']) \ - \ + 'business_tag', 'business_tags_de', 'tag']) # todo: recalculate toque_number def recalculate_toque_number(self): From 73c66c7357fb9845852f564e720e497ef85e3b32 Mon Sep 17 00:00:00 2001 From: Dmitriy Kuzmenko Date: Thu, 5 Dec 2019 17:19:38 +0300 Subject: [PATCH 59/75] add_publick_mark --- .../management/commands/add_public_mark.py | 25 +++++++++++++++++++ make_data_migration.sh | 1 + 2 files changed, 26 insertions(+) create mode 100644 apps/product/management/commands/add_public_mark.py diff --git a/apps/product/management/commands/add_public_mark.py b/apps/product/management/commands/add_public_mark.py new file mode 100644 index 00000000..b6bcc296 --- /dev/null +++ b/apps/product/management/commands/add_public_mark.py @@ -0,0 +1,25 @@ +from django.core.management.base import BaseCommand +from tqdm import tqdm + +from product.models import Product + + +class Command(BaseCommand): + help = """Add public_mark to product from reviews.""" + + def handle(self, *args, **kwarg): + update_products = [] + products = Product.objects.filter( + public_mark__isnull=True, + reviews__isnull=False).distinct() + + for product in tqdm(products): + review = product.reviews.published().filter( + mark__isnull=False).order_by('-published_at').first() + if review: + product.public_mark = review.mark + update_products.append(product) + + Product.objects.bulk_update(update_products, ['public_mark', ]) + self.stdout.write( + self.style.WARNING(f'Updated products: {len(update_products)}')) \ No newline at end of file diff --git a/make_data_migration.sh b/make_data_migration.sh index bed1afb7..70e27ccb 100755 --- a/make_data_migration.sh +++ b/make_data_migration.sh @@ -2,6 +2,7 @@ ./manage.py transfer -a ./manage.py transfer -d ./manage.py transfer -e +./manage.py upd_transportation ./manage.py transfer --fill_city_gallery ./manage.py transfer -l ./manage.py transfer --product From 5d76e8a02bce6c9a5acef222ebde496ee83f63af Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 6 Dec 2019 08:20:23 +0300 Subject: [PATCH 60/75] fix address command --- .../management/commands/fix_address.py | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 apps/location/management/commands/fix_address.py diff --git a/apps/location/management/commands/fix_address.py b/apps/location/management/commands/fix_address.py new file mode 100644 index 00000000..5fcdf1b9 --- /dev/null +++ b/apps/location/management/commands/fix_address.py @@ -0,0 +1,29 @@ +from django.core.management.base import BaseCommand +from tqdm import tqdm + +from location.models import Address +from transfer.models import Locations + + +class Command(BaseCommand): + help = """Fix address, clear number field and fill street_name_1 like in old db""" + + def handle(self, *args, **kwarg): + addresses = Address.objects.filter( + old_id__isnull=False + ).values_list('old_id', flat=True) + + old_addresses = Locations.objects.filter( + id__in=list(addresses) + ).values_list('id', 'address') + + update_address = [] + for idx, address in tqdm(old_addresses): + new_address = Address.objects.filter(old_id=idx).first() + if new_address: + new_address.number = 0 + new_address.street_name_1 = address + update_address.append(new_address) + + Address.objects.bulk_update(update_address, ['number', 'street_name_1']) + self.stdout.write(self.style.WARNING(f'Updated addresses: {len(update_address)}')) From 48ae6a437d8d63bf5fa911ba38bc87fe118fe218 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 6 Dec 2019 10:29:43 +0300 Subject: [PATCH 61/75] street_name_2 clear --- apps/location/management/commands/fix_address.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/location/management/commands/fix_address.py b/apps/location/management/commands/fix_address.py index 5fcdf1b9..5ecacba6 100644 --- a/apps/location/management/commands/fix_address.py +++ b/apps/location/management/commands/fix_address.py @@ -22,8 +22,9 @@ class Command(BaseCommand): new_address = Address.objects.filter(old_id=idx).first() if new_address: new_address.number = 0 + new_address.street_name_2 = '' new_address.street_name_1 = address update_address.append(new_address) - Address.objects.bulk_update(update_address, ['number', 'street_name_1']) + Address.objects.bulk_update(update_address, ['number', 'street_name_1', 'street_name_2']) self.stdout.write(self.style.WARNING(f'Updated addresses: {len(update_address)}')) From 7635eafb0906291896a3b426b99b2f0c56ac039d Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Fri, 6 Dec 2019 13:11:29 +0300 Subject: [PATCH 62/75] booking urls for mobile (cherry picked from commit 0df3425) --- apps/booking/urls/__init__.py | 0 apps/booking/{urls.py => urls/common.py} | 0 apps/booking/urls/mobile.py | 8 ++++++++ apps/booking/urls/web.py | 8 ++++++++ project/urls/mobile.py | 1 + project/urls/web.py | 2 +- 6 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 apps/booking/urls/__init__.py rename apps/booking/{urls.py => urls/common.py} (100%) create mode 100644 apps/booking/urls/mobile.py create mode 100644 apps/booking/urls/web.py diff --git a/apps/booking/urls/__init__.py b/apps/booking/urls/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/booking/urls.py b/apps/booking/urls/common.py similarity index 100% rename from apps/booking/urls.py rename to apps/booking/urls/common.py diff --git a/apps/booking/urls/mobile.py b/apps/booking/urls/mobile.py new file mode 100644 index 00000000..57e58c8f --- /dev/null +++ b/apps/booking/urls/mobile.py @@ -0,0 +1,8 @@ +from booking.urls import common as common_views +app = 'booking' + + +urlpatterns_api = [] + +urlpatterns = urlpatterns_api + \ + common_views.urlpatterns diff --git a/apps/booking/urls/web.py b/apps/booking/urls/web.py new file mode 100644 index 00000000..57e58c8f --- /dev/null +++ b/apps/booking/urls/web.py @@ -0,0 +1,8 @@ +from booking.urls import common as common_views +app = 'booking' + + +urlpatterns_api = [] + +urlpatterns = urlpatterns_api + \ + common_views.urlpatterns diff --git a/project/urls/mobile.py b/project/urls/mobile.py index 4fa53ad9..4368189e 100644 --- a/project/urls/mobile.py +++ b/project/urls/mobile.py @@ -3,6 +3,7 @@ from django.urls import path, include app_name = 'mobile' urlpatterns = [ + path('booking/', include('booking.urls.web')), path('establishments/', include('establishment.urls.mobile')), path('location/', include('location.urls.mobile')), path('main/', include('main.urls.mobile')), diff --git a/project/urls/web.py b/project/urls/web.py index c5a609e2..99c12937 100644 --- a/project/urls/web.py +++ b/project/urls/web.py @@ -19,7 +19,7 @@ app_name = 'web' urlpatterns = [ path('account/', include('account.urls.web')), - path('booking/', include('booking.urls')), + path('booking/', include('booking.urls.web')), path('re_blocks/', include('advertisement.urls.web')), path('collections/', include('collection.urls.web')), path('establishments/', include('establishment.urls.web')), From c272dc1255e1e51b90aa9973a0196aaa9a8a8686 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Fri, 6 Dec 2019 13:15:27 +0300 Subject: [PATCH 63/75] increase JWT token lifetime --- project/settings/base.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/project/settings/base.py b/project/settings/base.py index 6648f0af..1d2c5744 100644 --- a/project/settings/base.py +++ b/project/settings/base.py @@ -414,10 +414,10 @@ SORL_THUMBNAIL_ALIASES = { SIMPLE_JWT = { # Increase access token lifetime b.c. front-end dev's cant send multiple # requests to API in one HTTP request. - 'ACCESS_TOKEN_LIFETIME': timedelta(days=30), - 'ACCESS_TOKEN_LIFETIME_SECONDS': 21600, # 6 hours in seconds - 'REFRESH_TOKEN_LIFETIME': timedelta(days=30), - 'REFRESH_TOKEN_LIFETIME_SECONDS': 2592000, # 30 days in seconds + 'ACCESS_TOKEN_LIFETIME': timedelta(days=182), + 'ACCESS_TOKEN_LIFETIME_SECONDS': 15770000, # 6 months + 'REFRESH_TOKEN_LIFETIME': timedelta(days=182), + 'REFRESH_TOKEN_LIFETIME_SECONDS': 15770000, # 6 months 'ROTATE_REFRESH_TOKENS': True, 'BLACKLIST_AFTER_ROTATION': True, @@ -453,7 +453,7 @@ NOTIFICATION_PASSWORD_TEMPLATE = 'account/password_change_email.html' # COOKIES -COOKIES_MAX_AGE = 2628000 # 30 days +COOKIES_MAX_AGE = 15730000 # 6 months SESSION_COOKIE_SAMESITE = None From 91b528feb9cf846aa7ad13f29d0686be1fa57829 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Fri, 6 Dec 2019 14:03:06 +0300 Subject: [PATCH 64/75] tags for establishments --- apps/establishment/models.py | 8 +++++++- apps/establishment/serializers/common.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index 3cdef691..fb401ddd 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -457,9 +457,15 @@ class Establishment(GalleryModelMixin, ProjectBaseMixin, URLImageMixin, def visible_tags(self): return super().visible_tags \ .exclude(category__index_name__in=['guide', 'collection', 'purchased_item', - 'business_tag', 'business_tags_de', 'tag']) + 'business_tag', 'business_tags_de']) \ + .exclude(value__in=['rss', 'rss_selection']) # todo: recalculate toque_number + @property + def visible_tags_detail(self): + """Removes some tags from detail Establishment representation""" + return self.visible_tags.exclude(category__index_name__in=['tag']) + def recalculate_toque_number(self): toque_number = 0 if self.address and self.public_mark: diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index 23fc24df..4025eb96 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -369,7 +369,7 @@ class EstablishmentDetailSerializer(EstablishmentBaseSerializer): employees = EstablishmentEmployeeSerializer(source='actual_establishment_employees', many=True) address = AddressDetailSerializer(read_only=True) - + tags = TagBaseSerializer(read_only=True, many=True, source='visible_tags_detail') menu = MenuSerializers(source='menu_set', many=True, read_only=True) best_price_menu = serializers.DecimalField(max_digits=14, decimal_places=2, read_only=True) best_price_carte = serializers.DecimalField(max_digits=14, decimal_places=2, read_only=True) From e08296c52d1eef433da9494204e5de87b1ed5c0c Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 6 Dec 2019 14:12:26 +0300 Subject: [PATCH 65/75] address to product detail web api --- apps/establishment/serializers/common.py | 26 +++++++++++++++++++++++- apps/product/serializers/common.py | 12 +++++------ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/apps/establishment/serializers/common.py b/apps/establishment/serializers/common.py index 23fc24df..0b2cd6be 100644 --- a/apps/establishment/serializers/common.py +++ b/apps/establishment/serializers/common.py @@ -17,7 +17,7 @@ from utils.serializers import ImageBaseSerializer, CarouselCreateSerializer from utils.serializers import (ProjectModelSerializer, TranslatedField, FavoritesCreateSerializer) from location.serializers import EstablishmentWineRegionBaseSerializer, \ - EstablishmentWineOriginBaseSerializer + EstablishmentWineOriginBaseSerializer class ContactPhonesSerializer(serializers.ModelSerializer): @@ -239,6 +239,30 @@ class EstablishmentShortSerializer(serializers.ModelSerializer): ] +class _EstablishmentAddressShortSerializer(serializers.ModelSerializer): + """Short serializer for establishment.""" + city = CitySerializer(source='address.city', allow_null=True) + establishment_type = EstablishmentTypeGeoSerializer() + establishment_subtypes = EstablishmentSubTypeBaseSerializer(many=True) + currency = CurrencySerializer(read_only=True) + address = AddressBaseSerializer(read_only=True) + + class Meta: + """Meta class.""" + model = models.Establishment + fields = [ + 'id', + 'name', + 'index_name', + 'slug', + 'city', + 'establishment_type', + 'establishment_subtypes', + 'currency', + 'address', + ] + + class EstablishmentProductShortSerializer(serializers.ModelSerializer): """SHORT Serializer for displaying info about an establishment on product page.""" establishment_type = EstablishmentTypeGeoSerializer() diff --git a/apps/product/serializers/common.py b/apps/product/serializers/common.py index 983cc2ab..d794ca93 100644 --- a/apps/product/serializers/common.py +++ b/apps/product/serializers/common.py @@ -4,15 +4,15 @@ from rest_framework import serializers from comment.models import Comment from comment.serializers import CommentSerializer -from establishment.serializers import EstablishmentShortSerializer, EstablishmentProductSerializer, EstablishmentProductShortSerializer -from gallery.models import Image +from establishment.serializers import EstablishmentProductShortSerializer +from establishment.serializers.common import _EstablishmentAddressShortSerializer +from location.serializers import WineOriginRegionBaseSerializer, WineOriginBaseSerializer +from main.serializers import AwardSerializer from product import models from review.serializers import ReviewShortSerializer +from tag.serializers import TagBaseSerializer, TagCategoryProductSerializer from utils import exceptions as utils_exceptions from utils.serializers import TranslatedField, FavoritesCreateSerializer, ImageBaseSerializer -from main.serializers import AwardSerializer -from location.serializers import WineOriginRegionBaseSerializer, WineOriginBaseSerializer -from tag.serializers import TagBaseSerializer, TagCategoryProductSerializer class ProductTagSerializer(TagBaseSerializer): @@ -119,7 +119,7 @@ class ProductBaseSerializer(serializers.ModelSerializer): class ProductDetailSerializer(ProductBaseSerializer): """Product detail serializer.""" description_translated = TranslatedField() - establishment_detail = EstablishmentShortSerializer(source='establishment', read_only=True) + establishment_detail = _EstablishmentAddressShortSerializer(source='establishment', read_only=True) review = ReviewShortSerializer(source='last_published_review', read_only=True) awards = AwardSerializer(many=True, read_only=True) classifications = ProductClassificationBaseSerializer(many=True, read_only=True) From 1372538acf7e722a97ca4064dea3eaf00bb51654 Mon Sep 17 00:00:00 2001 From: dormantman Date: Thu, 5 Dec 2019 18:10:24 +0300 Subject: [PATCH 66/75] Merge branch 'fix/dublicate-products' of /home/dormantman/PycharmProjects/gm-backend with conflicts. --- .gitignore | 6 ++---- apps/product/views/common.py | 2 ++ project/settings/local.py | 36 +++++++++++++----------------------- 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 90e4f23f..ea6151b0 100644 --- a/.gitignore +++ b/.gitignore @@ -21,10 +21,8 @@ logs/ /geoip_db/ # dev -./docker-compose.override.yml +docker-compose.override.yml + celerybeat-schedule local_files celerybeat.pid -/gm_viktor.dump -/docker-compose.dump.yml -/gm_production_20191029.sql diff --git a/apps/product/views/common.py b/apps/product/views/common.py index f984a87b..764a0c97 100644 --- a/apps/product/views/common.py +++ b/apps/product/views/common.py @@ -26,6 +26,8 @@ class ProductListView(ProductBaseView, generics.ListAPIView): filter_class = filters.ProductFilterSet def get_queryset(self): + print(super().get_queryset()) + qs = super().get_queryset().with_extended_related() \ .by_country_code(self.request.country_code) return qs diff --git a/project/settings/local.py b/project/settings/local.py index c56f9042..fe521d92 100644 --- a/project/settings/local.py +++ b/project/settings/local.py @@ -30,31 +30,18 @@ MEDIA_ROOT = os.path.join(PUBLIC_ROOT, MEDIA_LOCATION) THUMBNAIL_DEBUG = True # ADDED TRANSFER APP -INSTALLED_APPS.append('transfer.apps.TransferConfig') +# INSTALLED_APPS.append('transfer.apps.TransferConfig') # DATABASES -DATABASES = { - 'default': { - 'ENGINE': 'django.contrib.gis.db.backends.postgis', - 'NAME': os.environ.get('DB_NAME'), - 'USER': os.environ.get('DB_USERNAME'), - 'PASSWORD': os.environ.get('DB_PASSWORD'), - 'HOST': os.environ.get('DB_HOSTNAME'), - 'PORT': os.environ.get('DB_PORT'), - 'OPTIONS': { - 'options': '-c search_path=gm' - }, - }, - 'legacy': { - 'ENGINE': 'django.db.backends.mysql', - # 'HOST': '172.22.0.1', - 'HOST': 'mysql_db', - 'PORT': 3306, - 'NAME': 'dev', - 'USER': 'dev', - 'PASSWORD': 'octosecret123' - }, -} +# DATABASES.update({ +# 'legacy': { +# 'ENGINE': 'django.db.backends.mysql', +# # 'HOST': '172.22.0.1', +# 'HOST': 'mysql_db', +# 'PORT': 3306, +# 'NAME': 'dev', +# 'USER': 'dev', +# 'PASSWORD': 'octosecret123'}}) # LOGGING @@ -113,3 +100,6 @@ TESTING = sys.argv[1:2] == ['test'] if TESTING: ELASTICSEARCH_INDEX_NAMES = {} ELASTICSEARCH_DSL_AUTOSYNC = False + +# INSTALLED APPS +INSTALLED_APPS.append('transfer.apps.TransferConfig') \ No newline at end of file From 0c5140d35944328b2916b6eabaa04ec8677b23a5 Mon Sep 17 00:00:00 2001 From: dormantman Date: Fri, 6 Dec 2019 15:03:18 +0300 Subject: [PATCH 67/75] Added current product exclude --- apps/product/filters.py | 6 ++++++ apps/product/models.py | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/apps/product/filters.py b/apps/product/filters.py index c7e87dda..1d226356 100644 --- a/apps/product/filters.py +++ b/apps/product/filters.py @@ -9,6 +9,7 @@ class ProductFilterSet(filters.FilterSet): """Product filter set.""" establishment_id = filters.NumberFilter() + current_product = filters.CharFilter(method='without_current_product') product_type = filters.CharFilter(method='by_product_type') product_subtype = filters.CharFilter(method='by_product_subtype') @@ -21,6 +22,11 @@ class ProductFilterSet(filters.FilterSet): 'product_subtype', ] + def without_current_product(self, queryset, name, value): + if value not in EMPTY_VALUES: + return queryset.without_current_product(value) + return queryset + def by_product_type(self, queryset, name, value): if value not in EMPTY_VALUES: return queryset.by_product_type(value) diff --git a/apps/product/models.py b/apps/product/models.py index a6129c48..6d3e4954 100644 --- a/apps/product/models.py +++ b/apps/product/models.py @@ -102,6 +102,11 @@ class ProductQuerySet(models.QuerySet): def wines(self): return self.filter(type__index_name__icontains=ProductType.WINE) + def without_current_product(self, current_product: str): + """Exclude by current product.""" + kwargs = {'pk': int(current_product)} if current_product.isdigit() else {'slug': current_product} + return self.exclude(**kwargs) + def by_product_type(self, product_type: str): """Filter by type.""" return self.filter(product_type__index_name__icontains=product_type) From 6a9356aaa6b9efc7f5a41ff32a58c2b37196bf76 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Fri, 6 Dec 2019 15:10:48 +0300 Subject: [PATCH 68/75] fix merge conflicts --- .gitignore | 6 ++++-- apps/product/views/common.py | 2 -- project/settings/local.py | 36 +++++++++++++++++++++++------------- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index ea6151b0..90e4f23f 100644 --- a/.gitignore +++ b/.gitignore @@ -21,8 +21,10 @@ logs/ /geoip_db/ # dev -docker-compose.override.yml - +./docker-compose.override.yml celerybeat-schedule local_files celerybeat.pid +/gm_viktor.dump +/docker-compose.dump.yml +/gm_production_20191029.sql diff --git a/apps/product/views/common.py b/apps/product/views/common.py index 764a0c97..f984a87b 100644 --- a/apps/product/views/common.py +++ b/apps/product/views/common.py @@ -26,8 +26,6 @@ class ProductListView(ProductBaseView, generics.ListAPIView): filter_class = filters.ProductFilterSet def get_queryset(self): - print(super().get_queryset()) - qs = super().get_queryset().with_extended_related() \ .by_country_code(self.request.country_code) return qs diff --git a/project/settings/local.py b/project/settings/local.py index fe521d92..c56f9042 100644 --- a/project/settings/local.py +++ b/project/settings/local.py @@ -30,18 +30,31 @@ MEDIA_ROOT = os.path.join(PUBLIC_ROOT, MEDIA_LOCATION) THUMBNAIL_DEBUG = True # ADDED TRANSFER APP -# INSTALLED_APPS.append('transfer.apps.TransferConfig') +INSTALLED_APPS.append('transfer.apps.TransferConfig') # DATABASES -# DATABASES.update({ -# 'legacy': { -# 'ENGINE': 'django.db.backends.mysql', -# # 'HOST': '172.22.0.1', -# 'HOST': 'mysql_db', -# 'PORT': 3306, -# 'NAME': 'dev', -# 'USER': 'dev', -# 'PASSWORD': 'octosecret123'}}) +DATABASES = { + 'default': { + 'ENGINE': 'django.contrib.gis.db.backends.postgis', + 'NAME': os.environ.get('DB_NAME'), + 'USER': os.environ.get('DB_USERNAME'), + 'PASSWORD': os.environ.get('DB_PASSWORD'), + 'HOST': os.environ.get('DB_HOSTNAME'), + 'PORT': os.environ.get('DB_PORT'), + 'OPTIONS': { + 'options': '-c search_path=gm' + }, + }, + 'legacy': { + 'ENGINE': 'django.db.backends.mysql', + # 'HOST': '172.22.0.1', + 'HOST': 'mysql_db', + 'PORT': 3306, + 'NAME': 'dev', + 'USER': 'dev', + 'PASSWORD': 'octosecret123' + }, +} # LOGGING @@ -100,6 +113,3 @@ TESTING = sys.argv[1:2] == ['test'] if TESTING: ELASTICSEARCH_INDEX_NAMES = {} ELASTICSEARCH_DSL_AUTOSYNC = False - -# INSTALLED APPS -INSTALLED_APPS.append('transfer.apps.TransferConfig') \ No newline at end of file From 351d4920121049e0b00c3563abd6d48091969da0 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Fri, 6 Dec 2019 15:45:46 +0300 Subject: [PATCH 69/75] command to remove relative news description images --- .../news/management/commands/rm_empty_images.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 apps/news/management/commands/rm_empty_images.py diff --git a/apps/news/management/commands/rm_empty_images.py b/apps/news/management/commands/rm_empty_images.py new file mode 100644 index 00000000..3a48e2e4 --- /dev/null +++ b/apps/news/management/commands/rm_empty_images.py @@ -0,0 +1,17 @@ +from django.core.management.base import BaseCommand + +from news.models import News +import re + +class Command(BaseCommand): + help = 'Removes empty img html tags from news description' + + relative_img_regex = re.compile(r'\', re.I) + + def handle(self, *args, **kwargs): + for news in News.objects.all(): + if isinstance(news.description, dict): + news.description = {locale: self.relative_img_regex.sub('', rich_text) + for locale, rich_text in news.description.items()} + self.stdout.write(self.style.WARNING(f'Replaced {news} empty img html tags...\n')) + news.save() \ No newline at end of file From bdb82d0fb010632fcfb64b9a056e3e163f4407cc Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Fri, 6 Dec 2019 16:40:39 +0300 Subject: [PATCH 70/75] add migration command --- make_data_migration.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/make_data_migration.sh b/make_data_migration.sh index 70e27ccb..e6cec3e1 100755 --- a/make_data_migration.sh +++ b/make_data_migration.sh @@ -12,4 +12,5 @@ ./manage.py transfer --wine_characteristics ./manage.py transfer --inquiries ./manage.py transfer --assemblage -./manage.py transfer --purchased_plaques \ No newline at end of file +./manage.py transfer --purchased_plaques +./manage.py rm_empty_images \ No newline at end of file From 8af8cf92e97d97c52a0617a05cd7c99d6f511996 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Fri, 6 Dec 2019 17:00:54 +0300 Subject: [PATCH 71/75] added objects related statistic in Collection backoffice serializer --- apps/collection/models.py | 36 +++++++++++++++++++++++++++++ apps/collection/serializers/back.py | 4 ++++ 2 files changed, 40 insertions(+) diff --git a/apps/collection/models.py b/apps/collection/models.py index 58ca9f07..7acd9991 100644 --- a/apps/collection/models.py +++ b/apps/collection/models.py @@ -87,6 +87,42 @@ class Collection(ProjectBaseMixin, CollectionDateMixin, verbose_name = _('collection') verbose_name_plural = _('collections') + @property + def _related_objects(self) -> list: + """Return list of related objects.""" + related_objects = [] + # get related objects + for related_object in self._meta.related_objects: + related_objects.append(related_object) + return related_objects + + @property + def count_related_objects(self) -> int: + """Return count of related objects.""" + counter = 0 + # count of related objects + for related_object in [related_object.name for related_object in self._related_objects]: + counter += getattr(self, f'{related_object}').count() + return counter + + @property + def related_object_names(self) -> list: + """Return related object names.""" + raw_object_names = [] + for related_object in [related_object.name for related_object in self._related_objects]: + instances = getattr(self, f'{related_object}') + if instances.exists(): + for instance in instances.all(): + raw_object_names.append(instance.slug if hasattr(instance, 'slug') else None) + + # parse slugs + object_names = [] + re_pattern = r'[\w]+' + for raw_name in raw_object_names: + result = re.findall(re_pattern, raw_name) + if result: object_names.append(' '.join(result).capitalize()) + return set(object_names) + class GuideTypeQuerySet(models.QuerySet): """QuerySet for model GuideType.""" diff --git a/apps/collection/serializers/back.py b/apps/collection/serializers/back.py index bb88a778..48c25f6c 100644 --- a/apps/collection/serializers/back.py +++ b/apps/collection/serializers/back.py @@ -19,6 +19,8 @@ class CollectionBackOfficeSerializer(CollectionBaseSerializer): collection_type_display = serializers.CharField( source='get_collection_type_display', read_only=True) country = CountrySimpleSerializer(read_only=True) + count_related_objects = serializers.IntegerField(read_only=True) + related_object_names = serializers.ListField(read_only=True) class Meta: model = models.Collection @@ -36,6 +38,8 @@ class CollectionBackOfficeSerializer(CollectionBaseSerializer): 'slug', 'start', 'end', + 'count_related_objects', + 'related_object_names', ] From f1fa8a58de3c3d7a9eb6d90b99b8d57332e3e6f1 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Fri, 6 Dec 2019 17:37:33 +0300 Subject: [PATCH 72/75] small refactoring --- apps/establishment/views/web.py | 5 +---- apps/product/views/common.py | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/apps/establishment/views/web.py b/apps/establishment/views/web.py index 71994522..74c20451 100644 --- a/apps/establishment/views/web.py +++ b/apps/establishment/views/web.py @@ -114,10 +114,7 @@ class EstablishmentCommentListView(generics.ListAPIView): """Override get_queryset method""" establishment = get_object_or_404(models.Establishment, slug=self.kwargs['slug']) - return comment_models.Comment.objects.by_content_type(app_label='establishment', - model='establishment') \ - .by_object_id(object_id=establishment.pk) \ - .order_by('-created') + return establishment.comments.order_by('-created') class EstablishmentCommentRUDView(generics.RetrieveUpdateDestroyAPIView): diff --git a/apps/product/views/common.py b/apps/product/views/common.py index f984a87b..650c1dfe 100644 --- a/apps/product/views/common.py +++ b/apps/product/views/common.py @@ -60,10 +60,7 @@ class ProductCommentListView(generics.ListAPIView): def get_queryset(self): """Override get_queryset method""" product = get_object_or_404(Product, slug=self.kwargs['slug']) - return Comment.objects.by_content_type(app_label='product', - model='product') \ - .by_object_id(object_id=product.pk) \ - .order_by('-created') + return product.comments.order_by('-created') class ProductCommentRUDView(generics.RetrieveUpdateDestroyAPIView): From 831cb4bc81a48f7418f645d3d0a4998e3c8abda1 Mon Sep 17 00:00:00 2001 From: Dmitriy Kuzmenko Date: Fri, 6 Dec 2019 18:17:16 +0300 Subject: [PATCH 73/75] add home_page --- _dockerfiles/db/Dockerfile | 2 +- .../commands/add_home_page_carousel.py | 37 +++++++++++++++++++ apps/transfer/models.py | 2 +- make_data_migration.sh | 2 + project/settings/base.py | 3 ++ project/settings/local.py | 2 +- 6 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 apps/main/management/commands/add_home_page_carousel.py diff --git a/_dockerfiles/db/Dockerfile b/_dockerfiles/db/Dockerfile index e8a9ded3..c3e35955 100644 --- a/_dockerfiles/db/Dockerfile +++ b/_dockerfiles/db/Dockerfile @@ -1,3 +1,3 @@ -FROM mdillon/postgis:latest +FROM mdillon/postgis:10 RUN localedef -i ru_RU -c -f UTF-8 -A /usr/share/locale/locale.alias ru_RU.UTF-8 ENV LANG ru_RU.utf8 diff --git a/apps/main/management/commands/add_home_page_carousel.py b/apps/main/management/commands/add_home_page_carousel.py new file mode 100644 index 00000000..5d4f2703 --- /dev/null +++ b/apps/main/management/commands/add_home_page_carousel.py @@ -0,0 +1,37 @@ +from django.core.management.base import BaseCommand +from tqdm import tqdm + +from establishment.models import Establishment +from main.models import Carousel +from transfer.models import HomePages +from location.models import Country +from django.db.models import F + + +class Command(BaseCommand): + help = '''Add establishment form HomePage to Carousel!''' + + @staticmethod + def get_country(country_code): + return Country.objects.filter(code__iexact=country_code).first() + + def handle(self, *args, **kwargs): + objects = [] + deleted = 0 + hp_list = HomePages.objects.annotate( + country=F('site__country_code_2'), + ).all() + for hm in tqdm(hp_list, desc='Add home_page.establishments to carousel'): + est = Establishment.objects.filter(old_id=hm.selection_of_week).first() + if est: + if est.carousels.exists(): + est.carousels.all().delete() + deleted += 1 + carousel = Carousel( + content_object=est, + country=self.get_country(hm.country) + ) + objects.append(carousel) + Carousel.objects.bulk_create(objects) + self.stdout.write( + self.style.WARNING(f'Created {len(objects)}/Deleted {deleted} carousel objects.')) \ No newline at end of file diff --git a/apps/transfer/models.py b/apps/transfer/models.py index 2ebcfb65..019f38aa 100644 --- a/apps/transfer/models.py +++ b/apps/transfer/models.py @@ -1000,7 +1000,7 @@ class ProductNotes(MigrateMixin): db_table = 'product_notes' -class HomePages(models.Model): +class HomePages(MigrateMixin): using = 'legacy' site = models.ForeignKey(Sites, models.DO_NOTHING, blank=True, null=True) diff --git a/make_data_migration.sh b/make_data_migration.sh index 70e27ccb..13fba591 100755 --- a/make_data_migration.sh +++ b/make_data_migration.sh @@ -2,6 +2,8 @@ ./manage.py transfer -a ./manage.py transfer -d ./manage.py transfer -e +./manage.py transfer -n +./manage.py rm_empty_images # команда для удаления картинок с относительным урлом из news.description ./manage.py upd_transportation ./manage.py transfer --fill_city_gallery ./manage.py transfer -l diff --git a/project/settings/base.py b/project/settings/base.py index 1d2c5744..76af8966 100644 --- a/project/settings/base.py +++ b/project/settings/base.py @@ -524,3 +524,6 @@ INTERNATIONAL_COUNTRY_CODES = ['www', 'main', 'next'] THUMBNAIL_ENGINE = 'utils.thumbnail_engine.GMEngine' COOKIE_DOMAIN = None + +ELASTICSEARCH_DSL = {} +ELASTICSEARCH_INDEX_NAMES = {} diff --git a/project/settings/local.py b/project/settings/local.py index c56f9042..d9c7cab8 100644 --- a/project/settings/local.py +++ b/project/settings/local.py @@ -42,7 +42,7 @@ DATABASES = { 'HOST': os.environ.get('DB_HOSTNAME'), 'PORT': os.environ.get('DB_PORT'), 'OPTIONS': { - 'options': '-c search_path=gm' + 'options': '-c search_path=gm,public' }, }, 'legacy': { From b5a113c875c4245a82db8d1c69d50ddbc54e4c51 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Fri, 6 Dec 2019 18:53:40 +0300 Subject: [PATCH 74/75] user last visit middleware --- apps/utils/middleware.py | 11 ++++++++++- project/settings/base.py | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/utils/middleware.py b/apps/utils/middleware.py index f3936169..1a421322 100644 --- a/apps/utils/middleware.py +++ b/apps/utils/middleware.py @@ -1,5 +1,6 @@ """Custom middleware.""" -from django.utils import translation +from django.utils import translation, timezone +from account.models import User from configuration.models import TranslationSettings from translation.models import Language @@ -12,6 +13,14 @@ def get_locale(cookie_dict): def get_country_code(cookie_dict): return cookie_dict.get('country_code') +def user_last_visit(get_response): + """Updates user last visit w/ current""" + def middleware(request): + response = get_response(request) + if request.user.is_authenticated: + User.objects.filter(pk=request.user.pk).update(last_login=timezone.now()) + return response + return middleware def parse_cookies(get_response): """Parse cookies.""" diff --git a/project/settings/base.py b/project/settings/base.py index 76af8966..5a48c261 100644 --- a/project/settings/base.py +++ b/project/settings/base.py @@ -118,6 +118,7 @@ MIDDLEWARE = [ 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'utils.middleware.parse_cookies', + 'utils.middleware.user_last_visit', ] ROOT_URLCONF = 'project.urls' From 8451ccf17ecf1f4ee7b60d3c58ac0cd40e790417 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Fri, 6 Dec 2019 19:17:38 +0300 Subject: [PATCH 75/75] add ordering & optimize serializer --- apps/account/serializers/back.py | 19 ++++++++++++++++++- apps/account/views/back.py | 13 +++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/apps/account/serializers/back.py b/apps/account/serializers/back.py index b2316734..699210e7 100644 --- a/apps/account/serializers/back.py +++ b/apps/account/serializers/back.py @@ -16,7 +16,24 @@ class RoleSerializer(serializers.ModelSerializer): class BackUserSerializer(serializers.ModelSerializer): class Meta: model = User - fields = '__all__' + fields = ( + 'id', + 'last_login', + 'is_superuser', + 'username', + 'last_name', + 'first_name', + 'is_active', + 'date_joined', + 'image_url', + 'cropped_image_url', + 'email', + 'email_confirmed', + 'unconfirmed_email', + 'email_confirmed', + 'newsletter', + 'roles', + ) extra_kwargs = { 'password': {'write_only': True} } diff --git a/apps/account/views/back.py b/apps/account/views/back.py index 80775b3a..fbbc986e 100644 --- a/apps/account/views/back.py +++ b/apps/account/views/back.py @@ -1,5 +1,6 @@ from django_filters.rest_framework import DjangoFilterBackend from rest_framework import generics, permissions +from rest_framework.filters import OrderingFilter from account import models from account.models import User @@ -18,10 +19,10 @@ class UserRoleLstView(generics.ListCreateAPIView): class UserLstView(generics.ListCreateAPIView): """User list create view.""" - queryset = User.objects.all() + queryset = User.objects.prefetch_related('roles') serializer_class = serializers.BackUserSerializer permission_classes = (permissions.IsAdminUser,) - filter_backends = (DjangoFilterBackend,) + filter_backends = (DjangoFilterBackend, OrderingFilter) filterset_fields = ( 'email_confirmed', 'is_staff', @@ -29,6 +30,14 @@ class UserLstView(generics.ListCreateAPIView): 'is_superuser', 'roles', ) + ordering_fields = ( + 'email_confirmed', + 'is_staff', + 'is_active', + 'is_superuser', + 'roles', + 'last_login' + ) class UserRUDView(generics.RetrieveUpdateDestroyAPIView):