diff --git a/apps/notification/transfer_data.py b/apps/notification/transfer_data.py index dcc5b395..cc5542b4 100644 --- a/apps/notification/transfer_data.py +++ b/apps/notification/transfer_data.py @@ -1,6 +1,5 @@ from pprint import pprint -from account.models import User from transfer.models import EmailAddresses, NewsletterSubscriber from transfer.serializers.notification import SubscriberSerializer, NewsletterSubscriberSerializer @@ -17,17 +16,13 @@ def transfer_subscriber(): def transfer_newsletter_subscriber(): - users = User.objects.filter(old_id__isnull=False).values_list('old_id', flat=True) - queryset = NewsletterSubscriber.objects.filter( - email_address__account_id__in=list(users) - ).values( + queryset = NewsletterSubscriber.objects.all().values( 'id', 'email_address__email', 'email_address__account_id', 'email_address__ip', 'email_address__country_code', 'email_address__locale', - 'state', 'created_at', ) diff --git a/apps/transfer/serializers/notification.py b/apps/transfer/serializers/notification.py index bd568239..dc685a0c 100644 --- a/apps/transfer/serializers/notification.py +++ b/apps/transfer/serializers/notification.py @@ -36,15 +36,14 @@ class SubscriberSerializer(serializers.ModelSerializer): class NewsletterSubscriberSerializer(serializers.Serializer): - pass - # vintage = serializers.IntegerField() - # mark = serializers.FloatField(allow_null=True) - # establishment_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() - # id = serializers.IntegerField() - # + id = serializers.IntegerField() + email_address__email = serializers.CharField() + email_address__account_id = serializers.IntegerField(allow_null=True) + email_address__ip = serializers.CharField(allow_null=True) + email_address__country_code = serializers.CharField(allow_null=True) + email_address__locale = serializers.CharField(allow_null=True) + created_at = serializers.DateTimeField(format='%m-%d-%Y %H:%M:%S') + # def validate(self, data): # data.update({ # 'reviewer': self.get_reviewer(data),