From b143172df821572d1b84911c31f30a978adc6e91 Mon Sep 17 00:00:00 2001
From: BoYanZh <bomingzh@sjtu.edu.cn>
Date: Wed, 15 Sep 2021 15:28:42 +0800
Subject: [PATCH] fix: name converter

---
 joint_teapot/workers/canvas.py |  2 +-
 joint_teapot/workers/gitea.py  | 29 +++++++++++++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/joint_teapot/workers/canvas.py b/joint_teapot/workers/canvas.py
index 65ba319..234931d 100644
--- a/joint_teapot/workers/canvas.py
+++ b/joint_teapot/workers/canvas.py
@@ -18,7 +18,7 @@ class Canvas:
         self.students = self.course.get_users(
             enrollment_type=["student"], include=["email"]
         )
-        for attr in ["sis_login_id", "sortable_name"]:
+        for attr in ["sis_login_id", "sortable_name", "name"]:
             if not hasattr(self.students[0], attr):
                 raise Exception(
                     f"Unable to gather students' {attr}, please contact the Canvas site admin"
diff --git a/joint_teapot/workers/gitea.py b/joint_teapot/workers/gitea.py
index dcd5b16..f322c9a 100644
--- a/joint_teapot/workers/gitea.py
+++ b/joint_teapot/workers/gitea.py
@@ -7,6 +7,7 @@ import focs_gitea
 from canvasapi.group import Group, GroupMembership
 from canvasapi.paginated_list import PaginatedList
 from canvasapi.user import User
+from focs_gitea.rest import ApiException
 from loguru import logger
 
 from joint_teapot.config import settings
@@ -20,8 +21,9 @@ class PermissionEnum(Enum):
 
 
 def default_repo_name_convertor(user: User) -> Optional[str]:
-    id, name = user.sis_login_id, user.sortable_name
+    id, name = user.sis_login_id, user.name
     eng = re.sub("[\u4e00-\u9fa5]", "", name)
+    eng = eng.replace(",", "")
     eng = "".join([word[0].capitalize() + word[1:] for word in eng.split()])
     return f"{eng}{id}"
 
@@ -84,22 +86,25 @@ class Gitea:
             if repo_name is None:
                 continue
             repo_names.append(repo_name)
-            repo = self.organization_api.create_org_repo(
-                self.org_name,
-                body={
-                    "auto_init": False,
-                    "default_branch": "master",
-                    "name": repo_name,
-                    "private": True,
-                    "template": False,
-                    "trust_model": "default",
-                },
-            )
+            body = {
+                "auto_init": False,
+                "default_branch": "master",
+                "name": repo_name,
+                "private": True,
+                "template": False,
+                "trust_model": "default",
+            }
             try:
+                repo = self.organization_api.create_org_repo(self.org_name, body=body)
                 username = self._get_username_by_canvas_student(student)
                 self.repository_api.repo_add_collaborator(
                     self.org_name, repo.name, username
                 )
+            except ApiException as e:
+                if e.status == 409:
+                    logger.info(f"Peronsal repo for {student} already exists.")
+                else:
+                    logger.error(e)
             except Exception as e:
                 logger.error(e)
         return repo_names