refactor(src): replace role CharField with Role FK and centralize role management
Centralize role definitions to support dynamic roles and enforce role existence at DB level
This commit is contained in:
4 files changed
+66
-46
No files matched your search
@@ -5,7 +5,7 @@ from django.contrib.auth import get_user_model
|
||||
from django.core.management.base import BaseCommand
|
||||
from django.utils import timezone
|
||||
|
||||
from src.accounts.models import Setting, SiteBranding
|
||||
from src.accounts.models import Role, Setting, SiteBranding
|
||||
from src.epics.models import Epic
|
||||
from src.external.models import ExternalAccess
|
||||
from src.notes.models import ProjectNote
|
||||
@@ -154,6 +154,10 @@ class Command(BaseCommand):
|
||||
admin = User.objects.filter(is_superuser=True).first()
|
||||
if not admin:
|
||||
admin = User.objects.create_superuser("admin", "admin@mail.com", "admin123")
|
||||
superadmin_role = Role.objects.get(slug="superadmin")
|
||||
if admin.role != superadmin_role:
|
||||
admin.role = superadmin_role
|
||||
admin.save()
|
||||
|
||||
# ── Ticket Priorities (seed if not present) ─────────────────────────
|
||||
priority_defs = [
|
||||
@@ -184,7 +188,7 @@ class Command(BaseCommand):
|
||||
# ── Demo Users ───────────────────────────────────────────────────────
|
||||
|
||||
users = []
|
||||
dev_roles = [
|
||||
dev_role_slugs = [
|
||||
"backend_developer",
|
||||
"frontend_developer",
|
||||
"ui_ux_designer",
|
||||
@@ -195,24 +199,25 @@ class Command(BaseCommand):
|
||||
"product_owner",
|
||||
"scrum_master",
|
||||
]
|
||||
for role_name in dev_roles:
|
||||
for role_slug in dev_role_slugs:
|
||||
role = Role.objects.get(slug=role_slug)
|
||||
user, _ = User.objects.get_or_create(
|
||||
username=role_name,
|
||||
username=role_slug,
|
||||
defaults={
|
||||
"email": f"{role_name}@mail.com",
|
||||
"first_name": role_name.replace("_", " ").title(),
|
||||
"email": f"{role_slug}@mail.com",
|
||||
"first_name": role_slug.replace("_", " ").title(),
|
||||
"last_name": "User",
|
||||
"role": role_name,
|
||||
"role": role,
|
||||
},
|
||||
)
|
||||
user.set_password("user123")
|
||||
if user.role != role_name:
|
||||
user.role = role_name
|
||||
if user.role != role:
|
||||
user.role = role
|
||||
user.save()
|
||||
users.append(user)
|
||||
|
||||
# Manager user
|
||||
manager_role = "manager"
|
||||
manager_role = Role.objects.get(slug="manager")
|
||||
user, _ = User.objects.get_or_create(
|
||||
username="manager",
|
||||
defaults={
|
||||
|
||||
@@ -32,6 +32,15 @@ class Command(BaseCommand):
|
||||
self.stdout.write(f" -> {TicketPriority.objects.count()} priorities seeded")
|
||||
|
||||
def _seed_superuser(self):
|
||||
from src.accounts.models import Role
|
||||
|
||||
superadmin_role, _ = Role.objects.get_or_create(
|
||||
slug="superadmin", defaults={"name": "Superadmin", "is_system": True}
|
||||
)
|
||||
manager_role, _ = Role.objects.get_or_create(
|
||||
slug="manager", defaults={"name": "Manager", "is_system": True}
|
||||
)
|
||||
|
||||
if not User.objects.filter(username="admin").exists():
|
||||
admin = User.objects.create_superuser(
|
||||
username="admin",
|
||||
@@ -40,13 +49,13 @@ class Command(BaseCommand):
|
||||
first_name="Super",
|
||||
last_name="Admin",
|
||||
)
|
||||
admin.role = "superadmin"
|
||||
admin.role = superadmin_role
|
||||
admin.save()
|
||||
self.stdout.write(" -> superuser created: admin / admin123")
|
||||
else:
|
||||
admin = User.objects.get(username="admin")
|
||||
if admin.role != "superadmin":
|
||||
admin.role = "superadmin"
|
||||
if admin.role != superadmin_role:
|
||||
admin.role = superadmin_role
|
||||
admin.save()
|
||||
self.stdout.write(" -> superuser 'admin' already exists (role verified)")
|
||||
|
||||
@@ -58,12 +67,12 @@ class Command(BaseCommand):
|
||||
first_name="Project",
|
||||
last_name="Manager",
|
||||
)
|
||||
mgr.role = "manager"
|
||||
mgr.role = manager_role
|
||||
mgr.save()
|
||||
self.stdout.write(" -> manager created: manager / admin123")
|
||||
else:
|
||||
mgr = User.objects.get(username="manager")
|
||||
if mgr.role != "manager":
|
||||
mgr.role = "manager"
|
||||
if mgr.role != manager_role:
|
||||
mgr.role = manager_role
|
||||
mgr.save()
|
||||
self.stdout.write(" -> manager 'manager' already exists (role verified)")
|
||||
+27
-30
@@ -2,45 +2,45 @@ from django.contrib.auth.models import AbstractUser
|
||||
from django.db import models
|
||||
|
||||
ADMIN_ROLES = ("superadmin", "manager")
|
||||
DEVELOPER_ROLES = (
|
||||
"backend_developer",
|
||||
"frontend_developer",
|
||||
"ui_ux_designer",
|
||||
"qa",
|
||||
"tester",
|
||||
"devops",
|
||||
"data_analyst",
|
||||
"product_owner",
|
||||
"scrum_master",
|
||||
)
|
||||
|
||||
|
||||
class Role(models.Model):
|
||||
name = models.CharField(max_length=100)
|
||||
slug = models.CharField(max_length=30, unique=True, db_index=True)
|
||||
is_system = models.BooleanField(
|
||||
default=False,
|
||||
help_text="System roles (superadmin, manager) cannot be deleted",
|
||||
)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta:
|
||||
db_table = "roles"
|
||||
verbose_name = "Role"
|
||||
verbose_name_plural = "Roles"
|
||||
ordering = ["name"]
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
class User(AbstractUser):
|
||||
ROLE_CHOICES = (
|
||||
("superadmin", "Superadmin"),
|
||||
("manager", "Manager"),
|
||||
("backend_developer", "Backend Developer"),
|
||||
("frontend_developer", "Frontend Developer"),
|
||||
("ui_ux_designer", "UI/UX Designer"),
|
||||
("qa", "QA"),
|
||||
("tester", "Tester"),
|
||||
("devops", "DevOps"),
|
||||
("data_analyst", "Data Analyst"),
|
||||
("product_owner", "Product Owner"),
|
||||
("scrum_master", "Scrum Master"),
|
||||
)
|
||||
role = models.CharField(
|
||||
max_length=30, choices=ROLE_CHOICES, default="backend_developer"
|
||||
role = models.ForeignKey(
|
||||
Role, on_delete=models.PROTECT, related_name="users", null=True, blank=True
|
||||
)
|
||||
|
||||
@property
|
||||
def is_admin(self):
|
||||
return self.role in ADMIN_ROLES
|
||||
return self.role and self.role.slug in ADMIN_ROLES
|
||||
|
||||
@property
|
||||
def is_developer(self):
|
||||
return not self.is_admin
|
||||
|
||||
@property
|
||||
def role_display(self):
|
||||
return self.role.name if self.role else "—"
|
||||
|
||||
google_id = models.CharField(max_length=255, blank=True, null=True, unique=True)
|
||||
profile_image = models.ImageField(upload_to="profiles/", blank=True, null=True)
|
||||
receive_deadline_emails = models.BooleanField(
|
||||
@@ -52,9 +52,6 @@ class User(AbstractUser):
|
||||
db_table = "users"
|
||||
verbose_name = "User"
|
||||
verbose_name_plural = "Users"
|
||||
indexes = [
|
||||
models.Index(fields=["role"]),
|
||||
]
|
||||
|
||||
def __str__(self):
|
||||
return self.email or self.username
|
||||
|
||||
@@ -113,3 +113,12 @@ class BoardRolePermission(models.Model):
|
||||
|
||||
def __str__(self):
|
||||
return f"[{self.project.ticket_prefix}] {self.role}"
|
||||
|
||||
@property
|
||||
def role_display_name(self):
|
||||
from src.accounts.models import Role
|
||||
|
||||
try:
|
||||
return Role.objects.get(slug=self.role).name
|
||||
except Role.DoesNotExist:
|
||||
return self.role
|
||||
Reference in new issue
Block a user