From 069a2ad2a885a4e838d24f175e4f61801b70b4cb Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 24 Dec 2019 11:35:20 +0300 Subject: [PATCH 1/9] review text author model --- apps/review/admin.py | 14 ++++++++ .../migrations/0020_reviewtextauthor.py | 33 +++++++++++++++++++ apps/review/models.py | 21 ++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 apps/review/migrations/0020_reviewtextauthor.py diff --git a/apps/review/admin.py b/apps/review/admin.py index b1ac0636..5b8e3b01 100644 --- a/apps/review/admin.py +++ b/apps/review/admin.py @@ -4,8 +4,22 @@ from django.contrib import admin from utils.admin import BaseModelAdminMixin +class ReviewTextAuthorInline(admin.TabularInline): + """ReviewTextAuthor inline.""" + model = models.ReviewTextAuthor + extra = 0 + + @admin.register(models.Review) class ReviewAdminModel(BaseModelAdminMixin, admin.ModelAdmin): """Admin model for model Review.""" raw_id_fields = ('reviewer', 'child', 'country') + inlines = [ReviewTextAuthorInline, ] + + +@admin.register(models.ReviewTextAuthor) +class ReviewTextAuthorAdminModel(BaseModelAdminMixin, admin.ModelAdmin): + """Admin model for model ReviewTextAuthor.""" + + raw_id_fields = ('author', 'review') diff --git a/apps/review/migrations/0020_reviewtextauthor.py b/apps/review/migrations/0020_reviewtextauthor.py new file mode 100644 index 00000000..8d817103 --- /dev/null +++ b/apps/review/migrations/0020_reviewtextauthor.py @@ -0,0 +1,33 @@ +# Generated by Django 2.2.7 on 2019-12-24 08:30 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('review', '0019_review_priority'), + ] + + operations = [ + migrations.CreateModel( + name='ReviewTextAuthor', + 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')), + ('locale', models.CharField(max_length=10, verbose_name='locale')), + ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='review_authors', to=settings.AUTH_USER_MODEL, verbose_name='author')), + ('review', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='text_authors', to='review.Review', verbose_name='review')), + ], + options={ + 'verbose_name': 'Text author', + 'verbose_name_plural': 'Text authors', + 'unique_together': {('locale', 'review')}, + }, + ), + ] diff --git a/apps/review/models.py b/apps/review/models.py index a65ef96f..79f964a4 100644 --- a/apps/review/models.py +++ b/apps/review/models.py @@ -93,6 +93,27 @@ class Review(BaseAttributes, TranslatedFieldsMixin): verbose_name_plural = _('Reviews') +class ReviewTextAuthor(ProjectBaseMixin): + author = models.ForeignKey( + 'account.User', + verbose_name=_('author'), + on_delete=models.CASCADE, + related_name='review_authors', + ) + review = models.ForeignKey( + 'review.Review', + verbose_name=_('review'), + on_delete=models.CASCADE, + related_name='text_authors', + ) + locale = models.CharField(_('locale'), max_length=10) + + class Meta: + verbose_name = _('Text author') + verbose_name_plural = _('Text authors') + unique_together = ('locale', 'review') + + class Inquiries(GalleryMixin, ProjectBaseMixin): NONE = 0 DINER = 1 From 92e5f7a40ba5d216a82e0767f7b3f362904cb397 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 24 Dec 2019 13:40:27 +0300 Subject: [PATCH 2/9] signals for text field --- apps/review/admin.py | 10 ++-------- apps/review/models.py | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/apps/review/admin.py b/apps/review/admin.py index 5b8e3b01..3e5ee4a2 100644 --- a/apps/review/admin.py +++ b/apps/review/admin.py @@ -1,13 +1,8 @@ """Admin page for app Review""" -from . import models from django.contrib import admin + from utils.admin import BaseModelAdminMixin - - -class ReviewTextAuthorInline(admin.TabularInline): - """ReviewTextAuthor inline.""" - model = models.ReviewTextAuthor - extra = 0 +from . import models @admin.register(models.Review) @@ -15,7 +10,6 @@ class ReviewAdminModel(BaseModelAdminMixin, admin.ModelAdmin): """Admin model for model Review.""" raw_id_fields = ('reviewer', 'child', 'country') - inlines = [ReviewTextAuthorInline, ] @admin.register(models.ReviewTextAuthor) diff --git a/apps/review/models.py b/apps/review/models.py index 79f964a4..b412b305 100644 --- a/apps/review/models.py +++ b/apps/review/models.py @@ -1,7 +1,11 @@ """Review app models.""" +from pprint import pprint + from django.contrib.contenttypes import fields as generic from django.core.validators import MinValueValidator, MaxValueValidator from django.db import models +from django.db.models.signals import post_init, post_save +from django.dispatch import receiver from django.utils.translation import gettext_lazy as _ from utils.models import (BaseAttributes, TranslatedFieldsMixin, @@ -93,6 +97,30 @@ class Review(BaseAttributes, TranslatedFieldsMixin): verbose_name_plural = _('Reviews') +@receiver(signal=post_init, sender=Review) +def post_init_handler(instance, **kwargs): + instance.original_text = instance.text + + +@receiver(signal=post_save, sender=Review) +def post_save_handler(instance, **kwargs): + new_text = instance.text + old_text = instance.original_text + if new_text != old_text: + for locale in new_text: + if locale in old_text: + pass + else: + # TODO: для добавленной локали создать запись в ReviewTextAuthor + pass + + # TODO: для измененной локали создать или обновить запись в ReviewTextAuthor + # TODO: для удаленной локали удалить соответствующую запись в ReviewTextAuthor + + pprint(instance.text) + pprint(instance.original_text) + + class ReviewTextAuthor(ProjectBaseMixin): author = models.ForeignKey( 'account.User', From 670da807af05ec8fe14fd53eae10c16e9291e21c Mon Sep 17 00:00:00 2001 From: littlewolf Date: Tue, 24 Dec 2019 14:10:47 +0300 Subject: [PATCH 3/9] Fix fake country flag --- apps/location/transfer_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/location/transfer_data.py b/apps/location/transfer_data.py index 3837de28..54bf2301 100644 --- a/apps/location/transfer_data.py +++ b/apps/location/transfer_data.py @@ -191,7 +191,7 @@ def update_fake_country_flag(): resp = get(link_to_request) if resp.status_code == 200: country = Country.objects.get(code="aa") - country.svg_image = link_to_request + country.svg_image = "/svg/country/10-31-2019/aa.svg" country.save() From bc0db915be267c7c2f26451d1a1b5a435c00fc80 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 25 Dec 2019 09:15:36 +0300 Subject: [PATCH 4/9] author for review text --- apps/review/admin.py | 1 + apps/review/models.py | 37 +++++--------- apps/review/serializers/back.py | 85 ++++++++++++++++++++++++++++++++- 3 files changed, 98 insertions(+), 25 deletions(-) diff --git a/apps/review/admin.py b/apps/review/admin.py index 3e5ee4a2..61c4d15a 100644 --- a/apps/review/admin.py +++ b/apps/review/admin.py @@ -16,4 +16,5 @@ class ReviewAdminModel(BaseModelAdminMixin, admin.ModelAdmin): class ReviewTextAuthorAdminModel(BaseModelAdminMixin, admin.ModelAdmin): """Admin model for model ReviewTextAuthor.""" + list_display = ('author', 'review', 'locale', 'modified') raw_id_fields = ('author', 'review') diff --git a/apps/review/models.py b/apps/review/models.py index b412b305..ee4b74a3 100644 --- a/apps/review/models.py +++ b/apps/review/models.py @@ -97,30 +97,6 @@ class Review(BaseAttributes, TranslatedFieldsMixin): verbose_name_plural = _('Reviews') -@receiver(signal=post_init, sender=Review) -def post_init_handler(instance, **kwargs): - instance.original_text = instance.text - - -@receiver(signal=post_save, sender=Review) -def post_save_handler(instance, **kwargs): - new_text = instance.text - old_text = instance.original_text - if new_text != old_text: - for locale in new_text: - if locale in old_text: - pass - else: - # TODO: для добавленной локали создать запись в ReviewTextAuthor - pass - - # TODO: для измененной локали создать или обновить запись в ReviewTextAuthor - # TODO: для удаленной локали удалить соответствующую запись в ReviewTextAuthor - - pprint(instance.text) - pprint(instance.original_text) - - class ReviewTextAuthor(ProjectBaseMixin): author = models.ForeignKey( 'account.User', @@ -142,6 +118,19 @@ class ReviewTextAuthor(ProjectBaseMixin): unique_together = ('locale', 'review') +# @receiver(signal=post_init, sender=Review) +# def post_init_handler(instance, **kwargs): +# instance.original_text = instance.text +# +# +# @receiver(signal=post_save, sender=Review) +# def post_save_handler(instance, **kwargs): +# new_text = instance.text +# old_text = instance.original_text +# pprint(instance.text) +# pprint(instance.original_text) + + class Inquiries(GalleryMixin, ProjectBaseMixin): NONE = 0 DINER = 1 diff --git a/apps/review/serializers/back.py b/apps/review/serializers/back.py index 75df94e2..ffe14d22 100644 --- a/apps/review/serializers/back.py +++ b/apps/review/serializers/back.py @@ -1,9 +1,10 @@ """Review app back serializers.""" + from django.contrib.contenttypes.models import ContentType from rest_framework import serializers from account.models import User -from review.models import Review +from review.models import Review, ReviewTextAuthor class _ReviewerSerializer(serializers.ModelSerializer): @@ -28,10 +29,24 @@ class _ContentTypeSerializer(serializers.ModelSerializer): ) +class _ReviewTextAuthorSerializer(serializers.ModelSerializer): + author = _ReviewerSerializer(read_only=True) + + class Meta: + model = ReviewTextAuthor + fields = ( + 'id', + 'author', + 'locale', + 'modified', + ) + + class ReviewBackSerializer(serializers.ModelSerializer): reviewer_data = _ReviewerSerializer(read_only=True, source='reviewer') content_type_data = _ContentTypeSerializer(read_only=True, source='content_type') status_display = serializers.CharField(read_only=True, source='get_status_display') + authors = _ReviewTextAuthorSerializer(read_only=True, many=True, source='text_authors') class Meta: model = Review @@ -51,4 +66,72 @@ class ReviewBackSerializer(serializers.ModelSerializer): 'content_type', 'content_type_data', 'object_id', + 'authors', ) + + def update(self, instance, validated_data): + old_text = instance.text + new_text = validated_data['text'] + + # если поле text не менялось - то ничего не делаем + if new_text == old_text: + return super().update(instance, validated_data) + + # если пользователь анонимный - то ничего не делаем + user = self.context['request'].user + if user.is_anonymous: + return super().update(instance, validated_data) + + for locale, text in new_text.items(): + + # если поменяли имеющийся текст + if locale in old_text and text != old_text[locale]: + review_author, _ = ReviewTextAuthor.objects.update_or_create( + review=instance, + locale=locale, + defaults={ + 'author': user, + } + ) + + # если добавили новый перевод + elif locale not in old_text: + ReviewTextAuthor.objects.create( + author=user, + review=instance, + locale=locale, + ) + + for locale in old_text: + + # Если удалили перевод + if locale not in new_text: + ReviewTextAuthor.objects.filter( + author=user, + review=instance, + locale=locale, + ).delete() + + return super().update(instance, validated_data) + + def create(self, validated_data): + obj = super().create(validated_data) + new_text = validated_data['text'] + + # если нет переводов для review - то ничего не делаем + if not isinstance(new_text, dict): + return obj + + # если пользователь анонимный - то ничего не делаем + user = self.context['request'].user + if user.is_anonymous: + return obj + + for locale, text in new_text.items(): + ReviewTextAuthor.objects.create( + author=user, + review=obj, + locale=locale, + ) + + return obj From 432873da31e517b675b25eebdc7300b80bb1a666 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 25 Dec 2019 13:48:04 +0300 Subject: [PATCH 5/9] fix main_image for news (cherry picked from commit 8ca213a) --- apps/news/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/news/models.py b/apps/news/models.py index cfcc8dd5..0396c441 100644 --- a/apps/news/models.py +++ b/apps/news/models.py @@ -307,7 +307,7 @@ class News(GalleryMixin, BaseAttributes, TranslatedFieldsMixin, HasTagsMixin, def main_image(self): qs = self.news_gallery.main_image() if qs.exists(): - return qs.first().image + return qs.order_by('-id').first().image @property def image_url(self): From cd194b79bd4f07fd67c4a556bc7c764f2f3063f3 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 25 Dec 2019 14:05:48 +0300 Subject: [PATCH 6/9] fix artisans chosen tags --- apps/tag/filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/tag/filters.py b/apps/tag/filters.py index 5b0ba43e..a731272e 100644 --- a/apps/tag/filters.py +++ b/apps/tag/filters.py @@ -73,7 +73,7 @@ class TagsFilterSet(TagsBaseFilterSet): def by_establishment_type(self, queryset, name, value): if value == EstablishmentType.ARTISAN: - qs = models.Tag.objects.filter(index_name__in=settings.ARTISANS_CHOSEN_TAGS) + qs = models.Tag.objects.filter(value__in=settings.ARTISANS_CHOSEN_TAGS) 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) From d173664750d50948bd570ac36e7664cf336985d7 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 25 Dec 2019 15:35:55 +0300 Subject: [PATCH 7/9] rm comments --- apps/review/models.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/apps/review/models.py b/apps/review/models.py index ee4b74a3..a987cf2e 100644 --- a/apps/review/models.py +++ b/apps/review/models.py @@ -118,19 +118,6 @@ class ReviewTextAuthor(ProjectBaseMixin): unique_together = ('locale', 'review') -# @receiver(signal=post_init, sender=Review) -# def post_init_handler(instance, **kwargs): -# instance.original_text = instance.text -# -# -# @receiver(signal=post_save, sender=Review) -# def post_save_handler(instance, **kwargs): -# new_text = instance.text -# old_text = instance.original_text -# pprint(instance.text) -# pprint(instance.original_text) - - class Inquiries(GalleryMixin, ProjectBaseMixin): NONE = 0 DINER = 1 From f3c48281d455e2d038d4174a50afad48f203a900 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 25 Dec 2019 18:09:45 +0300 Subject: [PATCH 8/9] back office news reformat --- apps/news/models.py | 11 +++++++++++ apps/news/serializers.py | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/apps/news/models.py b/apps/news/models.py index 0396c441..c7785f45 100644 --- a/apps/news/models.py +++ b/apps/news/models.py @@ -367,6 +367,17 @@ class News(GalleryMixin, BaseAttributes, TranslatedFieldsMixin, HasTagsMixin, {f'{crop[len(f"{model_name}_"):]}_url': image.get_image_url(crop)}) return image_property + @property + def descriptions(self): + """Read-only list field for backoffice news representation""" + return [{ + 'locale': locale, + 'slug': (self.slugs or {}).get(locale), + 'status': 'active' if (self.locale_to_description_is_active or {}).get(locale) else 'inactive', + 'title': (self.title or {}).get(locale), + 'text': desc + } for locale, desc in self.description.items()] if self.description else [] + class NewsGallery(IntermediateGalleryModelMixin): news = models.ForeignKey(News, null=True, diff --git a/apps/news/serializers.py b/apps/news/serializers.py index 0640b15a..e3ffd01f 100644 --- a/apps/news/serializers.py +++ b/apps/news/serializers.py @@ -178,6 +178,7 @@ class NewsDetailWebSerializer(NewsDetailSerializer): class NewsBackOfficeBaseSerializer(NewsBaseSerializer): """News back office base serializer.""" is_published = serializers.BooleanField(source='is_publish', read_only=True) + descriptions = serializers.ListField(required=False) class Meta(NewsBaseSerializer.Meta): """Meta class.""" @@ -195,6 +196,7 @@ class NewsBackOfficeBaseSerializer(NewsBaseSerializer): 'publication_time', 'created', 'modified', + 'descriptions', ) extra_kwargs = { 'created': {'read_only': True}, @@ -204,6 +206,22 @@ class NewsBackOfficeBaseSerializer(NewsBaseSerializer): 'must_of_the_week': {'read_only': True}, } + def validate(self, attrs): + """Overridden validate method.""" + if 'descriptions' in attrs: + descriptions = attrs.pop('descriptions') + status_to_bool = { + 'active': True, + 'inactive': False, + } + attrs['slugs'] = {obj['locale']: obj['slug'] for obj in descriptions} + attrs['title'] = {obj['locale']: obj['title'] for obj in descriptions} + attrs['locale_to_description_is_active'] = { + obj['locale']: status_to_bool[obj['status']] for obj in descriptions + } + attrs['description'] = {obj['locale']: obj['text'] for obj in descriptions} + return attrs + def create(self, validated_data): slugs = validated_data.get('slugs') From ac2dc2344efb89b40d6c751a8d4de405b6bc3c8d Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 25 Dec 2019 18:50:59 +0300 Subject: [PATCH 9/9] try to fix issue w/ news elastic update --- apps/news/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/news/models.py b/apps/news/models.py index c7785f45..79e2bbd0 100644 --- a/apps/news/models.py +++ b/apps/news/models.py @@ -283,7 +283,7 @@ class News(GalleryMixin, BaseAttributes, TranslatedFieldsMixin, HasTagsMixin, @property def has_any_desc_active(self): """Detects whether news item has any active description""" - return any(list(map(lambda v: v.lower() == 'true', self.locale_to_description_is_active.values()))) + return any(list(map(lambda v: v.lower() == 'true' if isinstance(v, str) else v, self.locale_to_description_is_active.values()))) @property def is_publish(self):