diff --git a/mailing_lists/models.py b/mailing_lists/models.py
index 5d6bdfe0d80e987b1ade7a7afa459288cc54f5d5..e9ccc0b32da6c800d3179cda24d3a3adb32cc709 100644
--- a/mailing_lists/models.py
+++ b/mailing_lists/models.py
@@ -17,7 +17,7 @@ from .constants import MAIL_LIST_STATUSES, MAIL_LIST_STATUS_ACTIVE,\
from .managers import MailListManager
from scipost.behaviors import TimeStampedModel
-from scipost.constants import CONTRIBUTOR_NORMAL
+from scipost.constants import NORMAL_CONTRIBUTOR
from scipost.models import Contributor
@@ -88,7 +88,7 @@ class MailchimpList(TimeStampedModel):
# are not in the list yet.
db_subscribers = (User.objects
.filter(contributor__isnull=False)
- .filter(is_active=True, contributor__status=CONTRIBUTOR_NORMAL)
+ .filter(is_active=True, contributor__status=NORMAL_CONTRIBUTOR)
.filter(contributor__accepts_SciPost_emails=True,
groups__in=self.allowed_groups.all(),
email__isnull=False,
diff --git a/scipost/constants.py b/scipost/constants.py
index 44c02c3b232db385cc9015db6a4c691585d2c322..dd7a72d42083715dfc7d0fa3db8fbca06b4c86f1 100644
--- a/scipost/constants.py
+++ b/scipost/constants.py
@@ -29,8 +29,7 @@ SCIPOST_SUBJECT_AREAS = (
('Phys:NE', 'Nuclear Physics - Experiment'),
('Phys:NT', 'Nuclear Physics - Theory'),
('Phys:QP', 'Quantum Physics'),
- ('Phys:SM', 'Statistical and Soft Matter Physics'),
- )
+ ('Phys:SM', 'Statistical and Soft Matter Physics'))
),
('Astrophysics', (
('Astro:GA', 'Astrophysics of Galaxies'),
@@ -38,8 +37,7 @@ SCIPOST_SUBJECT_AREAS = (
('Astro:EP', 'Earth and Planetary Astrophysics'),
('Astro:HE', 'High Energy Astrophysical Phenomena'),
('Astro:IM', 'Instrumentation and Methods for Astrophysics'),
- ('Astro:SR', 'Solar and Stellar Astrophysics'),
- )
+ ('Astro:SR', 'Solar and Stellar Astrophysics'))
),
('Mathematics', (
('Math:AG', 'Algebraic Geometry'),
@@ -73,8 +71,7 @@ SCIPOST_SUBJECT_AREAS = (
('Math:RA', 'Rings and Algebras'),
('Math:SP', 'Spectral Theory'),
('Math:ST', 'Statistics Theory'),
- ('Math:SG', 'Symplectic Geometry'),
- )
+ ('Math:SG', 'Symplectic Geometry'))
),
('Computer Science', (
('Comp:AI', 'Artificial Intelligence'),
@@ -115,9 +112,8 @@ SCIPOST_SUBJECT_AREAS = (
('Comp:SE', 'Software Engineering'),
('Comp:SD', 'Sound'),
('Comp:SC', 'Symbolic Computation'),
- ('Comp:SY', 'Systems and Control'),
- )
- ),
+ ('Comp:SY', 'Systems and Control'))
+ )
)
subject_areas_raw_dict = dict(SCIPOST_SUBJECT_AREAS)
@@ -126,25 +122,20 @@ subject_areas_dict = {}
for k in subject_areas_raw_dict.keys():
subject_areas_dict.update(dict(subject_areas_raw_dict[k]))
-CONTRIBUTOR_NEWLY_REGISTERED = 0
-CONTRIBUTOR_NORMAL = 1
-CONTRIBUTOR_STATUS = (
- # status determine the type of Contributor:
- # 0: newly registered (unverified; not allowed to submit, comment or vote)
- # 1: contributor has been vetted through
- #
- # Negative status denotes rejected requests or:
- # -1: not a professional scientist (>= PhD student in known university)
- # -2: other account already exists for this person
- # -3: barred from SciPost (abusive behaviour)
- # -4: disabled account (deceased)
- (CONTRIBUTOR_NEWLY_REGISTERED, 'newly registered'),
- (CONTRIBUTOR_NORMAL, 'normal user'),
- (-1, 'not a professional scientist'), # Soon to be deprecated
- (-2, 'other account already exists'),
- (-3, 'barred from SciPost'),
- (-4, 'account disabled'),
- )
+# Contributor types
+NEWLY_REGISTERED, NORMAL_CONTRIBUTOR = 'newly_registered', 'normal'
+NO_SCIENTIST, DOUBLE_ACCOUNT, OUT_OF_ACADEMIA = 'no_scientist', 'double_account', 'out_of_academia'
+BARRED, DISABLED, DECEASED = 'barred', 'disabled', 'deceased'
+CONTRIBUTOR_STATUSES = (
+ (NEWLY_REGISTERED, 'Newly registered'),
+ (NORMAL_CONTRIBUTOR, 'Normal user'),
+ (NO_SCIENTIST, 'Not a professional scientist'),
+ (DOUBLE_ACCOUNT, 'Other account already exists'),
+ (OUT_OF_ACADEMIA, 'Out of academia'),
+ (BARRED, 'Barred from SciPost'),
+ (DISABLED, 'Account disabled'),
+ (DECEASED, 'Person deceased')
+)
TITLE_CHOICES = (
('PR', 'Prof.'),
diff --git a/scipost/factories.py b/scipost/factories.py
index 4c7e91d45a9430c899f093416fc7a36e69b5e57f..d058e515701c72e7a0229d2e79af31867d51fd55 100644
--- a/scipost/factories.py
+++ b/scipost/factories.py
@@ -18,7 +18,7 @@ from .constants import TITLE_CHOICES, SCIPOST_SUBJECT_AREAS
class ContributorFactory(factory.django.DjangoModelFactory):
title = factory.Iterator(TITLE_CHOICES, getter=lambda c: c[0])
user = factory.SubFactory('scipost.factories.UserFactory', contributor=None)
- status = 1 # normal user
+ status = 'normal' # normal user
vetted_by = factory.Iterator(Contributor.objects.all())
personalwebpage = factory.Faker('uri')
expertises = factory.Iterator(SCIPOST_SUBJECT_AREAS[0][1], getter=lambda c: [c[0]])
diff --git a/scipost/forms.py b/scipost/forms.py
index 73a2a142d803ee568904776fb34bd6349caab0a7..3dcaaea2176155b7341178437baeccf775bac7e6 100644
--- a/scipost/forms.py
+++ b/scipost/forms.py
@@ -24,7 +24,8 @@ from ajax_select.fields import AutoCompleteSelectField
from haystack.forms import ModelSearchForm as HayStackSearchForm
from .behaviors import orcid_validator
-from .constants import SCIPOST_DISCIPLINES, TITLE_CHOICES, SCIPOST_FROM_ADDRESSES
+from .constants import (SCIPOST_DISCIPLINES, TITLE_CHOICES, SCIPOST_FROM_ADDRESSES,
+ NO_SCIENTIST, DOUBLE_ACCOUNT, BARRED)
from .decorators import has_contributor
from .models import Contributor, DraftInvitation,\
UnavailabilityPeriod, PrecookedEmail
@@ -39,11 +40,11 @@ from submissions.models import Report
REGISTRATION_REFUSAL_CHOICES = (
- (0, '-'),
- (-1, 'not a professional scientist (>= PhD student)'),
- (-2, 'another account already exists for this person'),
- (-3, 'barred from SciPost (abusive behaviour)'),
- )
+ (None, '-'),
+ (NO_SCIENTIST, 'not a professional scientist (>= PhD student)'),
+ (DOUBLE_ACCOUNT, 'another account already exists for this person'),
+ (BARRED, 'barred from SciPost (abusive behaviour)')
+)
reg_ref_dict = dict(REGISTRATION_REFUSAL_CHOICES)
diff --git a/scipost/management/commands/setup_contributor.py b/scipost/management/commands/setup_contributor.py
index c4798f122ef1db1b8029c14139b0a52541e95ffd..f4b98c3abb3404ebc1730601a1417ecc482dfc82 100644
--- a/scipost/management/commands/setup_contributor.py
+++ b/scipost/management/commands/setup_contributor.py
@@ -5,6 +5,7 @@ __license__ = "AGPL v3"
from django.core.management.base import BaseCommand
from django.contrib.auth.models import User
+from ...constants import NORMAL_CONTRIBUTOR
from ...models import Contributor
@@ -16,7 +17,7 @@ class Command(BaseCommand):
def create_contributor(self, username):
user = User.objects.get(username=username)
- contributor = Contributor(user=user, status=1, title="MR")
+ contributor = Contributor(user=user, status=NORMAL_CONTRIBUTOR, title="MR")
contributor.vetted_by = contributor
contributor.save()
diff --git a/scipost/managers.py b/scipost/managers.py
index b552f3adff613cfc6d807ce8c9e817339e7ff171..df5a60d44e538eeee8c77149556af1af3f07822e 100644
--- a/scipost/managers.py
+++ b/scipost/managers.py
@@ -6,7 +6,7 @@ from django.db import models
from django.db.models import Q
from django.utils import timezone
-from .constants import CONTRIBUTOR_NORMAL, CONTRIBUTOR_NEWLY_REGISTERED, AUTHORSHIP_CLAIM_PENDING
+from .constants import NORMAL_CONTRIBUTOR, NEWLY_REGISTERED, AUTHORSHIP_CLAIM_PENDING
today = timezone.now().date()
@@ -23,7 +23,7 @@ class FellowManager(models.Manager):
class ContributorQuerySet(models.QuerySet):
def active(self):
- return self.filter(user__is_active=True, status=CONTRIBUTOR_NORMAL)
+ return self.filter(user__is_active=True, status=NORMAL_CONTRIBUTOR)
def available(self):
return self.exclude(
@@ -31,10 +31,10 @@ class ContributorQuerySet(models.QuerySet):
unavailability_periods__end__gte=today)
def awaiting_validation(self):
- return self.filter(user__is_active=False, status=CONTRIBUTOR_NEWLY_REGISTERED)
+ return self.filter(user__is_active=False, status=NEWLY_REGISTERED)
def awaiting_vetting(self):
- return self.filter(user__is_active=True, status=CONTRIBUTOR_NEWLY_REGISTERED)
+ return self.filter(user__is_active=True, status=NEWLY_REGISTERED)
def fellows(self):
return self.filter(user__groups__name='Editorial College')
diff --git a/scipost/migrations/0011_contributor_new_status.py b/scipost/migrations/0011_contributor_new_status.py
new file mode 100644
index 0000000000000000000000000000000000000000..7ad51995a44018ac139414bc2d66744c5dfd611b
--- /dev/null
+++ b/scipost/migrations/0011_contributor_new_status.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-04-14 20:12
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scipost', '0010_merge_20180327_2022'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='contributor',
+ name='new_status',
+ field=models.CharField(choices=[('newly_registered', 'Newly registered'), ('normal', 'Normal user'), ('no_scientist', 'Not a professional scientist'), ('double_account', 'Other account already exists'), ('out_of_academia', 'Out of academia'), ('barred', 'Barred from SciPost'), ('disabled', 'Account disabled'), ('deceased', 'Person deceased')], default='newly_registered', max_length=16),
+ ),
+ ]
diff --git a/scipost/migrations/0012_auto_20180414_2212.py b/scipost/migrations/0012_auto_20180414_2212.py
new file mode 100644
index 0000000000000000000000000000000000000000..c3faed8fd33b8ffbd9a04432e42a627949b3b9ab
--- /dev/null
+++ b/scipost/migrations/0012_auto_20180414_2212.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-04-14 20:12
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+def update_contributor_status_field(apps, schema_editor):
+ Contributor = apps.get_model('scipost', 'Contributor')
+
+ Contributor.objects.filter(status=-4).update(new_status='disabled')
+ Contributor.objects.filter(status=-3).update(new_status='barred')
+ Contributor.objects.filter(status=-2).update(new_status='double_account')
+ Contributor.objects.filter(status=-1).update(new_status='no_scientist')
+ Contributor.objects.filter(status=0).update(new_status='newly_registered')
+ Contributor.objects.filter(status=1).update(new_status='normal')
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scipost', '0011_contributor_new_status'),
+ ]
+
+ operations = [
+ migrations.RunPython(update_contributor_status_field)
+ ]
diff --git a/scipost/migrations/0013_remove_contributor_status.py b/scipost/migrations/0013_remove_contributor_status.py
new file mode 100644
index 0000000000000000000000000000000000000000..7dfb7cc212142c45870d0fbea11d73a5f972f7cc
--- /dev/null
+++ b/scipost/migrations/0013_remove_contributor_status.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-04-14 20:18
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scipost', '0012_auto_20180414_2212'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='contributor',
+ name='status',
+ ),
+ ]
diff --git a/scipost/migrations/0014_auto_20180414_2218.py b/scipost/migrations/0014_auto_20180414_2218.py
new file mode 100644
index 0000000000000000000000000000000000000000..d2782391c11e94bc712aa0c98de6c7a3ee192a3c
--- /dev/null
+++ b/scipost/migrations/0014_auto_20180414_2218.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2018-04-14 20:18
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scipost', '0013_remove_contributor_status'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='contributor',
+ old_name='new_status',
+ new_name='status',
+ ),
+ ]
diff --git a/scipost/models.py b/scipost/models.py
index 9f358b52c9bac2ee022a4ce26f65cb76523c76d6..26ab371a3ec504fdece70416ad9695afde7a55d5 100644
--- a/scipost/models.py
+++ b/scipost/models.py
@@ -10,45 +10,50 @@ import string
from django.core.urlresolvers import reverse
from django.conf import settings
from django.contrib.auth import get_user_model
+from django.contrib.auth.models import AbstractUser
from django.contrib.postgres.fields import ArrayField
from django.db import models
from django.utils import timezone
from .behaviors import TimeStampedModel, orcid_validator
-from .constants import SCIPOST_DISCIPLINES, SCIPOST_SUBJECT_AREAS,\
- subject_areas_dict, CONTRIBUTOR_STATUS, TITLE_CHOICES,\
- INVITATION_STYLE, INVITATION_TYPE,\
- INVITATION_CONTRIBUTOR, INVITATION_FORMAL,\
- AUTHORSHIP_CLAIM_PENDING, AUTHORSHIP_CLAIM_STATUS,\
- CONTRIBUTOR_NEWLY_REGISTERED
+from .constants import (
+ SCIPOST_DISCIPLINES, SCIPOST_SUBJECT_AREAS, subject_areas_dict, DISABLED,
+ TITLE_CHOICES, INVITATION_STYLE, INVITATION_TYPE, INVITATION_CONTRIBUTOR, INVITATION_FORMAL,
+ AUTHORSHIP_CLAIM_PENDING, AUTHORSHIP_CLAIM_STATUS, CONTRIBUTOR_STATUSES, NEWLY_REGISTERED)
from .fields import ChoiceArrayField
-from .managers import FellowManager, ContributorQuerySet,\
- UnavailabilityPeriodManager, AuthorshipClaimQuerySet
+from .managers import (
+ FellowManager, ContributorQuerySet, UnavailabilityPeriodManager, AuthorshipClaimQuerySet)
today = timezone.now().date()
def get_sentinel_user():
- '''
- Temporary fix: eventually the 'to-be-removed-Contributor' should be
- status: "deactivated" and anonymized.
+ """Temporary fix to be able to delete Contributor instances.
+
+ Eventually the 'to-be-removed-Contributor' should be status: "deactivated" and anonymized.
Fallback user for models relying on Contributor that is being deleted.
- '''
+ """
user, __ = get_user_model().objects.get_or_create(username='deleted')
- return Contributor.objects.get_or_create(status=-4, user=user)[0]
+ return Contributor.objects.get_or_create(status=DISABLED, user=user)[0]
+
+
+class User(AbstractUser):
+ class Meta:
+ db_table = 'auth_user'
class Contributor(models.Model):
- """
+ """A Contributor is an academic extention of the User model.
+
All *science* users of SciPost are Contributors.
username, password, email, first_name and last_name are inherited from User.
"""
+
user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.PROTECT, unique=True)
invitation_key = models.CharField(max_length=40, blank=True)
activation_key = models.CharField(max_length=40, blank=True)
key_expires = models.DateTimeField(default=timezone.now)
- status = models.SmallIntegerField(default=CONTRIBUTOR_NEWLY_REGISTERED,
- choices=CONTRIBUTOR_STATUS)
+ status = models.CharField(max_length=16, choices=CONTRIBUTOR_STATUSES, default=NEWLY_REGISTERED)
title = models.CharField(max_length=4, choices=TITLE_CHOICES)
discipline = models.CharField(max_length=20, choices=SCIPOST_DISCIPLINES,
default='physics', verbose_name='Main discipline')
diff --git a/scipost/views.py b/scipost/views.py
index 9c9ba8c786e6f0739759f8682df5cd4c3db2a51f..2565a46f8c1e1bb24b29f235f2ce5f73190cd61e 100644
--- a/scipost/views.py
+++ b/scipost/views.py
@@ -30,7 +30,7 @@ from guardian.decorators import permission_required
from haystack.generic_views import SearchView
from .constants import SCIPOST_SUBJECT_AREAS, subject_areas_raw_dict, SciPost_from_addresses_dict,\
- CONTRIBUTOR_NORMAL
+ NORMAL_CONTRIBUTOR
from .decorators import has_contributor
from .models import Contributor, UnavailabilityPeriod,\
AuthorshipClaim, EditorialCollege, EditorialCollegeFellowship
@@ -259,7 +259,7 @@ def vet_registration_request_ack(request, contributor_id):
contributor = Contributor.objects.get(pk=contributor_id)
if form.is_valid():
if form.promote_to_registered_contributor():
- contributor.status = 1
+ contributor.status = NORMAL_CONTRIBUTOR
contributor.vetted_by = request.user.contributor
contributor.save()
group = Group.objects.get(name='Registered Contributors')
@@ -292,7 +292,7 @@ def vet_registration_request_ack(request, contributor_id):
reply_to=['registration@scipost.org'])
emailmessage.send(fail_silently=False)
else:
- ref_reason = int(form.cleaned_data['refusal_reason'])
+ ref_reason = form.cleaned_data['refusal_reason']
email_text = ('Dear ' + contributor.get_title_display() + ' '
+ contributor.user.last_name +
', \n\nYour registration to the SciPost publication portal '
@@ -640,7 +640,7 @@ def personal_page(request, tab='account'):
try:
contributor = Contributor.objects.select_related('user').get(user=request.user)
- context['needs_validation'] = contributor.status != CONTRIBUTOR_NORMAL
+ context['needs_validation'] = contributor.status != NORMAL_CONTRIBUTOR
except Contributor.DoesNotExist:
contributor = None