make tests pass

Author: artcz

intbot/core/bot/channel_router.py

@@ -15,11 +15,11 @@
 
 @dataclass
 class DiscordChannel:
-    channel_id: int
+    channel_id: str
     channel_name: str
 
 
-dont_send_it = DiscordChannel(channel_id=0, channel_name="/dev/null")
+dont_send_it = DiscordChannel(channel_id="0", channel_name="/dev/null")
 
 
 class Channels:

intbot/core/endpoints/webhooks.py

@@ -21,6 +21,7 @@ def internal_webhook_endpoint(request):
         wh = Webhook.objects.create(
             source="internal",
             content=json.loads(request.body),
+            extra={},
         )
         process_webhook.enqueue(str(wh.uuid))
 
@@ -58,6 +59,7 @@ def github_webhook_endpoint(request):
             meta=github_headers,
             signature=signature,
             content=json.loads(request.body),
+            extra={},
         )
         process_webhook.enqueue(str(wh.uuid))
         return JsonResponse({"status": "ok"})

intbot/core/integrations/github.py

@@ -78,7 +78,6 @@ def as_discord_message(self):
         return f"[{self.title}]({self.url})"
 
 
-@dataclasses.dataclass
 class GithubDraftIssue(BaseModel):
     id: str
     title: str
@@ -122,9 +121,6 @@ def get_repository(self):
 class GithubProjectV2Item(GithubWebhook):
     # NOTE: This might be something for pydantic schemas in the future
 
-    def action(self):
-        return self.content["action"]
-
     def sender(self):
         sender = self.get_sender()
 
@@ -200,7 +196,7 @@ def as_discord_message(self) -> str:
         return message(
             **{
                 "sender": sender,
-                "action": self.action(),
+                "action": self.action,
                 "details": details,
             }
         )
@@ -220,7 +216,7 @@ def prep_github_webhook(wh: Webhook):
         wh.save()
         return wh
 
-    raise ValueError(f"Event {event} not supported")
+    raise ValueError(f"Event `{event}` not supported")
 
 
 # Should we have a separate GithubClient that encapsulates this?

intbot/tests/test_admin.py

@@ -7,7 +7,7 @@
 
 def test_admin_for_webhooks_sanity_check(admin_client):
     url = "/admin/core/webhook/"
-    wh = Webhook.objects.create(content={})
+    wh = Webhook.objects.create(content={}, extra={})
     assert wh.uuid
 
     response = admin_client.get(url)