Add sent time to push notification, in order to sort API results

website/pushnotifications/api/serializers.py

@@ -41,4 +41,4 @@ class MessageSerializer(ModelSerializer):
     class Meta:
         model = Message
 
-        fields = ('pk', 'title', 'body', 'url', 'category')
+        fields = ('pk', 'title', 'body', 'url', 'category', 'time')

website/pushnotifications/api/viewsets.py

 from django.utils.translation import get_language_from_request
-from rest_framework import permissions, viewsets
+from rest_framework import permissions, viewsets, filters
 from rest_framework.decorators import action
 from rest_framework.response import Response
 
@@ -52,6 +52,8 @@ class DeviceViewSet(viewsets.ModelViewSet):
 class MessageViewSet(viewsets.ReadOnlyModelViewSet):
     permission_classes = (permissions.IsAuthenticated,)
     queryset = Message.objects.all()
+    filter_backends = (filters.OrderingFilter,)
+    ordering_fields = ('time',)
     serializer_class = MessageSerializer
 
     def get_queryset(self):

website/pushnotifications/locale/nl/LC_MESSAGES/django.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-02 16:51+0100\n"
-"PO-Revision-Date: 2019-03-02 16:52+0100\n"
+"POT-Creation-Date: 2019-10-13 16:50+0200\n"
+"PO-Revision-Date: 2019-10-13 16:51+0200\n"
 "Last-Translator: Thom Wiggers <thom@thomwiggers.nl>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #: admin.py
 msgid "Enable selected devices"
@@ -90,6 +90,10 @@ msgstr "mislukt"
 msgid "success"
 msgstr "succesvol"
 
+#: models.py
+msgid "time"
+msgstr "tijd"
+
 #: templates/admin/pushnotifications/change_form.html
 msgid "Send message"
 msgstr "Verstuur bericht"

website/pushnotifications/migrations/0015_auto_20191013_1642.py

+# Generated by Django 2.2.1 on 2019-10-13 14:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pushnotifications', '0014_fix_typo'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='scheduledmessage',
+            name='time',
+        ),
+        migrations.AddField(
+            model_name='message',
+            name='time',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='time'),
+        ),
+    ]

website/pushnotifications/models.py

@@ -3,6 +3,7 @@ import datetime
 
 from django.conf import settings
 from django.db import models
+from django.utils import timezone
 from django.utils.translation import override
 from django.utils.translation import ugettext_lazy as _
 from firebase_admin import messaging
@@ -126,6 +127,11 @@ class Message(models.Model, metaclass=ModelTranslateMeta):
         blank=True,
         null=True,
     )
+    time = models.DateTimeField(
+        verbose_name=_('time'),
+        blank=True,
+        null=True,
+    )
 
     def __str__(self):
         return '{}: {}'.format(self.title, self.body)
@@ -187,6 +193,7 @@ class Message(models.Model, metaclass=ModelTranslateMeta):
             self.sent = True
             self.success = success_total
             self.failure = failure_total
+            self.time = timezone.now()
             self.save()
         return None
 
@@ -204,5 +211,4 @@ class ScheduledMessage(Message, metaclass=ModelTranslateMeta):
     objects = ScheduledMessageManager()
 
     scheduled = models.BooleanField(default=True)
-    time = models.DateTimeField()
     executed = models.DateTimeField(null=True)