Add a has_profile decorator

4 files changed, 71 insertions, 32 deletions

diff --git a/yaksh/decorators.py b/yaksh/decorators.py
index f0d354c..8e5f879 100644
--- a/yaksh/decorators.py
+++ b/yaksh/decorators.py
@@ -1,12 +1,39 @@
-from django.shortcuts import render_to_response
+from django.shortcuts import render_to_response, redirect
 from django.conf import settings
 from django.template import RequestContext
 
+# Local imports
+from yaksh.forms import ProfileForm
+
+
+def user_has_profile(user):
+    return hasattr(user, 'profile')
+
+
+def has_profile(func):
+    """
+    This decorator is used to check if the user account has a profile.
+    If the user does not have a profile then redirect the user to
+    profile edit page.
+    """
+
+    def _wrapped_view(request, *args, **kwargs):
+        if user_has_profile(request.user):
+            return func(request, *args, **kwargs)
+        ci = RequestContext(request)
+        template = 'manage.html' if 'moderator' in request.user.groups.all() else 'user.html'
+        form = ProfileForm(user=request.user, instance=None)
+        context = {'template': template, 'form': form}
+        return render_to_response('yaksh/editprofile.html', context,
+                                    context_instance=ci)
+    return _wrapped_view
+
 
 def email_verified(func):
-    """ This decorator is used to check if email is verified. 
-        If email is not verified then redirect user for email
-        verification
+    """
+    This decorator is used to check if email is verified.
+    If email is not verified then redirect user for email
+    verification.
     """
 
     def is_email_verified(request, *args, **kwargs):
@@ -14,7 +41,7 @@ def email_verified(func):
         user = request.user
         context = {}
         if not settings.IS_DEVELOPMENT:
-            if user.is_authenticated() and hasattr(user, 'profile'):
+            if user.is_authenticated() and user_has_profile(user):
                 if not user.profile.is_email_verified:
                     context['success'] = False
                     context['msg'] = "Your account is not verified. \
diff --git a/yaksh/models.py b/yaksh/models.py
index 87e6260..30ecde0 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -92,11 +92,6 @@ def get_model_class(model):
     return model_class
 
 
-def has_profile(user):
-    """ check if user has profile """
-    return True if hasattr(user, 'profile') else False
-
-
 def get_upload_dir(instance, filename):
     return os.sep.join((
         'question_%s' % (instance.question.id), filename
diff --git a/yaksh/test_views.py b/yaksh/test_views.py
index f8a7c87..fefe9bc 100644
--- a/yaksh/test_views.py
+++ b/yaksh/test_views.py
@@ -21,8 +21,9 @@ from django.conf import settings
 from django.core.files.uploadedfile import SimpleUploadedFile
 
 from yaksh.models import User, Profile, Question, Quiz, QuestionPaper,\
-    QuestionSet, AnswerPaper, Answer, Course, StandardTestCase, has_profile,\
+    QuestionSet, AnswerPaper, Answer, Course, StandardTestCase,\
     AssignmentUpload, FileUpload
+from yaksh.decorators import user_has_profile
 
 
 class TestUserRegistration(TestCase):
@@ -90,18 +91,18 @@ class TestProfile(TestCase):
         self.user2.delete()
 
 
-    def test_has_profile_for_user_without_profile(self):
+    def test_user_has_profile_for_user_without_profile(self):
         """
         If no profile exists for user passed as argument return False
         """
-        has_profile_status = has_profile(self.user1)
+        has_profile_status = user_has_profile(self.user1)
         self.assertFalse(has_profile_status)
 
-    def test_has_profile_for_user_with_profile(self):
+    def test_user_has_profile_for_user_with_profile(self):
         """
         If profile exists for user passed as argument return True
         """
-        has_profile_status = has_profile(self.user2)
+        has_profile_status = user_has_profile(self.user2)
         self.assertTrue(has_profile_status)
 
 
@@ -206,6 +207,30 @@ class TestProfile(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, 'yaksh/editprofile.html')
 
+    def test_edit_profile_get_for_user_without_profile(self):
+        """
+        If no profile exists a blank profile form will be displayed
+        """
+        self.client.login(
+            username=self.user1.username,
+            password=self.user1_plaintext_pass
+        )
+        response = self.client.get(reverse('yaksh:edit_profile'))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'yaksh/editprofile.html')
+
+    def test_edit_profile_get_for_user_with_profile(self):
+        """
+        If profile exists a editprofile.html template will be rendered
+        """
+        self.client.login(
+            username=self.user2.username,
+            password=self.user2_plaintext_pass
+        )
+        response = self.client.get(reverse('yaksh:edit_profile'))
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'yaksh/editprofile.html')
+
     def test_update_email_for_user_post(self):
         """ POST request to update email if multiple users with same email are
             found
diff --git a/yaksh/views.py b/yaksh/views.py
index 248a333..823e506 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -32,7 +32,7 @@ except ImportError:
 # Local imports.
 from yaksh.models import get_model_class, Quiz, Question, QuestionPaper, QuestionSet, Course
 from yaksh.models import Profile, Answer, AnswerPaper, User, TestCase, FileUpload,\
-                         has_profile, StandardTestCase, McqTestCase,\
+                         StandardTestCase, McqTestCase,\
                          StdIOBasedTestCase, HookTestCase, IntegerTestCase,\
                          FloatTestCase, StringTestCase
 from yaksh.forms import UserRegisterForm, UserLoginForm, QuizForm,\
@@ -43,7 +43,7 @@ from .settings import URL_ROOT
 from yaksh.models import AssignmentUpload
 from .file_utils import extract_files
 from .send_emails import send_user_mail, generate_activation_key, send_bulk_mail
-from .decorators import email_verified
+from .decorators import email_verified, has_profile
 
 
 def my_redirect(url):
@@ -127,6 +127,7 @@ def user_logout(request):
 
 
 @login_required
+@has_profile
 @email_verified
 def quizlist_user(request, enrolled=None):
     """Show All Quizzes that is available to logged-in user."""
@@ -280,6 +281,7 @@ def add_quiz(request, course_id, quiz_id=None):
                                  context_instance=ci)
 
 @login_required
+@has_profile
 @email_verified
 def prof_manage(request, msg=None):
     """Take credentials of the user with professor/moderator
@@ -1221,6 +1223,7 @@ def grade_user(request, quiz_id=None, user_id=None, attempt_number=None):
 
 
 @login_required
+@has_profile
 @email_verified
 def view_profile(request):
     """ view moderators and users profile """
@@ -1230,20 +1233,12 @@ def view_profile(request):
         template = 'manage.html'
     else:
         template = 'user.html'
-    context = {'template': template}
-    if has_profile(user):
-        context['user'] = user
-        return my_render_to_response('yaksh/view_profile.html', context)
-    else:
-        form = ProfileForm(user=user)
-        msg = True
-        context['form'] = form
-        context['msg'] = msg
-        return my_render_to_response('yaksh/editprofile.html', context,
-                                    context_instance=ci)
+    context = {'template': template, 'user': user}
+    return my_render_to_response('yaksh/view_profile.html', context)
 
 
 @login_required
+@has_profile
 @email_verified
 def edit_profile(request):
     """ edit profile details facility for moderator and students """
@@ -1255,10 +1250,7 @@ def edit_profile(request):
     else:
         template = 'user.html'
     context = {'template': template}
-    if has_profile(user):
-        profile = Profile.objects.get(user_id=user.id)
-    else:
-        profile = None
+    profile = Profile.objects.get(user_id=user.id)
 
     if request.method == 'POST':
         form = ProfileForm(request.POST, user=user, instance=profile)