diff --git a/src/sentry/integrations/slack/requests/base.py b/src/sentry/integrations/slack/requests/base.py index a769106a1740db..c0859c166a084c 100644 --- a/src/sentry/integrations/slack/requests/base.py +++ b/src/sentry/integrations/slack/requests/base.py @@ -115,7 +115,7 @@ def integration(self) -> RpcIntegration: return self._integration @property - def channel_id(self) -> str: + def channel_id(self) -> str | None: return get_field_id(self.data, "channel") @property @@ -123,12 +123,12 @@ def response_url(self) -> str: return self.data.get("response_url", "") @property - def team_id(self) -> str: - return get_field_id(self.data, "team") + def team_id(self) -> str | None: + return _get_field_id_option(self.data, "team") @property - def user_id(self) -> str: - return get_field_id(self.data, "user") + def user_id(self) -> str | None: + return _get_field_id_option(self.data, "user") @property def data(self) -> Mapping[str, Any]: diff --git a/tests/sentry/integrations/slack/test_requests.py b/tests/sentry/integrations/slack/test_requests.py index 80583a5126ef7b..6473eb925bb94e 100644 --- a/tests/sentry/integrations/slack/test_requests.py +++ b/tests/sentry/integrations/slack/test_requests.py @@ -118,6 +118,7 @@ def test_none_in_data(self): request.META = (options.get("slack.signing-secret"), self.request.body) slack_request = SlackRequest(request) + assert slack_request.team_id is None assert slack_request.logging_data == { "slack_channel_id": "1", "slack_user_id": "2",