changes subscription first name/last name to simply name

plugs_newsletter/admin.py

@@ -6,9 +6,9 @@ class SubscriptionAdmin(admin.ModelAdmin):
     """
     Subscription Model Admin
     """
-    fields = ('email', 'first_name', 'last_name', 'created', 'updated')
+    fields = ('email', 'name', 'created', 'updated')
     readonly_fields = ('id', 'created', 'updated')
-    list_display = ('email', 'first_name', 'last_name')
-    search_fields = ('email', 'first_name', 'last_name')
+    list_display = ('email', 'name')
+    search_fields = ('email', 'name')
 
 admin.site.register(Subscription, SubscriptionAdmin)

plugs_newsletter/migrations/0002_auto_20170829_1210.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2017-08-29 11:10
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('plugs_newsletter', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='subscription',
+            name='first_name',
+        ),
+        migrations.RemoveField(
+            model_name='subscription',
+            name='last_name',
+        ),
+        migrations.AddField(
+            model_name='subscription',
+            name='name',
+            field=models.CharField(max_length=70, null=True),
+        ),
+    ]

plugs_newsletter/models.py

@@ -21,8 +21,7 @@ class Subscription(mixins.Timestampable, models.Model):
     """
     error_msgs = {'unique': _('This email is already registered.')}
     email = models.EmailField(unique=True, error_messages=error_msgs)
-    first_name = models.CharField(max_length=35, null=True)
-    last_name = models.CharField(max_length=35, null=True)
+    name = models.CharField(max_length=70, null=True)
 
     def __str__(self):
         return self.email
@@ -59,8 +58,7 @@ def update_newsletter_settings(instance, created, **kwargs):
     if send_newsletter:
         kwargs = {
             'email': instance.email,
-            'first_name': instance.first_name,
-            'last_name': instance.last_name
+            'name': instance.name
         }
         try:
             with transaction.atomic():

plugs_newsletter/serializers.py

@@ -16,4 +16,4 @@ class Meta:
         Metaclass definition
         """
         model = models.Subscription
-        fields = ('id', 'email', 'first_name', 'last_name', 'created', 'updated')
+        fields = ('id', 'email', 'name', 'created', 'updated')

plugs_newsletter/tests/test_serializers.py

@@ -24,7 +24,7 @@ def test_subscription_serializer(self):
         """
         Ensures subscription serializer
         """
-        data = {'email': 'janedoe@example.com', 'first_name': 'Jane', 'last_name': 'Doe'}
+        data = {'email': 'janedoe@example.com', 'name': 'Jane Doe'}
         serializer = serializers.SubscriptionSerializer(data=data)
         self.assertTrue(serializer.is_valid())
         self.assertEqual(serializer.validated_data, data)