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

inquiries serializer

Browse Source
This commit is contained in:
alex 2019-11-10 10:14:16 +03:00
parent 5267e24f05
commit d8995ab754
5 changed files with 153 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
apps/review/migrations/0009_auto_20191110_0615.py Normal file
View File

@ -0,0 +1,44 @@
# Generated by Django 2.2.4 on 2019-11-10 06:15
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('gallery', '0006_merge_20191027_1758'),
('review', '0008_auto_20191108_0927'),
]
operations = [
migrations.AddField(
model_name='inquiries',
name='attachment_content_type',
field=models.CharField(blank=True, max_length=255, null=True),
),
migrations.AddField(
model_name='inquiries',
name='bill_content_type',
field=models.CharField(blank=True, max_length=255, null=True),
),
migrations.CreateModel(
name='InquiriesGallery',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('is_main', models.BooleanField(default=False, verbose_name='Is the main image')),
('image', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='inquiries_gallery', to='gallery.Image', verbose_name='gallery')),
('inquiry', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='inquiries_gallery', to='review.Inquiries', verbose_name='inquiry')),
],
options={
'verbose_name': 'inquiry gallery',
'verbose_name_plural': 'inquiry galleries',
'unique_together': {('inquiry', 'is_main'), ('inquiry', 'image')},
},
),
migrations.AddField(
model_name='inquiries',
name='gallery',
field=models.ManyToManyField(through='review.InquiriesGallery', to='gallery.Image'),
),
]

38
apps/review/models.py
View File

@ -94,15 +94,18 @@ class Inquiries(ProjectBaseMixin):
final_comment = models.TextField(_('final comment'), blank=True, null=True)
mark = models.FloatField(verbose_name=_('mark'), blank=True, null=True, default=None)
attachment_file = models.URLField(verbose_name=_('attachment'), max_length=255, blank=True, null=True, default=None)
attachment_content_type = models.CharField(max_length=255, blank=True, null=True)
author = models.ForeignKey('account.User', related_name='incuiries', on_delete=models.CASCADE,
verbose_name=_('author'))
bill_file = models.URLField(verbose_name=_('bill'), max_length=255, blank=True, null=True, default=None)
bill_content_type = models.CharField(max_length=255, blank=True, null=True)
price = models.DecimalField(_('price'), max_digits=7, decimal_places=2, blank=True, null=True)
moment = models.PositiveSmallIntegerField(choices=MOMENTS, default=NONE)
gallery = models.ManyToManyField('gallery.Image', through='review.InquiriesGallery')
decibels = models.CharField(max_length=255, blank=True, null=True)
nomination = models.CharField(max_length=255, blank=True, null=True)
nominee = models.CharField(max_length=255, blank=True, null=True)
published = models.BooleanField(_('is published'), default=False)
class Meta:
verbose_name = _('Inquiry')
@ -126,3 +129,36 @@ class GridItems(ProjectBaseMixin):
def __str__(self):
return f'inquiry: {self.inquiry.id}, grid id: {self.id}'
class InquiriesGalleryQuerySet(models.QuerySet):
"""QuerySet for model Inquiries"""
def main_image(self):
"""Return objects with flag is_main is True"""
return self.filter(is_main=True)
class InquiriesGallery(models.Model):
inquiry = models.ForeignKey(
Inquiries,
null=True,
related_name='inquiries_gallery',
on_delete=models.CASCADE,
verbose_name=_('inquiry'),
)
image = models.ForeignKey(
'gallery.Image',
null=True,
related_name='inquiries_gallery',
on_delete=models.CASCADE,
verbose_name=_('gallery'),
)
is_main = models.BooleanField(default=False, verbose_name=_('Is the main image'))
objects = InquiriesGalleryQuerySet.as_manager()
class Meta:
verbose_name = _('inquiry gallery')
verbose_name_plural = _('inquiry galleries')
unique_together = (('inquiry', 'is_main'), ('inquiry', 'image'))

17
apps/review/transfer_data.py
View File

@ -1,3 +1,6 @@
from django.db.models import Q
from account.transfer_data import STOP_LIST
from transfer.models import Reviews, ReviewTexts, Inquiries
from transfer.serializers.inquiries import InquiriesSerializer
from transfer.serializers.reviews import LanguageSerializer, ReviewSerializer, Establishment
@ -95,7 +98,19 @@ def transfer_reviews():
def transfer_inquiries():
inquiries = Inquiries.objects.all()
# отфильтровать по review, account, establishment
# TODO: нужно ли переносить данные у которых нет привязки к аккаунту? .filter(account__isnull=False)
inquiries = Inquiries.objects.exclude(
Q(review__reviewer_id__gt=0) |
Q(review__reviewer_id__isnull=True) |
Q(review__mark__isnull=True) |
Q(review__reviewtexts__text__isnull=True) |
Q(review__reviewtexts__locale__isnull=True) |
Q(review__establishment__type='Wineyard') |
Q(review__establishment__location__timezone__isnull=True) |
Q(account__confirmed_at__isnull=True) |
Q(account__email__in=STOP_LIST)
)
serialized_data = InquiriesSerializer(data=list(inquiries.values()), many=True)
if serialized_data.is_valid():

2
apps/transfer/models.py
View File

@ -1025,7 +1025,7 @@ class Inquiries(MigrateMixin):
bill_file_size = models.IntegerField(blank=True, null=True)
bill_updated_at = models.DateTimeField(blank=True, null=True)
bill_suffix_url = models.TextField(blank=True, null=True)
price = models.DecimalField(max_digits=10, decimal_places=2, blank=True, null=True)
price = models.DecimalField(max_digits=7, decimal_places=2, blank=True, null=True)
moment = models.CharField(max_length=255, blank=True, null=True)
published = models.PositiveSmallIntegerField(blank=True, null=True)
menu_id = models.IntegerField(blank=True, null=True)

74
apps/transfer/serializers/inquiries.py
View File

@ -1,28 +1,48 @@
from rest_framework import serializers
from review.models import Inquiries
from account.models import User
from review.models import Inquiries, Review
class InquiriesSerializer(serializers.Serializer):
id = serializers.IntegerField()
comment = serializers.CharField()
mark = serializers.DecimalField(max_digits=4, decimal_places=2)
locale = serializers.CharField()
account_id = serializers.IntegerField()
establishment_id = serializers.CharField()
comment = serializers.CharField(allow_null=True, allow_blank=True)
final_comment = serializers.CharField(allow_null=True, allow_blank=True)
mark = serializers.FloatField(allow_null=True, allow_blank=True)
created_at = serializers.DateTimeField(format='%m-%d-%Y %H:%M:%S')
review_id = serializers.IntegerField()
attachment_content_type = serializers.CharField(allow_null=True, allow_blank=True)
attachment_suffix_url = serializers.CharField(allow_null=True, allow_blank=True)
account_id = serializers.IntegerField(allow_null=True, allow_blank=True)
bill_content_type = serializers.CharField(allow_null=True, allow_blank=True)
bill_suffix_url = serializers.CharField(allow_null=True, allow_blank=True)
price = serializers.DecimalField(max_digits=7, decimal_places=2, blank=True, null=True)
moment = serializers.CharField(allow_null=True, allow_blank=True)
published = serializers.IntegerField(allow_null=True, allow_blank=True)
decibels = serializers.CharField(blank=True, null=True)
nomination = serializers.CharField(blank=True, null=True)
nominee = serializers.CharField(blank=True, null=True)
def validate(self, data):
data.update({
'old_id': data.pop('id'),
'text': data.pop('comment'),
'mark': data['mark'] * -1 if data['mark'] < 0 else data['mark'],
'content_object': self.get_content_object(data),
'user': self.get_account(data),
'country': self.get_country(data),
'review': self.get_review(data),
'created': data.pop('created_at'),
'published': bool(data['published']),
'moment': self.get_moment(data),
'author': self.get_author(data),
'attachment_file': data['attachment_suffix_url'] if data['attachment_content_type'] else '',
'bill_file': data['bill_suffix_url'] if data['bill_content_type'] else '',
})
data.pop('establishment_id')
data.pop('review_id')
data.pop('account_id')
data.pop('locale')
data.pop('attachment_suffix_url')
data.pop('bill_suffix_url')
return data
def create(self, validated_data):
@ -31,9 +51,25 @@ class InquiriesSerializer(serializers.Serializer):
except Exception as e:
raise ValueError(f"Error creating Inquiries with {validated_data}: {e}")
# @staticmethod
# def get_content_object(data):
# establishment = Establishment.objects.filter(old_id=data['establishment_id']).first()
# if not establishment:
# raise ValueError(f"Establishment not found with old_id {data['establishment_id']}: ")
# return establishment
@staticmethod
def get_review(data):
review = Review.objects.filter(old_id=data['review_id']).first()
if not review:
raise ValueError(f"Review not found with old_id {data['review_id']}")
return review
@staticmethod
def get_moment(data):
moments = {
'lanch': Inquiries.LUNCH,
'diner': Inquiries.DINER,
}
moment = data['moment']
return moments.get(moment, Inquiries.NONE)
@staticmethod
def get_author(data):
user = User.objects.filter(old_id=data['account_id']).first()
if not user:
raise ValueError(f"User account not found with old_id {data['account_id']}")
return user