Simplify pull request handler (#286)

* Simplify pull request handler

* Remove redundant test

Author: mfosterw

democrasite/webiscite/tests/test_webhooks.py

@@ -136,15 +136,6 @@ def test_pr_handler_dispatch_invalid(self, pr_handler: PullRequestHandler):
         assert response.status_code == HTTPStatus.BAD_REQUEST
         assert response.content == b"Unsupported action: test"
 
-    def test_pr_handler_get_response(self, pr_handler: PullRequestHandler, bill: Bill):
-        response = pr_handler.get_response("test", bill.pull_request, bill)
-
-        assert json.loads(response.content) == {
-            "action": "test",
-            "pull_request": bill.pull_request.number,
-            "bill": bill.id,
-        }
-
     @patch("requests.get")
     def test_opened(self, mock_get, user: User, pr_handler: PullRequestHandler):
         pr = GithubPullRequestFactory.create()

democrasite/webiscite/webhooks.py

@@ -42,10 +42,11 @@ def __call__(self, payload: dict) -> HttpResponse:
             An object containing the primary keys of the pull request and bill affected,
             if applicable
         """
+        action = payload["action"]
         handler: (
             Callable[[dict[str, Any]], tuple[PullRequest | None, Bill | None]] | None
         )
-        handler = getattr(self, payload["action"], None)
+        handler = getattr(self, action, None)
         if handler is None:
             logger.warning(
                 "GitHub pull request webhook failed with unsupported action: %s",
@@ -54,18 +55,14 @@ def __call__(self, payload: dict) -> HttpResponse:
             return HttpResponseBadRequest(f"Unsupported action: {payload['action']}")
 
         pull_request, bill = handler(payload["pull_request"])
-        return self.get_response(payload["action"], pull_request, bill)
 
-    def get_response(
-        self, action: str, pull_request: PullRequest | None, bill: Bill | None
-    ) -> JsonResponse:
-        body: dict[str, str | int] = {"action": action}
+        response = {"action": action}
         if pull_request is not None:
-            body["pull_request"] = pull_request.number
+            response["pull_request"] = pull_request.number
         if bill is not None:
-            body["bill"] = bill.id
+            response["bill"] = bill.id
 
-        return JsonResponse(body)
+        return JsonResponse(response)
 
     def reopened(self, pr: dict[str, Any]) -> tuple[PullRequest, Bill | None]:
         return self.opened(pr)