revamed the categories to a model and added fields to device and message....

revamed the categories to a model and added fields to device and message. Added filtering for pushnotifications

website/pushnotifications/migrations/0004_auto_20180221_1924.py

+# Generated by Django 2.0.2 on 2018-02-21 18:24
+
+from django.db import migrations, models
+import django.db.models.deletion
+import pushnotifications.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pushnotifications', '0003_message_category'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Category',
+            fields=[
+                ('key', models.CharField(max_length=16, primary_key=True, serialize=False)),
+                ('name_en', models.CharField(max_length=32, verbose_name='name (EN)')),
+                ('name_nl', models.CharField(max_length=32, verbose_name='name (NL)')),
+            ],
+        ),
+        migrations.AlterField(
+            model_name='message',
+            name='category',
+            field=models.ForeignKey(default='general', on_delete=django.db.models.deletion.CASCADE, to='pushnotifications.Category', verbose_name='category'),
+        ),
+        migrations.AddField(
+            model_name='device',
+            name='receive_category',
+            field=models.ManyToManyField(default=pushnotifications.models.Device.default_receive_category, to='pushnotifications.Category'),
+        ),
+    ]

website/pushnotifications/migrations/0005_populate_category.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+def forwards_func(apps, schema_editor):
+    Category = apps.get_model("pushnotifications", "Category")
+    db_alias = schema_editor.connection.alias
+    Category.objects.using(db_alias).bulk_create([
+        Category(key="general", name_en="general", name_nl="algemeen"),
+        Category(key="pizza", name_en="pizza", name_nl="pizza"),
+        Category(key="event", name_en="event", name_nl="evenement"),
+        Category(key="newsletter", name_en="newsletter", name_nl="nieuwsbrief"),
+        Category(key="sponsor", name_en="sponsor", name_nl="sponsor"),
+        Category(key="photo", name_en="photo", name_nl="foto"),
+        Category(key="board", name_en="board", name_nl="bestuur"),
+    ])
+
+
+def reverse_func(apps, schema_editor):
+    Category = apps.get_model("pushnotifications", "Category")
+    db_alias = schema_editor.connection.alias
+    Category.objects.using(db_alias).all().delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pushnotifications', '0004_auto_20180221_1924'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func),
+    ]

website/pushnotifications/models.py

@@ -6,6 +6,20 @@ from django.utils.translation import ugettext_lazy as _
 from pyfcm import FCMNotification
 
 from thaliawebsite import settings
+from utils.translation import MultilingualField, ModelTranslateMeta
+
+
+class Category(models.Model, metaclass=ModelTranslateMeta):
+    key = models.CharField(max_length=16, primary_key=True)
+
+    name = MultilingualField(
+        models.CharField,
+        _("name"),
+        max_length=32,
+    )
+
+    def __str__(self):
+        return self.name_en
 
 
 class Device(models.Model):
@@ -33,29 +47,19 @@ class Device(models.Model):
         choices=settings.LANGUAGES,
     )
 
+    def default_receive_category(self):
+        return Category.objects.filter(key="general")
+
+    receive_category = models.ManyToManyField(
+        Category,
+        default=default_receive_category
+    )
+
     class Meta:
         unique_together = ('registration_id', 'user',)
 
 
 class Message(models.Model):
-    GENERAL = 'general'
-    PIZZA = 'pizza'
-    EVENT = 'event'
-    NEWSLETTER = 'newsletter'
-    SPONSOR = 'sponsor'
-    PHOTO = 'photo'
-    BOARD = 'board'
-
-    CATEGORIES = (
-        (GENERAL, _("General")),
-        (PIZZA, _("Pizza")),
-        (EVENT, _("Events")),
-        (NEWSLETTER, _("Newsletter")),
-        (SPONSOR, _("Sponsored messages")),
-        (PHOTO, _("Photos")),
-        (BOARD, _("Board")),
-    )
-
     users = models.ManyToManyField(django_settings.AUTH_USER_MODEL)
     title = models.CharField(
         max_length=150,
@@ -64,13 +68,11 @@ class Message(models.Model):
     body = models.TextField(
         verbose_name=_('body')
     )
-
-    category = models.CharField(
-        choices=CATEGORIES,
-        max_length=10,
+    category = models.ForeignKey(
+        Category,
+        verbose_name=_('category'),
         default="general"
     )
-
     sent = models.BooleanField(
         verbose_name=_('sent'),
         default=False
@@ -92,8 +94,11 @@ class Message(models.Model):
     def send(self, **kwargs):
         if self:
             reg_ids = list(
-                Device.objects.filter(user__in=self.users.all(), active=True)
-                              .values_list('registration_id', flat=True))
+                Device.objects.filter(
+                    user__in=self.users.all(),
+                    receive_category__id=self.category_id,
+                    active=True
+                ).values_list('registration_id', flat=True))
             if len(reg_ids) == 0:
                 return None