Merge pull request #519 from staticdev/bug/error-handling-merge-prs

Fix error handling merge PRs

Author: staticdev

src/git_portfolio/github_service.py

@@ -13,6 +13,12 @@
 import git_portfolio.request_objects.issue_list as il
 
 
+class GithubServiceError(Exception):
+    """Generic error for GithubService."""
+
+    pass
+
+
 class GithubService:
     """Github service class."""
 
@@ -46,11 +52,11 @@ def _test_connection(
         try:
             return connection.me()
         except github3.exceptions.AuthenticationFailed:
-            raise AttributeError("Invalid token.") from None
+            raise GithubServiceError("Invalid token.") from None
         except github3.exceptions.ConnectionError as github_error:
             raise ConnectionError() from github_error
         except github3.exceptions.IncompleteResponse:
-            raise AttributeError(
+            raise GithubServiceError(
                 "Invalid response. Your token might not be properly scoped."
             ) from None
 
@@ -94,7 +100,7 @@ def create_issue_from_repo(self, github_repo: str, issue: i.Issue) -> str:
             else:
                 return f"{github_repo}: {client_error.msg}.\n"
         except github3.exceptions.GitHubError as github_error:
-            raise AttributeError(
+            raise GithubServiceError(
                 f"{github_repo}: {github_error.msg}\n"
             ) from github_error
 
@@ -202,7 +208,7 @@ def create_pull_request_from_repo(
                     extra += f" Invalid field {error['field']}."
             return f"{github_repo}: {github_exception.msg}.{extra}\n"
         except github3.exceptions.GitHubError as github_error:
-            raise AttributeError(
+            raise GithubServiceError(
                 f"{github_repo}: {github_error.msg}\n"
             ) from github_error
 
@@ -233,7 +239,7 @@ def delete_branch_from_repo(self, github_repo: str, branch: str) -> str:
         except github3.exceptions.NotFoundError as github_exception:
             return f"{github_repo}: {github_exception.msg}.\n"
         except github3.exceptions.GitHubError as github_error:
-            raise AttributeError(
+            raise GithubServiceError(
                 f"{github_repo}: {github_error.msg}\n"
             ) from github_error
 
@@ -256,9 +262,14 @@ def merge_pull_request_from_repo(
         elif len(pulls) == 1:
             pull = pulls[0]
             output = ""
-            pull.merge()
-            output += f"{github_repo}: merge PR successful.\n"
-            return output
+            try:
+                pull.merge()
+                output += f"{github_repo}: merge PR successful.\n"
+                return output
+            except github3.exceptions.MethodNotAllowed as github_exception:
+                raise GithubServiceError(
+                    f"{github_repo}: {github_exception.msg}\n"
+                ) from github_exception
         else:
             return (
                 f"{github_repo}: unexpected number of PRs for "

src/git_portfolio/use_cases/gh.py

@@ -1,4 +1,5 @@
 """Base Github use case."""
+import traceback
 from typing import Any
 from typing import Union
 
@@ -28,9 +29,16 @@ def call_github_service(self, method: str, *args: Any, **kwargs: Any) -> None:
         try:
             method_to_call = getattr(self.github_service, method)
             self.output += method_to_call(*args, **kwargs)
-        except AttributeError as ae:
+        except ghs.GithubServiceError as gse:
             self.error = True
-            self.output += str(ae)
+            self.output += str(gse)
+        except Exception:
+            self.error = True
+            self.output += (
+                "An unexpected error occured. Please report at "
+                "https://github.com/staticdev/git-portfolio/issues/new "
+                f"with the following info:\n{traceback.format_exc()}"
+            )
 
     def generate_response(self) -> Union[res.ResponseFailure, res.ResponseSuccess]:
         """Create appropriate response object."""