diff --git a/apps/review/transfer_data.py b/apps/review/transfer_data.py index af70873e..20c5712d 100644 --- a/apps/review/transfer_data.py +++ b/apps/review/transfer_data.py @@ -115,12 +115,8 @@ def transfer_product_reviews(): products = Product.objects.filter( 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( product_id__in=list(products), - reviewer_id__in=list(users), ).values('id', 'reviewer_id', 'aasm_state', 'created_at', 'product_id', 'mark', 'vintage') serialized_data = ProductReviewSerializer(data=list(queryset.values()), many=True) diff --git a/apps/transfer/serializers/reviews.py b/apps/transfer/serializers/reviews.py index 6e0db860..6d3f50b4 100644 --- a/apps/transfer/serializers/reviews.py +++ b/apps/transfer/serializers/reviews.py @@ -55,7 +55,7 @@ class ProductReviewSerializer(ReviewSerializer): product_id = serializers.IntegerField() created_at = serializers.DateTimeField(format='%m-%d-%Y %H:%M:%S') aasm_state = serializers.CharField(allow_null=True) - reviewer_id = serializers.IntegerField() + reviewer_id = serializers.IntegerField(allow_null=True) id = serializers.IntegerField() def validate(self, data): @@ -82,9 +82,8 @@ class ProductReviewSerializer(ReviewSerializer): @staticmethod def get_reviewer(data): user = User.objects.filter(old_id=data['reviewer_id']).first() - if not user: - raise ValueError(f"User account not found with old_id {data['reviewer_id']}") - return user + if user: + return user @staticmethod def get_product(data):