Skip to content

E
ecommerce
Commit c99deb6b by zubair-arbi
Options

Merge branch 'zub/ENT-1052-rename-enterprise-customer-catalog-uuid-queryparam' into business/etorki

parents 656a7b61 a9375bc5
Showing with 23 additions and 100 deletions
ecommerce/enterprise/conditions.py
......@@ -35,7 +35,7 @@ class EnterpriseCustomerCondition(ConditionWithoutRangeMixin, SingleItemConsumpt
Determines if a user is eligible for an enterprise customer offer
based on their association with the enterprise customer.
It also verifies the catalog `enterprise_customer_catalog_uuid` on the
It also verifies the catalog `catalog` on the
offer with the catalog on the basket when provided.
Args:
......@@ -74,28 +74,11 @@ class EnterpriseCustomerCondition(ConditionWithoutRangeMixin, SingleItemConsumpt
course_run_ids.append(course.id)
# For temporary basket try to get enterprise_customer_catalog_uuid from request
enterprise_customer_catalog_uuid = basket.strategy.request.GET.get(
'enterprise_customer_catalog_uuid'
) if basket.strategy.request else None
if not enterprise_customer_catalog_uuid:
# For actual baskets get enterprise_customer_catalog_uuid from basket attribute
enterprise_catalog_attribute, __ = BasketAttributeType.objects.get_or_create(
name=ENTERPRISE_CATALOG_ATTRIBUTE_TYPE
)
enterprise_customer_catalog = BasketAttribute.objects.filter(
basket=basket,
attribute_type=enterprise_catalog_attribute,
).first()
if enterprise_customer_catalog:
enterprise_customer_catalog_uuid = enterprise_customer_catalog.value_text
# Verify that the current conditional offer is related to the provided
# enterprise catalog
enterprise_customer_catalog_uuid = self._get_enterprise_catalog_uuid_from_basket(basket)
if enterprise_customer_catalog_uuid:
if str(offer.condition.enterprise_customer_catalog_uuid) != enterprise_customer_catalog_uuid:
catalog = self._get_enterprise_catalog_uuid_from_basket(basket)
if catalog:
if str(offer.condition.enterprise_customer_catalog_uuid) != catalog:
return False
if not catalog_contains_course_runs(basket.site, course_run_ids, self.enterprise_customer_uuid,
......@@ -115,15 +98,13 @@ class EnterpriseCustomerCondition(ConditionWithoutRangeMixin, SingleItemConsumpt
basket (Basket): The provided basket can be either temporary (just
for calculating discounts) or an actual one to buy a product.
"""
# For temporary basket try to get `enterprise_customer_catalog_uuid`
# from request
enterprise_customer_catalog_uuid = basket.strategy.request.GET.get(
'enterprise_customer_catalog_uuid'
# For temporary basket try to get `catalog` from request
catalog = basket.strategy.request.GET.get(
'catalog'
) if basket.strategy.request else None
if not enterprise_customer_catalog_uuid:
# For actual baskets get `enterprise_customer_catalog_uuid` from
# basket attribute
if not catalog:
# For actual baskets get `catalog` from basket attribute
enterprise_catalog_attribute, __ = BasketAttributeType.objects.get_or_create(
name=ENTERPRISE_CATALOG_ATTRIBUTE_TYPE
)
......@@ -132,6 +113,6 @@ class EnterpriseCustomerCondition(ConditionWithoutRangeMixin, SingleItemConsumpt
attribute_type=enterprise_catalog_attribute,
).first()
if enterprise_customer_catalog:
enterprise_customer_catalog_uuid = enterprise_customer_catalog.value_text
catalog = enterprise_customer_catalog.value_text
return enterprise_customer_catalog_uuid
return catalog
ecommerce/enterprise/tests/test_conditions.py
......@@ -78,7 +78,7 @@ class EnterpriseCustomerConditionTests(EnterpriseServiceMockMixin, DiscoveryTest
enterprise_catalog_uuid = str(self.condition.enterprise_customer_catalog_uuid)
basket = factories.BasketFactory(site=self.site, owner=self.user)
basket.strategy.request = self.request
basket.strategy.request.GET = {'enterprise_customer_catalog_uuid': enterprise_catalog_uuid}
basket.strategy.request.GET = {'catalog': enterprise_catalog_uuid}
self._check_condition_is_satisfied(offer, basket, is_satisfied=True)
@httpretty.activate
......@@ -89,7 +89,7 @@ class EnterpriseCustomerConditionTests(EnterpriseServiceMockMixin, DiscoveryTest
offer = factories.EnterpriseOfferFactory(site=self.site, condition=self.condition)
enterprise_catalog_uuid = str(self.condition.enterprise_customer_catalog_uuid)
basket = factories.BasketFactory(site=self.site, owner=self.user)
request_data = {'enterprise_customer_catalog_uuid': enterprise_catalog_uuid}
request_data = {'catalog': enterprise_catalog_uuid}
basket_add_enterprise_catalog_attribute(basket, request_data)
self._check_condition_is_satisfied(offer, basket, is_satisfied=True)
......@@ -103,7 +103,7 @@ class EnterpriseCustomerConditionTests(EnterpriseServiceMockMixin, DiscoveryTest
invalid_enterprise_catalog_uuid = str(uuid4())
basket = factories.BasketFactory(site=self.site, owner=self.user)
basket.strategy.request = self.request
basket.strategy.request.GET = {'enterprise_customer_catalog_uuid': invalid_enterprise_catalog_uuid}
basket.strategy.request.GET = {'catalog': invalid_enterprise_catalog_uuid}
self._check_condition_is_satisfied(offer, basket, is_satisfied=False)
assert invalid_enterprise_catalog_uuid != offer.condition.enterprise_customer_catalog_uuid
......
ecommerce/enterprise/utils.py
......@@ -348,6 +348,7 @@ def set_enterprise_customer_cookie(site, response, enterprise_customer_uuid, max
settings.ENTERPRISE_CUSTOMER_COOKIE_NAME, enterprise_customer_uuid,
domain=site.siteconfiguration.base_cookie_domain,
max_age=max_age,
secure=True,
)
else:
log.warning(
......
ecommerce/extensions/api/v2/tests/views/test_baskets.py
......@@ -17,7 +17,7 @@ from oscar.core.loading import get_model
from oscar.test import factories
from oscar.test.factories import BasketFactory
from rest_framework.throttling import UserRateThrottle
from waffle.testutils import override_flag, override_switch
from waffle.testutils import override_flag
from ecommerce.courses.models import Course
from ecommerce.extensions.api import exceptions as api_exceptions
......@@ -582,7 +582,6 @@ class BasketCalculateViewTests(ProgramTestMixin, TestCase):
@mock.patch('ecommerce.extensions.api.v2.views.baskets.BasketCalculateView._calculate_temporary_basket')
@override_flag('disable_calculate_temporary_basket_atomic_transaction', active=True)
@override_switch('force_anonymous_user_response_for_basket_calculate', active=True)
def test_basket_calculate_anonymous_caching(self, mock_calculate_basket):
"""Verify a request made with the is_anonymous parameter is cached"""
url_with_one_sku = self._generate_sku_url(self.products[0:1], username=None)
......
ecommerce/extensions/api/v2/views/baskets.py
......@@ -471,13 +471,8 @@ class BasketCalculateView(generics.GenericAPIView):
basket_owner = request.user
if waffle.switch_is_active("force_anonymous_user_response_for_basket_calculate"):
# Use the anonymous user program price for all users
requested_username = ''
is_anonymous = True
else:
requested_username = request.GET.get('username', default='')
is_anonymous = request.GET.get('is_anonymous', 'false').lower() == 'true'
requested_username = request.GET.get('username', default='')
is_anonymous = request.GET.get('is_anonymous', 'false').lower() == 'true'
use_default_basket = is_anonymous
......@@ -528,11 +523,7 @@ class BasketCalculateView(generics.GenericAPIView):
if cached_response.is_hit:
return Response(cached_response.value)
# There are too many open questions around dropping the atomic transaction for a user's basket,
# including how user basket merges was coded. For now, only allow disabling the atomic
# transaction if we are also forcing the anonymous basket response for all users.
if waffle.flag_is_active(request, "disable_calculate_temporary_basket_atomic_transaction")\
and waffle.switch_is_active("force_anonymous_user_response_for_basket_calculate"):
if waffle.flag_is_active(request, "disable_calculate_temporary_basket_atomic_transaction"):
response = self._calculate_temporary_basket(basket_owner, request, products, voucher, skus, code)
else:
response = self._calculate_temporary_basket_atomic(basket_owner, request, products, voucher, skus, code)
......
ecommerce/extensions/basket/tests/test_utils.py
......@@ -426,7 +426,7 @@ class BasketUtilsTests(DiscoveryTestMixin, BasketMixin, TestCase):
product = ProductFactory()
request = self.request
expected_enterprise_catalog_uuid = str(uuid4())
request.GET = {'enterprise_customer_catalog_uuid': expected_enterprise_catalog_uuid}
request.GET = {'catalog': expected_enterprise_catalog_uuid}
basket = prepare_basket(request, [product])
# Verify that the enterprise catalog attribute exists for the basket
......
ecommerce/extensions/basket/utils.py
......@@ -5,7 +5,6 @@ from urllib import unquote, urlencode
import newrelic.agent
import pytz
import waffle
from django.conf import settings
from django.contrib import messages
from django.db import transaction
......@@ -32,7 +31,6 @@ Refund = get_model('refund', 'Refund')
logger = logging.getLogger(__name__)
@newrelic.agent.function_trace()
def add_utm_params_to_url(url, params):
# utm_params is [(u'utm_content', u'course-v1:IDBx IDB20.1x 1T2017'),...
utm_params = [item for item in params if 'utm_' in item[0]]
......@@ -45,7 +43,6 @@ def add_utm_params_to_url(url, params):
return url
@newrelic.agent.function_trace()
def prepare_basket(request, products, voucher=None):
"""
Create or get the basket, add products, apply a voucher, and record referral data.
......@@ -117,7 +114,6 @@ def prepare_basket(request, products, voucher=None):
return basket
@newrelic.agent.function_trace()
def get_basket_switch_data(product):
"""
Given a seat or enrollment product, find the SKU of the related product of
......@@ -142,38 +138,6 @@ def get_basket_switch_data(product):
partner_sku = _find_seat_enrollment_toggle_sku(product, 'standalone')
switch_link_text = _('Click here to purchase multiple seats in this course')
if waffle.switch_is_active("debug_logging_for_get_basket_switch_data"): # pragma: no cover
msg = "get_basket_switch_data: product.course_id={}, product.get_product_class().name={}, " \
"product.structure={}, partner_sku={}".format(
product.course_id,
product.get_product_class().name,
product.structure,
partner_sku)
logger.info(msg)
if product.course_id is None:
if partner_sku is not None:
logger.info("get_basket_switch_data: product.course_id is None. partner_sku has been set")
courseless_stock_records = StockRecord.objects.filter(
product__id=product.id,
)
courseless_partner_sku = None
product_cert_type = getattr(product.attr, 'certificate_type', None)
product_seat_type = getattr(product.attr, 'seat_type', None)
for courseless_stock_record in courseless_stock_records:
stock_record_cert_type = getattr(courseless_stock_record.product.attr, 'certificate_type', None)
stock_record_seat_type = getattr(courseless_stock_record.product.attr, 'seat_type', None)
if (product_seat_type and product_seat_type == stock_record_cert_type) or \
(product_cert_type and product_cert_type == stock_record_seat_type):
courseless_partner_sku = courseless_stock_record.partner_sku
break
if courseless_partner_sku != partner_sku:
msg = "get_basket_switch_data: courseless_partner_sku {} != original_partner_sku {}".format(
courseless_partner_sku, partner_sku
)
logger.info(msg)
return switch_link_text, partner_sku
......@@ -215,7 +179,6 @@ def _find_seat_enrollment_toggle_sku(product, target_structure):
return None
@newrelic.agent.function_trace()
def attribute_cookie_data(basket, request):
try:
with transaction.atomic():
......@@ -239,7 +202,6 @@ def attribute_cookie_data(basket, request):
logger.exception('Error while attributing cookies to basket.')
@newrelic.agent.function_trace()
def _referral_from_basket_site(basket, site):
try:
# There should be only 1 referral instance for one basket.
......@@ -250,7 +212,6 @@ def _referral_from_basket_site(basket, site):
return referral
@newrelic.agent.function_trace()
def _record_affiliate_basket_attribution(referral, request):
"""
Attribute this user's basket to the referring affiliate, if applicable.
......@@ -264,7 +225,6 @@ def _record_affiliate_basket_attribution(referral, request):
referral.affiliate_id = affiliate_id
@newrelic.agent.function_trace()
def _record_utm_basket_attribution(referral, request):
"""
Attribute this user's basket to UTM data, if applicable.
......@@ -288,7 +248,6 @@ def _record_utm_basket_attribution(referral, request):
referral.utm_created_at = created_at_datetime
@newrelic.agent.function_trace()
def basket_add_organization_attribute(basket, request_data):
"""
Add organization attribute on basket, if organization value is provided
......@@ -322,9 +281,9 @@ def basket_add_enterprise_catalog_attribute(basket, request_data):
request_data (dict): HttpRequest data
"""
# Value of enterprise catalog UUID is being passed as
# `enterprise_customer_catalog_uuid` from basket page
enterprise_catalog_uuid = request_data.get('enterprise_customer_catalog_uuid') if request_data else None
# Value of enterprise catalog UUID is being passed as `catalog` from
# basket page
enterprise_catalog_uuid = request_data.get('catalog') if request_data else None
if enterprise_catalog_uuid:
enterprise_catalog_attribute, __ = BasketAttributeType.objects.get_or_create(
......@@ -337,7 +296,6 @@ def basket_add_enterprise_catalog_attribute(basket, request_data):
)
@newrelic.agent.function_trace()
def _set_basket_bundle_status(bundle, basket):
"""
Sets the basket's bundle status
......
ecommerce/extensions/basket/views.py
......@@ -6,7 +6,6 @@ from decimal import Decimal
from urllib import urlencode
import dateutil.parser
import newrelic.agent
import waffle
from django.http import HttpResponseBadRequest, HttpResponseRedirect
from django.shortcuts import redirect, render
......@@ -104,7 +103,6 @@ class BasketSummaryView(BasketView):
Display basket contents and checkout/payment options.
"""
@newrelic.agent.function_trace()
def _determine_product_type(self, product):
"""
Return the seat type based on the product class
......@@ -116,7 +114,6 @@ class BasketSummaryView(BasketView):
seat_type = get_certificate_type_display_value(product.attr.seat_type)
return seat_type
@newrelic.agent.function_trace()
def _deserialize_date(self, date_string):
date = None
try:
......@@ -125,7 +122,6 @@ class BasketSummaryView(BasketView):
pass
return date
@newrelic.agent.function_trace()
def _get_course_data(self, product):
"""
Return course data.
......@@ -196,7 +192,6 @@ class BasketSummaryView(BasketView):
'course_end': course_end,
}
@newrelic.agent.function_trace()
def _process_basket_lines(self, lines):
"""Processes the basket lines and extracts information for the view's context.
In addition determines whether:
......@@ -303,7 +298,6 @@ class BasketSummaryView(BasketView):
return context_updates, lines_data
@newrelic.agent.function_trace()
def _get_payment_processors_data(self, payment_processors):
"""Retrieve information about payment processors for the client side checkout basket.
......@@ -363,7 +357,6 @@ class BasketSummaryView(BasketView):
else:
return super(BasketSummaryView, self).get(request, *args, **kwargs)
@newrelic.agent.function_trace()
def get_context_data(self, **kwargs):
context = super(BasketSummaryView, self).get_context_data(**kwargs)
formset = context.get('formset', [])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment