From 37fb67cbb33b4179cff019236ff0aa70f710943c Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 16 Oct 2019 14:11:07 +0300 Subject: [PATCH 1/4] Fix subqueries --- apps/main/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/main/models.py b/apps/main/models.py index 6af4e4d8..129ea238 100644 --- a/apps/main/models.py +++ b/apps/main/models.py @@ -173,7 +173,8 @@ class SiteSettings(ProjectBaseMixin): @property def published_sitefeatures(self): return self.sitefeature_set\ - .filter(Q(published=True) and Q(feature__source__in=[PlatformMixin.WEB, PlatformMixin.ALL])) + .filter(published=True)\ + .filter(feature__source__in=[PlatformMixin.WEB, PlatformMixin.ALL]) @property def site_url(self): From 2c9d579a54a71633bbca9b3037c69b5a787263fe Mon Sep 17 00:00:00 2001 From: "e.stoyushko" Date: Thu, 31 Oct 2019 11:42:57 +0000 Subject: [PATCH 2/4] Update models.py --- apps/main/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/main/models.py b/apps/main/models.py index 129ea238..1474acb0 100644 --- a/apps/main/models.py +++ b/apps/main/models.py @@ -172,9 +172,9 @@ class SiteSettings(ProjectBaseMixin): @property def published_sitefeatures(self): - return self.sitefeature_set\ - .filter(published=True)\ - .filter(feature__source__in=[PlatformMixin.WEB, PlatformMixin.ALL]) + return self.sitefeature_set. \ + filter(Q(published=True) & + Q(feature__source__in=[PlatformMixin.WEB, PlatformMixin.ALL])) @property def site_url(self): From b87f21c630c2c03d9544ec6f981f9215bdcbd1f9 Mon Sep 17 00:00:00 2001 From: evgeniy-st Date: Thu, 31 Oct 2019 17:34:59 +0300 Subject: [PATCH 3/4] update transfer tz field --- apps/search_indexes/documents/establishment.py | 2 +- apps/search_indexes/views.py | 14 +++++++------- apps/transfer/serializers/establishment.py | 5 ++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/apps/search_indexes/documents/establishment.py b/apps/search_indexes/documents/establishment.py index e4e0c937..7eac2d6c 100644 --- a/apps/search_indexes/documents/establishment.py +++ b/apps/search_indexes/documents/establishment.py @@ -37,7 +37,7 @@ class EstablishmentDocument(Document): works_noon = fields.ListField(fields.IntegerField( attr='works_noon' )) - # works_now = fields.BooleanField(attr='works_now') + works_now = fields.BooleanField(attr='works_now') tags = fields.ObjectField( properties={ 'id': fields.IntegerField(attr='id'), diff --git a/apps/search_indexes/views.py b/apps/search_indexes/views.py index 1cbf9d05..a53e2615 100644 --- a/apps/search_indexes/views.py +++ b/apps/search_indexes/views.py @@ -139,7 +139,7 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet): 'lookups': [ constants.LOOKUP_QUERY_IN, ], - }, + }, 'works_noon': { 'field': 'works_noon', 'lookups': [ @@ -152,12 +152,12 @@ class EstablishmentDocumentViewSet(BaseDocumentViewSet): constants.LOOKUP_QUERY_IN, ], }, - # 'works_now': { - # 'field': 'works_now', - # 'lookups': [ - # constants.LOOKUP_FILTER_TERM, - # ] - # }, + 'works_now': { + 'field': 'works_now', + 'lookups': [ + constants.LOOKUP_FILTER_TERM, + ] + }, } geo_spatial_filter_fields = { diff --git a/apps/transfer/serializers/establishment.py b/apps/transfer/serializers/establishment.py index 7c8ce97c..6a2fcde5 100644 --- a/apps/transfer/serializers/establishment.py +++ b/apps/transfer/serializers/establishment.py @@ -6,8 +6,8 @@ from establishment.models import Establishment, ContactEmail, ContactPhone, Esta from location.models import Address from timetable.models import Timetable from utils.legacy_parser import parse_legacy_schedule_content +from utils.serializers import TimeZoneChoiceField from utils.slug_generator import generate_unique_slug -from pytz import timezone as ptz class EstablishmentSerializer(serializers.ModelSerializer): @@ -26,7 +26,7 @@ class EstablishmentSerializer(serializers.ModelSerializer): twitter = serializers.CharField(allow_null=True, allow_blank=True) booking = serializers.CharField(allow_null=True, allow_blank=True) state = serializers.CharField(allow_null=True) - tz = serializers.CharField() + tz = TimeZoneChoiceField() created = serializers.DateTimeField(format='%m-%d-%Y %H:%M:%S') class Meta: @@ -59,7 +59,6 @@ class EstablishmentSerializer(serializers.ModelSerializer): 'establishment_type_id': self.get_type(data), 'is_publish': data.get('state') == 'published', }) - data['tz'] = ptz(data['tz']) data.pop('location') data.pop('type') data.pop('state') From fe586755e3fab8c9cd402d04e3ee50d51f055926 Mon Sep 17 00:00:00 2001 From: Anatoly Date: Thu, 31 Oct 2019 17:54:56 +0300 Subject: [PATCH 4/4] small fix --- apps/tag/serializers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tag/serializers.py b/apps/tag/serializers.py index c09f42f1..c4811f7a 100644 --- a/apps/tag/serializers.py +++ b/apps/tag/serializers.py @@ -14,7 +14,7 @@ class TagBaseSerializer(serializers.ModelSerializer): # todo: refactor this # label_translated = TranslatedField() - label_translated = serializers.CharField(source='value') + label_translated = serializers.CharField(source='value', read_only=True, allow_null=True) class Meta: """Meta class.""" @@ -43,7 +43,7 @@ class TagCategoryBaseSerializer(serializers.ModelSerializer): # todo: refactor this # label_translated = TranslatedField() - label_translated = serializers.CharField(source='index_name') + label_translated = serializers.CharField(source='index_name', read_only=True, allow_null=True) tags = TagBaseSerializer(many=True, read_only=True) class Meta: