Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/SparkPost.Tests/DataMapperTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,16 @@ public void metadata()
.CastAs<IDictionary<string, object>>()[key].ShouldEqual(value);
}

[Test]
public void do_not_alter_the_keys_passed_to_metadata()
{
var key = "TEST";
var value = Guid.NewGuid().ToString();
transmission.Metadata[key] = value;
mapper.ToDictionary(transmission)["metadata"]
.CastAs<IDictionary<string, object>>()[key].ShouldEqual(value);
}

[Test]
public void do_not_include_empty_metadata()
{
Expand Down
13 changes: 9 additions & 4 deletions src/SparkPost/DataMapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,8 @@ public virtual IDictionary<string, object> ToDictionary(Transmission transmissio
{
var data = new Dictionary<string, object>
{
["substitution_data"] =
transmission.SubstitutionData != null && transmission.SubstitutionData.Keys.Any()
? transmission.SubstitutionData
: null,
["substitution_data"] = AlterThisDictionaryToBePassedToSparkpost(transmission.SubstitutionData),
["metadata"] = AlterThisDictionaryToBePassedToSparkpost(transmission.Metadata),
["recipients"] = transmission.ListId != null
? (object) new Dictionary<string, object> {["list_id"] = transmission.ListId}
: transmission.Recipients.Select(ToDictionary)
Expand All @@ -100,6 +98,13 @@ public virtual IDictionary<string, object> ToDictionary(Transmission transmissio
return result;
}

private static IDictionary<string, object> AlterThisDictionaryToBePassedToSparkpost(IDictionary<string, object> dictionary)
{
return dictionary != null && dictionary.Keys.Any()
? dictionary
: null;
}

public virtual IDictionary<string, object> ToDictionary(Recipient recipient)
{
return WithCommonConventions(recipient, new Dictionary<string, object>()
Expand Down