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

fix review

Browse Source
This commit is contained in:
Dmitriy Kuzmenko 2019-12-05 15:23:16 +03:00
parent 9f5a1f9ce5
commit f06596b5b6
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/review/transfer_data.py
View File

@ -115,12 +115,8 @@ def transfer_product_reviews():
products = Product.objects.filter( products = Product.objects.filter(
old_id__isnull=False).values_list('old_id', flat=True) old_id__isnull=False).values_list('old_id', flat=True)
users = User.objects.filter(
old_id__isnull=False).values_list('old_id', flat=True)
queryset = Reviews.objects.filter( queryset = Reviews.objects.filter(
product_id__in=list(products), product_id__in=list(products),
reviewer_id__in=list(users),
).values('id', 'reviewer_id', 'aasm_state', 'created_at', 'product_id', 'mark', 'vintage') ).values('id', 'reviewer_id', 'aasm_state', 'created_at', 'product_id', 'mark', 'vintage')
serialized_data = ProductReviewSerializer(data=list(queryset.values()), many=True) serialized_data = ProductReviewSerializer(data=list(queryset.values()), many=True)

7
apps/transfer/serializers/reviews.py
View File

@ -55,7 +55,7 @@ class ProductReviewSerializer(ReviewSerializer):
product_id = serializers.IntegerField() product_id = serializers.IntegerField()
created_at = serializers.DateTimeField(format='%m-%d-%Y %H:%M:%S') created_at = serializers.DateTimeField(format='%m-%d-%Y %H:%M:%S')
aasm_state = serializers.CharField(allow_null=True) aasm_state = serializers.CharField(allow_null=True)
reviewer_id = serializers.IntegerField() reviewer_id = serializers.IntegerField(allow_null=True)
id = serializers.IntegerField() id = serializers.IntegerField()
def validate(self, data): def validate(self, data):
@ -82,9 +82,8 @@ class ProductReviewSerializer(ReviewSerializer):
@staticmethod @staticmethod
def get_reviewer(data): def get_reviewer(data):
user = User.objects.filter(old_id=data['reviewer_id']).first() user = User.objects.filter(old_id=data['reviewer_id']).first()
if not user: if user:
raise ValueError(f"User account not found with old_id {data['reviewer_id']}") return user
return user
@staticmethod @staticmethod
def get_product(data): def get_product(data):