Commit c97f0cf8 by christopher lee Committed by Christopher Lee

Refactor temporary cache key names

parent 53a5259b
...@@ -24,7 +24,7 @@ from ecommerce.extensions.analytics.utils import audit_log ...@@ -24,7 +24,7 @@ from ecommerce.extensions.analytics.utils import audit_log
from ecommerce.extensions.api import data as data_api from ecommerce.extensions.api import data as data_api
from ecommerce.extensions.api import exceptions as api_exceptions from ecommerce.extensions.api import exceptions as api_exceptions
from ecommerce.extensions.api.serializers import OrderSerializer from ecommerce.extensions.api.serializers import OrderSerializer
from ecommerce.extensions.basket.constants import is_calculate_temporary_basket from ecommerce.extensions.basket.constants import TEMPORARY_BASKET_CACHE_KEY
from ecommerce.extensions.basket.utils import attribute_cookie_data from ecommerce.extensions.basket.utils import attribute_cookie_data
from ecommerce.extensions.checkout.mixins import EdxOrderPlacementMixin from ecommerce.extensions.checkout.mixins import EdxOrderPlacementMixin
from ecommerce.extensions.partner.shortcuts import get_partner_for_site from ecommerce.extensions.partner.shortcuts import get_partner_for_site
...@@ -446,7 +446,7 @@ class BasketCalculateView(generics.GenericAPIView): ...@@ -446,7 +446,7 @@ class BasketCalculateView(generics.GenericAPIView):
'currency': basket.currency 'currency': basket.currency
} }
""" """
RequestCache.set(is_calculate_temporary_basket, True) # TODO: LEARNER 5463 RequestCache.set(TEMPORARY_BASKET_CACHE_KEY, True) # TODO: LEARNER 5463
partner = get_partner_for_site(request) partner = get_partner_for_site(request)
skus = request.GET.getlist('sku') skus = request.GET.getlist('sku')
......
is_calculate_temporary_basket = "Calculate temporary basket" TEMPORARY_BASKET_CACHE_KEY = "ecommerce.is_calculate_temporary_basket"
...@@ -5,7 +5,7 @@ from oscar.core.loading import get_class ...@@ -5,7 +5,7 @@ from oscar.core.loading import get_class
from ecommerce.cache_utils.utils import RequestCache from ecommerce.cache_utils.utils import RequestCache
from ecommerce.extensions.analytics.utils import track_segment_event, translate_basket_line_for_segment from ecommerce.extensions.analytics.utils import track_segment_event, translate_basket_line_for_segment
from ecommerce.extensions.basket.constants import is_calculate_temporary_basket from ecommerce.extensions.basket.constants import TEMPORARY_BASKET_CACHE_KEY
OrderNumberGenerator = get_class('order.utils', 'OrderNumberGenerator') OrderNumberGenerator = get_class('order.utils', 'OrderNumberGenerator')
Selector = get_class('partner.strategy', 'Selector') Selector = get_class('partner.strategy', 'Selector')
...@@ -51,7 +51,7 @@ class Basket(AbstractBasket): ...@@ -51,7 +51,7 @@ class Basket(AbstractBasket):
def flush(self): def flush(self):
"""Remove all products in basket and fire Segment 'Product Removed' Analytic event for each""" """Remove all products in basket and fire Segment 'Product Removed' Analytic event for each"""
cached_response = RequestCache.get_cached_response(is_calculate_temporary_basket) cached_response = RequestCache.get_cached_response(TEMPORARY_BASKET_CACHE_KEY)
if cached_response.is_hit: if cached_response.is_hit:
# Do not track anything. This is a temporary basket calculation. TODO: LEARNER 5463 # Do not track anything. This is a temporary basket calculation. TODO: LEARNER 5463
return return
...@@ -72,7 +72,7 @@ class Basket(AbstractBasket): ...@@ -72,7 +72,7 @@ class Basket(AbstractBasket):
Performs AbstractBasket add_product method and fires Google Analytics 'Product Added' event. Performs AbstractBasket add_product method and fires Google Analytics 'Product Added' event.
""" """
line, created = super(Basket, self).add_product(product, quantity, options) # pylint: disable=bad-super-call line, created = super(Basket, self).add_product(product, quantity, options) # pylint: disable=bad-super-call
cached_response = RequestCache.get_cached_response(is_calculate_temporary_basket) cached_response = RequestCache.get_cached_response(TEMPORARY_BASKET_CACHE_KEY)
if cached_response.is_hit: if cached_response.is_hit:
# Do not track anything. This is a temporary basket calculation. TODO: LEARNER 5463 # Do not track anything. This is a temporary basket calculation. TODO: LEARNER 5463
return line, created return line, created
......
...@@ -10,7 +10,7 @@ from ecommerce.cache_utils.utils import RequestCache ...@@ -10,7 +10,7 @@ from ecommerce.cache_utils.utils import RequestCache
from ecommerce.courses.tests.factories import CourseFactory from ecommerce.courses.tests.factories import CourseFactory
from ecommerce.extensions.analytics.utils import parse_tracking_context, translate_basket_line_for_segment from ecommerce.extensions.analytics.utils import parse_tracking_context, translate_basket_line_for_segment
from ecommerce.extensions.api.v2.tests.views.mixins import CatalogMixin from ecommerce.extensions.api.v2.tests.views.mixins import CatalogMixin
from ecommerce.extensions.basket.constants import is_calculate_temporary_basket from ecommerce.extensions.basket.constants import TEMPORARY_BASKET_CACHE_KEY
from ecommerce.extensions.basket.models import Basket from ecommerce.extensions.basket.models import Basket
from ecommerce.extensions.basket.tests.mixins import BasketMixin from ecommerce.extensions.basket.tests.mixins import BasketMixin
from ecommerce.extensions.test.factories import create_basket from ecommerce.extensions.test.factories import create_basket
...@@ -142,7 +142,7 @@ class BasketTests(CatalogMixin, BasketMixin, TestCase): ...@@ -142,7 +142,7 @@ class BasketTests(CatalogMixin, BasketMixin, TestCase):
TODO: LEARNER 5463 TODO: LEARNER 5463
""" """
basket = self._create_basket_with_product() basket = self._create_basket_with_product()
RequestCache.set(is_calculate_temporary_basket, True) RequestCache.set(TEMPORARY_BASKET_CACHE_KEY, True)
with mock.patch.object(Client, 'track') as mock_track: with mock.patch.object(Client, 'track') as mock_track:
basket.flush() basket.flush()
...@@ -176,7 +176,7 @@ class BasketTests(CatalogMixin, BasketMixin, TestCase): ...@@ -176,7 +176,7 @@ class BasketTests(CatalogMixin, BasketMixin, TestCase):
course = CourseFactory() course = CourseFactory()
basket = create_basket(empty=True) basket = create_basket(empty=True)
seat = course.create_or_update_seat('verified', True, 100, self.partner) seat = course.create_or_update_seat('verified', True, 100, self.partner)
RequestCache.set(is_calculate_temporary_basket, True) RequestCache.set(TEMPORARY_BASKET_CACHE_KEY, True)
with mock.patch('ecommerce.extensions.basket.models.track_segment_event') as mock_track: with mock.patch('ecommerce.extensions.basket.models.track_segment_event') as mock_track:
basket.add_product(seat) basket.add_product(seat)
properties = translate_basket_line_for_segment(basket.lines.first()) properties = translate_basket_line_for_segment(basket.lines.first())
......
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