Take Exec Ed course data from course runs #785
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
enterprise_catalog/apps/api/tasks.py
Outdated
| @@ -298,29 +298,23 @@ def _normalize_course_metadata(course_metadata_record): | |||
| json_meta = course_metadata_record.json_metadata | |||
| normalized_metadata = {} | |||
| # For each content type, find the values that correspond to the desired output key. | |||
There was a problem hiding this comment.
is this comment still relevant?
There was a problem hiding this comment.
Nope, removed!
enterprise_catalog/apps/api/tasks.py
Outdated
| all_seats = advertised_course_run.get('seats', []) | ||
| seat = _find_best_mode_seat(all_seats) | ||
| if seat: | ||
| normalized_metadata['enroll_by_date'] = seat.get('upgrade_deadline') | ||
| else: | ||
| logger.info(f"No Seat Found for course run '{advertised_course_run.get('key')}'. Seats: {all_seats}") | ||
| logger.info(f"No Enrollment End or Seat Found for course run '{advertised_course_run.get('key')}'. Seats: {all_seats}") |
There was a problem hiding this comment.
entirely small nit, why the funky capitalization? I see it was there before I'm just confused lol
There was a problem hiding this comment.
Yeah I was just following along with the old funky capitalization, but went ahead and removed it.
|
|
||
| end_date = None | ||
| if additional_md.get('end_date'): |
There was a problem hiding this comment.
lol there was just a way better way to write this 🤦
| csv_row.append(end_date) | ||
| formatted_enroll_by = fetch_and_format_registration_date(additional_md) | ||
| adv_course_run = hit.get('advertised_course_run', {}) | ||
| if adv_course_run and (start_date := adv_course_run.get('start'), end_date := adv_course_run.get('end')): |
There was a problem hiding this comment.
do you need the if adv_course_run? It feels like you should be able to do a gettr on an empty dict and have it resolve to false
There was a problem hiding this comment.
Good point! Removed.
marlonkeating
force-pushed
the
mkeating/ENT-8248
branch
3 times, most recently
from
cbb951f
to
68d09f3
Compare
marlonkeating
force-pushed
the
mkeating/ENT-8248
branch
from
68d09f3
to
aa9dddd
Compare
alex-sheehan-edx
approved these changes
Jun 13, 2024
enterprise_catalog/apps/api/tasks.py
Outdated
| if advertised_course_run is not None: | ||
| normalized_metadata['start_date'] = advertised_course_run.get('start') | ||
| normalized_metadata['end_date'] = advertised_course_run.get('end') | ||
| normalized_metadata['content_price'] = advertised_course_run.get('first_enrollable_paid_seat_price') \ |
There was a problem hiding this comment.
optional nit, you could make DEFAULT_NORMALIZED_PRICE the default value in the advertised_course_run getter
kiram15
approved these changes
Aug 8, 2024
marlonkeating
force-pushed
the
mkeating/ENT-8248
branch
3 times, most recently
from
0cce2dc
to
42ae17a
Compare
…metadata style: fix long line fix: don't use advertised_course_run before it is populated fix: bug caused by typo fix: merge error chore: fix trailing whitespace chore: fix pylint issues chore: fix code style issues
marlonkeating
force-pushed
the
mkeating/ENT-8248
branch
from
42ae17a
to
65f4dc3
Compare
This was referenced Aug 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Updates references for Exec Ed courses originally contained in the
additional_metadatafield, to now be taken from course runs.Ticket Link
ENT-8248: update custom logic for non-ocm courses in enterprise-catalog
Outstanding Questions
Post-review