code review

2bndy5 · web-flow · commit 3374bc6738a6 · 2024-12-11T06:02:55.000-08:00
clean up and various fixes
diff --git a/cpp_linter/rest_api/github_api.py b/cpp_linter/rest_api/github_api.py
@@ -37,8 +37,7 @@
     retry="retry-after",
 )
 
-QUERY_REVIEW_COMMENTS = """
- query($owner: String!, $name: String!, $number: Int!) {
+QUERY_REVIEW_COMMENTS = """query($owner: String!, $name: String!, $number: Int!) {
      repository(owner: $owner, name: $name) {
          pullRequest(number: $number) {
             id
@@ -66,38 +65,31 @@
             }
         }
     }
-}
-"""
+}"""
 
-RESOLVE_REVIEW_COMMENT = """
-mutation($threadId: ID!) {
+RESOLVE_REVIEW_COMMENT = """mutation($threadId: ID!) {
     resolveReviewThread(input: {threadId: $threadId, clientMutationId: "github-actions"}) {
         thread {
             id
         }
     }
-}
-"""
+}"""
 
-DELETE_REVIEW_COMMENT = """
-mutation($id: ID!) {
+DELETE_REVIEW_COMMENT = """mutation($id: ID!) {
     deletePullRequestReviewComment(input: {id: $id, clientMutationId: "github-actions"}) {
         pullRequestReviewComment {
             id
         }
     }
-}
-"""
+}"""
 
-HIDE_REVIEW_COMMENT = """
-mutation($subjectId: ID!) {
+HIDE_REVIEW_COMMENT = """mutation($subjectId: ID!) {
     minimizeComment(input: {classifier:OUTDATED, subjectId: $subjectId, clientMutationId: "github-actions"}) {
         minimizedComment {
             isMinimized
         }
     }
-}
-"""
+}"""
 
 
 class GithubApiClient(RestApiClient):
@@ -731,24 +723,12 @@ def _close_review_comment(
             data=json.dumps({"query": mutation, "variables": variables}),
             strict=False,
         )
-        if response.status_code != 200:
-            logger.error(
-                "Failed to %s review thread comment: %d",
-                operation,
-                response.status_code,
-            )
-        elif "errors" in response.json():
-            error_msg = response.json()["errors"][0]["message"]
-            if "Resource not accessible by integration" in error_msg:
-                logger.error(
-                    "Changing review thread comments requires `contents: write` permission."
-                )
-            else:
-                logger.error(
-                    "Failed to %s review thread comment: %s", operation, error_msg
-                )
-        else:
-            logger.debug("Review comment thread %sd: %s", operation, thread_id)
+        logger.debug(
+            "%s review comment thread %s (thread_id: %s)",
+            operation.title(),
+            "failed" if response.status_code != 200 else "succeeded",
+            thread_id,
+        )
 
     def _hide_stale_reviews(self, ignored_reviews: List[str]):
         """Hide all review comments that were previously created by cpp-linter
@@ -777,17 +757,8 @@ def _hide_stale_reviews(self, ignored_reviews: List[str]):
                         data=json.dumps({"query": mutation, "variables": variables}),
                         strict=False,
                     )
-                    if response.status_code != 200:
-                        logger.error(
-                            "Failed to hide review comment: %d", response.status_code
-                        )
-                    elif "errors" in response.json():
-                        error_msg = response.json()["errors"][0]["message"]
-                        if "Resource not accessible by integration" in error_msg:
-                            logger.error(
-                                "Hiding review comments requires `contents: write` permission."
-                            )
-                        else:
-                            logger.error("Hiding review comment failed: %s", error_msg)
-                    else:
-                        logger.debug("Review comment minimized: %s", review["node_id"])
+                    logger.debug(
+                        "Minimized review comment: %s (node_id: %s)",
+                        repr(response.status_code != 200).lower(),
+                        review["node_id"],
+                    )
diff --git a/tests/reviews/test_pr_review.py b/tests/reviews/test_pr_review.py
@@ -145,12 +145,13 @@ def test_post_review(
 
         def graphql_callback(request, context):
             context.status_code = 200
-            if request.data.startswith("query"):
+            query: str = request.json()["query"]
+            if query.startswith("query"):
                 # get existing review comments
                 return (cache_path / "pr_reviews_graphql.json").read_text(
                     encoding="utf-8"
                 )
-            elif "resolveReviewThread" in request.data:
+            elif "resolveReviewThread" in query:
                 # resolve review
                 id_pos = request.data.find('threadId:"') + 10
                 id_end_pos = request.data.find('"', id_pos + 1)
@@ -167,7 +168,7 @@ def graphql_callback(request, context):
 }"""
                     % id_tag
                 )
-            elif "deletePullRequestReviewComment" in request.data:
+            elif "deletePullRequestReviewComment" in query:
                 # delete PR or minimizeComment
                 id_pos = request.data.find('id:"') + 4
                 id_end_pos = request.data.find('"', id_pos + 1)
@@ -184,7 +185,7 @@ def graphql_callback(request, context):
 }"""
                     % id_tag
                 )
-            elif "minimizeComment" in request.data:
+            elif "minimizeComment" in query:
                 # minimizeComment
                 return """{
   "data": {
@@ -195,7 +196,13 @@ def graphql_callback(request, context):
     }
   }
 }"""
-            return "errors"
+            return json.dumps(
+                {
+                    "errors": [
+                        {"message": "Failed to parse query when mocking a response"}
+                    ]
+                }
+            )
 
         mock.post(graphql_url, text=graphql_callback)
 
