feat: add library roles support for roles API #124
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
tehreem-sadat
changed the title
tehreem-sadat
force-pushed
the
tehreem/feat_add_library_user_role_support
branch
from
d37d261 to
1eb00da
Compare
tehreem-sadat
force-pushed
the
tehreem/feat_add_library_user_role_support
branch
3 times, most recently
from
f154c32 to
1c62ff5
Compare
tehreem-sadat
force-pushed
the
tehreem/feat_add_library_user_role_support
branch
from
1c62ff5 to
44aed5d
Compare
tehreem-sadat
changed the title
shadinaif
requested changes
Nov 12, 2024
There was a problem hiding this comment.
small changes and it's good to go, thank you @tehreem-sadat !
Comment on lines
+148
to
+152
| result['courses'].update({ | ||
| str(lib_key): lib_key.org | ||
| for lib_key in modulestore().get_library_keys() | ||
| if str(lib_key) in course_ids | ||
| }) |
There was a problem hiding this comment.
I thought this was bad, then realized it's great! thank you!
Comment on lines
+55
to
+58
| for course_id in course_ids: | ||
| if not re.match(cs.LIBRARY_ID_REGX, course_id): | ||
| return False | ||
| return True |
There was a problem hiding this comment.
Suggested change
| for course_id in course_ids: | |
| if not re.match(cs.LIBRARY_ID_REGX, course_id): | |
| return False | |
| return True | |
| return all(re.match(cs.LIBRARY_ID_REGX, course_id) for course_id in course_ids) |
Comment on lines
+77
to
+81
| check_broken_rule( | ||
| role == cs.COURSE_ACCESS_ROLES_LIBRARY_USER and course_id and not are_all_library_ids([course_id]), | ||
| FXExceptionCodes.ROLE_INVALID_ENTRY, | ||
| f'role {role} is only valid with library_id', | ||
| ) |
There was a problem hiding this comment.
validation order is a bit important in this function. Please move this after ....f'role {role} must have at least an org, it can also have a course_id!',
|
|
||
| def get_library_keys(self): | ||
| """mock modulestore library keys method""" | ||
| return [CourseKey.from_string(id) for id in self.ids] |
There was a problem hiding this comment.
Mocking is our enemy in tests. Please keep close to the real result as much as possible
Suggested change
| return [CourseKey.from_string(id) for id in self.ids] | |
| return [LibraryLocator.from_string(id) for id in self.ids] |
from opaque_keys.edx.locator import LibraryLocator
shadinaif
approved these changes
Nov 13, 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.
Add library roles and library_ids support for course access role APIs
Following are roles details
Related Issue: #107