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.

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

feat: TNL-10136 tease course enrollment from student model #31344

Merged
merged 9 commits into from
Dec 15, 2022

Conversation

bszabo
Copy link
Contributor

@bszabo bszabo commented Nov 24, 2022

Reapply changes developed in bszabo/TNL-10136-student-course-enrollment branch to current master

The intent here is to resolve dependency version conflicts only, relative to PR #31229

@bszabo bszabo force-pushed the bszabo/TNL-10136-reapply-course-enrollment-changes branch from 998fbe5 to f846ea3 Compare November 25, 2022 12:41
@bszabo bszabo force-pushed the bszabo/TNL-10136-reapply-course-enrollment-changes branch from 81e3192 to b897833 Compare December 12, 2022 20:44
@bszabo bszabo requested a review from connorhaugh December 12, 2022 21:28
@bszabo
Copy link
Contributor Author

bszabo commented Dec 12, 2022

@connorhaugh This PR is now ready for your review. It should have no substantive changes from the previous one you reviewed. That one had been approved but ran into dependency conflicts with master. The incremental changes here are to resolve those dependency changes.

@connorhaugh
Copy link
Contributor

Ok @bszabo I will read through again to double-check, but for when we merge this, what kind of smoke tests should I make to make sure we haven't broken the user table?

@bszabo
Copy link
Contributor Author

bszabo commented Dec 12, 2022

Good question, @connorhaugh . I haven't actually changed the model (tables are all the same), so in theory if it builds and passes unit tests, it should be OK. But in theory, theory and practice are the same; in practice, they're not. I need to explore a bit to answer your question.

@bszabo
Copy link
Contributor Author

bszabo commented Dec 12, 2022

Practice rules, @connorhaugh ! The basic smoke test is to log in to LMS, go to the profile menu, and then save something like the maximum degree you attained. Then you log out, log back in, and see that what you selected is still there.

Presently, works in the master branch. Doesn't work on the feature branch.

I'll tag you here once I've got it working; there's nothing further for you to do with this PR until then.

Bernard Szabo and others added 7 commits December 13, 2022 17:19
Reapply changes developed in bszabo/TNL-10136-student-course-enrollment branch to current master
inclusion in __init__
docstring
And import cross-references
And wrap-around lines
blank lines in __init__
private method that needed to be public
importlib and importlib-resources dependencies
Multiple commits squashed. Common theme was to resolve dependencies with master branch
@bszabo bszabo force-pushed the bszabo/TNL-10136-reapply-course-enrollment-changes branch from b1dc6bd to 6e75002 Compare December 13, 2022 23:03
Too many blank lines, missing import between student model files
@bszabo
Copy link
Contributor Author

bszabo commented Dec 14, 2022

@connorhaugh Once again ready for review. I rebased with master yesterday & got the code to where it passes CI checks and successfully runs on devstack. My suggested approach for testing is to run a few manual tests to verify proper end-to-end behavior with representative user model changes and representative course enrollment changes. I further propose a pair programming session where we visit the nature of the changes in the former models.py file (combined student and course enrollment models), and the new user.py and course_enrollment.py files. My contention is that the nature of the changes is such that either nothing will work or everything will work, and that the code review will back this up.

For the manual student model tests, I recommend logging in to your devstack LMS and making edits to your account profile. Log out, log back in, and confirm that the changes you made are visible.

For the manual course enrollment test, I recommend you enroll in a course in your localhost environment, log out, log back in, and confirm that you're still enrolled in that course.

Remove block of 3 lines duplicated in last rebase exercise
Copy link
Contributor

@connorhaugh connorhaugh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've discussed this code and it looks good to me, we plan to release this with care.

@bszabo bszabo merged commit 05542a3 into master Dec 15, 2022
@bszabo bszabo deleted the bszabo/TNL-10136-reapply-course-enrollment-changes branch December 15, 2022 18:18
@bszabo
Copy link
Contributor Author

bszabo commented Dec 15, 2022

@connorhaugh Merge to stage has begun

@edx-pipeline-bot
Copy link
Contributor

EdX Release Notice: This PR has been deployed to the staging environment in preparation for a release to production.

@edx-pipeline-bot
Copy link
Contributor

EdX Release Notice: This PR has been deployed to the production environment.

1 similar comment
@edx-pipeline-bot
Copy link
Contributor

EdX Release Notice: This PR has been deployed to the production environment.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants