From b659308729548d8a2e5df9c49ca90a1546ff152a Mon Sep 17 00:00:00 2001 From: Anatoly Date: Fri, 6 Dec 2019 13:06:59 +0300 Subject: [PATCH 1/5] exclude field from Establishment serializer --- apps/establishment/models.py | 69 ++++++++++++++++++++++++------- apps/establishment/urls/common.py | 8 +++- apps/establishment/views/web.py | 20 +++++++-- project/settings/local.py | 2 +- 4 files changed, 79 insertions(+), 20 deletions(-) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index 3cdef691..fe9ad53b 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -24,8 +24,8 @@ from collection.models import Collection from location.models import Address from location.models import WineOriginAddressMixin from main.models import Award, Currency -from tag.models import Tag from review.models import Review +from tag.models import Tag from utils.models import (ProjectBaseMixin, TJSONField, URLImageMixin, TranslatedFieldsMixin, BaseAttributes, GalleryModelMixin, IntermediateGalleryModelMixin, HasTagsMixin, @@ -209,23 +209,34 @@ class EstablishmentQuerySet(models.QuerySet): """ return self.annotate(mark_similarity=ExpressionWrapper( mark - F('intermediate_public_mark'), - output_field=models.FloatField() + output_field=models.FloatField(default=0) )) - def similar(self, establishment_slug: str): + def similar_base(self, establishment): + + filters = { + 'reviews__status': Review.READY, + 'establishment_type': establishment.establishment_type, + } + if establishment.establishment_subtypes.exists(): + filters.update({'establishment_subtypes__in': establishment.establishment_subtypes.all()}) + return self.exclude(id=establishment.id) \ + .filter(**filters) \ + .annotate_distance(point=establishment.location) + + def similar_restaurants(self, restaurant_slug): """ - Return QuerySet with objects that similar to Establishment. - :param establishment_slug: str Establishment slug + Return QuerySet with objects that similar to Restaurant. + :param restaurant_slug: str Establishment slug """ - establishment_qs = self.filter(slug=establishment_slug, - public_mark__isnull=False) - if establishment_qs.exists(): - establishment = establishment_qs.first() + restaurant_qs = self.filter(slug=restaurant_slug, + public_mark__isnull=False) + if restaurant_qs.exists(): + establishment = restaurant_qs.first() subquery_filter_by_distance = Subquery( - self.exclude(slug=establishment_slug) - .filter(image_url__isnull=False, public_mark__gte=10) - .has_published_reviews() - .annotate_distance(point=establishment.location) + self.similar_base(establishment) + .filter(public_mark__gte=10, + establishment_gallery__is_main=True) .order_by('distance')[:settings.LIMITING_QUERY_OBJECTS] .values('id') ) @@ -234,8 +245,38 @@ class EstablishmentQuerySet(models.QuerySet): .annotate_mark_similarity(mark=establishment.public_mark) \ .order_by('mark_similarity') \ .distinct('mark_similarity', 'id') + + def by_wine_region(self, wine_region): + """ + Return filtered QuerySet by wine region in wine origin. + :param wine_region: wine region. + """ + return self.filter(wine_origin__wine_region=wine_region).distinct() + + def by_wine_sub_region(self, wine_sub_region): + """ + Return filtered QuerySet by wine region in wine origin. + :param wine_sub_region: wine sub region. + """ + return self.filter(wine_origin__wine_sub_region=wine_sub_region).distinct() + + def similar_wineries(self, winery_slug: str): + """ + Return QuerySet with objects that similar to Winery. + :param establishment_slug: str Establishment slug + """ + winery_qs = self.filter(slug=winery_slug) + if winery_qs.exists(): + winery = winery_qs.first() + return self.similar_base(winery) \ + .order_by(F('wine_origins__wine_region').asc(), + F('wine_origins__wine_sub_region').asc()) \ + .annotate_distance(point=winery.location) \ + .order_by('distance') \ + .distinct('distance', 'wine_origins__wine_region', + 'wine_origins__wine_sub_region', 'id') else: - return self.none() + self.none() def last_reviewed(self, point: Point): """ diff --git a/apps/establishment/urls/common.py b/apps/establishment/urls/common.py index faa34bd9..5821a4c6 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//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(), name='create-comment'), @@ -17,4 +16,11 @@ urlpatterns = [ name='rud-comment'), path('slug//favorites/', views.EstablishmentFavoritesCreateDestroyView.as_view(), name='create-destroy-favorites'), + + # similar establishments + path('slug//similar/restaurants/', views.RestaurantSimilarListView.as_view(), + name='similar-restaurants'), + path('slug//similar/wineries/', views.WinerySimilarListView.as_view(), + name='similar-restaurants'), + ] diff --git a/apps/establishment/views/web.py b/apps/establishment/views/web.py index ba5cb23b..a7b90184 100644 --- a/apps/establishment/views/web.py +++ b/apps/establishment/views/web.py @@ -77,16 +77,28 @@ class EstablishmentRecentReviewListView(EstablishmentListView): return qs.last_reviewed(point=point) -class EstablishmentSimilarListView(EstablishmentListView): - """Resource for getting a list of establishments.""" - +class EstablishmentSimilarList(EstablishmentListView): + """Resource for getting a list of similar establishments.""" serializer_class = serializers.EstablishmentSimilarSerializer pagination_class = EstablishmentPortionPagination + +class RestaurantSimilarListView(EstablishmentSimilarList): + """Resource for getting a list of similar restaurants.""" + def get_queryset(self): """Override get_queryset method""" qs = super().get_queryset() - return qs.similar(establishment_slug=self.kwargs.get('slug')) + return qs.similar_restaurants(restaurant_slug=self.kwargs.get('slug')) + + +class WinerySimilarListView(EstablishmentSimilarList): + """Resource for getting a list of similar wineries.""" + + def get_queryset(self): + """Override get_queryset method""" + qs = super().get_queryset() + return qs.similar_wineries(winery_slug=self.kwargs.get('slug')) class EstablishmentTypeListView(generics.ListAPIView): 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 51da45b00ba5518319855b6d0cded477cfd6ddf8 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Tue, 10 Dec 2019 13:08:28 +0300 Subject: [PATCH 2/5] refactoring --- apps/establishment/models.py | 37 +++++++++++++++++++++---------- apps/establishment/urls/common.py | 2 +- apps/establishment/views/web.py | 8 +++---- 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/apps/establishment/models.py b/apps/establishment/models.py index 68e09eb3..9ecf38c2 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -224,12 +224,12 @@ class EstablishmentQuerySet(models.QuerySet): .filter(**filters) \ .annotate_distance(point=establishment.location) - def similar_restaurants(self, restaurant_slug): + def similar_restaurants(self, slug): """ Return QuerySet with objects that similar to Restaurant. :param restaurant_slug: str Establishment slug """ - restaurant_qs = self.filter(slug=restaurant_slug, + restaurant_qs = self.filter(slug=slug, public_mark__isnull=False) if restaurant_qs.exists(): establishment = restaurant_qs.first() @@ -260,12 +260,12 @@ class EstablishmentQuerySet(models.QuerySet): """ return self.filter(wine_origin__wine_sub_region=wine_sub_region).distinct() - def similar_wineries(self, winery_slug: str): + def similar_wineries(self, slug: str): """ Return QuerySet with objects that similar to Winery. :param establishment_slug: str Establishment slug """ - winery_qs = self.filter(slug=winery_slug) + winery_qs = self.filter(slug=slug) if winery_qs.exists(): winery = winery_qs.first() return self.similar_base(winery) \ @@ -276,7 +276,7 @@ class EstablishmentQuerySet(models.QuerySet): .distinct('distance', 'wine_origins__wine_region', 'wine_origins__wine_sub_region', 'id') else: - self.none() + return self.none() def last_reviewed(self, point: Point): """ @@ -498,15 +498,9 @@ 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 - @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: @@ -871,6 +865,25 @@ class ContactEmail(models.Model): return f'{self.email}' +# +# class Wine(TranslatedFieldsMixin, models.Model): +# """Wine model.""" +# establishment = models.ForeignKey( +# 'establishment.Establishment', verbose_name=_('establishment'), +# on_delete=models.CASCADE) +# bottles = models.IntegerField(_('bottles')) +# price_min = models.DecimalField( +# _('price min'), max_digits=14, decimal_places=2) +# price_max = models.DecimalField( +# _('price max'), max_digits=14, decimal_places=2) +# by_glass = models.BooleanField(_('by glass')) +# price_glass_min = models.DecimalField( +# _('price min'), max_digits=14, decimal_places=2) +# price_glass_max = models.DecimalField( +# _('price max'), max_digits=14, decimal_places=2) +# + + class Plate(TranslatedFieldsMixin, models.Model): """Plate model.""" STR_FIELD_NAME = 'name' diff --git a/apps/establishment/urls/common.py b/apps/establishment/urls/common.py index 5821a4c6..68ba2b16 100644 --- a/apps/establishment/urls/common.py +++ b/apps/establishment/urls/common.py @@ -18,7 +18,7 @@ urlpatterns = [ name='create-destroy-favorites'), # similar establishments - path('slug//similar/restaurants/', views.RestaurantSimilarListView.as_view(), + path('slug//similar/', views.RestaurantSimilarListView.as_view(), name='similar-restaurants'), path('slug//similar/wineries/', views.WinerySimilarListView.as_view(), name='similar-restaurants'), diff --git a/apps/establishment/views/web.py b/apps/establishment/views/web.py index eae34789..9e6dc026 100644 --- a/apps/establishment/views/web.py +++ b/apps/establishment/views/web.py @@ -88,8 +88,8 @@ class RestaurantSimilarListView(EstablishmentSimilarList): def get_queryset(self): """Override get_queryset method""" - qs = super().get_queryset() - return qs.similar_restaurants(restaurant_slug=self.kwargs.get('slug')) + return EstablishmentMixinView.get_queryset(self) \ + .similar_restaurants(slug=self.kwargs.get('slug')) class WinerySimilarListView(EstablishmentSimilarList): @@ -97,8 +97,8 @@ class WinerySimilarListView(EstablishmentSimilarList): def get_queryset(self): """Override get_queryset method""" - qs = super().get_queryset() - return qs.similar_wineries(winery_slug=self.kwargs.get('slug')) + return EstablishmentMixinView.get_queryset(self) \ + .similar_wineries(slug=self.kwargs.get('slug')) class EstablishmentTypeListView(generics.ListAPIView): From bec4e9be96b9ad4944145d507ca40f1319ec721b Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Tue, 10 Dec 2019 15:31:57 +0300 Subject: [PATCH 3/5] ordering from center for mobiles --- apps/search_indexes/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/search_indexes/views.py b/apps/search_indexes/views.py index 0e93d8fc..387a6eae 100644 --- a/apps/search_indexes/views.py +++ b/apps/search_indexes/views.py @@ -314,7 +314,8 @@ class MobileEstablishmentDocumentViewSet(EstablishmentDocumentViewSet): filter_backends = [ FilteringFilterBackend, filters.CustomSearchFilterBackend, - GeoSpatialFilteringFilterBackend, + filters.CustomGeoSpatialFilteringFilterBackend, + GeoSpatialOrderingFilterBackend, ] From 3b85e927a17eb6039474017a6a0dc3e1b2fd15b8 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Tue, 10 Dec 2019 15:39:53 +0300 Subject: [PATCH 4/5] BO title field --- .../migrations/0038_news_backoffice_title.py | 18 ++++++++++++++++++ apps/news/models.py | 2 ++ apps/news/serializers.py | 4 ++++ apps/search_indexes/documents/news.py | 1 + 4 files changed, 25 insertions(+) create mode 100644 apps/news/migrations/0038_news_backoffice_title.py diff --git a/apps/news/migrations/0038_news_backoffice_title.py b/apps/news/migrations/0038_news_backoffice_title.py new file mode 100644 index 00000000..05363acb --- /dev/null +++ b/apps/news/migrations/0038_news_backoffice_title.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.7 on 2019-12-10 12:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('news', '0037_auto_20191129_1320'), + ] + + operations = [ + migrations.AddField( + model_name='news', + name='backoffice_title', + field=models.TextField(default=None, null=True, verbose_name='Title for searching via BO'), + ), + ] diff --git a/apps/news/models.py b/apps/news/models.py index 30e4206b..a2db35b4 100644 --- a/apps/news/models.py +++ b/apps/news/models.py @@ -168,6 +168,8 @@ class News(GalleryModelMixin, BaseAttributes, TranslatedFieldsMixin, HasTagsMixi title = TJSONField(blank=True, null=True, default=None, verbose_name=_('title'), help_text='{"en-GB":"some text"}') + backoffice_title = models.TextField(null=True, default=None, + verbose_name=_('Title for searching via BO')) subtitle = TJSONField(blank=True, null=True, default=None, verbose_name=_('subtitle'), help_text='{"en-GB":"some text"}') diff --git a/apps/news/serializers.py b/apps/news/serializers.py index 86673645..c14e28fe 100644 --- a/apps/news/serializers.py +++ b/apps/news/serializers.py @@ -169,9 +169,13 @@ class NewsBackOfficeBaseSerializer(NewsBaseSerializer): fields = NewsBaseSerializer.Meta.fields + ( 'title', + 'backoffice_title', 'subtitle', 'is_published', ) + extra_kwargs = { + 'backoffice_title': {'allow_null': False}, + } class NewsBackOfficeDetailSerializer(NewsBackOfficeBaseSerializer, diff --git a/apps/search_indexes/documents/news.py b/apps/search_indexes/documents/news.py index 3c87e680..535c92f6 100644 --- a/apps/search_indexes/documents/news.py +++ b/apps/search_indexes/documents/news.py @@ -17,6 +17,7 @@ class NewsDocument(Document): 'name': fields.KeywordField()}) title = fields.ObjectField(attr='title_indexing', properties=OBJECT_FIELD_PROPERTIES) + backoffice_title = fields.KeywordField(analyzer='english') subtitle = fields.ObjectField(attr='subtitle_indexing', properties=OBJECT_FIELD_PROPERTIES) description = fields.ObjectField(attr='description_indexing', From 34173afb05fe8092b25b63c5858ca9d94d03f3e7 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Tue, 10 Dec 2019 15:41:33 +0300 Subject: [PATCH 5/5] fix field analyzer --- apps/search_indexes/documents/news.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/search_indexes/documents/news.py b/apps/search_indexes/documents/news.py index 535c92f6..2aab01c8 100644 --- a/apps/search_indexes/documents/news.py +++ b/apps/search_indexes/documents/news.py @@ -17,7 +17,7 @@ class NewsDocument(Document): 'name': fields.KeywordField()}) title = fields.ObjectField(attr='title_indexing', properties=OBJECT_FIELD_PROPERTIES) - backoffice_title = fields.KeywordField(analyzer='english') + backoffice_title = fields.TextField(analyzer='english') subtitle = fields.ObjectField(attr='subtitle_indexing', properties=OBJECT_FIELD_PROPERTIES) description = fields.ObjectField(attr='description_indexing',