Merge pull request #72 from edx/mushtaq/3play-turnaround-levels

Modify 3PlayMedia turnaround levels

VEDA_OS01/migrations/0005_auto_20171127_0856.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2017-11-27 08:56
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('VEDA_OS01', '0004_auto_20171108_0714'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='video',
+            name='three_play_turnaround',
+            field=models.CharField(blank=True, choices=[(b'extended', b'10-Day/Extended'), (b'standard', b'4-Day/Standard'), (b'expedited', b'2-Day/Expedited'), (b'rush', b'24 hour/Rush'), (b'same_day', b'Same Day'), (b'two_hour', b'2 Hour')], max_length=20, null=True, verbose_name=b'3PlayMedia Turnaround'),
+        ),
+    ]

VEDA_OS01/models.py

@@ -85,18 +85,20 @@ class ThreePlayTurnaround(object):
     Turnaround Enumeration.
     Its the time taken by 3PlayMedia transcription process.
     """
-    EXTENDED_SERVICE = 'extended_service'
-    DEFAULT = 'default'
-    EXPEDITED_SERVICE = 'expedited_service'
-    RUSH_SERVICE = 'rush_service'
-    SAME_DAY_SERVICE = 'same_day_service'
+    EXTENDED = 'extended'
+    STANDARD = 'standard'
+    EXPEDITED = 'expedited'
+    RUSH = 'rush'
+    SAME_DAY = 'same_day'
+    TWO_HOUR = 'two_hour'
 
     CHOICES = (
-        (EXTENDED_SERVICE, '10-Day/Extended'),
-        (DEFAULT, '4-Day/Default'),
-        (EXPEDITED_SERVICE, '2-Day/Expedited'),
-        (RUSH_SERVICE, '24 hour/Rush'),
-        (SAME_DAY_SERVICE, 'Same Day'),
+        (EXTENDED, '10-Day/Extended'),
+        (STANDARD, '4-Day/Standard'),
+        (EXPEDITED, '2-Day/Expedited'),
+        (RUSH, '24 hour/Rush'),
+        (SAME_DAY, 'Same Day'),
+        (TWO_HOUR, '2 Hour'),
     )
 
 

control/tests/test_deliver_3play.py

@@ -53,7 +53,7 @@ class ThreePlayMediaClientTests(TestCase):
             'media_url': u'https://s3.amazonaws.com/bkt/video.mp4',
             'api_key': u'insecure_api_key',
             'api_secret': u'insecure_api_secret',
-            'turnaround_level': ThreePlayTurnaround.DEFAULT,
+            'turnaround_level': ThreePlayTurnaround.STANDARD,
             'callback_url': build_url(
                 u'https://veda.edx.org/3playmedia/transcripts/handle/123123',
                 org=u'MAx',