Merge pull request #3675 from athenianco/duplicated-team-members

Duplicated team members

Author: se7entyse7en

server/athenian/api/controllers/settings_controller.py

@@ -1,4 +1,5 @@
 from bisect import bisect_left, bisect_right
+from collections import defaultdict
 from datetime import datetime, timezone
 import logging
 import re
@@ -253,21 +254,27 @@ async def set_jira_identities(request: AthenianWebRequest, body: dict) -> web.Re
         ),
     ]
     github_id_rows, jira_id_rows = await gather(*tasks)
-    github_id_map = {r[GitHubUser.login.name]: r[GitHubUser.node_id.name] for r in github_id_rows}
-    jira_id_map = {r[JIRAUser.display_name.name]: r[JIRAUser.id.name] for r in jira_id_rows}
+    github_id_map = defaultdict(list)
+    for r in github_id_rows:
+        github_id_map[r[GitHubUser.login.name]].append(
+            r[GitHubUser.node_id.name])
+
+    jira_id_map = {
+        r[JIRAUser.display_name.name]: r[JIRAUser.id.name]
+        for r in jira_id_rows
+    }
     cleared_github_ids = set()
     updated_maps = []
     for i, change in enumerate(request_model.changes):
-        try:
-            github_id = github_id_map[change.developer_id.rsplit("/", 1)[1]]
-        except KeyError:
+        github_ids = github_id_map[change.developer_id.rsplit("/", 1)[1]]
+        if len(github_ids) == 0:
             raise ResponseError(
                 InvalidRequestError(
                     detail="Developer was not found.", pointer=f".changes[{i}].developer_id",
                 ),
             )
         if change.jira_name is None:
-            cleared_github_ids.add(github_id)
+            cleared_github_ids.update(github_ids)
             continue
         if not change.jira_name:
             raise ResponseError(
@@ -283,7 +290,9 @@ async def set_jira_identities(request: AthenianWebRequest, body: dict) -> web.Re
                     detail="JIRA user was not found.", pointer=f".changes[{i}].jira_name",
                 ),
             )
-        updated_maps.append((github_id, jira_id))
+
+        for github_id in github_ids:
+            updated_maps.append((github_id, jira_id))
 
     try:
         async with sdb.connection() as sdb_conn:

server/athenian/api/internal/jira.py

@@ -348,13 +348,18 @@ async def _load_mapped_jira_users(
         get_jira_id(account, sdb, cache),
     ]
     map_rows, jira_id = await gather(*tasks)
-    jira_user_ids = {r[1]: r[0] for r in map_rows}
+    gh_uid_to_jira_uid = {r["github_user_id"]: r["jira_user_id"] for r in map_rows}
     name_rows = await mdb.fetch_all(
         select(JIRAUser.id, JIRAUser.display_name).where(
-            JIRAUser.acc_id == jira_id, JIRAUser.id.in_(jira_user_ids),
+            JIRAUser.acc_id == jira_id, JIRAUser.id.in_(
+                gh_uid_to_jira_uid.values()),
         ),
     )
-    return {jira_user_ids[row[0]]: row[1] for row in name_rows}
+    jira_uid_to_jira_name = {r["id"]: r["display_name"] for r in name_rows}
+    return {
+        gh_uid: jira_uid_to_jira_name[jira_uid]
+        for gh_uid, jira_uid in gh_uid_to_jira_uid.items()
+    }
 
 
 @cached(