-
Notifications
You must be signed in to change notification settings - Fork 3
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
fix: course staff mgmt command #310
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -90,7 +90,7 @@ def test_add_course_staff_with_not_default_batch_size(self): | |
'sam,[email protected],staff,course-v1:edx+test+f20\n'] | ||
with NamedTemporaryFile() as csv: | ||
csv = self._write_test_csv(csv, lines) | ||
with self.assertNumQueries(8): | ||
with self.assertNumQueries(12): | ||
call_command(self.command, f'--csv_path={csv.name}', '--batch_size=1') | ||
|
||
def test_add_course_staff_with_batch_size_larger_than_list(self): | ||
|
@@ -99,7 +99,7 @@ def test_add_course_staff_with_batch_size_larger_than_list(self): | |
'sam,[email protected],staff,course-v1:edx+test+f20\n'] | ||
with NamedTemporaryFile() as csv: | ||
csv = self._write_test_csv(csv, lines) | ||
with self.assertNumQueries(6): | ||
with self.assertNumQueries(11): | ||
call_command(self.command, f'--csv_path={csv.name}', '--batch_size=3') | ||
|
||
def test_add_course_staff_with_batch_size_smaller_than_list(self): | ||
|
@@ -109,7 +109,7 @@ def test_add_course_staff_with_batch_size_smaller_than_list(self): | |
'tam,[email protected],staff,course-v1:edx+test+f20\n'] | ||
with NamedTemporaryFile() as csv: | ||
csv = self._write_test_csv(csv, lines) | ||
with self.assertNumQueries(9): | ||
with self.assertNumQueries(16): | ||
call_command(self.command, f'--csv_path={csv.name}', '--batch_size=2') | ||
|
||
def test_add_course_staff_with_not_default_batch_delay(self): | ||
|
@@ -125,16 +125,16 @@ def test_add_course_staff_with_not_default_batch_delay(self): | |
|
||
def test_num_queries_correct(self): | ||
""" | ||
Assert the number of queries to be 4 + 1 * number of lines: | ||
Assert the number of queries to be 2 + 1 * number of lines: | ||
2 for savepoint/release savepoint | ||
1 to bulk create users, 1 to bulk create course role | ||
1 for each user (to get user) | ||
1 to bulk create course role | ||
4 for each user (to get user, and savepoints) | ||
""" | ||
num_lines = 20 | ||
lines = [f'pam{i},pam{i}@pond.com,staff,course-v1:edx+test+f20\n' for i in range(num_lines)] | ||
with NamedTemporaryFile() as csv: | ||
csv = self._write_test_csv(csv, lines) | ||
with self.assertNumQueries(4 + num_lines): | ||
with self.assertNumQueries(3 + 4 * num_lines): | ||
call_command(self.command, f'--csv_path={csv.name}') | ||
|
||
def test_dupe_user_csv(self): | ||
|
Oops, something went wrong.
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.
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.
Took a pass at handling IntegrityError here. This handles the case where there's a duplicate username with a different email. This does not handle when there is a new username with a duplicate email address. I don't know if this is an issue, but this is also something that may need to be handled in the Model/db itself so might be more cumbersome than needed.
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.
if this is a case we're expecting can we log something or output information about the rows that failed to create when this is run so the failure isn't silent?
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.
Yes I can do that.