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

Jump to bottom

feat: Source price from content_price for fixed_price_usd in CatalogWorkbookView #954

Closed
wants to merge 1 commit into from
Closed

feat: Source price from content_price for fixed_price_usd in CatalogWorkbookView #954

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
16 changes: 11 additions & 5 deletions enterprise_catalog/apps/api/v1/export_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
'End Date',
'Verified Upgrade Deadline',
'Enroll-by Date',
'Price',
'Min Effort',
'Max Effort',
'Length',
Expand Down Expand Up @@ -200,12 +201,16 @@ def _base_csv_row_data(hit):
if enroll_by := advertised_course_run.get('enroll_by'):
enroll_by = datetime.datetime.fromtimestamp(enroll_by).strftime(DATE_FORMAT)

if content_price := advertised_course_run.get('content_price'):
content_price = math.trunc(float(content_price))

return {
'title': title,
'partner_name': partner_name,
'start_date': start_date,
'end_date': end_date,
'enroll_by': enroll_by,
'price': content_price,
'aggregation_key': aggregation_key,
'course_run_key': course_run_key,
'language': language,
Expand Down Expand Up @@ -248,7 +253,7 @@ def course_hit_to_row(hit):
csv_row.append(pacing_type)

csv_row.append(hit.get('level_type'))
csv_row.append(hit.get('first_enrollable_paid_seat_price'))
csv_row.append(row_data.get('price'))
csv_row.append(row_data.get('language'))
csv_row.append(row_data.get('transcript_languages'))
csv_row.append(row_data.get('marketing_url'))
Expand Down Expand Up @@ -276,15 +281,13 @@ def exec_ed_course_to_row(hit):
"""
row_data = _base_csv_row_data(hit)
csv_row = []

csv_row.append(row_data.get('title'))
csv_row.append(row_data.get('partners'))

csv_row.append(row_data.get('start_date'))
csv_row.append(row_data.get('end_date'))
csv_row.append(row_data.get('enroll_by'))

price = float(hit['entitlements'][0]['price'])
csv_row.append(math.trunc(price))
csv_row.append(row_data.get('price'))
csv_row.append(row_data.get('language'))
csv_row.append(row_data.get('transcript_languages'))
csv_row.append(row_data.get('marketing_url'))
Expand Down Expand Up @@ -349,6 +352,9 @@ def course_run_to_row(hit, course_run):
enroll_by = datetime.datetime.fromtimestamp(enroll_by).strftime(DATE_FORMAT)
csv_row.append(enroll_by)

# Price
csv_row.append(course_run.get('content_price'))

# Min Effort
csv_row.append(course_run.get('min_effort'))

Expand Down
3 changes: 2 additions & 1 deletion enterprise_catalog/apps/api/v1/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,6 +731,7 @@ class EnterpriseCatalogCsvDataViewTests(APITestMixin):
'max_effort': 10,
'min_effort': 1,
'weeks_to_complete': 1,
'content_price': 100,
},
'outcome': '<p>learn</p>',
'prerequisites_raw': '<p>interest</p>',
Expand Down Expand Up @@ -777,8 +778,8 @@ def _get_contains_content_base_url(self):
def _get_mock_algolia_hits_with_missing_values(self):
mock_hits_missing_values = copy.deepcopy(self.mock_algolia_hits)
mock_hits_missing_values['hits'][0]['advertised_course_run'].pop('upgrade_deadline')
mock_hits_missing_values['hits'][0]['advertised_course_run'].pop('content_price')
mock_hits_missing_values['hits'][0].pop('marketing_url')
mock_hits_missing_values['hits'][0].pop('first_enrollable_paid_seat_price')
mock_hits_missing_values['hits'][0]['advertised_course_run']['end'] = None
return mock_hits_missing_values

Expand Down
Loading