From 23f8ac5d378043a064cc4970a65dcb1d269e3f2f Mon Sep 17 00:00:00 2001 From: William Date: Wed, 5 Feb 2025 15:07:04 -0500 Subject: [PATCH] [SC-16] Added account model (#14) * Added account model * Override user model to not require username --- backend/.gitignore | 2 ++ backend/accounts/__init__.py | 0 backend/accounts/admin.py | 6 ++++ backend/accounts/apps.py | 6 ++++ backend/accounts/migrations/0001_initial.py | 40 +++++++++++++++++++++ backend/accounts/migrations/__init__.py | 0 backend/accounts/models.py | 38 ++++++++++++++++++++ backend/accounts/tests.py | 3 ++ backend/accounts/user_manager.py | 31 ++++++++++++++++ backend/accounts/views.py | 3 ++ backend/backend/settings.py | 3 ++ 11 files changed, 132 insertions(+) create mode 100644 backend/.gitignore create mode 100644 backend/accounts/__init__.py create mode 100644 backend/accounts/admin.py create mode 100644 backend/accounts/apps.py create mode 100644 backend/accounts/migrations/0001_initial.py create mode 100644 backend/accounts/migrations/__init__.py create mode 100644 backend/accounts/models.py create mode 100644 backend/accounts/tests.py create mode 100644 backend/accounts/user_manager.py create mode 100644 backend/accounts/views.py diff --git a/backend/.gitignore b/backend/.gitignore new file mode 100644 index 0000000..0c86c46 --- /dev/null +++ b/backend/.gitignore @@ -0,0 +1,2 @@ +*.sqlite3 +__pycache__/ diff --git a/backend/accounts/__init__.py b/backend/accounts/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/accounts/admin.py b/backend/accounts/admin.py new file mode 100644 index 0000000..cb50bab --- /dev/null +++ b/backend/accounts/admin.py @@ -0,0 +1,6 @@ +from django.contrib import admin +from .models import User + +@admin.register(User) +class UserAdmin(admin.ModelAdmin): + pass diff --git a/backend/accounts/apps.py b/backend/accounts/apps.py new file mode 100644 index 0000000..3e3c765 --- /dev/null +++ b/backend/accounts/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class AccountsConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'accounts' diff --git a/backend/accounts/migrations/0001_initial.py b/backend/accounts/migrations/0001_initial.py new file mode 100644 index 0000000..0a0540a --- /dev/null +++ b/backend/accounts/migrations/0001_initial.py @@ -0,0 +1,40 @@ +# Generated by Django 5.1.5 on 2025-02-03 21:07 + +import accounts.user_manager +import django.utils.timezone +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ] + + operations = [ + migrations.CreateModel( + name='User', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('email', models.EmailField(max_length=255, unique=True, verbose_name='email address')), + ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')), + ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), + ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')), + ], + options={ + 'abstract': False, + }, + managers=[ + ('objects', accounts.user_manager.UserManager()), + ], + ), + ] diff --git a/backend/accounts/migrations/__init__.py b/backend/accounts/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/accounts/models.py b/backend/accounts/models.py new file mode 100644 index 0000000..d42119a --- /dev/null +++ b/backend/accounts/models.py @@ -0,0 +1,38 @@ +from django.db import models + +from django.contrib.auth.base_user import AbstractBaseUser +from django.contrib.auth.models import PermissionsMixin + +from django.utils import timezone +from django.utils.translation import gettext_lazy as _ + +from .user_manager import UserManager + +class User(AbstractBaseUser, PermissionsMixin): + email = models.EmailField( + _("email address"), + unique=True, + max_length=255, + blank=False + ) + first_name = models.CharField(_("first name"), max_length=150, blank=True) + last_name = models.CharField(_("last name"), max_length=150, blank=True) + is_staff = models.BooleanField( + _("staff status"), + default=False, + help_text=_("Designates whether the user can log into this admin site."), + ) + is_active = models.BooleanField( + _("active"), + default=True, + help_text=_( + "Designates whether this user should be treated as active. " + "Unselect this instead of deleting accounts." + ), + ) + + date_joined = models.DateTimeField(_("date joined"), default=timezone.now) + + objects = UserManager() + + USERNAME_FIELD = 'email' diff --git a/backend/accounts/tests.py b/backend/accounts/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/backend/accounts/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/backend/accounts/user_manager.py b/backend/accounts/user_manager.py new file mode 100644 index 0000000..babf37d --- /dev/null +++ b/backend/accounts/user_manager.py @@ -0,0 +1,31 @@ +from django.contrib.auth.base_user import BaseUserManager + + +class UserManager(BaseUserManager): + + use_in_migrations = True + + def _create_user(self, email, password, **extra_fields): + '''Create and save a user with the given email, and + password. + ''' + if not email: + raise ValueError("No email provided") + + email = self.normalize_email(email) + user = self.model(email=email, **extra_fields) + user.set_password(password) + user.save(using=self._db) + return user + + def create_user(self, email, password=None, **extra_fields): + extra_fields.setdefault("is_staff", False) + extra_fields.setdefault("is_superuser", False) + return self._create_user(email, password, **extra_fields) + + def create_superuser(self, email, password, **extra_fields): + extra_fields.setdefault("is_staff", True) + extra_fields.setdefault("is_superuser", True) + assert(extra_fields.get("is_staff")) + assert(extra_fields.get("is_superuser")) + return self._create_user(email, password, **extra_fields) diff --git a/backend/accounts/views.py b/backend/accounts/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/backend/accounts/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/backend/backend/settings.py b/backend/backend/settings.py index e18e6d9..21041c9 100644 --- a/backend/backend/settings.py +++ b/backend/backend/settings.py @@ -39,6 +39,7 @@ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'accounts', ] MIDDLEWARE = [ @@ -69,6 +70,8 @@ }, ] +AUTH_USER_MODEL = 'accounts.User' + WSGI_APPLICATION = 'backend.wsgi.application'