squash!: Fix conflicts

Author: rodmgwgu

openedx_authz/api/roles.py

@@ -571,6 +571,5 @@ def get_all_role_assignments_per_scope_type(scope_types: tuple[type[ScopeData],
         list[RoleAssignmentData]: All assignments whose scope is an instance of any of the given scope types.
     """
     return [
-        role_assignment for role_assignment in get_role_assignments()
-        if isinstance(role_assignment.scope, scope_types)
+        role_assignment for role_assignment in get_role_assignments() if isinstance(role_assignment.scope, scope_types)
     ]

openedx_authz/engine/utils.py

@@ -264,8 +264,7 @@ def migrate_legacy_course_roles_to_authz(course_access_role_model, course_id_lis
 
         # Permission applied to individual user
         logger.info(
-            f"Migrating permission for User: {permission.user.username} "
-            f"to Role: {role} in Scope: {scope_external_key}"
+            f"Migrating permission for User: {permission.user.username} to Role: {role} in Scope: {scope_external_key}"
         )
 
         is_user_added = assign_role_to_user_in_scope(
@@ -322,25 +321,26 @@ def migrate_authz_to_legacy_course_roles(
     _validate_migration_input(course_id_list, org_id)
 
     role_assignments = get_all_role_assignments_per_scope_type(
-        scope_types=(CourseOverviewData, OrgCourseOverviewGlobData,)
+        scope_types=(
+            CourseOverviewData,
+            OrgCourseOverviewGlobData,
+        )
     )
 
     # Two cases here:
     # 1. org_id provided: filter by org — includes org-level glob and course-level scopes for that org.
     # 2. only course_id_list provided: filter by course_id — org-level glob scopes are excluded (no course_id).
     if org_id:
         role_assignments = [
-            role_assignment
-            for role_assignment in role_assignments
-            if role_assignment.scope.org == org_id
+            role_assignment for role_assignment in role_assignments if role_assignment.scope.org == org_id
         ]
 
     if course_id_list and not org_id:
         role_assignments = [
             role_assignment
             for role_assignment in role_assignments
-            if isinstance(role_assignment.scope, CourseOverviewData) and
-            role_assignment.scope.course_id in course_id_list
+            if isinstance(role_assignment.scope, CourseOverviewData)
+            and role_assignment.scope.course_id in course_id_list
         ]
 
     roles_with_errors = []
@@ -350,13 +350,10 @@ def migrate_authz_to_legacy_course_roles(
     user_external_keys = {assignment.subject.external_key for assignment in role_assignments}
     users_by_username = {
         subject.user.username: subject.user
-        for subject in user_subject_model.objects.filter(
-            user__username__in=user_external_keys
-        ).select_related("user")
+        for subject in user_subject_model.objects.filter(user__username__in=user_external_keys).select_related("user")
     }
 
     for role_assignment in role_assignments:
-
         # Per valid role assignment, create corresponding CourseAccessRole entry
         # depending on whether the scope is course-level or org-level glob
         try:

openedx_authz/tests/rest_api/test_views.py

@@ -25,7 +25,7 @@
 from openedx_authz.models.scopes import get_content_library_model, get_course_overview_model
 from openedx_authz.rest_api.data import RoleOperationError, RoleOperationStatus
 from openedx_authz.rest_api.v1.permissions import AnyScopePermission, DynamicScopePermission
-from openedx_authz.rest_api.v1.views import UserValidationAPIView
+from openedx_authz.rest_api.v1.views import ScopesAPIView, UserValidationAPIView
 from openedx_authz.tests.api.test_roles import BaseRolesTestCase
 from openedx_authz.tests.stubs.models import LearningPackage
 
@@ -966,7 +966,7 @@ def setUp(self):
 
         # Patch _build_queryset so tests don't need real DB querysets.
         self.build_qs_patcher = patch.object(
-            views.ScopesAPIView,
+            ScopesAPIView,
             "_build_queryset",
             return_value=self.fake_scopes,
         )
@@ -1029,9 +1029,9 @@ def test_type_param_calls_only_expected_queryset(self, scope_type, called_method
         """When type=course only courses are fetched; when type=library only libraries."""
         self.build_qs_patcher.stop()
         with (
-            patch.object(views.ScopesAPIView, called_method, return_value=[]) as mock_called,
-            patch.object(views.ScopesAPIView, skipped_method) as mock_skipped,
-            patch.object(views.ScopesAPIView, "_build_queryset", return_value=[]),
+            patch.object(ScopesAPIView, called_method, return_value=[]) as mock_called,
+            patch.object(ScopesAPIView, skipped_method) as mock_skipped,
+            patch.object(ScopesAPIView, "_build_queryset", return_value=[]),
         ):
             response = self.client.get(self.url, {"scope_type": scope_type})
         self.build_qs_patcher.start()
@@ -1050,9 +1050,9 @@ def test_type_param_absent_returns_both(self):
         """When type is not specified, both courses and libraries are returned."""
         self.build_qs_patcher.stop()
         with (
-            patch.object(views.ScopesAPIView, "_get_courses_queryset", return_value=[]) as mock_courses,
-            patch.object(views.ScopesAPIView, "_get_libraries_queryset", return_value=[]) as mock_libraries,
-            patch.object(views.ScopesAPIView, "_build_queryset", return_value=[]),
+            patch.object(ScopesAPIView, "_get_courses_queryset", return_value=[]) as mock_courses,
+            patch.object(ScopesAPIView, "_get_libraries_queryset", return_value=[]) as mock_libraries,
+            patch.object(ScopesAPIView, "_build_queryset", return_value=[]),
         ):
             response = self.client.get(self.url)
         self.build_qs_patcher.start()
@@ -1102,7 +1102,7 @@ def test_pagination(self, query_params: dict, expected_page_count: int, has_next
             {"scope_id": self.COURSE_ORG2, "display_name_col": "Course 2", "org_name": "Org2", "scope_type": "course"},
         ]
         self.build_qs_patcher.stop()
-        with patch.object(views.ScopesAPIView, "_build_queryset", return_value=mixed):
+        with patch.object(ScopesAPIView, "_build_queryset", return_value=mixed):
             response = self.client.get(self.url, query_params)
         self.build_qs_patcher.start()
 

openedx_authz/tests/test_migrations.py

@@ -1301,9 +1301,7 @@ def test_migrate_org_level_scope_creates_org_glob_assignment(self):
         AuthzEnforcer.get_enforcer().load_policy()
 
         org_scope = OrgCourseOverviewGlobData.build_external_key(org_short_name_new)
-        assignments = get_user_role_assignments_in_scope(
-            user_external_key=user.username, scope_external_key=org_scope
-        )
+        assignments = get_user_role_assignments_in_scope(user_external_key=user.username, scope_external_key=org_scope)
         self.assertEqual(len(assignments), 1)
         self.assertEqual(assignments[0].roles[0], COURSE_ADMIN)
 
@@ -1404,8 +1402,7 @@ def test_course_id_list_filter_excludes_glob_and_other_courses(self):
         AuthzEnforcer.get_enforcer().load_policy()
 
         errors, successes = migrate_authz_to_legacy_course_roles(
-            CourseAccessRole, UserSubject,
-            course_id_list=[self.course_id], org_id=None, delete_after_migration=False
+            CourseAccessRole, UserSubject, course_id_list=[self.course_id], org_id=None, delete_after_migration=False
         )
 
         migrated_users = {assignment.subject.external_key for assignment in successes}