fixes

Author: Bala-Sakabattula

sync2jira/upstream_issue.py

@@ -110,7 +110,7 @@
 """
 
 
-def _apply_github_filters(item, _filter, upstream, item_type="issue"):
+def passes_github_filters(item, config, upstream, item_type="issue"):
     """
     Apply GitHub filters (labels, milestone, other fields) to an item.
 
@@ -121,7 +121,11 @@ def _apply_github_filters(item, _filter, upstream, item_type="issue"):
     :returns: True if item passes all filters, False otherwise
     :rtype: bool
     """
-    for key, expected in _filter.items():
+    filter_config = (
+        config["sync2jira"].get("filters", {}).get("github", {}).get(upstream, {})
+    )
+
+    for key, expected in filter_config.items():
         if key == "labels":
             # special handling for label: we look for it in the list of labels
             actual = {label["name"] for label in item.get("labels", [])}
@@ -182,10 +186,8 @@ def handle_github_message(body, config, is_pr=False):
         )
         return None
 
-    _filter = config["sync2jira"].get("filters", {}).get("github", {}).get(upstream, {})
-
     issue = body["issue"]
-    if not _apply_github_filters(issue, _filter, upstream, "issue"):
+    if not passes_github_filters(issue, config, upstream, "issue"):
         return None
     if is_pr and not issue.get("closed_at"):
         log.debug(

sync2jira/upstream_pr.py

@@ -49,10 +49,8 @@ def handle_github_message(body, config, suffix):
         log.debug("%r not in Github PR map: %r", upstream, mapped_repos.keys())
         return None
 
-    _filter = config["sync2jira"].get("filters", {}).get("github", {}).get(upstream, {})
-
     pr = body["pull_request"]
-    if not u_issue._apply_github_filters(pr, _filter, upstream, item_type="PR"):
+    if not u_issue.passes_github_filters(pr, config, upstream, item_type="PR"):
         return None
     github_client = Github(config["sync2jira"]["github_token"])
     reformat_github_pr(pr, upstream, github_client)

tests/test_upstream_issue.py

@@ -767,3 +767,51 @@ def test_add_project_values_early_exit(self, mock_requests_post):
             self.assertIsNone(result)
             # Reset mock
             mock_requests_post.reset_mock()
+
+    def test_passes_github_filters(self):
+        """
+        Test passes_github_filters for labels, milestone, and other fields.
+        Tests all filtering conditions in one test case.
+        """
+        self.mock_config["sync2jira"]["filters"]["github"]["org/repo"]["milestone"] = 1
+        upstream = "org/repo"
+
+        # Test 1: Bad label - should return False
+        item = {
+            "labels": [{"name": "bad_label"}],
+            "milestone": {"number": 1},
+            "filter1": "filter1",
+        }
+        self.assertFalse(
+            u.passes_github_filters(item, self.mock_config, upstream, item_type="issue")
+        )
+
+        # Test 2: Bad milestone - should return False
+        item = {
+            "labels": [{"name": "custom_tag"}],
+            "milestone": {"number": 456},
+            "filter1": "filter1",
+        }
+        self.assertFalse(
+            u.passes_github_filters(item, self.mock_config, upstream, item_type="issue")
+        )
+
+        # Test 3: Bad other field (filter1) - should return False
+        item = {
+            "labels": [{"name": "custom_tag"}],
+            "milestone": {"number": 1},
+            "filter1": "filter2",
+        }
+        self.assertFalse(
+            u.passes_github_filters(item, self.mock_config, upstream, item_type="issue")
+        )
+
+        # Test 4: All filters pass - should return True
+        item = {
+            "labels": [{"name": "custom_tag"}],
+            "milestone": {"number": 1},
+            "filter1": "filter1",
+        }
+        self.assertTrue(
+            u.passes_github_filters(item, self.mock_config, upstream, item_type="issue")
+        )

tests/test_upstream_pr.py

@@ -345,3 +345,43 @@ def test_handle_github_message_filtering_passes(
         mock_pr_from_github.assert_called_once()
         mock_github.assert_called_with("mock_token")
         self.assertEqual("Successful Call!", response)
+
+    @mock.patch("sync2jira.upstream_pr.u_issue.passes_github_filters")
+    @mock.patch("sync2jira.intermediary.PR.from_github")
+    def test_handle_github_message_filter_returns_false(
+        self, mock_pr_from_github, mock_passes
+    ):
+        """When passes_github_filters returns False, handle_github_message returns None."""
+        mock_passes.return_value = False
+
+        response = u.handle_github_message(
+            body=self.mock_github_message_body,
+            config=self.mock_config,
+            suffix="mock_suffix",
+        )
+
+        mock_passes.assert_called_once()
+        mock_pr_from_github.assert_not_called()
+        self.assertIsNone(response)
+
+    @mock.patch(PATH + "Github")
+    @mock.patch("sync2jira.upstream_pr.u_issue.passes_github_filters")
+    @mock.patch("sync2jira.intermediary.PR.from_github")
+    def test_handle_github_message_filter_returns_true(
+        self, mock_pr_from_github, mock_passes, mock_github
+    ):
+        """When passes_github_filters returns True, handle_github_message proceeds to PR.from_github."""
+        mock_passes.return_value = True
+        mock_pr_from_github.return_value = "Successful Call!"
+        mock_github.return_value = self.mock_github_client
+
+        response = u.handle_github_message(
+            body=self.mock_github_message_body,
+            config=self.mock_config,
+            suffix="mock_suffix",
+        )
+
+        mock_passes.assert_called_once()
+        mock_pr_from_github.assert_called_once()
+        mock_github.assert_called_with("mock_token")
+        self.assertEqual("Successful Call!", response)