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

refactor subscriber model

Browse Source
This commit is contained in:
alex 2019-11-15 10:09:26 +03:00
parent 6b83003eac
commit e922117c61
3 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/notification/migrations/0002_subscriber_old_id.py Normal file
View File

@ -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'),
),
]

38
apps/notification/models.py
View File

@ -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)()

1
apps/transfer/models.py
View File

@ -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()