From 3ace542deb437d815b5b28e3f54a5964f63a07de Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 12 Nov 2019 18:12:14 +0300 Subject: [PATCH 1/2] comment created date --- apps/comment/transfer_data.py | 1 + apps/transfer/serializers/comments.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/apps/comment/transfer_data.py b/apps/comment/transfer_data.py index c9d07585..1755b2e3 100644 --- a/apps/comment/transfer_data.py +++ b/apps/comment/transfer_data.py @@ -20,6 +20,7 @@ def transfer_comments(): 'mark', 'establishment_id', 'account_id', + 'created_at', ) serialized_data = CommentSerializer(data=list(queryset.values()), many=True) diff --git a/apps/transfer/serializers/comments.py b/apps/transfer/serializers/comments.py index 73c90802..f15c1930 100644 --- a/apps/transfer/serializers/comments.py +++ b/apps/transfer/serializers/comments.py @@ -10,6 +10,7 @@ class CommentSerializer(serializers.Serializer): mark = serializers.DecimalField(max_digits=4, decimal_places=2, allow_null=True) account_id = serializers.IntegerField() establishment_id = serializers.CharField() + created_at = serializers.DateTimeField(format='%m-%d-%Y %H:%M:%S') def validate(self, data): data.update({ @@ -18,6 +19,7 @@ class CommentSerializer(serializers.Serializer): 'mark': self.get_mark(data), 'content_object': self.get_content_object(data), 'user': self.get_account(data), + 'created': data.pop('created_at'), }) data.pop('establishment_id') data.pop('account_id') From fef5008d3501e07aa0a41549dd4f729ca573cb0d Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Tue, 12 Nov 2019 18:13:34 +0300 Subject: [PATCH 2/2] Revert "Change images search fields sources" This reverts commit 0833d40 --- apps/search_indexes/documents/news.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/search_indexes/documents/news.py b/apps/search_indexes/documents/news.py index df3b8b48..86b117e5 100644 --- a/apps/search_indexes/documents/news.py +++ b/apps/search_indexes/documents/news.py @@ -24,8 +24,8 @@ class NewsDocument(Document): country = fields.ObjectField(properties={'id': fields.IntegerField(), 'code': fields.KeywordField()}) web_url = fields.KeywordField(attr='web_url') - image_url = fields.KeywordField(attr='image.original_url') - preview_image_url = fields.KeywordField(attr='image.auto_crop_images.preview_url') + image_url = fields.KeywordField(attr='image_url') + preview_image_url = fields.KeywordField(attr='preview_image_url') tags = fields.ObjectField( properties={ 'id': fields.IntegerField(attr='id'),