JOJ/Joint-Teapot
13
3
Fork 2
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor: __get_username_by_canvas_student

Browse Source
This commit is contained in:
张泊明518370910136 2021-06-10 14:41:02 +08:00
parent 1b0edfc935
commit a0e9c6808a
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
joint_teapot/gitea.py
View File

@ -49,8 +49,8 @@ class Gitea:
return res["data"][0]["id"] return res["data"][0]["id"]
@lru_cache @lru_cache
def __get_username_by_student_id(self, student_id: str) -> str: def __get_username_by_canvas_student(self, student: User) -> str:
res = self.user_api.user_search(q=student_id, limit=1) res = self.user_api.user_search(q=student.sis_login_id, limit=1)
return res["data"][0]["username"] return res["data"][0]["username"]
def add_canvas_students_to_teams( def add_canvas_students_to_teams(
@ -59,7 +59,7 @@ class Gitea:
for team_name in team_names: for team_name in team_names:
team_id = self.__get_team_id_by_name(team_name) team_id = self.__get_team_id_by_name(team_name)
for student in students: for student in students:
username = self.__get_username_by_student_id(student.sis_login_id) username = self.__get_username_by_canvas_student(student)
self.organization_api.org_add_team_member(team_id, username) self.organization_api.org_add_team_member(team_id, username)
def create_personal_repos_for_canvas_students( def create_personal_repos_for_canvas_students(
@ -89,7 +89,7 @@ class Gitea:
self.repository_api.repo_add_collaborator( self.repository_api.repo_add_collaborator(
self.org_name, self.org_name,
repo["name"], repo["name"],
self.__get_username_by_student_id(student.sis_login_id), self.__get_username_by_canvas_student(student),
) )
return repo_names return repo_names
@ -150,7 +150,7 @@ class Gitea:
f"student with user_id {membership.user_id} not found" f"student with user_id {membership.user_id} not found"
) )
self.organization_api.org_add_team_member( self.organization_api.org_add_team_member(
team["id"], self.__get_username_by_student_id(student.sis_login_id) team["id"], self.__get_username_by_canvas_student(student)
) )
return repo_names return repo_names
@ -158,9 +158,7 @@ class Gitea:
self, students: PaginatedList self, students: PaginatedList
) -> List[List[Dict[str, Any]]]: ) -> List[List[Dict[str, Any]]]:
return [ return [
self.user_api.user_list_keys( self.user_api.user_list_keys(self.__get_username_by_canvas_student(student))
self.__get_username_by_student_id(student.sis_login_id)
)
for student in students for student in students
] ]