message

Change-Id: I6e853d829f064b2f77cb25f1c9628dca73d190ce

dkt/const.py

@@ -47,3 +47,8 @@ class UserRole(Enum):
     STUDENT = 'student'
     PARENT = 'parent'
     ADMIN = 'admin'
+
+
+class MessageObjects(Enum):
+    PUB = u'pub'
+    ALL = u'all'

dkt/service/message.py

@@ -6,10 +6,8 @@
 import time
 from django.db.models import Q
 
-from dkt.database.models import MESSAGES
-from dkt.database.models import USERS
-from dkt.database.models import COURSE
-from dkt.const import ObjectStatus
+from dkt.database.models import MESSAGES, USERS, COURSE
+from dkt.const import ObjectStatus, MessageObjects
 
 def get_message(request, post_data):
     """
@@ -23,8 +21,8 @@ def get_message(request, post_data):
     since = post_data.get('since', int(time.time()))
     sender = post_data.get('sender')
 
-    if sender == 'pub':
-        msgs = MESSAGES.objects.filter(course_id=course_id, receiver='all', _t__lte=since)[:10]
+    if sender == MessageObjects.PUB.value:
+        msgs = MESSAGES.objects.filter(course_id=course_id, receiver=MessageObjects.ALL.value, _t__lte=since)[:10]
     else:
         msgs = MESSAGES.objects.filter(course_id=course_id, sender=sender, receiver=receiver, _t__lte=since)[:10]
 
@@ -45,12 +43,12 @@ def pub_message(request, post_data):
     receiver = post_data.get('receiver')
     msg = post_data.get('msg')
 
-    if not COURSE.objects.filter(Q(course_id=course_id), Q(t_account=sender)|Q(s_account=sender)):
-        return "Course and sender can't match!"
-    if receiver != 'all' and not COURSE.objects.filter(Q(course_id=course_id), Q(t_account=receiver)|Q(s_account=receiver)):
-        return "Course and receiver can't match!"
-    if receiver == 'all' and USERS.objects.get(account=sender).role != 'teacher':
-        return "Can't send to all, because you are not a teacher!"
+#      if not COURSE.objects.filter(Q(course_id=course_id), Q(t_account=sender)|Q(s_account=sender)):
+        #  return "Course and sender can't match!"
+    #  if receiver != 'all' and not COURSE.objects.filter(Q(course_id=course_id), Q(t_account=receiver)|Q(s_account=receiver)):
+        #  return "Course and receiver can't match!"
+    #  if receiver == 'all' and USERS.objects.get(account=sender).role != 'teacher':
+        #  return "Can't send to all, because you are not a teacher!"
 
     MESSAGES.objects.create(course_id=course_id, sender=sender, receiver=receiver, _t=int(time.time()), msg=msg)