Pull Request - Push LHUB Staging 280421

cms/envs/common.py

@@ -177,6 +177,7 @@
     # in sync with the ones in lms/envs/common.py
     'ENABLE_DISCUSSION_SERVICE': True,
     'ENABLE_TEXTBOOK': True,
+    'IS_NOTE_TAB_ENABLED': True,
 
     # When True, all courses will be active, regardless of start date
     # DO NOT SET TO True IN THIS FILE
@@ -273,7 +274,7 @@
     'ALLOW_COURSE_RERUNS': True,
 
     # Certificates Web/HTML Views
-    'CERTIFICATES_HTML_VIEW': False,
+    'CERTIFICATES_HTML_VIEW': True,
 
     # Teams feature
     'ENABLE_TEAMS': True,
@@ -1516,6 +1517,15 @@
     'openedx.core.djangoapps.content.learning_sequences.apps.LearningSequencesConfig',
 
     'ratelimitbackend',
+
+    #banner related
+    'lms.djangoapps.banner.apps.BannerConfig',
+
+    #Note
+    'lms.djangoapps.note.apps.NoteApiConfig',
+
+    # course_block_user related
+    'lms.djangoapps.course_block_user.apps.CourseBlockUserConfig'
 ]
 
 

cms/envs/production.py

@@ -575,3 +575,4 @@ def get_env_setting(setting):
 LOGO_URL_PNG = ENV_TOKENS.get('LOGO_URL_PNG', LOGO_URL_PNG)
 LOGO_TRADEMARK_URL = ENV_TOKENS.get('LOGO_TRADEMARK_URL', LOGO_TRADEMARK_URL)
 FAVICON_URL = ENV_TOKENS.get('FAVICON_URL', FAVICON_URL)
+

cms/static/js/views/settings/main.js

@@ -93,12 +93,12 @@ define(['js/views/validation', 'codemirror', 'underscore', 'jquery', 'jquery.ui'
                 //Disable course sale type if already exist or not indexed in discovery
                 if (this.model.get('indexed_in_discovery') && this.model.get('course_sale_type') === null) {
                     this.$el.find('#course-course-sale-type').prop("disabled", false)
-                    this.$el.find('#course-course-price').prop("disabled", false)
                 }
                 else {
                     this.$el.find('#course-course-sale-type').prop("disabled", true)
-                    this.$el.find('#course-course-price').prop("disabled", false)
                 }
+                //Disable course price
+                this.$el.find('#course-course-price').prop("disabled", true)
             },
 
             render: function () {
@@ -403,7 +403,7 @@ define(['js/views/validation', 'codemirror', 'underscore', 'jquery', 'jquery.ui'
                     this.$el.find('#course-course-price').prop("disabled", true)
                 }
                 else {
-                    this.$el.find('#course-course-price').prop("disabled", false)
+                    this.$el.find('#course-course-price').prop("disabled", true)
                 }
             },
             updateModel: function (event) {

common/djangoapps/course_modes/models.py

@@ -45,6 +45,14 @@
 
 @python_2_unicode_compatible
 class CourseMode(models.Model):
+
+    @property
+    def get_price_string(self):
+        if self.min_price > 0:
+            price_string = self.min_price
+            return "%.2f" % price_string
+        return "%.2f" % 0.0
+
     """
     We would like to offer a course in a variety of modes.
 

common/djangoapps/feedback/models.py

@@ -33,4 +33,8 @@ class Meta:
                 fields=['user_id', 'course_id'],
             )
         ]
+    @classmethod
+    def is_reviewed(cls, user=None, course_id=None):
+        reviews = cls.objects.filter(user_id=user, course_id=course_id)
+        return True if reviews else False
 

common/djangoapps/student/views/management.py

@@ -74,7 +74,7 @@
 from common.djangoapps.util.db import outer_atomic
 from common.djangoapps.util.json_request import JsonResponse
 from xmodule.modulestore.django import modulestore
-
+from lms.djangoapps.banner.models import Banner
 log = logging.getLogger("edx.student")
 
 AUDIT_LOG = logging.getLogger("audit")
@@ -185,7 +185,8 @@ def filter_courses(course):
 
     # allow for theme override of the courses list
     context['courses_list'] = theming_helpers.get_template_path('courses_list.html')
-
+    #fetch banner for courses to show in home page
+    context['banner_list'] = Banner.objects.filter(platform__in = ['WEB', 'BOTH'], enabled=True)
     # Insert additional context for use in the template
     context.update(extra_context)
 

lms/djangoapps/banner/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'lms.djangoapps.banner.BannerConfig'

lms/djangoapps/banner/admin.py

@@ -0,0 +1,6 @@
+from django.contrib import admin
+from .models import Banner
+
+
+# Register your models here.
+admin.site.register(Banner)

lms/djangoapps/banner/api/serializers.py

@@ -0,0 +1,35 @@
+"""
+Serializers for Banner
+"""
+from rest_framework import serializers
+from lms.djangoapps.banner.models import Banner
+from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
+from logging import getLogger
+log = getLogger(__name__)
+
+class BannerSerializer(serializers.ModelSerializer):
+    """
+    Serializer for BadgeClass model.
+    """
+    course_over_view =  serializers.SlugRelatedField(
+        read_only=True,
+        slug_field='display_name'
+     )
+    course_id = serializers.SerializerMethodField('course_id_')
+    banner_img_url = serializers.SerializerMethodField('banner_img_url_')
+
+    def course_id_(self, obj):
+        if obj.course_over_view.display_name and obj.course_over_view.display_number_with_default:
+            return str(CourseOverview.objects.filter(display_name = obj.course_over_view.display_name, display_number_with_default = obj.course_over_view.display_number_with_default).values_list('id', flat=True)[0])
+        else:
+            return None
+
+    def banner_img_url_(self, obj):
+        if obj:
+            return str(obj.banner_img_url_txt)
+        else:
+            return None
+
+    class Meta(object):
+        model = Banner
+        fields = ('course_id', 'course_over_view', 'enabled', 'platform', 'slide_position', 'created_by', 'banner_img_url')

lms/djangoapps/banner/api/urls.py

@@ -0,0 +1,14 @@
+"""
+URLs for banner API
+"""
+
+
+from django.conf.urls import url
+
+from .views import BannerApi
+from . import views 
+
+urlpatterns = [
+    url('^details/$', BannerApi.as_view(), name='banner_api'),
+    url('^home/$', views.mobile_home_page, name='mobile_api'),
+]

lms/djangoapps/banner/api/views.py

@@ -0,0 +1,184 @@
+"""
+API views for banner
+"""
+
+from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
+from rest_framework.generics import ListAPIView
+from rest_framework.exceptions import APIException, NotFound
+from lms.djangoapps.banner.models import Banner
+from openedx.core.lib.api.authentication import BearerAuthenticationAllowInactiveUser
+from .serializers import BannerSerializer
+from rest_framework import status
+from openedx.core.lib.api.view_utils import DeveloperErrorViewMixin, view_auth_classes
+from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
+from rest_framework.permissions import IsAuthenticated
+from edx_rest_framework_extensions.paginators import NamespacedPageNumberPagination
+from django.core.paginator import InvalidPage
+from rest_framework.serializers import ValidationError
+from rest_framework.status import HTTP_200_OK, HTTP_500_INTERNAL_SERVER_ERROR
+
+from django.http import Http404
+from rest_framework.views import APIView
+from rest_framework.response import Response
+
+
+class LazyPageNumberPagination(NamespacedPageNumberPagination):
+    """
+    NamespacedPageNumberPagination that works with a LazySequence queryset.
+
+    The paginator cache uses ``@cached_property`` to cache the property values for
+    count and num_pages.  It assumes these won't change, but in the case of a
+    LazySquence, its count gets updated as we move through it.  This class clears
+    the cached property values before reporting results so they will be recalculated.
+
+    """
+
+    def get_paginated_response(self, data):
+        # Clear the cached property values to recalculate the estimated count from the LazySequence
+        del self.page.paginator.__dict__['count']
+        del self.page.paginator.__dict__['num_pages']
+
+        # Paginate queryset function is using cached number of pages and sometime after
+        # deleting from cache when we recalculate number of pages are different and it raises
+        # EmptyPage error while accessing the previous page link. So we are catching that exception
+        # and raising 404. For more detail checkout PROD-1222
+        page_number = self.request.query_params.get(self.page_query_param, 1)
+        try:
+            self.page.paginator.validate_number(page_number)
+        except InvalidPage as exc:
+            msg = self.invalid_page_message.format(
+                page_number=page_number, message=str(exc)
+            )
+            self.page.number = self.page.paginator.num_pages
+            raise NotFound(msg)
+
+        return super(LazyPageNumberPagination, self).get_paginated_response(data)
+
+@view_auth_classes(is_authenticated=True)
+class BannerApi(DeveloperErrorViewMixin, ListAPIView):
+
+    class BannerApiPageNumberPagination(LazyPageNumberPagination):
+        max_page_size = 100
+
+    pagination_class = BannerApiPageNumberPagination
+    serializer_class = BannerSerializer
+    authentication_classes = (
+        BearerAuthenticationAllowInactiveUser,
+        SessionAuthenticationAllowInactiveUser,
+        JwtAuthentication,
+    )
+    permission_classes = (IsAuthenticated,)
+
+    # def get_queryset(self):
+    #     """
+    #     The query will return 1 to 10 images of banner, platform is both(mobile, web) or mobile alone as of now
+    #     """
+    #     queryset = Banner.objects.filter(platform__in=['MOBILE', 'BOTH'], enabled=True)
+    #     return queryset
+    #     # raise CustomAPIException("Invalid course ID.", status_code=status.HTTP_404_NOT_FOUND)
+
+    def get(self, request, format=None):
+        banners = Banner.objects.filter(platform__in=['MOBILE', 'BOTH'], enabled=True)
+        serializer = BannerSerializer(banners, many=True)
+        result = {"results":serializer.data}
+        pagination = {"next":None, "previous": None, "count": 1, "num_pages": 1 if len(serializer.data)<=100 else int(len(serializer.data)/100)}
+        x = Response({"message": "", "result": result, "pagination":pagination, "status": True, "status_code": 200})
+        if x and serializer.data:
+            return x
+        elif not serializer.data:
+            return Response({"message": "No data found", "result": result, "pagination":pagination, "status": True, "status_code": 200})
+        else:
+            return Response({"message": "Error", "result": result, "pagination":pagination, "status": False, "status_code": 400})
+
+
+class CustomAPIException(ValidationError):
+    """
+    raises API exceptions with custom messages and custom status codes
+    """
+    status_code = status.HTTP_400_BAD_REQUEST
+    default_code = 'error'
+
+    def __init__(self, detail, status_code=None):
+        self.detail = detail
+        if status_code is not None:
+            self.status_code = status_code
+
+"""
+API views for Mobile Home page
+"""
+
+
+from rest_framework import status
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework.decorators import api_view, authentication_classes, permission_classes
+from openedx.core.lib.api.authentication import BearerAuthentication
+from rest_framework.authentication import SessionAuthentication
+import requests
+from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
+from logging import getLogger
+#from ..decorators import mobile_view
+from lms.djangoapps.mobile_api.utils import API_V05, API_V1
+logger = getLogger(__name__)
+
+@api_view(['GET'])
+@authentication_classes((BearerAuthentication, SessionAuthentication, JwtAuthentication))
+@permission_classes([IsAuthenticated])
+def mobile_home_page(request):
+    home_page_url = {}
+    base = request.get_host()
+    bearer_token_from_request = request.META.get('HTTP_AUTHORIZATION')
+
+    url_list  = dict()
+    url_list["banner"] = '/api/banner/details/'
+    url_list["category"] = '/api/courses/v2/courses/categories/?page=1&page_size=1000'
+    url_list['recommended_courses'] = '/api/courses/v2/recommended/courses/?page=1&page_size=10'
+    url_list["most_popular"] = '/api/commerce/v2/courses/?platform_visibility=mobile&ordering=enrollments_count'
+    url_list["top_rated_courses"] = '/api/commerce/v2/courses/?platform_visibility=mobile&ordering=-ratings'
+    url_list["free_courses"] = '/api/commerce/v2/courses/?platform_visibility=mobile&sale_type=free'
+    headers = {
+        'Authorization': bearer_token_from_request
+    }
+    http = 'http://'
+    response_obj = {"message": "Authentication Failed ", "net_response_chunk": {}, "status": False, "status_code": 401}
+    error_flag = True
+    response_code_list = []
+    api_version = 'v1' 
+    if api_version:
+        try:
+            for key, api_url in url_list.items():
+                actual_request = requests.get(http+base+api_url, headers=headers)
+                data = actual_request.json()
+                home_page_url[key] = data
+                response_code_list.append(data['status_code'])
+        except Exception as ex:
+            #dont' expose the specify error internal to system to outside API, Put it in generic manner
+            logger.error("Error while processing mobile home API - Exception as %s", ex)
+            response_obj = {"message": "ERROR", "net_response_chunk": {}, "status": False,
+                            "status_code": 500}
+            error_flag = True
+            pass
+        response_final_codes = list(set(response_code_list))
+        #stream line 200, 202 and 500
+        if len(response_final_codes) == 1 and response_final_codes[0] == 200:
+            error_flag = False
+        elif len(response_final_codes) >= 2 and 200 in response_final_codes:
+            response_obj['status_code'] = status.HTTP_202_ACCEPTED
+            response_obj['status'] = True
+            response_obj['net_response_chunk'] = home_page_url if home_page_url else ""
+            response_obj['message'] = "partial success"
+            return Response(response_obj)
+        else:
+            error_flag = True
+
+        if not error_flag:
+            response_obj['status_code'] =status.HTTP_200_OK
+            response_obj['status'] = True
+            response_obj['net_response_chunk'] = home_page_url if home_page_url else ""
+            response_obj['message'] = ""
+            return Response(response_obj)
+        else:
+            return Response(response_obj)
+    else:
+        obj = {"message": "Wrong API version", "net_response_chunk": {}, "status": False, "status_code": 400}
+        return Response(obj)

lms/djangoapps/banner/apps.py

@@ -0,0 +1,13 @@
+"""
+App Configuration
+"""
+from django.apps import AppConfig
+
+class BannerConfig(AppConfig):
+    name = 'lms.djangoapps.banner'
+    verbose_name = 'banner'
+
+    def ready(self):
+        super().ready()
+        # noinspection PyUnresolvedReferences
+        import lms.djangoapps.banner.signals

lms/djangoapps/banner/migrations/0001_initial.py

@@ -0,0 +1,33 @@
+# Generated by Django 2.2.18 on 2021-04-20 06:55
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('course_overviews', '0038_merge_20210405_0536'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Banner',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('banner_img_url_txt', models.TextField(blank=True, default='')),
+                ('banner_img', models.ImageField(upload_to='banner/lms/courses')),
+                ('enabled', models.BooleanField(default=True)),
+                ('platform', models.CharField(choices=[('mobile', 'MOBILE'), ('web', 'WEB'), ('both', 'BOTH')], max_length=10)),
+                ('slide_position', models.IntegerField()),
+                ('created_time', models.DateTimeField(auto_now_add=True)),
+                ('updated_time', models.DateTimeField(auto_now=True)),
+                ('course_over_view', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='course_over_view', to='course_overviews.CourseOverview')),
+                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]