fix TypeError and update tests (#222)

* fix TypeError and update tests

* bump version to 7.3.1

Author: aschuman0

tests/push/test_push.py

@@ -709,9 +709,7 @@ def test_local_scheduled_payload(self):
         sched = ua.ScheduledPush(None)
         sched.push = p
         sched.name = "a schedule in device local time"
-        sched.schedule = ua.local_scheduled_time(
-            datetime.datetime(2015, 1, 1, 12, 0, 0)
-        )
+        sched.schedule = ua.local_scheduled_time(datetime.datetime(2015, 1, 1, 12, 0, 0))
 
         self.assertEqual(
             sched.payload,
@@ -751,6 +749,50 @@ def test_push_success(self):
             pr = push.send()
             self.assertEqual(pr.push_ids, ["0492662a-1b52-4343-a1f9-c6b0c72931c0"])
 
+    def test_push_with_message_only_no_notification(self):
+        """Test that sending a push with only a message (no notification) works correctly."""
+        with mock.patch.object(ua.Airship, "_request") as mock_request:
+            response = requests.Response()
+            response._content = json.dumps(
+                {
+                    "ok": True,
+                    "operation_id": "780f6697-6b4e-49ea-ac91-b5c184516a15",
+                    "push_ids": ["0b4b5180-b990-11f0-a452-000a1acef8dc"],
+                    "message_ids": ["C0tRgLmQEfCkUgAKGs743A"],
+                    "content_urls": [],
+                    "localized_ids": [],
+                }
+            ).encode("utf-8")
+            response.status_code = 202
+            mock_request.return_value = response
+
+            airship = ua.Airship(TEST_KEY, TEST_SECRET)
+            push = ua.Push(airship)
+            push.audience = ua.named_user("123abc")
+            push.device_types = ua.device_types("ios")
+            push.message = ua.message(
+                "Hello",
+                "Hello World",
+                content_type="plain/text",
+            )
+            # Verify the payload structure (notification should be omitted when None)
+            self.assertEqual(
+                push.payload,
+                {
+                    "audience": {"named_user": "123abc"},
+                    "device_types": ["ios"],
+                    "message": {
+                        "title": "Hello",
+                        "body": "Hello World",
+                        "content_type": "plain/text",
+                    },
+                },
+            )
+            # This should not raise a TypeError
+            pr = push.send()
+            self.assertEqual(pr.push_ids, ["0b4b5180-b990-11f0-a452-000a1acef8dc"])
+            self.assertEqual(pr.payload.get("message_ids"), ["C0tRgLmQEfCkUgAKGs743A"])
+
     def test_schedule_success(self):
         with mock.patch.object(ua.Airship, "_request") as mock_request:
             response = requests.Response()
@@ -803,9 +845,7 @@ def test_scheduled_template(self):
             sched.schedule = ua.scheduled_time(datetime.datetime.now())
 
             template_push = ua.TemplatePush(airship)
-            template_push.audience = ua.ios_channel(
-                "780ba0c5-45be-4f29-befa-39135cb05b59"
-            )
+            template_push.audience = ua.ios_channel("780ba0c5-45be-4f29-befa-39135cb05b59")
             template_push.device_types = ua.device_types("ios")
             template_push.merge_data = ua.merge_data(
                 template_id="780ba0c5-45be-4f29-befa-39135cb05b59",
@@ -880,8 +920,7 @@ def test_schedule_from_url(self):
             mock_request.return_value = response
 
             url = (
-                "https://go.urbanairship.com/api/schedules/"
-                "0492662a-1b52-4343-a1f9-c6b0c72931c0"
+                "https://go.urbanairship.com/api/schedules/" "0492662a-1b52-4343-a1f9-c6b0c72931c0"
             )
 
             airship = ua.Airship(TEST_KEY, TEST_SECRET)
@@ -902,8 +941,7 @@ def test_cancel(self):
             mock_request.return_value = response
 
             url = (
-                "https://go.urbanairship.com/api/schedules/"
-                "0492662a-1b52-4343-a1f9-c6b0c72931c0"
+                "https://go.urbanairship.com/api/schedules/" "0492662a-1b52-4343-a1f9-c6b0c72931c0"
             )
             sched.url = url
 
@@ -917,8 +955,7 @@ def test_update_schedule(self):
 
         with mock.patch.object(ua.Airship, "_request") as mock_request:
             url = (
-                "https://go.urbanairship.com/api/schedules/"
-                "0492662a-1b52-4343-a1f9-c6b0c72931c0"
+                "https://go.urbanairship.com/api/schedules/" "0492662a-1b52-4343-a1f9-c6b0c72931c0"
             )
 
             response = requests.Response()
@@ -947,8 +984,12 @@ def test_update_schedule(self):
             sched.update()
 
     def test_schedules_listing(self):
-        self.url1 = "https://go.urbanairship.com/api/schedules/16153636-4434-441f-bad4-86ab0f1778bc"
-        self.url2 = "https://go.urbanairship.com/api/schedules/ee03b71b-5b88-4b87-93cf-2d9dc8b87e7c"
+        self.url1 = (
+            "https://go.urbanairship.com/api/schedules/16153636-4434-441f-bad4-86ab0f1778bc"
+        )
+        self.url2 = (
+            "https://go.urbanairship.com/api/schedules/ee03b71b-5b88-4b87-93cf-2d9dc8b87e7c"
+        )
 
         with mock.patch.object(ua.Airship, "_request") as mock_request:
             response = requests.Response()

urbanairship/__about__.py

@@ -1 +1 @@
-__version__ = "7.3.0"
+__version__ = "7.3.1"

urbanairship/push/core.py

@@ -56,9 +56,10 @@ def __init__(self, airship: BaseClient) -> None:
     def payload(self) -> Dict[str, Any]:
         data: Dict[str, Any] = {
             "audience": self.audience,
-            "notification": self.notification,
             "device_types": self.device_types,
         }
+        if self.notification is not None:
+            data["notification"] = self.notification
         if self.options is not None:
             data["options"] = self.options
         if self.campaigns is not None:
@@ -105,12 +106,14 @@ def send(self) -> PushResponse:
         :raises ValueError: Required keys missing or incorrect values included.
         :raises ConnectionFailure: Connection failed.
         """
-        if "email" in self.payload["notification"]:
+        if self.notification is not None and "email" in self.notification:
             if self.payload["device_types"] == "all":
                 raise ValueError("device_types cannot be all when including an email override")
             if "email" not in self.payload["device_types"]:
                 raise ValueError("email must be in device_types if email override is included")
-        if "email" in self.payload["device_types"] and "email" not in self.payload["notification"]:
+        if "email" in self.payload["device_types"] and (
+            self.notification is None or "email" not in self.notification
+        ):
             raise ValueError("email override must be included when email is in device_types")
 
         body = json.dumps(self.payload)