From cef1127e4870570a58f8869a03826f20ccfad1a8 Mon Sep 17 00:00:00 2001 From: Klaas van Schelven Date: Wed, 29 May 2024 10:22:57 +0200 Subject: [PATCH] Make user-model swappable I may just need this later, and doing it this late was already painful enough. --- bugsink/settings/default.py | 5 +++- issues/models.py | 5 +++- pyproject.toml | 1 + users/__init__.py | 0 users/admin.py | 5 ++++ users/apps.py | 6 +++++ users/migrations/0001_initial.py | 46 ++++++++++++++++++++++++++++++++ users/migrations/__init__.py | 0 users/models.py | 11 ++++++++ users/tests.py | 3 +++ 10 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 users/__init__.py create mode 100644 users/admin.py create mode 100644 users/apps.py create mode 100644 users/migrations/0001_initial.py create mode 100644 users/migrations/__init__.py create mode 100644 users/models.py create mode 100644 users/tests.py diff --git a/bugsink/settings/default.py b/bugsink/settings/default.py index 39abb11..a7b7b8f 100644 --- a/bugsink/settings/default.py +++ b/bugsink/settings/default.py @@ -47,9 +47,10 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'tailwind', # As currently set up, this is also needed in production (templatetags) - 'theme', 'admin_auto_filters', # TODO: decide whether 'admin.py' is useful in production too. + 'users', + 'theme', 'snappea', 'compat', 'projects', @@ -62,6 +63,8 @@ INSTALLED_APPS = [ 'performance', ] +AUTH_USER_MODEL = "users.User" + TAILWIND_APP_NAME = 'theme' MIDDLEWARE = [ diff --git a/issues/models.py b/issues/models.py index 85591e8..1d94f9c 100644 --- a/issues/models.py +++ b/issues/models.py @@ -7,6 +7,7 @@ from functools import partial from django.db import models, transaction from django.db.models import F, Value from django.template.defaultfilters import date as default_date_filter +from django.conf import settings from bugsink.volume_based_condition import VolumeBasedCondition from alerts.tasks import send_unmute_alert @@ -458,7 +459,9 @@ class TurningPoint(models.Model): issue = models.ForeignKey("Issue", blank=False, null=True, on_delete=models.SET_NULL) # SET_NULL: cleanup 'later' triggering_event = models.ForeignKey("events.Event", blank=True, null=True, on_delete=models.SET_NULL) - user = models.ForeignKey("auth.User", blank=True, null=True, on_delete=models.SET_NULL) # null: the system-user + + # null: the system-user + user = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, on_delete=models.SET_NULL) timestamp = models.DateTimeField(blank=False, null=False) # this info is also in the event, but event is nullable kind = models.IntegerField(blank=False, null=False, choices=TurningPointKind.choices) metadata = models.TextField(blank=False, null=False, default="{}") # json string diff --git a/pyproject.toml b/pyproject.toml index 031ea41..4191a52 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,6 +47,7 @@ include = [ "static*", "templates*", "theme*", + "users*", ] # exclude = ["my_package.tests*"] # exclude packages matching these glob patterns (empty by default) diff --git a/users/__init__.py b/users/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/users/admin.py b/users/admin.py new file mode 100644 index 0000000..f91be8f --- /dev/null +++ b/users/admin.py @@ -0,0 +1,5 @@ +from django.contrib import admin +from django.contrib.auth.admin import UserAdmin +from .models import User + +admin.site.register(User, UserAdmin) diff --git a/users/apps.py b/users/apps.py new file mode 100644 index 0000000..72b1401 --- /dev/null +++ b/users/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class UsersConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'users' diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py new file mode 100644 index 0000000..e3b3d94 --- /dev/null +++ b/users/migrations/0001_initial.py @@ -0,0 +1,46 @@ +# Generated by Django 4.2.13 on 2024-05-29 08:00 + +import django.contrib.auth.models +import django.contrib.auth.validators +from django.db import migrations, models +import django.utils.timezone + + +class Migration(migrations.Migration): + + # Since this was introduced later, it "shouldn't" work in theory, but it appears to work in practice, as long as you + # manually fake it using: + # INSERT INTO django_migrations (app, name, applied) VALUES ('users', '0001_initial', '2023-11-05 16:18:04.716257'); + + 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')), + ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), + ('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')), + ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), + ('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={ + 'db_table': 'auth_user', + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), + ] diff --git a/users/migrations/__init__.py b/users/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/users/models.py b/users/models.py new file mode 100644 index 0000000..22a9930 --- /dev/null +++ b/users/models.py @@ -0,0 +1,11 @@ +from django.contrib.auth.models import AbstractUser + +# > If you’re starting a new project, it’s highly recommended to set up a custom user model, even if the default User +# > model is sufficient for you. This model behaves identically to the default user model, but you’ll be able to +# > customize it in the future if the need arises + + +class User(AbstractUser): + + class Meta: + db_table = 'auth_user' diff --git a/users/tests.py b/users/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/users/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here.