not_landed: remove duplicate request to get user nicks

Author: Jubintgh

bugbot/rules/not_landed.py

@@ -263,37 +263,18 @@ def get_bz_userid(self, phids):
             return {}
 
         def handler(user, data):
-            data[str(user["id"])] = user["name"]
+            data[str(user["id"])] = (user["name"], user["nick"])
 
         data = {}
         BugzillaUser(
             user_names=list(users.values()),
-            include_fields=["id", "name"],
+            include_fields=["id", "name", "nick"],
             user_handler=handler,
             user_data=data,
         ).wait()
 
         return {phid: data[id] for phid, id in users.items()}
 
-    def get_nicks(self, nicknames):
-        def handler(user, data):
-            data[user["name"]] = user["nick"]
-
-        users = set(nicknames.values())
-        data = {}
-        if users:
-            BugzillaUser(
-                user_names=list(users),
-                include_fields=["name", "nick"],
-                user_handler=handler,
-                user_data=data,
-            ).wait()
-
-        for bugid, name in nicknames.items():
-            nicknames[bugid] = (name, data[name])
-
-        return nicknames
-
     def get_bz_params(self, date):
         self.date = lmdutils.get_date_ymd(date)
         fields = ["flags", "depends_on"]
@@ -340,7 +321,6 @@ def get_bugs(self, date="today", bug_ids=[]):
 
         bz_reviewers = self.get_bz_userid(reviewers_phid)
         all_reviewers = set(bz_reviewers.keys())
-        nicknames = self.get_nicks(nicknames)
 
         for bugid, data in bugs_patch.items():
             res[bugid] = d = bugs[bugid]
@@ -349,7 +329,7 @@ def get_bugs(self, date="today", bug_ids=[]):
             nickname = d["nickname"]
 
             if not assignee:
-                assignee, nickname = nicknames[bugid]
+                assignee, nickname = bz_reviewers[nicknames[bugid]]
 
             if not assignee:
                 continue
@@ -360,7 +340,11 @@ def get_bugs(self, date="today", bug_ids=[]):
             if common:
                 reviewer = random.choice(list(common))
                 self.add_auto_ni(
-                    bugid, {"mail": bz_reviewers[reviewer], "nickname": None}
+                    bugid,
+                    {
+                        "mail": bz_reviewers[reviewer][0],
+                        "nickname": bz_reviewers[reviewer][1],
+                    },
                 )
 
         return res