refactor: consider course_id when migrating backward for course-level roles

Author: mariajgrimaldi

openedx_authz/engine/utils.py

@@ -348,9 +348,8 @@ def migrate_authz_to_legacy_course_roles(
                 "role": COURSE_ROLE_EQUIVALENCES[role_external_key],
             }
 
-            # Here we prioritize course_id over org for scope since course-level scope is more specific
-            # and also both are not needed to create a valid CourseAccessRole entry
             if isinstance(role_assignment.scope, CourseOverviewData):
+                course_access_role_kwargs["org"] = role_assignment.scope.org
                 course_access_role_kwargs["course_id"] = scope_external_key
             elif isinstance(role_assignment.scope, OrgCourseOverviewGlobData):
                 course_access_role_kwargs["org"] = role_assignment.scope.org

openedx_authz/tests/test_migrations.py

@@ -809,7 +809,7 @@ def test_authz_rollback_course_authoring_command(self, mock_rollback):
         call_command("authz_rollback_course_authoring", "--course-id-list", self.course_id)
 
         mock_rollback.assert_called_once()
-        _, kwargs = mock_rollback.call_args
+        args, kwargs = mock_rollback.call_args
 
         self.assertEqual(kwargs["delete_after_migration"], False)