Merge pull request #4332 from nickmango/feature/disable-co-auth

Feature/Co Auth disabled
communitybridge · May 21, 2024 · 16f147c · 16f147c
2 parents ec43350 + 3636de5
commit 16f147c
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/cla-backend/cla/models/github_models.py b/cla-backend/cla/models/github_models.py
@@ -1388,12 +1388,12 @@ def get_author_summary(commit, pr, installation_id) -> List[UserCommitSummary]:
             # check for co-author details
             # issue # 3884
             commit_authors.append(commit_author_summary)
-            co_authors = cla.utils.get_co_authors_from_commit(commit)
-            with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
-                for co_author in co_authors:
-                    commit_authors.append(
-                        executor.submit(get_co_author_commits, co_author, commit, pr, installation_id).result()
-                    )
+            # co_authors = cla.utils.get_co_authors_from_commit(commit)
+            # with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
+            #     for co_author in co_authors:
+            #         commit_authors.append(
+            #             executor.submit(get_co_author_commits, co_author, commit, pr, installation_id).result()
+            #         )
 
             return commit_authors
         except (GithubException, IncompletableObject) as exc:

diff --git a/cla-backend/cla/tests/unit/test_github_models.py b/cla-backend/cla/tests/unit/test_github_models.py
@@ -11,42 +11,42 @@
 
 
 class TestGetPullRequestCommitAuthors(TestCase):
-    @patch("cla.utils.get_repository_service")
-    def test_get_pull_request_commit_with_co_author(self, mock_github_instance):
-        # Mock data
-        pull_request = MagicMock()
-        pull_request.number = 123
-        co_author = "co_author"
-        co_author_email = "co_author_email.gmail.com"
-        co_author_2 = "co_author_2"
-        co_author_email_2 = "co_author_email_2.gmail.com"
-        commit = MagicMock()
-        commit.sha = "fake_sha"
-        commit.author = MagicMock()
-        commit.author.id = 1
-        commit.author.login = "fake_login"
-        commit.author.name = "Fake Author"
-        commit.commit.message = f"fake message\n\nCo-authored-by: {co_author} <{co_author_email}>\n\nCo-authored-by: {co_author_2} <{co_author_email_2}>"
+    # @patch("cla.utils.get_repository_service")
+    # def test_get_pull_request_commit_with_co_author(self, mock_github_instance):
+    #     # Mock data
+    #     pull_request = MagicMock()
+    #     pull_request.number = 123
+    #     co_author = "co_author"
+    #     co_author_email = "co_author_email.gmail.com"
+    #     co_author_2 = "co_author_2"
+    #     co_author_email_2 = "co_author_email_2.gmail.com"
+    #     commit = MagicMock()
+    #     commit.sha = "fake_sha"
+    #     commit.author = MagicMock()
+    #     commit.author.id = 1
+    #     commit.author.login = "fake_login"
+    #     commit.author.name = "Fake Author"
+    #     commit.commit.message = f"fake message\n\nCo-authored-by: {co_author} <{co_author_email}>\n\nCo-authored-by: {co_author_2} <{co_author_email_2}>"
 
-        commit.author.email = "[email protected]"
-        pull_request.get_commits.return_value.__iter__.return_value = [commit]
+    #     commit.author.email = "[email protected]"
+    #     pull_request.get_commits.return_value.__iter__.return_value = [commit]
 
-        mock_user = Mock(id=2, login="co_author_login")
-        mock_user_2 = Mock(id=3, login="co_author_login_2")
+    #     mock_user = Mock(id=2, login="co_author_login")
+    #     mock_user_2 = Mock(id=3, login="co_author_login_2")
 
-        mock_github_instance.return_value.get_github_user_by_email.side_effect = (
-            lambda email, _: mock_user if email == co_author_email else mock_user_2
-        )
+    #     mock_github_instance.return_value.get_github_user_by_email.side_effect = (
+    #         lambda email, _: mock_user if email == co_author_email else mock_user_2
+    #     )
 
-        # Call the function
-        result = get_pull_request_commit_authors(pull_request, "fake_installation_id")
+    #     # Call the function
+    #     result = get_pull_request_commit_authors(pull_request, "fake_installation_id")
 
-        # Assertions
-        self.assertEqual(len(result), 3)
-        self.assertIn(co_author_email, [author.author_email for author in result])
-        self.assertIn(co_author_email_2, [author.author_email for author in result])
-        self.assertIn("fake_login", [author.author_login for author in result])
-        self.assertIn("co_author_login", [author.author_login for author in result])
+    #     # Assertions
+    #     self.assertEqual(len(result), 3)
+    #     self.assertIn(co_author_email, [author.author_email for author in result])
+    #     self.assertIn(co_author_email_2, [author.author_email for author in result])
+    #     self.assertIn("fake_login", [author.author_login for author in result])
+    #     self.assertIn("co_author_login", [author.author_login for author in result])
 
     @patch("cla.utils.get_repository_service")
     def test_get_co_author_commits_invalid_gh_email(self, mock_github_instance):