Updated Organization model

- Added marketing URL path
- Added tags

ECOM-5191

course_discovery/apps/api/serializers.py

@@ -7,6 +7,7 @@ from django.utils.translation import ugettext_lazy as _
 from drf_haystack.serializers import HaystackSerializer, HaystackFacetSerializer
 from rest_framework import serializers
 from rest_framework.fields import DictField
+from taggit_serializer.serializers import TagListSerializerField, TaggitSerializer
 
 from course_discovery.apps.catalogs.models import Catalog
 from course_discovery.apps.course_metadata.models import (
@@ -155,12 +156,13 @@ class PersonSerializer(serializers.ModelSerializer):
         fields = ('key', 'name', 'title', 'bio', 'profile_image',)
 
 
-class OrganizationSerializer(serializers.ModelSerializer):
+class OrganizationSerializer(TaggitSerializer, serializers.ModelSerializer):
     """Serializer for the ``Organization`` model."""
+    tags = TagListSerializerField()
 
     class Meta(object):
         model = Organization
-        fields = ('key', 'name', 'description', 'homepage_url',)
+        fields = ('key', 'name', 'description', 'homepage_url', 'tags',)
 
 
 class CatalogSerializer(serializers.ModelSerializer):

course_discovery/apps/api/tests/test_serializers.py

@@ -387,6 +387,8 @@ class VideoSerializerTests(TestCase):
 class OrganizationSerializerTests(TestCase):
     def test_data(self):
         organization = OrganizationFactory()
+        TAG = 'test'
+        organization.tags.add(TAG)
         serializer = OrganizationSerializer(organization)
 
         expected = {
@@ -394,6 +396,7 @@ class OrganizationSerializerTests(TestCase):
             'name': organization.name,
             'description': organization.description,
             'homepage_url': organization.homepage_url,
+            'tags': [TAG],
         }
 
         self.assertDictEqual(serializer.data, expected)

course_discovery/apps/course_metadata/migrations/0017_auto_20160815_2135.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import taggit.managers
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('taggit', '0002_auto_20150616_2121'),
+        ('course_metadata', '0016_auto_20160815_1438'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='historicalorganization',
+            name='marketing_url_path',
+            field=models.CharField(null=True, max_length=255, blank=True),
+        ),
+        migrations.AddField(
+            model_name='organization',
+            name='marketing_url_path',
+            field=models.CharField(null=True, max_length=255, blank=True),
+        ),
+        migrations.AddField(
+            model_name='organization',
+            name='tags',
+            field=taggit.managers.TaggableManager(verbose_name='Tags', to='taggit.Tag', through='taggit.TaggedItem', help_text='A comma-separated list of tags.', blank=True),
+        ),
+    ]

course_discovery/apps/course_metadata/models.py

@@ -14,6 +14,7 @@ from djchoices import DjangoChoices, ChoiceItem
 from haystack.query import SearchQuerySet
 from simple_history.models import HistoricalRecords
 from sortedm2m.fields import SortedManyToManyField
+from taggit.managers import TaggableManager
 
 from course_discovery.apps.core.models import Currency, Partner
 from course_discovery.apps.course_metadata.query import CourseQuerySet
@@ -156,11 +157,14 @@ class Organization(TimeStampedModel):
     uuid = models.UUIDField(blank=False, null=False, default=uuid4, editable=False, verbose_name=_('UUID'))
     key = models.CharField(max_length=255)
     name = models.CharField(max_length=255)
+    marketing_url_path = models.CharField(max_length=255, null=True, blank=True)
     description = models.TextField(null=True, blank=True)
     homepage_url = models.URLField(max_length=255, null=True, blank=True)
     logo_image_url = models.URLField(null=True, blank=True)
     banner_image_url = models.URLField(null=True, blank=True)
+
     history = HistoricalRecords()
+    tags = TaggableManager(blank=True)
 
     class Meta:
         unique_together = (

course_discovery/settings/base.py

@@ -45,6 +45,9 @@ THIRD_PARTY_APPS = [
     'django_filters',
     'django_fsm',
     'storages',
+    'django_comments',
+    'taggit',
+    'taggit_serializer',
 ]
 
 PROJECT_APPS = [
@@ -56,7 +59,6 @@ PROJECT_APPS = [
     'course_discovery.apps.edx_haystack_extensions',
     'course_discovery.apps.publisher',
     'course_discovery.apps.publisher_comments',
-    'django_comments',
 ]
 
 
@@ -359,3 +361,5 @@ DEFAULT_PARTNER_ID = None
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#site-id
 SITE_ID = 1
 COMMENTS_APP = 'course_discovery.apps.publisher_comments'
+
+TAGGIT_CASE_INSENSITIVE = True

requirements/base.txt

@@ -12,6 +12,8 @@ django-libsass==0.7
 django-simple-history==1.8.1
 django-sortedm2m==1.3.2
 django-storages==1.5.0
+django-taggit==0.20.2
+django-taggit-serializer==0.1.5
 django-waffle==0.11.1
 djangorestframework==3.3.3
 djangorestframework-csv==1.4.1