Merge pull request #15896 from edx/LEARNER-2294

Remove basket creation calls for audit orders from commerce and remove waffle flag used to stop those calls

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

 """ API v0 views. """
 import logging
 
-import requests
 from edx_rest_api_client import exceptions
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
@@ -11,9 +10,7 @@ from rest_framework.status import HTTP_406_NOT_ACCEPTABLE, HTTP_409_CONFLICT
 from rest_framework.views import APIView
 
 from commerce.constants import Messages
-from commerce.exceptions import InvalidResponseError
-from commerce.http import DetailResponse, InternalRequestErrorResponse
-from commerce.utils import COMMERCE_API_WAFFLE_FLAG_NAMESPACE
+from commerce.http import DetailResponse
 from course_modes.models import CourseMode
 from courseware import courses
 from enrollment.api import add_enrollment
@@ -21,15 +18,12 @@ from enrollment.views import EnrollmentCrossDomainSessionAuth
 from openedx.core.djangoapps.commerce.utils import ecommerce_api_client
 from openedx.core.djangoapps.embargo import api as embargo_api
 from openedx.core.djangoapps.user_api.preferences.api import update_email_opt_in
-from openedx.core.djangoapps.waffle_utils import WaffleFlag
 from openedx.core.lib.api.authentication import OAuth2AuthenticationAllowInactiveUser
-from openedx.core.lib.log_utils import audit_log
-from student.models import CourseEnrollment, RegistrationCookieConfiguration
+from student.models import CourseEnrollment
 from util.json_request import JsonResponse
 
 log = logging.getLogger(__name__)
 SAILTHRU_CAMPAIGN_COOKIE = 'sailthru_bid'
-STOP_BASKET_CREATION_FLAG = WaffleFlag(COMMERCE_API_WAFFLE_FLAG_NAMESPACE, 'stop_basket_creation')
 
 
 class BasketsView(APIView):
@@ -85,7 +79,7 @@ class BasketsView(APIView):
 
     def post(self, request, *args, **kwargs):
         """
-        Attempt to enroll the user, and if needed, create the basket.
+        Attempt to enroll the user.
         """
         user = request.user
         valid, course_key, error = self._is_data_valid(request)
@@ -120,11 +114,7 @@ class BasketsView(APIView):
         # Accept either honor or audit as an enrollment mode to
         # maintain backwards compatibility with existing courses
         default_enrollment_mode = audit_mode or honor_mode
-
-        if not default_enrollment_mode:
-            msg = Messages.NO_DEFAULT_ENROLLMENT_MODE.format(course_id=course_id)
-            return DetailResponse(msg, status=HTTP_406_NOT_ACCEPTABLE)
-        elif not default_enrollment_mode.sku or STOP_BASKET_CREATION_FLAG.is_enabled():
+        if default_enrollment_mode:
             msg = Messages.ENROLL_DIRECTLY.format(
                 username=user.username,
                 course_id=course_id
@@ -141,81 +131,8 @@ class BasketsView(APIView):
             self._handle_marketing_opt_in(request, course_key, user)
             return DetailResponse(msg)
         else:
-            return self._create_basket_to_order(request, user, course_key, default_enrollment_mode)
-
-    def _add_request_cookie_to_api_session(self, server_session, request, cookie_name):
-        """ Add cookie from user request into server session """
-        user_cookie = None
-        if cookie_name:
-            user_cookie = request.COOKIES.get(cookie_name)
-            if user_cookie:
-                server_cookie = {cookie_name: user_cookie}
-                if server_session.cookies:
-                    requests.utils.add_dict_to_cookiejar(server_session.cookies, server_cookie)
-                else:
-                    server_session.cookies = requests.utils.cookiejar_from_dict(server_cookie)
-
-    def _create_basket_to_order(self, request, user, course_key, default_enrollment_mode):
-        """
-        Connect to the ecommerce service to create the basket and the order to do the enrollment
-        """
-        # Setup the API
-        course_id = unicode(course_key)
-        try:
-            api_session = requests.Session()
-            api = ecommerce_api_client(user, session=api_session)
-        except ValueError:
-            self._enroll(course_key, user)
-            msg = Messages.NO_ECOM_API.format(username=user.username, course_id=course_id)
-            log.debug(msg)
-            return DetailResponse(msg)
-
-        response = None
-
-        # Make the API call
-        try:
-            # Pass along Sailthru campaign id
-            self._add_request_cookie_to_api_session(api_session, request, SAILTHRU_CAMPAIGN_COOKIE)
-
-            # Pass along UTM tracking info
-            utm_cookie_name = RegistrationCookieConfiguration.current().utm_cookie_name
-            self._add_request_cookie_to_api_session(api_session, request, utm_cookie_name)
-
-            response_data = api.baskets.post({
-                'products': [{'sku': default_enrollment_mode.sku}],
-                'checkout': True,
-            })
-
-            payment_data = response_data["payment_data"]
-            if payment_data:
-                # Pass data to the client to begin the payment flow.
-                response = JsonResponse(payment_data)
-            elif response_data['order']:
-                # The order was completed immediately because there is no charge.
-                msg = Messages.ORDER_COMPLETED.format(order_number=response_data['order']['number'])
-                log.debug(msg)
-                response = DetailResponse(msg)
-            else:
-                msg = u'Unexpected response from basket endpoint.'
-                log.error(
-                    msg + u' Could not enroll user %(username)s in course %(course_id)s.',
-                    {'username': user.id, 'course_id': course_id},
-                )
-                raise InvalidResponseError(msg)
-        except (exceptions.SlumberBaseException, exceptions.Timeout) as ex:
-            log.exception(ex.message)
-            return InternalRequestErrorResponse(ex.message)
-        finally:
-            audit_log(
-                'checkout_requested',
-                course_id=course_id,
-                mode=default_enrollment_mode.slug,
-                processor_name=None,
-                user_id=user.id
-            )
-
-        self._handle_marketing_opt_in(request, course_key, user)
-        return response
+            msg = Messages.NO_DEFAULT_ENROLLMENT_MODE.format(course_id=course_id)
+            return DetailResponse(msg, status=HTTP_406_NOT_ACCEPTABLE)
 
 
 class BasketOrderView(APIView):

lms/djangoapps/commerce/tests/mocks.py

@@ -80,24 +80,6 @@ class mock_ecommerce_api_endpoint(object):
             httpretty.reset()
 
 
-class mock_create_basket(mock_ecommerce_api_endpoint):
-    """ Mocks calls to E-Commerce API client basket creation method. """
-
-    default_response = {
-        'id': 7,
-        'order': {'number': '100004'},  # never both None.
-        'payment_data': {
-            'payment_processor_name': 'test-processor',
-            'payment_form_data': {},
-            'payment_page_url': 'http://example.com/pay',
-        },
-    }
-    method = httpretty.POST
-
-    def get_path(self):
-        return '/baskets/'
-
-
 class mock_basket_order(mock_ecommerce_api_endpoint):
     """ Mocks calls to E-Commerce API client basket order method. """
 

lms/djangoapps/commerce/utils.py

@@ -7,9 +7,6 @@ from django.conf import settings
 
 from commerce.models import CommerceConfiguration
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
-from openedx.core.djangoapps.waffle_utils import WaffleFlagNamespace
-
-COMMERCE_API_WAFFLE_FLAG_NAMESPACE = WaffleFlagNamespace(name='commerce_api')
 
 
 def is_account_activation_requirement_disabled():