Factor out User functions to a new model.

bikeshop_project/registration/models.py

@@ -2,14 +2,12 @@ from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, Permis
 from django.db import models
 
 
-class CustomMemberManager(BaseUserManager):
-    def create_user(self, email, first_name, last_name, password=None):
+class CustomUserManager(BaseUserManager):
+    def create_user(self, email, password=None):
         """
         Creates and saves a User with the given email and password.
         :param email: str
         :param password: str
-        :param first_name: str
-        :param last_name: str
         :return: object `CustomUser`
         """
         if not email:
@@ -38,12 +36,43 @@ class CustomMemberManager(BaseUserManager):
         return user
 
 
-class Member(AbstractBaseUser, PermissionsMixin):
+class CustomUser(AbstractBaseUser, PermissionsMixin):
     email = models.EmailField(
         verbose_name='email address',
         max_length=255,
         unique=True,
     )
+    is_admin = models.BooleanField(default=False)
+    is_active = models.BooleanField(default=True)
+
+    objects = CustomUserManager()
+
+    USERNAME_FIELD = 'email'
+
+    @property
+    def is_staff(self):
+        # Simplest possible answer: All admins are staff
+        return self.is_admin
+
+    def get_short_name(self):
+        return self.email
+
+    def get_full_name(self):
+        return self.email
+
+    def __str__(self):  # __unicode__ on Python 2
+        return self.email
+
+
+class Member(models.Model):
+    user = models.OneToOneField(CustomUser, on_delete=models.CASCADE, null=True)
+    email = models.EmailField(
+        verbose_name='email address',
+        max_length=255,
+        unique=False,
+        null=True,
+        blank=True,
+    )
     email_consent = models.BooleanField(default=False)
     first_name = models.CharField(max_length=255, null=False)
     last_name = models.CharField(max_length=255, null=False)
@@ -58,12 +87,6 @@ class Member(AbstractBaseUser, PermissionsMixin):
     post_code = models.CharField(max_length=20, null=True, blank=False)
     waiver = models.DateTimeField(null=True, blank=True)
     is_active = models.BooleanField(default=True)
-    is_admin = models.BooleanField(default=False)
-
-    objects = CustomMemberManager()
-
-    USERNAME_FIELD = 'email'
-    # REQUIRED_FIELDS = []
 
     @property
     def full_name(self):
@@ -78,12 +101,7 @@ class Member(AbstractBaseUser, PermissionsMixin):
 
     def get_short_name(self):
         # The user is identified by their email address
-        return self.email
+        return self.user.email
 
     def __str__(self):              # __unicode__ on Python 2
-        return self.email
-
-    @property
-    def is_staff(self):
-        # Simplest possible answer: All admins are staff
-        return self.is_admin
+        return self.user.email