Fixes #79 null body when calling history store get

NullDesk · Jul 27, 2017 · 2b6ecab · 2b6ecab
1 parent 4dfe686
commit 2b6ecab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/NullDesk.Extensions.Mailer.History.EntityFramework/HistoryDeliveryItem.cs b/src/NullDesk.Extensions.Mailer.History.EntityFramework/HistoryDeliveryItem.cs
@@ -186,14 +186,14 @@ internal static DeliveryItem ToDeliveryItem(this EntityHistoryDeliveryItem item)
                 SourceApplicationName = item.SourceApplicationName,
                 Body =
                     string.IsNullOrEmpty(item.TemplateName)
-                        ? (IMessageBody) new TemplateBody
-                        {
-                            TemplateName = item.TemplateName
-                        }
-                        : new ContentBody
+                        ? new ContentBody
                         {
                             HtmlContent = item.HtmlContent,
                             PlainTextContent = item.TextContent
+                        }
+                        : (IMessageBody)new TemplateBody
+                        {
+                            TemplateName = item.TemplateName
                         },
                 Substitutions = JsonConvert.DeserializeObject<IDictionary<string, string>>(item.SubstitutionsJson),
                 CreatedDate = item.CreatedDate,

diff --git a/test/NullDesk.Extensions.Mailer.History.EntityFramework.SqlServer.Tests/SqlHistoryTests.cs b/test/NullDesk.Extensions.Mailer.History.EntityFramework.SqlServer.Tests/SqlHistoryTests.cs
@@ -56,6 +56,9 @@ public async Task Ef_Sql_History_AddWithCustomSourceApplicationName(string html,
                 var id = await store.AddAsync(item);
                 var savedItem = await store.GetAsync(id);
                 savedItem.SourceApplicationName.Should().Be("testUpdatedValue");
+                var body = savedItem.Body.Should().BeOfType<ContentBody>();
+                body.Which.HtmlContent.Should().Be(html);
+                body.Which.PlainTextContent.Should().Be(text);
             }
         }