diff --git a/apps/notification/migrations/0002_subscriber_old_id.py b/apps/notification/migrations/0002_subscriber_old_id.py new file mode 100644 index 00000000..bf92831d --- /dev/null +++ b/apps/notification/migrations/0002_subscriber_old_id.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.7 on 2019-11-15 07:08 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('notification', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='subscriber', + name='old_id', + field=models.PositiveIntegerField(blank=True, default=None, null=True, verbose_name='old id'), + ), + ] diff --git a/apps/notification/models.py b/apps/notification/models.py index 85176d24..3e6f7f3a 100644 --- a/apps/notification/models.py +++ b/apps/notification/models.py @@ -74,21 +74,29 @@ class Subscriber(ProjectBaseMixin): (USABLE, _('Usable')), ) - user = models.OneToOneField(User, blank=True, null=True, default=None, - on_delete=models.SET_NULL, related_name='subscriber', - verbose_name=_('User')) - email = models.EmailField(blank=True, null=True, default=None, unique=True, - verbose_name=_('Email')) - ip_address = models.GenericIPAddressField(blank=True, null=True, default=None, - verbose_name=_('IP address')) - country_code = models.CharField(max_length=10, blank=True, null=True, default=None, - verbose_name=_('Country code')) - locale = models.CharField(blank=True, null=True, default=None, - max_length=10, verbose_name=_('Locale identifier')) - state = models.PositiveIntegerField(choices=STATE_CHOICES, default=USABLE, - verbose_name=_('State')) - update_code = models.CharField(max_length=254, blank=True, null=True, default=None, - db_index=True, verbose_name=_('Token')) + user = models.OneToOneField( + User, + blank=True, + null=True, + default=None, + on_delete=models.SET_NULL, + related_name='subscriber', + verbose_name=_('User'), + ) + email = models.EmailField(blank=True, null=True, default=None, unique=True, verbose_name=_('Email')) + ip_address = models.GenericIPAddressField(blank=True, null=True, default=None, verbose_name=_('IP address')) + country_code = models.CharField(max_length=10, blank=True, null=True, default=None, verbose_name=_('Country code')) + locale = models.CharField(blank=True, null=True, default=None, max_length=10, verbose_name=_('Locale identifier')) + state = models.PositiveIntegerField(choices=STATE_CHOICES, default=USABLE, verbose_name=_('State')) + update_code = models.CharField( + max_length=254, + blank=True, + null=True, + default=None, + db_index=True, + verbose_name=_('Token'), + ) + old_id = models.PositiveIntegerField(_('old id'), blank=True, null=True, default=None) objects = SubscriberManager.from_queryset(SubscriberQuerySet)() diff --git a/apps/transfer/models.py b/apps/transfer/models.py index 43084804..25fdb527 100644 --- a/apps/transfer/models.py +++ b/apps/transfer/models.py @@ -1194,6 +1194,7 @@ class NewsletterSubscriber(MigrateMixin): site = models.ForeignKey(Sites, models.DO_NOTHING, blank=True, null=True) email_address = models.ForeignKey(EmailAddresses, models.DO_NOTHING, blank=True, null=True) state = models.CharField(max_length=255, blank=True, null=True) + consent_purpose = models.CharField(max_length=255, blank=True, null=True) consent_at = models.DateTimeField() created_at = models.DateTimeField() updated_at = models.DateTimeField()