fixes

Author: Bala-Sakabattula

sync2jira/downstream_issue.py

@@ -316,7 +316,7 @@ def get_existing_jira_issue(client, issue, config):
     :rtype: JIssue or None
     """
 
-    issue_keys = _get_existing_jira_issue_query(issue)
+    issue_keys = _get_existing_jira_issue_keys(issue)
     if not issue_keys:
         return None
     jql = f"key in ({','.join(issue_keys)})"
@@ -370,22 +370,23 @@ def get_existing_jira_issue(client, issue, config):
     return results[0]
 
 
-def _get_existing_jira_issue_query(issue: Issue) -> tuple[str, ...]:
+def _get_existing_jira_issue_keys(issue: Issue) -> tuple[str, ...]:
     """
-    Generate a JQL query to find downstream issues corresponding to a given
-    upstream issue.  Return empty tuple if no matches were found in either our local
-    cache or in the Dataverse.
+    Retrieve downstream Jira issue keys corresponding to a given upstream issue.
+
+    The function first checks the local cache; if no cached result is found,
+    it queries Snowflake. Returns empty tuple if no matches are found.
 
     :param sync2jira.intermediary.Issue issue: Issue object
-    :returns: A string containing the JQL query or None if no matches
-    :rtype: Tuple[tuple[str, ...]
+    :returns: A tuple of Jira issue keys, or None if no matches are found
+    :rtype: Optional[Tuple[str, ...]]
     """
     if result := jira_cache.get(issue.url):
         issue_keys = (result,)
     else:
         results = execute_snowflake_query(issue)
         if not results:
-            return None
+            return ()
         issue_keys = tuple(row[0] for row in results)
 
     return issue_keys
@@ -448,7 +449,7 @@ def _jira_user_display_label(user) -> Optional[str]:
     """Best-effort display string for a Jira User (Cloud: displayName, else name)."""
     if not user:
         return None
-    return getattr(user, "displayName", getattr(user, "name", None))
+    return getattr(user, "displayName", None) or getattr(user, "name", None)
 
 
 def check_comments_for_duplicate(client, result, username):

tests/test_downstream_issue.py

@@ -269,9 +269,9 @@ class MockIssue(object):
         )
 
     @mock.patch(PATH + "_filter_downstream_issues")
-    @mock.patch(PATH + "_get_existing_jira_issue_query")
+    @mock.patch(PATH + "_get_existing_jira_issue_keys")
     @mock.patch("jira.client.JIRA")
-    def test_get_existing_newstyle(self, mock_client, mock_get_query, mock_filter):
+    def test_get_existing_newstyle(self, mock_client, mock_get_keys, mock_filter):
         """
         This tests 'get_existing_jira_issue' function.
         """
@@ -290,7 +290,7 @@ def test_get_existing_newstyle(self, mock_client, mock_get_query, mock_filter):
 
         scenarios = (
             {
-                "scenario": "_get_existing_jira_issue_query returns no keys",
+                "scenario": "_get_existing_jira_issue_keys returns no keys",
                 "query_return": (),
                 "search_issues": None,
                 "filter_results": None,
@@ -347,7 +347,7 @@ def test_get_existing_newstyle(self, mock_client, mock_get_query, mock_filter):
 
         for x in scenarios:
             d.jira_cache = d.UrlCache()  # Clear the cache
-            mock_get_query.return_value = x["query_return"]
+            mock_get_keys.return_value = x["query_return"]
             mock_client.search_issues.return_value = x["search_issues"]
             mock_filter.return_value = x["filter_results"]
             mock_client.issue.side_effect = x["issue_side_effect"]
@@ -361,7 +361,7 @@ def test_get_existing_newstyle(self, mock_client, mock_get_query, mock_filter):
                 self.assertEqual(d.jira_cache[self.mock_issue.url], x["expected"].key)
 
     @mock.patch(PATH + "execute_snowflake_query")
-    def test_get_existing_jira_issue_query(self, mock_snowflake):
+    def test_get_existing_jira_issue_keys(self, mock_snowflake):
         scenarios = (
             {
                 "jira_cache": {self.mock_issue.url: "issue_key"},
@@ -371,7 +371,7 @@ def test_get_existing_jira_issue_query(self, mock_snowflake):
             {
                 "jira_cache": {},
                 "snowflake": (),
-                "expected": None,
+                "expected": (),
             },
             {
                 "jira_cache": {},
@@ -392,7 +392,7 @@ def test_get_existing_jira_issue_query(self, mock_snowflake):
         for x in scenarios:
             d.jira_cache = x["jira_cache"]
             mock_snowflake.return_value = x["snowflake"]
-            result = d._get_existing_jira_issue_query(self.mock_issue)
+            result = d._get_existing_jira_issue_keys(self.mock_issue)
             self.assertEqual(result, x["expected"])
 
     @mock.patch(PATH + "find_username")
@@ -1720,6 +1720,15 @@ def test_jira_user_display_label(self):
             d._jira_user_display_label(types.SimpleNamespace(name="bob_only")),
             "bob_only",
         )
+        self.assertEqual(
+            d._jira_user_display_label(
+                types.SimpleNamespace(displayName="Alice", name="bob")
+            ),
+            "Alice",
+        )
+        self.assertIsNone(
+            d._jira_user_display_label(types.SimpleNamespace()),
+        )
 
     @mock.patch("jira.client.JIRA")
     def test_check_comments_for_duplicates(self, mock_client):