-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Badges V2 Feature Branch #10556
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.
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
Badges V2 Feature Branch #10556
Conversation
|
Thanks for the pull request, @Kelketek! It looks like you're a member of a company that does contract work for edX. If you're doing this work as part of a paid contract with edX, you should talk to edX about who will review this pull request. If this work is not part of a paid contract with edX, then you should ensure that there is an OSPR issue to track this work in JIRA, so that we don't lose track of your pull request. To automatically create an OSPR issue for this pull request, just visit this link: https://openedx-webhooks.herokuapp.com/github/process_pr?repo=edx%2Fedx-platform&number=10556 |
419f77e to
1817d9b
Compare
0563546 to
1b618aa
Compare
98f1635 to
1b618aa
Compare
|
FYI @mulby on this PR for new Badge analytics events. Specific link: https://github.com/edx/edx-platform/pull/10556/files#diff-7fa57903a46fbede7993bc2593ba3c0eR121 Wiki page: https://openedx.atlassian.net/wiki/display/AN/Digital+Badging+Event+Design+Modifications |
cf5ab04 to
3758dac
Compare
|
@antoviaque @bradenmacdonald @e-kolpakov @smagoun The last PR looks like it will merge soon. Am I clear to merge this feature branch if it does, or does anything else need to be done? |
3758dac to
dc3cdcc
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Kelketek image_url appears twice
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@catong The first image_url is the URL to the badge class's source image. The second one is the baked badge assertion image generated by Badgr, with all the metadata concerning the user's award.
9a7c2cf to
d48e093
Compare
|
@antoviaque @bradenmacdonald @smagoun @pbaruah This is ready to merge, assuming the tests pass. |
d675798 to
65ef341
Compare
| assertion.save() | ||
| # Would be overwritten by the first save. | ||
| assertion.created = datetime.fromtimestamp( | ||
| time.mktime(time.strptime(badge.data['created_at'], "%Y-%m-%dT%H:%M:%S")) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Kelketek I get an error when I run this:
*** ValueError: unconverted data remains: .979502Z
It works if I truncate the date string:
badge.data['created_at'][:19]Also, this is a shorter way of writing this:
assertion.created = datetime.strptime(badge.data['created_at'][:19], "%Y-%m-%dT%H:%M:%S")65ef341 to
18e9daa
Compare
|
jenkins run bokchoy |
|
@omarkhan I've been instructed to ignore the coveralls test for now-- could you take a look over the latest changes? If they're good I'll put them up on the sandbox. |
|
Actually, went ahead and updated it now. |
|
👍 Great stuff, @Kelketek. Don't forget to squash and fix the quality failure, then merge away! |
|
@catong I will be cleaning this up, squashing, and merging tomorrow morning. So you'll want to get the docs in order :) |
7475cce to
27957a6
Compare
|
@Kelketek these most recent two commits LGTM -- 👍 |
27957a6 to
f84f95c
Compare
|
@nedbat Disregard previous statement about email-- a recent tweak to the migration should remove the need for any special action. |
|
@catong In the end this merged after the release cut, so we are targeting next week's release for docs etc. |
|
@bradenmacdonald Sounds good. Thanks! |
|
@edx/devops Heads up that if you're cutting a release tomorrow it will include this PR for new badging features, which has migrations. Much of the new functionality is behind a feature flag though, and won't be enabled on edx.org. |
|
@mattdrayer @Kelketek @bradenmacdonald this change had a migration that deleted a column. This is not backwards compatible with the running software and resulted in errors during the deploy today. The model change and the migration need to be in separate deploys to not break users in production. |
|
@feanil Sorry about that. As you can see above I did ping devops about the migration, although I was not aware of the potential issues around deleting columns in particular. Have you made a fix for this or is further action required? |
|
At this point I think we can push it through, but I mostly wanted to leave a note to say do not do this on a table that is more highly trafficked in the future. |
Description: This PR is the next iteration of the Badging feature in the LMS
Discussions/Specs: https://docs.google.com/document/d/1ob-leRHV97agPGw5ys9uASXrcsU8qf51bzYlKH3mBEM/edit?usp=sharing
Jira Ticket: https://openedx.atlassian.net/browse/SOL-1325
Partner Information: 3rd party-hosted open edX instance, for an edX solutions client.
Sandbox: LMS at http://pr10556.sandbox.opencraft.com CMS at http://studio.pr10556.sandbox.opencraft.com
Components:
Settings