Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: disable fixed price logic #964

Closed
wants to merge 1 commit into from
Closed

fix: disable fixed price logic #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions enterprise_catalog/apps/catalog/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,9 @@ def get_enroll_by_date(self, obj) -> str: # pylint: disable=unused-argument
def get_content_price(self, obj) -> float: # pylint: disable=unused-argument
if not self.course_run_metadata:
return None
if self.course_run_metadata.get('fixed_price_usd'):
return float(self.course_run_metadata.get('fixed_price_usd'))
# To be uncommented out after fix forward
# if self.course_run_metadata.get('fixed_price_usd'):
# return float(self.course_run_metadata.get('fixed_price_usd'))
if self.is_exec_ed_2u_course is True:
for entitlement in self.course_metadata.get('entitlements', []):
if entitlement.get('price') and entitlement.get('mode') == CourseMode.PAID_EXECUTIVE_EDUCATION:
Expand Down
172 changes: 86 additions & 86 deletions enterprise_catalog/apps/catalog/tests/test_serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
NormalizedContentMetadataSerializer,
)
from enterprise_catalog.apps.catalog.tests import factories
from enterprise_catalog.apps.catalog.utils import get_course_run_by_uuid


@ddt.ddt
Expand Down Expand Up @@ -152,88 +151,89 @@ def test_enroll_by_date_verified_course_no_seat(self, has_course_run):

self.assertEqual(serialized_data['enroll_by_date'], actual_deadline)

@ddt.data(
# First enrollable paid seat price
{
'first_enrollable_paid_seat_price': 50,
'fixed_price_usd': None,
'entitlements': [],
'course_type': 'verified-audit',
'expected_content_price': 50.0,
},
# First enrollable paid seat default normalized price
{
'first_enrollable_paid_seat_price': None,
'fixed_price_usd': None,
'entitlements': [],
'course_type': 'verified-audit',
'expected_content_price': 0.0,
},
# Fixed price usd
{
'first_enrollable_paid_seat_price': 50,
'fixed_price_usd': "100.00",
'entitlements': [],
'course_type': 'verified-audit',
'expected_content_price': 100.0,
},
# entitlements
{
'first_enrollable_paid_seat_price': None,
'fixed_price_usd': None,
'entitlements': [
{
"mode": "paid-executive-education",
"price": "200.00",
"currency": "USD",
"sku": "1234",
"expires": None
}
],
'course_type': 'executive-education-2u',
'expected_content_price': 200.0,
},
# entitlements default normalized price
{
'first_enrollable_paid_seat_price': None,
'fixed_price_usd': None,
'entitlements': [
{
"mode": "paid-executive-education",
"price": None,
"currency": "USD",
"sku": "1234",
"expires": None
}
],
'course_type': 'executive-education-2u',
'expected_content_price': 0,
}
)
@ddt.unpack
def test_content_price(self,
first_enrollable_paid_seat_price,
fixed_price_usd,
entitlements,
course_type,
expected_content_price,
):
course_content = factories.ContentMetadataFactory(
content_type=COURSE,
)
course_content.json_metadata['entitlements'] = entitlements
course_content.json_metadata['course_type'] = course_type

advertised_course_run_uuid = course_content.json_metadata['advertised_course_run_uuid']
advertised_course_run = get_course_run_by_uuid(course_content.json_metadata, advertised_course_run_uuid)
advertised_course_run['fixed_price_usd'] = fixed_price_usd
advertised_course_run['first_enrollable_paid_seat_price'] = first_enrollable_paid_seat_price

normalized_metadata_input = {
'course_metadata': course_content.json_metadata,
'course_run_metadata': course_content.json_metadata['course_runs'][0]
}

serialized_data = NormalizedContentMetadataSerializer(normalized_metadata_input).data

self.assertEqual(serialized_data['content_price'], expected_content_price)
# Uncomment out once fix forward complete
# @ddt.data(
# # First enrollable paid seat price
# {
# 'first_enrollable_paid_seat_price': 50,
# 'fixed_price_usd': None,
# 'entitlements': [],
# 'course_type': 'verified-audit',
# 'expected_content_price': 50.0,
# },
# # First enrollable paid seat default normalized price
# {
# 'first_enrollable_paid_seat_price': None,
# 'fixed_price_usd': None,
# 'entitlements': [],
# 'course_type': 'verified-audit',
# 'expected_content_price': 0.0,
# },
# # Fixed price usd
# {
# 'first_enrollable_paid_seat_price': 50,
# 'fixed_price_usd': "100.00",
# 'entitlements': [],
# 'course_type': 'verified-audit',
# 'expected_content_price': 100.0,
# },
# # entitlements
# {
# 'first_enrollable_paid_seat_price': None,
# 'fixed_price_usd': None,
# 'entitlements': [
# {
# "mode": "paid-executive-education",
# "price": "200.00",
# "currency": "USD",
# "sku": "1234",
# "expires": None
# }
# ],
# 'course_type': 'executive-education-2u',
# 'expected_content_price': 200.0,
# },
# # entitlements default normalized price
# {
# 'first_enrollable_paid_seat_price': None,
# 'fixed_price_usd': None,
# 'entitlements': [
# {
# "mode": "paid-executive-education",
# "price": None,
# "currency": "USD",
# "sku": "1234",
# "expires": None
# }
# ],
# 'course_type': 'executive-education-2u',
# 'expected_content_price': 0,
# }
# )
# @ddt.unpack
# def test_content_price(self,
# first_enrollable_paid_seat_price,
# fixed_price_usd,
# entitlements,
# course_type,
# expected_content_price,
# ):
# course_content = factories.ContentMetadataFactory(
# content_type=COURSE,
# )
# course_content.json_metadata['entitlements'] = entitlements
# course_content.json_metadata['course_type'] = course_type

# advertised_course_run_uuid = course_content.json_metadata['advertised_course_run_uuid']
# advertised_course_run = get_course_run_by_uuid(course_content.json_metadata, advertised_course_run_uuid)
# advertised_course_run['fixed_price_usd'] = fixed_price_usd
# advertised_course_run['first_enrollable_paid_seat_price'] = first_enrollable_paid_seat_price

# normalized_metadata_input = {
# 'course_metadata': course_content.json_metadata,
# 'course_run_metadata': course_content.json_metadata['course_runs'][0]
# }

# serialized_data = NormalizedContentMetadataSerializer(normalized_metadata_input).data

# self.assertEqual(serialized_data['content_price'], expected_content_price)
Loading