From 29f6f4c31be8458f7367e653c49ac1de232fc673 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Wed, 8 Jun 2016 22:41:17 +0100
Subject: [PATCH] Fixed notifications

---
 api/serializers.py                            |  5 ++++-
 .../0026_notification_notification_text.py    | 19 -------------------
 spa/migrations/0027_auto_20160607_2042.py     | 19 -------------------
 spa/models/notification.py                    |  1 -
 4 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 spa/migrations/0026_notification_notification_text.py
 delete mode 100644 spa/migrations/0027_auto_20160607_2042.py

diff --git a/api/serializers.py b/api/serializers.py
index b2866c6..1748915 100755
--- a/api/serializers.py
+++ b/api/serializers.py
@@ -474,7 +474,7 @@ class NotificationSerializer(serializers.HyperlinkedModelSerializer):
     from_user = InlineUserProfileSerializer(source='get_from_user', read_only=True)
     notification_url = serializers.ReadOnlyField()
     verb = serializers.ReadOnlyField()
-    target = serializers.ReadOnlyField()
+    target = serializers.SerializerMethodField()
     date = serializers.ReadOnlyField()
 
     class Meta:
@@ -497,6 +497,9 @@ class NotificationSerializer(serializers.HyperlinkedModelSerializer):
     def get_avatar_image(self, obj):
         return settings.DEFAULT_USER_IMAGE if obj.from_user is None else obj.get_sized_avatar_image(253, 157)
 
+    def get_target(self, obj):
+        return "/{}/{}".format(obj.to_user.slug, obj.target)
+
 
 class MessageSerializer(serializers.ModelSerializer):
     from_user = InlineUserProfileSerializer(read_only=True)
diff --git a/spa/migrations/0026_notification_notification_text.py b/spa/migrations/0026_notification_notification_text.py
deleted file mode 100644
index efdb6d8..0000000
--- a/spa/migrations/0026_notification_notification_text.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('spa', '0025_socialaccountlink_provider_data'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='notification',
-            name='notification_text',
-            field=models.CharField(null=True, max_length=2048),
-        ),
-    ]
diff --git a/spa/migrations/0027_auto_20160607_2042.py b/spa/migrations/0027_auto_20160607_2042.py
deleted file mode 100644
index 6f27ab5..0000000
--- a/spa/migrations/0027_auto_20160607_2042.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('spa', '0026_notification_notification_text'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='notification',
-            name='notification_text',
-            field=models.CharField(max_length=2048),
-        ),
-    ]
diff --git a/spa/models/notification.py b/spa/models/notification.py
index 29aeaff..7ea116f 100755
--- a/spa/models/notification.py
+++ b/spa/models/notification.py
@@ -17,7 +17,6 @@ class Notification(BaseModel):
     type = models.CharField(max_length=200, null=True)
     target = models.CharField(max_length=200, null=True)
     target_desc = models.CharField(max_length=200, null=True)
-    notification_text = models.CharField(max_length=2048, null=False)
 
     accepted_date = models.DateTimeField(null=True)