Fix migration, fix example app admin

Author: kevinrenskers

example/notifications/admin.py

@@ -4,7 +4,15 @@
 
 @admin.register(Notification)
 class NotificationAdmin(admin.ModelAdmin):
-    list_display = ["recipient", "notification_type", "added", "channels"]
+    list_display = ["recipient", "notification_type", "added", "get_channels"]
+
+    def get_queryset(self, request):
+        return super().get_queryset(request).prefetch_related("channels")
+
+    @admin.display(description="Channels")
+    def get_channels(self, obj):
+        channels = obj.channels.values_list("channel", flat=True)
+        return ", ".join(channels) if channels else "-"
 
 
 @admin.register(DisabledNotificationTypeChannel)

example/uv.lock

@@ -40,7 +40,7 @@ def handle(self, *args, **options):
             frequency_cls = registry.get_frequency(target_frequency)
             if not frequency_cls:
                 raise KeyError(f"Frequency '{target_frequency}' not found")
-            
+
             total_digests_sent = send_notification_digests(frequency_cls, dry_run)
 
             if dry_run:

generic_notifications/management/commands/send_notification_digests.py

@@ -10,13 +10,17 @@ def migrate_channels_to_notificationchannel(apps, schema_editor):
     NotificationChannel = apps.get_model("generic_notifications", "NotificationChannel")
 
     for notification in Notification.objects.all():
+        # Access the channels_old JSONField (renamed to avoid conflict)
+        channels_data = notification.channels_old if hasattr(notification, "channels_old") else []
+
         # Create NotificationChannel entries for each channel
-        for channel in notification.channels:
+        for channel in channels_data:
             delivery, created = NotificationChannel.objects.get_or_create(
                 notification=notification,
                 channel=channel,
             )
 
+            # If this is the email channel and email_sent_at is set, update sent_at
             if notification.email_sent_at:
                 delivery.sent_at = notification.email_sent_at
                 delivery.save()
@@ -29,12 +33,12 @@ def reverse_migrate_channels(apps, schema_editor):
 
     for notification in Notification.objects.all():
         # Rebuild channels list from NotificationChannel entries
-        channels = list(notification.channels.values_list("channel", flat=True))
-        notification.channels = channels
+        channels = list(NotificationChannel.objects.filter(notification=notification).values_list("channel", flat=True))
+        notification.channels_old = channels
 
         # Restore email_sent_at from email NotificationChannel
         try:
-            email_delivery = notification.channels.get(channel="email")
+            email_delivery = NotificationChannel.objects.get(notification=notification, channel="email")
             if email_delivery.sent_at:
                 notification.email_sent_at = email_delivery.sent_at
         except NotificationChannel.DoesNotExist:
@@ -49,6 +53,13 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        # First, rename the channels field to avoid naming conflict with the related_name
+        migrations.RenameField(
+            model_name="notification",
+            old_name="channels",
+            new_name="channels_old",
+        ),
+        # Create the new NotificationChannel model
         migrations.CreateModel(
             name="NotificationChannel",
             fields=[
@@ -72,8 +83,15 @@ class Migration(migrations.Migration):
                 "unique_together": {("notification", "channel")},
             },
         ),
+        # Migrate the data
         migrations.RunPython(
             migrate_channels_to_notificationchannel,
             reverse_migrate_channels,
         ),
+        # Rename back to channels for migration 3 to handle removal
+        migrations.RenameField(
+            model_name="notification",
+            old_name="channels_old",
+            new_name="channels",
+        ),
     ]

generic_notifications/migrations/0002_alter_disablednotificationtypechannel_id_and_more.py

@@ -270,6 +270,7 @@ class NotificationFrequency(models.Model):
 
     class Meta:
         unique_together = ["user", "notification_type"]
+        verbose_name_plural = "Notification frequencies"
 
     def clean(self):
         if self.notification_type: