CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-30 21:11:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

beeminder: Strengthen types using WildValue.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2021-12-16 22:03:22 -08:00 committed by Tim Abbott
parent 950e3cfcaf
commit af565ef32f
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/webhooks/beeminder/tests.py
View File

@ -1,5 +1,4 @@
from typing import Any
from unittest.mock import patch
from unittest.mock import MagicMock, patch
from zerver.lib.test_classes import WebhookTestCase
@ -10,7 +9,7 @@ class BeeminderHookTests(WebhookTestCase):
WEBHOOK_DIR_NAME = "beeminder"
@patch("zerver.webhooks.beeminder.view.time.time")
def test_beeminder_derail(self, time: Any) -> None:
def test_beeminder_derail(self, time: MagicMock) -> None:
time.return_value = 1517739100 # 5.6 hours from fixture value
expected_topic = "beekeeper"
expected_message = """
@ -26,7 +25,7 @@ You are going to derail from goal **gainweight** in **5.6 hours**. You need **+2
)
@patch("zerver.webhooks.beeminder.view.time.time")
def test_beeminder_derail_worried(self, time: Any) -> None:
def test_beeminder_derail_worried(self, time: MagicMock) -> None:
time.return_value = 1517739100 # 5.6 hours from fixture value
expected_topic = "beekeeper"
expected_message = """

14
zerver/webhooks/beeminder/view.py
View File

@ -1,12 +1,12 @@
# Webhooks for external integrations.
import time
from typing import Any, Dict
from django.http import HttpRequest, HttpResponse
from zerver.decorator import webhook_view
from zerver.lib.request import REQ, has_request_variables
from zerver.lib.response import json_success
from zerver.lib.validator import WildValue, check_int, check_string, to_wild_value
from zerver.lib.webhooks.common import check_send_webhook_message
from zerver.models import UserProfile
@ -17,8 +17,8 @@ MESSAGE_TEMPLATE = (
)
def get_time(payload: Dict[str, Any]) -> Any:
losedate = payload["goal"]["losedate"]
def get_time(payload: WildValue) -> float:
losedate = payload["goal"]["losedate"].tame(check_int)
time_remaining = (losedate - time.time()) / 3600
return time_remaining
@ -28,12 +28,12 @@ def get_time(payload: Dict[str, Any]) -> Any:
def api_beeminder_webhook(
request: HttpRequest,
user_profile: UserProfile,
payload: Dict[str, Any] = REQ(argument_type="body"),
payload: WildValue = REQ(argument_type="body", converter=to_wild_value),
) -> HttpResponse:
goal_name = payload["goal"]["slug"]
limsum = payload["goal"]["limsum"]
pledge = payload["goal"]["pledge"]
goal_name = payload["goal"]["slug"].tame(check_string)
limsum = payload["goal"]["limsum"].tame(check_string)
pledge = payload["goal"]["pledge"].tame(check_int)
time_remain = get_time(payload) # time in hours
# To show user's probable reaction by looking at pledge amount
if pledge > 0: