phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop

Browse Source
This commit is contained in:
evgeniy-st 2019-11-12 18:16:19 +03:00
commit b13cb6916e
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/comment/transfer_data.py
View File

@ -20,6 +20,7 @@ def transfer_comments():
'mark', 'mark',
'establishment_id', 'establishment_id',
'account_id', 'account_id',
'created_at',
) )
serialized_data = CommentSerializer(data=list(queryset.values()), many=True) serialized_data = CommentSerializer(data=list(queryset.values()), many=True)

4
apps/search_indexes/documents/news.py
View File

@ -24,8 +24,8 @@ class NewsDocument(Document):
country = fields.ObjectField(properties={'id': fields.IntegerField(), country = fields.ObjectField(properties={'id': fields.IntegerField(),
'code': fields.KeywordField()}) 'code': fields.KeywordField()})
web_url = fields.KeywordField(attr='web_url') web_url = fields.KeywordField(attr='web_url')
image_url = fields.KeywordField(attr='image.original_url') image_url = fields.KeywordField(attr='image_url')
preview_image_url = fields.KeywordField(attr='image.auto_crop_images.preview_url') preview_image_url = fields.KeywordField(attr='preview_image_url')
tags = fields.ObjectField( tags = fields.ObjectField(
properties={ properties={
'id': fields.IntegerField(attr='id'), 'id': fields.IntegerField(attr='id'),

2
apps/transfer/serializers/comments.py
View File

@ -10,6 +10,7 @@ class CommentSerializer(serializers.Serializer):
mark = serializers.DecimalField(max_digits=4, decimal_places=2, allow_null=True) mark = serializers.DecimalField(max_digits=4, decimal_places=2, allow_null=True)
account_id = serializers.IntegerField() account_id = serializers.IntegerField()
establishment_id = serializers.CharField() establishment_id = serializers.CharField()
created_at = serializers.DateTimeField(format='%m-%d-%Y %H:%M:%S')
def validate(self, data): def validate(self, data):
data.update({ data.update({
@ -18,6 +19,7 @@ class CommentSerializer(serializers.Serializer):
'mark': self.get_mark(data), 'mark': self.get_mark(data),
'content_object': self.get_content_object(data), 'content_object': self.get_content_object(data),
'user': self.get_account(data), 'user': self.get_account(data),
'created': data.pop('created_at'),
}) })
data.pop('establishment_id') data.pop('establishment_id')
data.pop('account_id') data.pop('account_id')