fix messgae payload

Author: YonkoSam

.coverage

@@ -63,7 +63,7 @@ async def test_send_text_constructs_correct_payload_and_calls_post_internal(asyn
     expected_payload = {
         "to": test_to,
         "messageType": "text",
-        "text": {"body": test_body},
+        "text": test_body,
         "custom_param": "test_val"
     }
     assert args[1] == expected_payload
@@ -89,13 +89,15 @@ async def test_send_image(async_client_with_mocked_post, success_api_response_da
     response = await client.send_image(to=test_to, url=test_url, caption=test_caption)
 
     client._post_internal.assert_called_once_with(
-        "/send-message", 
+        "/send-message",
         {
-            "to": test_to, 
+            "to": test_to,
             "messageType": "image",
-            "image": {"url": test_url, "caption": test_caption}
+            "imageUrl": test_url,
+            "text": test_caption
         }
     )
+    assert isinstance(response, WasenderSendResult)
     assert response.response.success == True
     assert response.response.message == success_api_response_data["message"]
     assert response.rate_limit.limit == rate_limit_data["limit"]
@@ -115,13 +117,15 @@ async def test_send_video(async_client_with_mocked_post, success_api_response_da
     response = await client.send_video(to=test_to, url=test_url, caption=test_caption)
 
     client._post_internal.assert_called_once_with(
-        "/send-message", 
+        "/send-message",
         {
-            "to": test_to, 
+            "to": test_to,
             "messageType": "video",
-            "video": {"url": test_url, "caption": test_caption}
+            "videoUrl": test_url,
+            "text": test_caption
         }
     )
+    assert isinstance(response, WasenderSendResult)
     assert response.response.success == True
     assert response.response.message == success_api_response_data["message"]
 
@@ -141,13 +145,15 @@ async def test_send_document(async_client_with_mocked_post, success_api_response
     response = await client.send_document(to=test_to, url=test_url, filename=test_filename, caption=test_caption)
 
     client._post_internal.assert_called_once_with(
-        "/send-message", 
+        "/send-message",
         {
-            "to": test_to, 
+            "to": test_to,
             "messageType": "document",
-            "document": {"url": test_url, "filename": test_filename, "caption": test_caption}
+            "documentUrl": test_url,
+            "text": test_caption
         }
     )
+    assert isinstance(response, WasenderSendResult)
     assert response.response.success == True
     assert response.response.message == success_api_response_data["message"]
 
@@ -169,17 +175,17 @@ async def test_send_audio(async_client_with_mocked_post, success_api_response_da
         {
             "to": test_to,
             "messageType": "audio",
-            "audio": {"url": test_url, "ptt": False}
+            "audioUrl": test_url,
+            "ptt": False
         }
     )
-    assert response_no_ptt.response.success is True
+    assert isinstance(response_no_ptt, WasenderSendResult)
+    assert response_no_ptt.response.data.message_id == success_api_response_data["data"]["messageId"]
 
     # Test Case 2: ptt = True
-    client._post_internal.reset_mock() # Reset mock for a clean assertion
-    # Update message_id for distinct response if necessary, though not asserted here
-    updated_success_data = {**success_api_response_data, "data": {**success_api_response_data["data"], "message_id": "mock_audio_ptt_true"}}
-    client._post_internal.return_value = {
-        "response": updated_success_data, # Use potentially updated data
+    client._post_internal.reset_mock()
+    client._post_internal.return_value = { # Assuming same response structure for simplicity
+        "response": success_api_response_data,
         "rate_limit": rate_limit_data
     }
     response_ptt = await client.send_audio(to=test_to, url=test_url, ptt=True)
@@ -188,10 +194,30 @@ async def test_send_audio(async_client_with_mocked_post, success_api_response_da
         {
             "to": test_to,
             "messageType": "audio",
-            "audio": {"url": test_url, "ptt": True}
+            "audioUrl": test_url,
+            "ptt": True
+        }
+    )
+    assert isinstance(response_ptt, WasenderSendResult)
+    assert response_ptt.response.data.message_id == success_api_response_data["data"]["messageId"]
+
+    # Test Case 3: ptt not provided (should default or not be included if None)
+    client._post_internal.reset_mock()
+    client._post_internal.return_value = {
+        "response": success_api_response_data,
+        "rate_limit": rate_limit_data
+    }
+    response_no_ptt_arg = await client.send_audio(to=test_to, url=test_url) # ptt not passed
+    client._post_internal.assert_called_once_with(
+        "/send-message",
+        {
+            "to": test_to,
+            "messageType": "audio",
+            "audioUrl": test_url # ptt should not be in payload if not provided
         }
     )
-    assert response_ptt.response.success is True
+    assert isinstance(response_no_ptt_arg, WasenderSendResult)
+    assert response_no_ptt_arg.response.data.message_id == success_api_response_data["data"]["messageId"]
 
 @pytest.mark.asyncio
 async def test_send_location(async_client_with_mocked_post, success_api_response_data, rate_limit_data):

dist/wasenderapi-0.2.0-py3-none-any.whl

@@ -1 +1 @@
-__version__ = "0.2.0" 
+__version__ = "0.2.1" 

dist/wasenderapi-0.2.0.tar.gz

@@ -235,67 +235,61 @@ async def send_text(self, to: str, text_body: str, **kwargs: Any) -> WasenderSen
         payload: Dict[str, Any] = {**kwargs}
         payload["to"] = to
         payload["messageType"] = "text"
-        payload["text"] = {"body": text_body}
+        payload["text"] = text_body
         result = await self._post_internal("/send-message", payload)
         return WasenderSendResult(**result)
 
     async def send_image(self, to: str, url: str, caption: Optional[str] = None, **kwargs: Any) -> WasenderSendResult:
         payload: Dict[str, Any] = {**kwargs}
         payload["to"] = to
         payload["messageType"] = "image"
-        image_payload = {"url": url}
+        payload["imageUrl"] = url
         if caption:
-            image_payload["caption"] = caption
-        payload["image"] = image_payload
+            payload["text"] = caption
         result = await self._post_internal("/send-message", payload)
         return WasenderSendResult(**result)
 
     async def send_video(self, to: str, url: str, caption: Optional[str] = None, **kwargs: Any) -> WasenderSendResult:
         payload: Dict[str, Any] = {**kwargs}
         payload["to"] = to
         payload["messageType"] = "video"
-        video_payload = {"url": url}
+        payload["videoUrl"] = url
         if caption:
-            video_payload["caption"] = caption
-        payload["video"] = video_payload
+            payload["text"] = caption
         result = await self._post_internal("/send-message", payload)
         return WasenderSendResult(**result)
 
     async def send_document(self, to: str, url: str, filename: str, caption: Optional[str] = None, **kwargs: Any) -> WasenderSendResult:
         payload: Dict[str, Any] = {**kwargs}
         payload["to"] = to
         payload["messageType"] = "document"
-        document_payload = {"url": url, "filename": filename}
+        payload["documentUrl"] = url
         if caption:
-            document_payload["caption"] = caption
-        payload["document"] = document_payload
+            payload["text"] = caption
         result = await self._post_internal("/send-message", payload)
         return WasenderSendResult(**result)
 
     async def send_audio(self, to: str, url: str, **kwargs: Any) -> WasenderSendResult:
-        payload: Dict[str, Any] = {k: v for k, v in kwargs.items() if k != 'ptt'}
+        payload: Dict[str, Any] = {**kwargs}
         payload["to"] = to
         payload["messageType"] = "audio"
-        audio_payload = {"url": url}
-        if "ptt" in kwargs:
-            audio_payload["ptt"] = kwargs["ptt"]
-        payload["audio"] = audio_payload
+        payload["audioUrl"] = url
         result = await self._post_internal("/send-message", payload)
         return WasenderSendResult(**result)
 
     async def send_sticker(self, to: str, url: str, **kwargs: Any) -> WasenderSendResult:
         payload: Dict[str, Any] = {**kwargs}
         payload["to"] = to
         payload["messageType"] = "sticker"
-        payload["sticker"] = {"url": url}
+        payload["stickerUrl"] = url
         result = await self._post_internal("/send-message", payload)
         return WasenderSendResult(**result)
 
     async def send_contact(self, to: str, contact_name: str, contact_phone_number: str, **kwargs: Any) -> WasenderSendResult:
         payload: Dict[str, Any] = {**kwargs}
         payload["to"] = to
         payload["messageType"] = "contact"
-        payload["contact"] = {"name": contact_name, "phoneNumber": contact_phone_number}
+        payload["contact"] = {"name": contact_name, "phone": contact_phone_number}
         result = await self._post_internal("/send-message", payload)
         return WasenderSendResult(**result)