Move common/djangoapps/enrollment to openedx/core/djangoapps/enrollments

common/djangoapps/student/models.py

@@ -54,16 +54,16 @@ from six.moves.urllib.parse import urlencode
 from slumber.exceptions import HttpClientError, HttpServerError
 from user_util import user_util
 
-import openedx.core.djangoapps.django_comment_common.comment_client as cc
 from course_modes.models import CourseMode, get_cosmetic_verified_display_price
 from courseware.models import (
     CourseDynamicUpgradeDeadlineConfiguration,
     DynamicUpgradeDeadlineConfiguration,
     OrgDynamicUpgradeDeadlineConfiguration
 )
-from enrollment.api import _default_course_mode
 from lms.djangoapps.certificates.models import GeneratedCertificate
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
+import openedx.core.djangoapps.django_comment_common.comment_client as cc
+from openedx.core.djangoapps.enrollments.api import _default_course_mode
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.xmodule_django.models import NoneToEmptyManager
 from openedx.core.djangolib.model_mixins import DeletableByUserValue

lms/djangoapps/bulk_email/models.py

@@ -11,10 +11,10 @@ from opaque_keys.edx.django.models import CourseKeyField
 from six import text_type
 
 from course_modes.models import CourseMode
-from enrollment.api import validate_course_mode
-from enrollment.errors import CourseModeNotFoundError
 from openedx.core.djangoapps.course_groups.cohorts import get_cohort_by_name
 from openedx.core.djangoapps.course_groups.models import CourseUserGroup
+from openedx.core.djangoapps.enrollments.api import validate_course_mode
+from openedx.core.djangoapps.enrollments.errors import CourseModeNotFoundError
 from openedx.core.lib.html_to_text import html_to_text
 from openedx.core.lib.mail_utils import wrap_message
 from student.roles import CourseInstructorRole, CourseStaffRole

lms/djangoapps/bulk_email/tests/test_email.py

@@ -25,10 +25,10 @@ from bulk_email.models import BulkEmailFlag, Optout
 from bulk_email.tasks import _get_course_email_context, _get_source_address
 from course_modes.models import CourseMode
 from courseware.tests.factories import InstructorFactory, StaffFactory
-from enrollment.api import update_enrollment
 from lms.djangoapps.instructor_task.subtasks import update_subtask_status
 from openedx.core.djangoapps.course_groups.cohorts import add_user_to_cohort
 from openedx.core.djangoapps.course_groups.models import CourseCohort
+from openedx.core.djangoapps.enrollments.api import update_enrollment
 from student.models import CourseEnrollment
 from student.roles import CourseStaffRole
 from student.tests.factories import CourseEnrollmentFactory, UserFactory

lms/djangoapps/bulk_enroll/views.py

@@ -14,10 +14,10 @@ from rest_framework.response import Response
 from rest_framework.views import APIView
 
 from bulk_enroll.serializers import BulkEnrollmentSerializer
-from enrollment.views import EnrollmentUserThrottle
 from instructor.views.api import students_update_enrollment
 from openedx.core.djangoapps.course_groups.cohorts import add_user_to_cohort, get_cohort_by_name
 from openedx.core.djangoapps.course_groups.models import CourseUserGroup
+from openedx.core.djangoapps.enrollments.views import EnrollmentUserThrottle
 from openedx.core.lib.api.authentication import OAuth2Authentication
 from openedx.core.lib.api.permissions import IsStaff
 from util.disable_rate_limit import can_disable_rate_limit

lms/djangoapps/commerce/api/v0/tests/test_views.py

@@ -14,8 +14,8 @@ from django.test.utils import override_settings
 
 from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
-from enrollment.api import get_enrollment
 from openedx.core.djangoapps.embargo.test_utils import restrict_course
+from openedx.core.djangoapps.enrollments.api import get_enrollment
 from openedx.core.lib.django_test_client_utils import get_absolute_url
 from student.models import CourseEnrollment
 from student.tests.tests import EnrollmentEventTestMixin

lms/djangoapps/commerce/api/v0/views.py

@@ -14,11 +14,11 @@ from six import text_type
 
 from course_modes.models import CourseMode
 from courseware import courses
-from enrollment.api import add_enrollment
-from enrollment.views import EnrollmentCrossDomainSessionAuth
 from entitlements.models import CourseEntitlement
 from openedx.core.djangoapps.commerce.utils import ecommerce_api_client
 from openedx.core.djangoapps.embargo import api as embargo_api
+from openedx.core.djangoapps.enrollments.api import add_enrollment
+from openedx.core.djangoapps.enrollments.views import EnrollmentCrossDomainSessionAuth
 from openedx.core.djangoapps.user_api.preferences.api import update_email_opt_in
 from openedx.core.lib.api.authentication import OAuth2AuthenticationAllowInactiveUser
 from student.models import CourseEnrollment

lms/djangoapps/courseware/courses.py

@@ -28,7 +28,6 @@ from django.conf import settings
 from django.db.models import Prefetch
 from django.urls import reverse
 from django.http import Http404, QueryDict
-from enrollment.api import get_course_enrollment_details
 from edxmako.shortcuts import render_to_string
 from fs.errors import ResourceNotFound
 from lms.djangoapps.certificates import api as certs_api
@@ -37,6 +36,7 @@ from lms.djangoapps.courseware.exceptions import CourseAccessRedirect
 from opaque_keys.edx.keys import UsageKey
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
+from openedx.core.djangoapps.enrollments.api import get_course_enrollment_details
 from openedx.core.lib.api.view_utils import LazySequence
 from openedx.features.course_experience import COURSE_ENABLE_UNENROLLED_ACCESS_FLAG
 from path import Path as path

lms/djangoapps/courseware/views/views.py

@@ -59,7 +59,6 @@ from courseware.models import BaseStudentModuleHistory, StudentModule
 from courseware.url_helpers import get_redirect_url
 from courseware.user_state_client import DjangoXBlockUserStateClient
 from edxmako.shortcuts import marketing_link, render_to_response, render_to_string
-from enrollment.api import add_enrollment
 from ipware.ip import get_ip
 from lms.djangoapps.ccx.custom_exception import CCXLocatorValidationException
 from lms.djangoapps.certificates import api as certs_api
@@ -80,6 +79,7 @@ from openedx.core.djangoapps.credit.api import (
     is_credit_course,
     is_user_eligible_for_credit
 )
+from openedx.core.djangoapps.enrollments.api import add_enrollment
 from openedx.core.djangoapps.models.course_details import CourseDetails
 from openedx.core.djangoapps.plugin_api.views import EdxFragmentView
 from openedx.core.djangoapps.programs.utils import ProgramMarketingDataExtender

lms/djangoapps/support/views/enrollments.py

@@ -18,12 +18,12 @@ from six import text_type
 
 from course_modes.models import CourseMode
 from edxmako.shortcuts import render_to_response
-from enrollment.api import get_enrollments, update_enrollment
-from enrollment.errors import CourseModeNotFoundError
-from enrollment.serializers import ModeSerializer
 from lms.djangoapps.support.decorators import require_support_permission
 from lms.djangoapps.support.serializers import ManualEnrollmentSerializer
 from lms.djangoapps.verify_student.models import VerificationDeadline
+from openedx.core.djangoapps.enrollments.api import get_enrollments, update_enrollment
+from openedx.core.djangoapps.enrollments.errors import CourseModeNotFoundError
+from openedx.core.djangoapps.enrollments.serializers import ModeSerializer
 from student.models import ENROLLED_TO_ENROLLED, CourseEnrollment, ManualEnrollmentAudit
 from util.json_request import JsonResponse
 

lms/envs/common.py

@@ -2156,7 +2156,7 @@ INSTALLED_APPS = [
     'course_modes.apps.CourseModesConfig',
 
     # Enrollment API
-    'enrollment',
+    'openedx.core.djangoapps.enrollments',
 
     # Entitlement API
     'entitlements.apps.EntitlementsConfig',

lms/urls.py

@@ -92,7 +92,7 @@ urlpatterns = [
     url(r'^submit_feedback$', util_views.submit_feedback),
 
     # Enrollment API RESTful endpoints
-    url(r'^api/enrollment/v1/', include('enrollment.urls')),
+    url(r'^api/enrollment/v1/', include('openedx.core.djangoapps.enrollments.urls')),
 
     # Entitlement API RESTful endpoints
     url(r'^api/entitlements/', include('entitlements.api.urls', namespace='entitlements_api')),

openedx/core/djangoapps/enrollments/api.py

@@ -13,11 +13,11 @@ from django.core.cache import cache
 from opaque_keys.edx.keys import CourseKey
 
 from course_modes.models import CourseMode
-from enrollment import errors
+from openedx.core.djangoapps.enrollments import errors
 
 log = logging.getLogger(__name__)
 
-DEFAULT_DATA_API = 'enrollment.data'
+DEFAULT_DATA_API = 'openedx.core.djangoapps.enrollments.data'
 
 
 def get_enrollments(user_id, include_inactive=False):

openedx/core/djangoapps/enrollments/data.py

@@ -11,15 +11,15 @@ from django.db import transaction
 from opaque_keys.edx.keys import CourseKey
 from six import text_type
 
-from enrollment.errors import (
+from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
+from openedx.core.djangoapps.enrollments.errors import (
     CourseEnrollmentClosedError,
     CourseEnrollmentExistsError,
     CourseEnrollmentFullError,
     InvalidEnrollmentAttribute,
     UserNotFoundError
 )
-from enrollment.serializers import CourseEnrollmentSerializer, CourseSerializer
-from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
+from openedx.core.djangoapps.enrollments.serializers import CourseEnrollmentSerializer, CourseSerializer
 from openedx.core.lib.exceptions import CourseNotFoundError
 from student.models import (
     AlreadyEnrolledError,

openedx/core/djangoapps/enrollments/management/commands/enroll_user_in_course.py

@@ -4,8 +4,8 @@ Management command for enrolling a user into a course via the enrollment api
 from __future__ import absolute_import
 from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand
-from enrollment.data import CourseEnrollmentExistsError
-from enrollment.api import add_enrollment
+from openedx.core.djangoapps.enrollments.data import CourseEnrollmentExistsError
+from openedx.core.djangoapps.enrollments.api import add_enrollment
 
 
 class Command(BaseCommand):

openedx/core/djangoapps/enrollments/management/tests/test_enroll_user_in_course.py

@@ -9,7 +9,7 @@ from django.conf import settings
 from django.core.management import call_command
 from django.core.management.base import CommandError
 
-from enrollment.api import get_enrollment
+from openedx.core.djangoapps.enrollments.api import get_enrollment
 from student.tests.factories import UserFactory
 
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase

openedx/core/djangoapps/enrollments/tests/test_api.py

@@ -12,14 +12,14 @@ from django.test.utils import override_settings
 from mock import Mock, patch
 
 from course_modes.models import CourseMode
-from enrollment import api
-from enrollment.errors import CourseModeNotFoundError, EnrollmentApiLoadError, EnrollmentNotFoundError
-from enrollment.tests import fake_data_api
+from openedx.core.djangoapps.enrollments import api
+from openedx.core.djangoapps.enrollments.errors import CourseModeNotFoundError, EnrollmentApiLoadError, EnrollmentNotFoundError
+from openedx.core.djangoapps.enrollments.tests import fake_data_api
 from openedx.core.djangolib.testing.utils import CacheIsolationTestCase
 
 
 @ddt.ddt
-@override_settings(ENROLLMENT_DATA_API="enrollment.tests.fake_data_api")
+@override_settings(ENROLLMENT_DATA_API="openedx.core.djangoapps.enrollments.tests.fake_data_api")
 @unittest.skipUnless(settings.ROOT_URLCONF == 'lms.urls', 'Test only valid in lms')
 class EnrollmentTest(CacheIsolationTestCase):
     """
@@ -71,7 +71,7 @@ class EnrollmentTest(CacheIsolationTestCase):
     def test_enroll_no_mode_success(self, course_modes, expected_mode):
         # Add a fake course enrollment information to the fake data API
         fake_data_api.add_course(self.COURSE_ID, course_modes=course_modes)
-        with patch('enrollment.api.CourseMode.modes_for_course') as mock_modes_for_course:
+        with patch('openedx.core.djangoapps.enrollments.api.CourseMode.modes_for_course') as mock_modes_for_course:
             mock_course_modes = [Mock(slug=mode) for mode in course_modes]
             mock_modes_for_course.return_value = mock_course_modes
             # Enroll in the course and verify the URL we get sent to

openedx/core/djangoapps/enrollments/tests/test_data.py

@@ -17,14 +17,14 @@ from six.moves import range
 
 from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
-from enrollment import data
-from enrollment.errors import (
+from openedx.core.djangoapps.enrollments import data
+from openedx.core.djangoapps.enrollments.errors import (
     CourseEnrollmentClosedError,
     CourseEnrollmentExistsError,
     CourseEnrollmentFullError,
     UserNotFoundError
 )
-from enrollment.serializers import CourseEnrollmentSerializer
+from openedx.core.djangoapps.enrollments.serializers import CourseEnrollmentSerializer
 from openedx.core.lib.exceptions import CourseNotFoundError
 from student.models import AlreadyEnrolledError, CourseEnrollment, CourseFullError, EnrollmentClosedError
 from student.tests.factories import CourseAccessRoleFactory, UserFactory

openedx/core/djangoapps/enrollments/tests/test_views.py

@@ -28,13 +28,13 @@ from six.moves import range
 
 from course_modes.models import CourseMode
 from course_modes.tests.factories import CourseModeFactory
-from enrollment import api, data
-from enrollment.errors import CourseEnrollmentError
-from enrollment.views import EnrollmentUserThrottle
 from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
 from openedx.core.djangoapps.course_groups import cohorts
 from openedx.core.djangoapps.embargo.models import Country, CountryAccessRule, RestrictedCourse
 from openedx.core.djangoapps.embargo.test_utils import restrict_course
+from openedx.core.djangoapps.enrollments import api, data
+from openedx.core.djangoapps.enrollments.errors import CourseEnrollmentError
+from openedx.core.djangoapps.enrollments.views import EnrollmentUserThrottle
 from openedx.core.djangoapps.oauth_dispatch.jwt import create_jwt_for_user
 from openedx.core.djangoapps.user_api.models import RetirementState, UserOrgTag, UserRetirementStatus
 from openedx.core.lib.django_test_client_utils import get_absolute_url
@@ -105,7 +105,7 @@ class EnrollmentTestMixin(object):
 
         # Verify that the modulestore is queried as expected.
         with check_mongo_calls_range(min_finds=min_mongo_calls, max_finds=max_mongo_calls):
-            with patch('enrollment.views.audit_log') as mock_audit_log:
+            with patch('openedx.core.djangoapps.enrollments.views.audit_log') as mock_audit_log:
                 url = reverse('courseenrollments')
                 response = self.client.post(url, json.dumps(data), content_type='application/json', **extra)
                 self.assertEqual(response.status_code, expected_status)
@@ -1494,7 +1494,7 @@ class UserRoleTest(ModuleStoreTestCase):
         self._assert_roles([expected_role2], False, course_id=text_type(self.course2.id))
 
     def test_roles_exception(self):
-        with patch('enrollment.api.get_user_roles') as mock_get_user_roles:
+        with patch('openedx.core.djangoapps.enrollments.api.get_user_roles') as mock_get_user_roles:
             mock_get_user_roles.side_effect = Exception()
             response = self.client.get(reverse('roles'))
             self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)

openedx/core/djangoapps/enrollments/views.py

@@ -14,17 +14,17 @@ from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.utils.decorators import method_decorator
 from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
 from edx_rest_framework_extensions.auth.session.authentication import SessionAuthenticationAllowInactiveUser
-from enrollment import api
-from enrollment.errors import CourseEnrollmentError, CourseEnrollmentExistsError, CourseModeNotFoundError
-from enrollment.forms import CourseEnrollmentsApiListForm
-from enrollment.paginators import CourseEnrollmentsApiListPagination
-from enrollment.serializers import CourseEnrollmentsApiListSerializer
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
 from openedx.core.djangoapps.cors_csrf.authentication import SessionAuthenticationCrossDomainCsrf
 from openedx.core.djangoapps.cors_csrf.decorators import ensure_csrf_cookie_cross_domain
 from openedx.core.djangoapps.course_groups.cohorts import CourseUserGroup, add_user_to_cohort, get_cohort_by_name
 from openedx.core.djangoapps.embargo import api as embargo_api
+from openedx.core.djangoapps.enrollments import api
+from openedx.core.djangoapps.enrollments.errors import CourseEnrollmentError, CourseEnrollmentExistsError, CourseModeNotFoundError
+from openedx.core.djangoapps.enrollments.forms import CourseEnrollmentsApiListForm
+from openedx.core.djangoapps.enrollments.paginators import CourseEnrollmentsApiListPagination
+from openedx.core.djangoapps.enrollments.serializers import CourseEnrollmentsApiListSerializer
 from openedx.core.djangoapps.user_api.accounts.permissions import CanRetireUser
 from openedx.core.djangoapps.user_api.models import UserRetirementStatus
 from openedx.core.djangoapps.user_api.preferences.api import update_email_opt_in

openedx/core/djangoapps/user_api/accounts/tests/retirement_helpers.py

@@ -10,7 +10,7 @@ import pytz
 from django.test import TestCase
 from social_django.models import UserSocialAuth
 
-from enrollment import api
+from openedx.core.djangoapps.enrollments import api
 from openedx.core.djangoapps.user_api.models import RetirementState, UserRetirementStatus
 from student.models import get_retired_email_by_email, get_retired_username_by_username
 from student.tests.factories import UserFactory