Signal strategy with views

Author: tzangms

dj_elastictranscoder/tests.py

@@ -2,10 +2,18 @@
 import json
 
 from django.test import TestCase
+from django.dispatch import receiver
 from django.db import models
 from django.contrib.contenttypes.models import ContentType
 
 from .models import EncodeJob
+from .signals import (
+    transcode_init, 
+    transcode_onprogress, 
+    transcode_onerror, 
+    transcode_oncomplete
+)
+
 
 
 PROJECT_ROOT = os.path.dirname(os.path.realpath(__file__))
@@ -15,6 +23,46 @@
 class Item(models.Model):
     name = models.CharField(max_length=100)
 
+# ======================
+# define signal receiver
+# ======================
+
+@receiver(transcode_init)
+def encode_init(sender, message, **kwargs):
+    item = Item.objects.create(name='Hello')
+
+    ctype = ContentType.objects.get_for_model(item)
+
+    job = EncodeJob()
+    job.id = message['Job']['Id']
+    job.content_type = ctype
+    job.object_id = item.id
+    job.save()
+
+
+@receiver(transcode_onprogress)
+def encode_onprogress(sender, message, **kwargs):
+    job = EncodeJob.objects.get(pk=message['jobId'])
+    job.message = 'Progress'
+    job.state = 1
+    job.save()
+
+
+@receiver(transcode_onerror)
+def encode_onerror(sender, message, **kwargs):
+    job = EncodeJob.objects.get(pk=message['jobId'])
+    job.message = message['messageDetails']
+    job.state = 2
+    job.save()
+
+
+@receiver(transcode_oncomplete)
+def job_record(sender, message, **kwargs):
+    job = EncodeJob.objects.get(pk=message['jobId'])
+    job.message = 'Success'
+    job.state = 4
+    job.save()
+
 
 class SNSNotificationTest(TestCase):
     urls = 'dj_elastictranscoder.urls'
@@ -51,7 +99,7 @@ def test_onerror(self):
         self.assertEqual(resp.content, 'Done')
 
         job = EncodeJob.objects.get(id=self.job_id)
-        self.assertEqual(job.state, 3)
+        self.assertEqual(job.state, 2)
 
 
     def test_oncomplete(self):
@@ -66,14 +114,6 @@ def test_oncomplete(self):
         self.assertEqual(job.state, 4)
 
 
-from .signals import (
-    transcode_init, 
-    transcode_onprogress, 
-    transcode_onerror, 
-    transcode_oncomplete
-)
-from django.dispatch import receiver
-
 
 class SignalTest(TestCase):
 
@@ -85,19 +125,6 @@ def test_transcode_init(self):
         with open(os.path.join(FIXTURE_DIRS, 'submit.json')) as f:
             message = json.loads(f.read())
 
-        # define signal receiver
-        @receiver(transcode_init)
-        def job_record(sender, message, **kwargs):
-            item = Item.objects.create(name='Hello')
-
-            ctype = ContentType.objects.get_for_model(item)
-
-            job = EncodeJob()
-            job.id = message['Job']['Id']
-            job.content_type = ctype
-            job.object_id = item.id
-            job.save()
-
         # send signal
         transcode_init.send(sender=None, message=message)
 
@@ -127,14 +154,6 @@ def test_transcode_onprogress(self):
             resp = json.loads(f.read())
             message = json.loads(resp['Message'])
 
-        # define signal receiver
-        @receiver(transcode_onprogress)
-        def job_record(sender, message, **kwargs):
-            job = EncodeJob.objects.get(pk=message['jobId'])
-            job.message = 'Progress'
-            job.state = 1
-            job.save()
-
         # send signal
         transcode_onprogress.send(sender=None, message=message)
 
@@ -169,15 +188,6 @@ def test_transcode_onerror(self):
             resp = json.loads(f.read())
             message = json.loads(resp['Message'])
 
-
-        # define signal receiver
-        @receiver(transcode_onerror)
-        def job_record(sender, message, **kwargs):
-            job = EncodeJob.objects.get(pk=message['jobId'])
-            job.message = message['messageDetails']
-            job.state = 2
-            job.save()
-
         # send signal
         transcode_onerror.send(sender=None, message=message)
 
@@ -212,14 +222,6 @@ def test_transcode_oncomplete(self):
             resp = json.loads(f.read())
             message = json.loads(resp['Message'])
 
-        # define signal receiver
-        @receiver(transcode_oncomplete)
-        def job_record(sender, message, **kwargs):
-            job = EncodeJob.objects.get(pk=message['jobId'])
-            job.message = 'Success'
-            job.state = 4
-            job.save()
-
         # send signal
         transcode_oncomplete.send(sender=None, message=message)
 

dj_elastictranscoder/views.py

@@ -3,8 +3,11 @@
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.core.mail import mail_admins
 
-from .models import EncodeJob
-
+from .signals import (
+    transcode_onprogress,
+    transcode_onerror,
+    transcode_oncomplete
+)
 
 def sns_endpoint(request):
     """
@@ -35,18 +38,12 @@ def sns_endpoint(request):
     except ValueError:
         assert False, data['Message']
 
-    job, created = EncodeJob.objects.get_or_create(id=message['jobId'])
-    
+    #
     if message['state'] == 'PROGRESSING':
-        job.state = 1
+        transcode_onprogress.send(sender=None, message=message)
     elif message['state'] == 'COMPLETED':
-        job.state = 4
+        transcode_oncomplete.send(sender=None, message=message)
     elif message['state'] == 'ERROR':
-        job.state = 3
-
-    job.message = json.dumps(message)
-    job.save()
-
-    # TODO: send signal to handler
+        transcode_onerror.send(sender=None, message=message)
 
     return HttpResponse('Done')