Merge pull request #479 from edx/awais786/ECOM-6293-list-as-pc

Awais786/ecom 6293 list as pc

course_discovery/apps/publisher/constants.py

 # Name of the administrative group for the Publisher app
 ADMIN_GROUP_NAME = 'Publisher Admins'
 INTERNAL_USER_GROUP_NAME = 'Internal Users'
+PARTNER_COORDINATOR_GROUP_NAME = 'Partner Coordinators'
+REVIEWER_GROUP_NAME = 'Marketing Reviewers'
+PUBLISHER_GROUP_NAME = 'Publishers'

course_discovery/apps/publisher/migrations/0019_create_user_groups.py

+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+from course_discovery.apps.publisher.constants import (
+    PARTNER_COORDINATOR_GROUP_NAME, PUBLISHER_GROUP_NAME, REVIEWER_GROUP_NAME
+)
+
+GROUPS = [PARTNER_COORDINATOR_GROUP_NAME, REVIEWER_GROUP_NAME, PUBLISHER_GROUP_NAME]
+
+
+def create_groups(apps, schema_editor):
+    Group = apps.get_model('auth', 'Group')
+
+    for group in GROUPS:
+        Group.objects.get_or_create(name=group)
+
+
+def remove_groups(apps, schema_editor):
+    Group = apps.get_model('auth', 'Group')
+
+    for group in GROUPS:
+        Group.objects.filter(name=group).delete()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('publisher', '0018_create_internal_user_group'),
+        ('auth', '0006_require_contenttypes_0002'),
+    ]
+
+    operations = [
+        migrations.RunPython(create_groups, remove_groups)
+    ]

course_discovery/apps/publisher/tests/test_utils.py

@@ -3,10 +3,13 @@ from django.contrib.auth.models import Group
 from django.test import TestCase
 
 from course_discovery.apps.core.tests.factories import UserFactory
-from course_discovery.apps.publisher.constants import ADMIN_GROUP_NAME, INTERNAL_USER_GROUP_NAME
+from course_discovery.apps.publisher.constants import (
+    ADMIN_GROUP_NAME, INTERNAL_USER_GROUP_NAME, PARTNER_COORDINATOR_GROUP_NAME
+)
 from course_discovery.apps.publisher.tests import factories
 from course_discovery.apps.publisher.utils import (
-    is_email_notification_enabled, is_publisher_admin, is_internal_user, get_internal_users
+    is_email_notification_enabled, is_publisher_admin, is_internal_user,
+    get_internal_users, is_partner_coordinator_user
 )
 
 
@@ -69,3 +72,13 @@ class PublisherUtilsTests(TestCase):
 
         self.user.groups.add(internal_user_group)
         self.assertEqual(get_internal_users(), [self.user])
+
+    def test_is_partner_coordinator_user(self):
+        """ Verify the function returns a boolean indicating if the user
+        is a member of the partner coordinator group.
+        """
+        self.assertFalse(is_partner_coordinator_user(self.user))
+
+        partner_coordinator_group = Group.objects.get(name=PARTNER_COORDINATOR_GROUP_NAME)
+        self.user.groups.add(partner_coordinator_group)
+        self.assertTrue(is_partner_coordinator_user(self.user))

course_discovery/apps/publisher/utils.py

 """ Publisher Utils."""
 from course_discovery.apps.core.models import User
-from course_discovery.apps.publisher.constants import ADMIN_GROUP_NAME, INTERNAL_USER_GROUP_NAME
+from course_discovery.apps.publisher.constants import (
+    ADMIN_GROUP_NAME, INTERNAL_USER_GROUP_NAME, PARTNER_COORDINATOR_GROUP_NAME
+)
 
 
 def is_email_notification_enabled(user):
@@ -50,3 +52,15 @@ def get_internal_users():
         list
     """
     return list(User.objects.filter(groups__name=INTERNAL_USER_GROUP_NAME))
+
+
+def is_partner_coordinator_user(user):
+    """ Returns True if the user is an partner coordinator user.
+
+    Arguments:
+        user (:obj:`User`): User whose permissions should be checked.
+
+    Returns:
+        bool: True, if user is an PC user; otherwise, False.
+    """
+    return user.groups.filter(name=PARTNER_COORDINATOR_GROUP_NAME).exists()

course_discovery/apps/publisher/views.py

@@ -27,7 +27,10 @@ from course_discovery.apps.publisher.models import (
     Course, CourseRun, Seat, State, UserAttributes
 )
 from course_discovery.apps.publisher.serializers import UpdateCourseKeySerializer
-from course_discovery.apps.publisher.utils import is_internal_user, get_internal_users, is_publisher_admin
+from course_discovery.apps.publisher.utils import (
+    is_internal_user, get_internal_users, is_publisher_admin,
+    is_partner_coordinator_user
+)
 from course_discovery.apps.publisher.wrappers import CourseRunWrapper
 
 logger = logging.getLogger(__name__)
@@ -56,6 +59,7 @@ class Dashboard(mixins.LoginRequiredMixin, ListView):
             internal_user_courses = Course.objects.filter(course_user_roles__user=user)
             course_runs = CourseRun.objects.filter(course__in=internal_user_courses).select_related('course').all()
         else:
+            # in future we will change permission from course to OrganizationExtension model
             courses = get_objects_for_user(user, Course.VIEW_PERMISSION, Course)
             course_runs = CourseRun.objects.filter(course__in=courses).select_related('course').all()
 
@@ -72,7 +76,16 @@ class Dashboard(mixins.LoginRequiredMixin, ListView):
 
         unpublished_course_runs = course_runs.exclude(state__name=State.PUBLISHED)
 
-        studio_request_courses = unpublished_course_runs.filter(lms_course_id__isnull=True)
+        # Studio requests needs to check depending upon the user role with course
+        # Also user should be part of partner coordinator group.
+        if is_publisher_admin(self.request.user):
+            studio_request_courses = unpublished_course_runs.filter(lms_course_id__isnull=True)
+        elif is_partner_coordinator_user(self.request.user):
+            studio_request_courses = unpublished_course_runs.filter(lms_course_id__isnull=True).filter(
+                course__course_user_roles__role=PublisherUserRole.PartnerCoordinator
+            )
+        else:
+            studio_request_courses = []
 
         context['studio_request_courses'] = [CourseRunWrapper(course_run) for course_run in studio_request_courses]
         context['unpublished_course_runs'] = [CourseRunWrapper(course_run) for course_run in unpublished_course_runs]