make uuid writeable and fix serializer

course_discovery/apps/journal/api/serializers.py

@@ -4,6 +4,7 @@ from rest_framework import serializers
 from course_discovery.apps.api.serializers import MinimalCourseSerializer
 from course_discovery.apps.journal.models import Journal, JournalBundle
 from course_discovery.apps.core.models import Currency, Partner
+from course_discovery.apps.course_metadata.models import Organization
 
 
 class JournalSerializer(serializers.ModelSerializer):
@@ -14,12 +15,25 @@ class JournalSerializer(serializers.ModelSerializer):
         decimal_places=Journal.PRICE_FIELD_CONFIG['decimal_places'],
         max_digits=Journal.PRICE_FIELD_CONFIG['max_digits']
     )
-    partner = serializers.SlugRelatedField(slug_field='name', queryset=Partner.objects.all())
+    partner = serializers.SlugRelatedField(slug_field='short_code', queryset=Partner.objects.all())
+    organization = serializers.SlugRelatedField(slug_field='key', queryset=Organization.objects.all())
     currency = serializers.SlugRelatedField(slug_field='code', queryset=Currency.objects.all())
 
     class Meta(object):
         model = Journal
-        fields = ('uuid', 'partner', 'title', 'price', 'currency', 'sku', 'card_image_url', 'short_description', 'full_description', 'access_length')
+        fields = (
+            'uuid',
+            'partner',
+            'organization',
+            'title',
+            'price',
+            'currency',
+            'sku',
+            'card_image_url',
+            'short_description',
+            'full_description',
+            'access_length'
+        )
 
 
 class JournalBundleSerializer(serializers.ModelSerializer):

course_discovery/apps/journal/migrations/0006_auto_20180403_1927.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2018-04-03 19:27
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('journal', '0005_auto_20180329_2009'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='journal',
+            options={'ordering': ('created',)},
+        ),
+        migrations.AlterField(
+            model_name='journal',
+            name='uuid',
+            field=models.UUIDField(default=uuid.uuid4, verbose_name='UUID'),
+        ),
+    ]

course_discovery/apps/journal/migrations/0008_merge_20180405_1200.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2018-04-05 12:00
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('journal', '0007_journalbundle_applicable_seat_types'),
+        ('journal', '0006_auto_20180403_1927'),
+    ]
+
+    operations = [
+    ]

course_discovery/apps/journal/migrations/0009_auto_20180405_1203.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.11 on 2018-04-05 12:03
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('journal', '0008_merge_20180405_1200'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='journal',
+            name='uuid',
+            field=models.UUIDField(verbose_name='UUID'),
+        ),
+    ]

course_discovery/apps/journal/models.py

@@ -18,8 +18,6 @@ class Journal(TimeStampedModel):
         'default': 0.00,
     }
     uuid = models.UUIDField(
-        default=uuid4,
-        editable=False,
         verbose_name=_('UUID'),
     )
     partner = models.ForeignKey(Partner)