CUST-4797 from field handles 'from' and 'from_'

samLRodrigues · samLRodrigues · commit a61ef14da18f · 2025-09-22T15:54:46.000-03:00
diff --git a/tests/resources/test_messages.py b/tests/resources/test_messages.py
@@ -698,11 +698,13 @@ def test_clean_messages(self, http_client_clean_messages):
         assert response.data[0].conversation == "cleaned example"
         assert response.data[1].conversation == "another example"
 
-
     def test_list_messages_select_param(self, http_client_list_response):
         messages = Messages(http_client_list_response)
 
-        messages.list(identifier="abc-123", query_params={"select": ["id", "subject", "from", "to"]})
+        messages.list(
+            identifier="abc-123",
+            query_params={"select": ["id", "subject", "from", "to"]},
+        )
 
         http_client_list_response._execute.assert_called_once_with(
             "GET",
@@ -714,12 +716,18 @@ def test_list_messages_select_param(self, http_client_list_response):
         )
 
         # Make sure query params are properly serialized
-        assert http_client_list_response._execute.call_args[0][3] == {"select": ["id", "subject", "from", "to"]}
+        assert http_client_list_response._execute.call_args[0][3] == {
+            "select": ["id", "subject", "from", "to"]
+        }
 
     def test_find_message_select_param(self, http_client_response):
         messages = Messages(http_client_response)
 
-        messages.find(identifier="abc-123", message_id="message-123", query_params={"select": ["id", "subject", "from", "to"]})
+        messages.find(
+            identifier="abc-123",
+            message_id="message-123",
+            query_params={"select": ["id", "subject", "from", "to"]},
+        )
 
         http_client_response._execute.assert_called_once_with(
             "GET",
@@ -731,7 +739,9 @@ def test_find_message_select_param(self, http_client_response):
         )
 
         # Make sure query params are properly serialized
-        assert http_client_response._execute.call_args[0][3] == {"select": ["id", "subject", "from", "to"]}
+        assert http_client_response._execute.call_args[0][3] == {
+            "select": ["id", "subject", "from", "to"]
+        }
 
     # New tests for tracking_options and raw_mime features
     def test_message_deserialization_with_tracking_options(self):
@@ -747,8 +757,8 @@ def test_message_deserialization_with_tracking_options(self):
                 "opens": True,
                 "thread_replies": False,
                 "links": True,
-                "label": "Marketing Campaign"
-            }
+                "label": "Marketing Campaign",
+            },
         }
 
         message = Message.from_dict(message_json)
@@ -765,12 +775,15 @@ def test_message_deserialization_with_raw_mime(self):
             "grant_id": "41009df5-bf11-4c97-aa18-b285b5f2e386",
             "id": "5d3qmne77v32r8l4phyuksl2x",
             "object": "message",
-            "raw_mime": "TUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PXV0Zi04CgpIZWxsbyBXb3JsZCE="
+            "raw_mime": "TUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PXV0Zi04CgpIZWxsbyBXb3JsZCE=",
         }
 
         message = Message.from_dict(message_json)
 
-        assert message.raw_mime == "TUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PXV0Zi04CgpIZWxsbyBXb3JsZCE="
+        assert (
+            message.raw_mime
+            == "TUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PXV0Zi04CgpIZWxsbyBXb3JsZCE="
+        )
 
     def test_message_deserialization_backwards_compatibility(self):
         """Test that existing message deserialization still works (backwards compatibility)."""
@@ -792,7 +805,9 @@ def test_message_deserialization_backwards_compatibility(self):
         assert message.body == "Hello, I just sent a message using Nylas!"
         assert message.subject == "Hello from Nylas!"
 
-    def test_list_messages_with_include_tracking_options_field(self, http_client_list_response):
+    def test_list_messages_with_include_tracking_options_field(
+        self, http_client_list_response
+    ):
         """Test listing messages with include_tracking_options field."""
         messages = Messages(http_client_list_response)
 
@@ -828,7 +843,9 @@ def test_list_messages_with_raw_mime_field(self, http_client_list_response):
             overrides=None,
         )
 
-    def test_find_message_with_include_tracking_options_field(self, http_client_response):
+    def test_find_message_with_include_tracking_options_field(
+        self, http_client_response
+    ):
         """Test finding a message with include_tracking_options field."""
         messages = Messages(http_client_response)
 
@@ -869,21 +886,18 @@ def test_find_message_with_raw_mime_field(self, http_client_response):
     def test_tracking_options_serialization(self):
         """Test that tracking_options can be serialized to JSON."""
         from nylas.models.messages import TrackingOptions
-        
+
         tracking_options = TrackingOptions(
-            opens=True,
-            thread_replies=False,
-            links=True,
-            label="Test Campaign"
+            opens=True, thread_replies=False, links=True, label="Test Campaign"
         )
-        
+
         # Test serialization
         json_data = tracking_options.to_dict()
         assert json_data["opens"] is True
         assert json_data["thread_replies"] is False
         assert json_data["links"] is True
         assert json_data["label"] == "Test Campaign"
-        
+
         # Test deserialization
         tracking_options_from_dict = TrackingOptions.from_dict(json_data)
         assert tracking_options_from_dict.opens is True
@@ -931,7 +945,9 @@ def test_send_message_with_is_plaintext_false(self, http_client_response):
             overrides=None,
         )
 
-    def test_send_message_without_is_plaintext_backwards_compatibility(self, http_client_response):
+    def test_send_message_without_is_plaintext_backwards_compatibility(
+        self, http_client_response
+    ):
         """Test that existing code without is_plaintext still works (backwards compatibility)."""
         messages = Messages(http_client_response)
         request_body = {
@@ -949,4 +965,116 @@ def test_send_message_without_is_plaintext_backwards_compatibility(self, http_cl
             request_body=request_body,
             data=None,
             overrides=None,
-        ) 
+        )
+
+    def test_send_message_with_from_field_mapping(self, http_client_response):
+        """Test that from_ field is properly mapped to from field in request body."""
+        messages = Messages(http_client_response)
+        request_body = {
+            "subject": "Hello from Nylas!",
+            "to": [{"name": "Jon Snow", "email": "jsnow@gmail.com"}],
+            "body": "This is the body of my message.",
+            "from_": [{"name": "Daenerys Targaryen", "email": "daenerys.t@example.com"}],
+        }
+
+        messages.send(identifier="abc-123", request_body=request_body)
+
+        # Verify that from_ was mapped to from and from_ was removed
+        expected_request_body = {
+            "subject": "Hello from Nylas!",
+            "to": [{"name": "Jon Snow", "email": "jsnow@gmail.com"}],
+            "body": "This is the body of my message.",
+            "from": [{"name": "Daenerys Targaryen", "email": "daenerys.t@example.com"}],
+        }
+
+        http_client_response._execute.assert_called_once_with(
+            method="POST",
+            path="/v3/grants/abc-123/messages/send",
+            request_body=expected_request_body,
+            data=None,
+            overrides=None,
+        )
+
+    def test_send_message_with_existing_from_field_unchanged(self, http_client_response):
+        """Test that existing from field is left unchanged when both from and from_ are present."""
+        messages = Messages(http_client_response)
+        request_body = {
+            "subject": "Hello from Nylas!",
+            "to": [{"name": "Jon Snow", "email": "jsnow@gmail.com"}],
+            "body": "This is the body of my message.",
+            "from": [{"name": "Existing Sender", "email": "existing@example.com"}],
+            "from_": [{"name": "Daenerys Targaryen", "email": "daenerys.t@example.com"}],
+        }
+
+        messages.send(identifier="abc-123", request_body=request_body)
+
+        # Verify that the original from field is preserved and from_ is not processed
+        expected_request_body = {
+            "subject": "Hello from Nylas!",
+            "to": [{"name": "Jon Snow", "email": "jsnow@gmail.com"}],
+            "body": "This is the body of my message.",
+            "from": [{"name": "Existing Sender", "email": "existing@example.com"}],
+            "from_": [{"name": "Daenerys Targaryen", "email": "daenerys.t@example.com"}],
+        }
+
+        http_client_response._execute.assert_called_once_with(
+            method="POST",
+            path="/v3/grants/abc-123/messages/send",
+            request_body=expected_request_body,
+            data=None,
+            overrides=None,
+        )
+
+    def test_send_message_with_only_from_field_unchanged(self, http_client_response):
+        """Test that when only from field is present, it remains unchanged."""
+        messages = Messages(http_client_response)
+        request_body = {
+            "subject": "Hello from Nylas!",
+            "to": [{"name": "Jon Snow", "email": "jsnow@gmail.com"}],
+            "body": "This is the body of my message.",
+            "from": [{"name": "Direct Sender", "email": "direct@example.com"}],
+        }
+
+        messages.send(identifier="abc-123", request_body=request_body)
+
+        # Verify that the from field remains unchanged
+        expected_request_body = {
+            "subject": "Hello from Nylas!",
+            "to": [{"name": "Jon Snow", "email": "jsnow@gmail.com"}],
+            "body": "This is the body of my message.",
+            "from": [{"name": "Direct Sender", "email": "direct@example.com"}],
+        }
+
+        http_client_response._execute.assert_called_once_with(
+            method="POST",
+            path="/v3/grants/abc-123/messages/send",
+            request_body=expected_request_body,
+            data=None,
+            overrides=None,
+        )
+
+    def test_send_message_without_from_fields_unchanged(self, http_client_response):
+        """Test that request body without from or from_ fields remains unchanged."""
+        messages = Messages(http_client_response)
+        request_body = {
+            "subject": "Hello from Nylas!",
+            "to": [{"name": "Jon Snow", "email": "jsnow@gmail.com"}],
+            "body": "This is the body of my message.",
+        }
+
+        messages.send(identifier="abc-123", request_body=request_body)
+
+        # Verify that the request body remains unchanged
+        expected_request_body = {
+            "subject": "Hello from Nylas!",
+            "to": [{"name": "Jon Snow", "email": "jsnow@gmail.com"}],
+            "body": "This is the body of my message.",
+        }
+
+        http_client_response._execute.assert_called_once_with(
+            method="POST",
+            path="/v3/grants/abc-123/messages/send",
+            request_body=expected_request_body,
+            data=None,
+            overrides=None,
+        )
