bug fix 0.4.0 release

Author: naviens

README.md

@@ -24,6 +24,12 @@ DRF_FCM = {
 }
 ```
 
+urls.py
+
+```python
+url(r'^fcm/', include('drf_fcm.urls')),
+```
+
 # Docs
 
 **Available Endpoints**:
@@ -49,8 +55,7 @@ Request Body:
 "name": "Lenovo Vibe",
 "device_id": "<IMEI>",
 "reg_id": "<gcm reg id>",
-"is_active": true,
-"user": 1
+"is_active": true
 }
 ```
 
@@ -69,14 +74,13 @@ Request Body:```
   previous: null,
   results: [
     {
-      id: 1,
-      created_at: "2016-10-26T14:00:50.422635Z",
-      updated_at: "2016-10-26T14:00:50.422664Z",
-      name: "Lenovo Vibe",
-      device_id: "123456789",
-      reg_id: "cOQHI1sddd:reg_id",
+      id: 2,
+      name: "My LG Optimus Black",
+      device_id: "[email protected]",
+      reg_id: "12346767777",
       is_active: true,
-      user: 1
+      created_at: "2017-03-16T14:36:42.404759Z",
+      updated_at: "2017-03-16T14:36:42.404800Z"
     }
   ]
 }

drf_fcm/admin.py

@@ -1,3 +1,10 @@
 from django.contrib import admin
+from models import Device
 
-# Register your models here.
+class DeviceAdmin(admin.ModelAdmin):
+    list_display = ('name', 'device_id', 'reg_id', 'is_active', 'user')
+    fields = ('name', 'device_id', 'reg_id', 'is_active', 'user')
+    ordering = ('name',)
+
+
+admin.site.register(Device, DeviceAdmin)

drf_fcm/migrations/0002_auto_20170316_1411.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-03-16 14:11
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('drf_fcm', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='device',
+            name='is_active',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AlterField(
+            model_name='device',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='User'),
+        ),
+    ]

drf_fcm/models.py

@@ -40,8 +40,8 @@ class Device(BaseModel):
                                  max_length=50)
     reg_id = models.CharField(verbose_name=_("GCM Registration id"),
                               max_length=255, unique=True)
-    is_active = models.BooleanField(default=False)
-    user = models.ForeignKey(AUTH_USER_MODEL)
+    is_active = models.BooleanField(default=True)
+    user = models.ForeignKey(AUTH_USER_MODEL, on_delete=models.CASCADE, verbose_name=_("User"))
     objects = FCMDeviceManager()
 
     def __str__(self):

drf_fcm/serializers.py

@@ -1,18 +1,29 @@
 from rest_framework import serializers
+from django.utils.translation import ugettext_lazy as _
 
 from .settings import get_device_model
 
 Device = get_device_model()
 
 
 class DeviceSerializer(serializers.ModelSerializer):
+    name = serializers.CharField(label=_("Device Name"), required=False, allow_blank=False,)
+    device_id = serializers.CharField(label=_("Device Unique ID or IMEI"), required=True,)
+    reg_id = serializers.CharField(label=_("GCM Registration ID"), required=True,)
+
     default_error_messages = {
         'inactive_device': 'Inactive Device',
+        'duplicate_device': 'This device is already registered in your account',
     }
 
+    def validate_device_id(self, value):
+        if self.Meta.model.objects.filter(device_id=value, user=self.context.user).exists():
+            raise serializers.ValidationError(self.error_messages['duplicate_device'])
+        return value
+
     class Meta:
         model = Device
-        fields = '__all__'
+        fields = ('id','name', 'device_id', 'reg_id', 'is_active', 'created_at', 'updated_at')
         read_only_fields = ('id', 'created_at', 'updated_at')
 
 

drf_fcm/views.py

@@ -23,9 +23,9 @@ def get_queryset(self):
         return self.queryset
 
     def post(self, request, *args, **kwargs):
-        serializer = self.serializer_class(data=request.data)
+        serializer = self.serializer_class(data=request.data, context=self.request)
         if serializer.is_valid(raise_exception=True):
-            serializer.save()
+            serializer.save(user=self.request.user)
             return Response(
                 data=serializer.data,
                 status=status.HTTP_201_CREATED)

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(name='drf-fcm',
-      version='0.1.0',
+      version='0.4.0',
       description='Firebase Cloud Messaging Server in Django Rest FrameWork',
       packages=find_packages(),
       author='Naveen Subramani',