discoman/python-tdd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new applets app for cross-board usage of Applet() & UserApplet() models; dashboard migrations reset and apps reseeded w. new default specs; core.settings & many tests thru-out suite updated accordingly
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse Source
This commit is contained in:
Disco DeDisco
2026-03-09 16:08:28 -04:00
parent 2c445c0e76
commit 97601586c5
26 changed files with 142 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/apps/dashboard/admin.py
View File

@@ -1,11 +1 @@
from django.contrib import admin
from apps.dashboard.models import Applet, UserApplet
@admin.register(Applet)
class AppletAdmin(admin.ModelAdmin):
list_display = ['slug', 'name', 'default_visible', 'grid_cols', 'grid_rows']
list_editable = ['grid_cols', 'grid_rows']
admin.site.register(UserApplet)

37
src/apps/dashboard/migrations/0002_applet_userapplet.py
View File

@@ -1,37 +0,0 @@
# Generated by Django 6.0 on 2026-03-04 20:34
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('dashboard', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.CreateModel(
name='Applet',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('slug', models.SlugField(unique=True)),
('name', models.CharField(max_length=100)),
('default_visible', models.BooleanField(default=True)),
],
),
migrations.CreateModel(
name='UserApplet',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('visible', models.BooleanField(default=True)),
('applet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='dashboard.applet')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_applets', to=settings.AUTH_USER_MODEL)),
],
options={
'unique_together': {('user', 'applet')},
},
),
]

17
src/apps/dashboard/migrations/0003_seed_applets.py
View File

@@ -1,17 +0,0 @@
from django.db import migrations
def seed_applets(apps, schema_editor):
Applet = apps.get_model("dashboard", "Applet")
Applet.objects.get_or_create(slug="username", defaults={"name": "Username"})
Applet.objects.get_or_create(slug="theme-switcher", defaults={"name": "Theme Switcher"})
class Migration(migrations.Migration):
dependencies = [
("dashboard", "0002_applet_userapplet"),
]
operations = [
migrations.RunPython(seed_applets, migrations.RunPython.noop),
]

23
src/apps/dashboard/migrations/0004_applet_grid_cols_applet_grid_rows.py
View File

@@ -1,23 +0,0 @@
# Generated by Django 6.0 on 2026-03-06 22:29
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('dashboard', '0003_seed_applets'),
]
operations = [
migrations.AddField(
model_name='applet',
name='grid_cols',
field=models.PositiveSmallIntegerField(default=12),
),
migrations.AddField(
model_name='applet',
name='grid_rows',
field=models.PositiveSmallIntegerField(default=3),
),
]

17
src/apps/dashboard/migrations/0005_set_applet_grid_defaults.py
View File

@@ -1,17 +0,0 @@
from django.db import migrations
def set_grid_defaults(apps, schema_editor):
Applet = apps.get_model("dashboard", "Applet")
Applet.objects.filter(slug__in=["username", "theme-switcher"]).update(grid_cols=6, grid_rows=3)
Applet.objects.get_or_create(slug="new-list", defaults={"name": "New List", "grid_cols": 9, "grid_rows": 3})
Applet.objects.get_or_create(slug="my-lists", defaults={"name": "My Lists", "grid_cols": 3, "grid_rows": 3})
class Migration(migrations.Migration):
dependencies = [
("dashboard", "0004_applet_grid_cols_applet_grid_rows"),
]
operations = [
migrations.RunPython(set_grid_defaults, migrations.RunPython.noop),
]

18
src/apps/dashboard/migrations/0006_rename_theme_switcher.py
View File

@@ -1,18 +0,0 @@
from django.db import migrations
def rename_theme_switcher(apps, schema_editor):
Applet = apps.get_model("dashboard", "Applet")
Applet.objects.filter(slug="theme-switcher").update(
slug="palette", name="Palette", grid_cols=6, grid_rows=3
)
class Migration(migrations.Migration):
dependencies = [
("dashboard", "0005_set_applet_grid_defaults"),
]
operations = [
migrations.RunPython(rename_theme_switcher, migrations.RunPython.noop),
]

18
src/apps/dashboard/migrations/0007_seed_wallet_applet.py
View File

@@ -1,18 +0,0 @@
from django.db import migrations
def seed_wallet_applet(apps, schema_editor):
Applet = apps.get_model("dashboard", "Applet")
Applet.objects.get_or_create(
slug="wallet",
defaults={"name": "Wallet", "grid_cols": 12, "grid_rows": 3},
)
class Migration(migrations.Migration):
dependencies = [
("dashboard", "0006_rename_theme_switcher"),
]
operations = [
migrations.RunPython(seed_wallet_applet, migrations.RunPython.noop),
]

28
src/apps/dashboard/models.py
View File

@@ -36,30 +36,4 @@ class Item(models.Model):
unique_together = ("list", "text")
def __str__(self):
return self.text
class Applet(models.Model):
slug = models.SlugField(unique=True)
name = models.CharField(max_length=100)
default_visible = models.BooleanField(default=True)
grid_cols = models.PositiveSmallIntegerField(default=12)
grid_rows = models.PositiveSmallIntegerField(default=3)
def __str__(self):
return self.name
class UserApplet(models.Model):
user = models.ForeignKey(
"lyric.User",
related_name="user_applets",
on_delete=models.CASCADE,
)
applet = models.ForeignKey(
Applet,
on_delete=models.CASCADE,
)
visible = models.BooleanField(default=True)
class Meta:
unique_together = ("user", "applet")
return self.text

36
src/apps/dashboard/tests/integrated/test_models.py
View File

@@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError
from django.db.utils import IntegrityError
from django.test import TestCase
from apps.dashboard.models import Applet, Item, List, UserApplet
from apps.dashboard.models import Item, List
from apps.lyric.models import User
@@ -68,37 +68,3 @@ class ListModelTest(TestCase):
Item.objects.create(list=list_, text="first item")
Item.objects.create(list=list_, text="second item")
self.assertEqual(list_.name, "first item")
class AppletModelTest(TestCase):
def setUp(self):
self.applet = Applet.objects.create(
slug="my-applet", name="My Applet", default_visible=True
)
def test_applet_can_be_created(self):
self.assertEqual(Applet.objects.get(slug="my-applet"), self.applet)
def test_applet_slug_is_unique(self):
with self.assertRaises(IntegrityError):
Applet.objects.create(slug="my-applet", name="Second")
def test_applet_str(self):
self.assertEqual(str(self.applet), "My Applet")
def test_applet_grid_defaults(self):
self.assertEqual(self.applet.grid_cols, 12)
self.assertEqual(self.applet.grid_rows, 3)
class UserAppletModelTest(TestCase):
def setUp(self):
self.user = User.objects.create(email="a@b.cde")
self.applet, _ = Applet.objects.get_or_create(slug="username", defaults={"name": "Username"})
def test_user_applet_links_user_to_applet(self):
ua = UserApplet.objects.create(user=self.user, applet=self.applet, visible=True)
self.assertIn(ua, self.user.user_applets.all())
def test_user_applet_unique_per_user_and_applet(self):
UserApplet.objects.create(user=self.user, applet=self.applet, visible=True)
with self.assertRaises(IntegrityError):
UserApplet.objects.create(user=self.user, applet=self.applet, visible=False)

3
src/apps/dashboard/tests/integrated/test_views.py
View File

@@ -5,11 +5,12 @@ from django.test import override_settings, TestCase
from django.urls import reverse
from django.utils import html
from apps.applets.models import Applet, UserApplet
from apps.dashboard.forms import (
DUPLICATE_ITEM_ERROR,
EMPTY_ITEM_ERROR,
)
from apps.dashboard.models import Applet, Item, List, UserApplet
from apps.dashboard.models import Item, List
from apps.lyric.models import User

3
src/apps/dashboard/views.py
View File

@@ -8,8 +8,9 @@ from django.http import HttpResponse, HttpResponseForbidden, JsonResponse
from django.shortcuts import redirect, render
from django.views.decorators.csrf import ensure_csrf_cookie
from apps.applets.models import Applet, UserApplet
from apps.dashboard.forms import ExistingListItemForm, ItemForm
from apps.dashboard.models import Applet, Item, List, UserApplet
from apps.dashboard.models import Item, List
from apps.lyric.models import PaymentMethod, Token, User, Wallet