Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
ecommerce
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
ecommerce
Commits
93755a42
Commit
93755a42
authored
Jun 26, 2018
by
Jason Myatt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove BasketSummaryView debug logging and traces
LEARNER-5611
parent
a4669410
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
50 deletions
+0
-50
ecommerce/extensions/basket/utils.py
+0
-43
ecommerce/extensions/basket/views.py
+0
-7
No files found.
ecommerce/extensions/basket/utils.py
View file @
93755a42
...
@@ -3,9 +3,7 @@ import json
...
@@ -3,9 +3,7 @@ import json
import
logging
import
logging
from
urllib
import
unquote
,
urlencode
from
urllib
import
unquote
,
urlencode
import
newrelic.agent
import
pytz
import
pytz
import
waffle
from
django.conf
import
settings
from
django.conf
import
settings
from
django.contrib
import
messages
from
django.contrib
import
messages
from
django.db
import
transaction
from
django.db
import
transaction
...
@@ -31,7 +29,6 @@ Refund = get_model('refund', 'Refund')
...
@@ -31,7 +29,6 @@ Refund = get_model('refund', 'Refund')
logger
=
logging
.
getLogger
(
__name__
)
logger
=
logging
.
getLogger
(
__name__
)
@newrelic.agent.function_trace
()
def
add_utm_params_to_url
(
url
,
params
):
def
add_utm_params_to_url
(
url
,
params
):
# utm_params is [(u'utm_content', u'course-v1:IDBx IDB20.1x 1T2017'),...
# 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
]]
utm_params
=
[
item
for
item
in
params
if
'utm_'
in
item
[
0
]]
...
@@ -44,7 +41,6 @@ def add_utm_params_to_url(url, params):
...
@@ -44,7 +41,6 @@ def add_utm_params_to_url(url, params):
return
url
return
url
@newrelic.agent.function_trace
()
def
prepare_basket
(
request
,
products
,
voucher
=
None
):
def
prepare_basket
(
request
,
products
,
voucher
=
None
):
"""
"""
Create or get the basket, add products, apply a voucher, and record referral data.
Create or get the basket, add products, apply a voucher, and record referral data.
...
@@ -115,7 +111,6 @@ def prepare_basket(request, products, voucher=None):
...
@@ -115,7 +111,6 @@ def prepare_basket(request, products, voucher=None):
return
basket
return
basket
@newrelic.agent.function_trace
()
def
get_basket_switch_data
(
product
):
def
get_basket_switch_data
(
product
):
"""
"""
Given a seat or enrollment product, find the SKU of the related product of
Given a seat or enrollment product, find the SKU of the related product of
...
@@ -140,38 +135,6 @@ def get_basket_switch_data(product):
...
@@ -140,38 +135,6 @@ def get_basket_switch_data(product):
partner_sku
=
_find_seat_enrollment_toggle_sku
(
product
,
'standalone'
)
partner_sku
=
_find_seat_enrollment_toggle_sku
(
product
,
'standalone'
)
switch_link_text
=
_
(
'Click here to purchase multiple seats in this course'
)
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
return
switch_link_text
,
partner_sku
...
@@ -213,7 +176,6 @@ def _find_seat_enrollment_toggle_sku(product, target_structure):
...
@@ -213,7 +176,6 @@ def _find_seat_enrollment_toggle_sku(product, target_structure):
return
None
return
None
@newrelic.agent.function_trace
()
def
attribute_cookie_data
(
basket
,
request
):
def
attribute_cookie_data
(
basket
,
request
):
try
:
try
:
with
transaction
.
atomic
():
with
transaction
.
atomic
():
...
@@ -237,7 +199,6 @@ def attribute_cookie_data(basket, request):
...
@@ -237,7 +199,6 @@ def attribute_cookie_data(basket, request):
logger
.
exception
(
'Error while attributing cookies to basket.'
)
logger
.
exception
(
'Error while attributing cookies to basket.'
)
@newrelic.agent.function_trace
()
def
_referral_from_basket_site
(
basket
,
site
):
def
_referral_from_basket_site
(
basket
,
site
):
try
:
try
:
# There should be only 1 referral instance for one basket.
# There should be only 1 referral instance for one basket.
...
@@ -248,7 +209,6 @@ def _referral_from_basket_site(basket, site):
...
@@ -248,7 +209,6 @@ def _referral_from_basket_site(basket, site):
return
referral
return
referral
@newrelic.agent.function_trace
()
def
_record_affiliate_basket_attribution
(
referral
,
request
):
def
_record_affiliate_basket_attribution
(
referral
,
request
):
"""
"""
Attribute this user's basket to the referring affiliate, if applicable.
Attribute this user's basket to the referring affiliate, if applicable.
...
@@ -262,7 +222,6 @@ def _record_affiliate_basket_attribution(referral, request):
...
@@ -262,7 +222,6 @@ def _record_affiliate_basket_attribution(referral, request):
referral
.
affiliate_id
=
affiliate_id
referral
.
affiliate_id
=
affiliate_id
@newrelic.agent.function_trace
()
def
_record_utm_basket_attribution
(
referral
,
request
):
def
_record_utm_basket_attribution
(
referral
,
request
):
"""
"""
Attribute this user's basket to UTM data, if applicable.
Attribute this user's basket to UTM data, if applicable.
...
@@ -286,7 +245,6 @@ def _record_utm_basket_attribution(referral, request):
...
@@ -286,7 +245,6 @@ def _record_utm_basket_attribution(referral, request):
referral
.
utm_created_at
=
created_at_datetime
referral
.
utm_created_at
=
created_at_datetime
@newrelic.agent.function_trace
()
def
basket_add_organization_attribute
(
basket
,
request_data
):
def
basket_add_organization_attribute
(
basket
,
request_data
):
"""
"""
Add organization attribute on basket, if organization value is provided
Add organization attribute on basket, if organization value is provided
...
@@ -309,7 +267,6 @@ def basket_add_organization_attribute(basket, request_data):
...
@@ -309,7 +267,6 @@ def basket_add_organization_attribute(basket, request_data):
)
)
@newrelic.agent.function_trace
()
def
_set_basket_bundle_status
(
bundle
,
basket
):
def
_set_basket_bundle_status
(
bundle
,
basket
):
"""
"""
Sets the basket's bundle status
Sets the basket's bundle status
...
...
ecommerce/extensions/basket/views.py
View file @
93755a42
...
@@ -6,7 +6,6 @@ from decimal import Decimal
...
@@ -6,7 +6,6 @@ from decimal import Decimal
from
urllib
import
urlencode
from
urllib
import
urlencode
import
dateutil.parser
import
dateutil.parser
import
newrelic.agent
import
waffle
import
waffle
from
django.http
import
HttpResponseBadRequest
,
HttpResponseRedirect
from
django.http
import
HttpResponseBadRequest
,
HttpResponseRedirect
from
django.shortcuts
import
redirect
,
render
from
django.shortcuts
import
redirect
,
render
...
@@ -104,7 +103,6 @@ class BasketSummaryView(BasketView):
...
@@ -104,7 +103,6 @@ class BasketSummaryView(BasketView):
Display basket contents and checkout/payment options.
Display basket contents and checkout/payment options.
"""
"""
@newrelic.agent.function_trace
()
def
_determine_product_type
(
self
,
product
):
def
_determine_product_type
(
self
,
product
):
"""
"""
Return the seat type based on the product class
Return the seat type based on the product class
...
@@ -116,7 +114,6 @@ class BasketSummaryView(BasketView):
...
@@ -116,7 +114,6 @@ class BasketSummaryView(BasketView):
seat_type
=
get_certificate_type_display_value
(
product
.
attr
.
seat_type
)
seat_type
=
get_certificate_type_display_value
(
product
.
attr
.
seat_type
)
return
seat_type
return
seat_type
@newrelic.agent.function_trace
()
def
_deserialize_date
(
self
,
date_string
):
def
_deserialize_date
(
self
,
date_string
):
date
=
None
date
=
None
try
:
try
:
...
@@ -125,7 +122,6 @@ class BasketSummaryView(BasketView):
...
@@ -125,7 +122,6 @@ class BasketSummaryView(BasketView):
pass
pass
return
date
return
date
@newrelic.agent.function_trace
()
def
_get_course_data
(
self
,
product
):
def
_get_course_data
(
self
,
product
):
"""
"""
Return course data.
Return course data.
...
@@ -196,7 +192,6 @@ class BasketSummaryView(BasketView):
...
@@ -196,7 +192,6 @@ class BasketSummaryView(BasketView):
'course_end'
:
course_end
,
'course_end'
:
course_end
,
}
}
@newrelic.agent.function_trace
()
def
_process_basket_lines
(
self
,
lines
):
def
_process_basket_lines
(
self
,
lines
):
"""Processes the basket lines and extracts information for the view's context.
"""Processes the basket lines and extracts information for the view's context.
In addition determines whether:
In addition determines whether:
...
@@ -303,7 +298,6 @@ class BasketSummaryView(BasketView):
...
@@ -303,7 +298,6 @@ class BasketSummaryView(BasketView):
return
context_updates
,
lines_data
return
context_updates
,
lines_data
@newrelic.agent.function_trace
()
def
_get_payment_processors_data
(
self
,
payment_processors
):
def
_get_payment_processors_data
(
self
,
payment_processors
):
"""Retrieve information about payment processors for the client side checkout basket.
"""Retrieve information about payment processors for the client side checkout basket.
...
@@ -363,7 +357,6 @@ class BasketSummaryView(BasketView):
...
@@ -363,7 +357,6 @@ class BasketSummaryView(BasketView):
else
:
else
:
return
super
(
BasketSummaryView
,
self
)
.
get
(
request
,
*
args
,
**
kwargs
)
return
super
(
BasketSummaryView
,
self
)
.
get
(
request
,
*
args
,
**
kwargs
)
@newrelic.agent.function_trace
()
def
get_context_data
(
self
,
**
kwargs
):
def
get_context_data
(
self
,
**
kwargs
):
context
=
super
(
BasketSummaryView
,
self
)
.
get_context_data
(
**
kwargs
)
context
=
super
(
BasketSummaryView
,
self
)
.
get_context_data
(
**
kwargs
)
formset
=
context
.
get
(
'formset'
,
[])
formset
=
context
.
get
(
'formset'
,
[])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment