Merge pull request #102 from davidsonsousa/develop

Develop

Author: davidsonsousa

CmsEngine.Application/CmsEngine.Application.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.2.0" />
-    <PackageReference Include="System.Drawing.Common" Version="4.6.0" />
+    <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
   </ItemGroup>
 
   <ItemGroup>

CmsEngine.Application/Extensions/Mapper/PageExtensions.cs

@@ -119,7 +119,7 @@ public static IEnumerable<PageTableViewModel> MapToTableViewModel(this IEnumerab
                     Slug = item.Slug,
                     PublishedOn = item.PublishedOn.ToString(),
                     Status = item.Status,
-                    Author = item.ApplicationUsers.MapToViewModelSimple().SingleOrDefault()
+                    Author = item.ApplicationUsers.MapToViewModelSimple().Single()
                 });
             }
 
@@ -142,7 +142,7 @@ public static PageViewModel MapToViewModel(this Page item)
                 DocumentContent = item.DocumentContent,
                 HeaderImage = item.HeaderImage,
                 PublishedOn = item.PublishedOn.ToShortDateString(),
-                Author = item.ApplicationUsers.MapToViewModelSimple().SingleOrDefault()
+                Author = item.ApplicationUsers.MapToViewModelSimple().Single()
             };
         }
 

CmsEngine.Application/Extensions/Mapper/PostExtensions.cs

@@ -121,7 +121,7 @@ public static IEnumerable<PostTableViewModel> MapToTableViewModel(this IEnumerab
                     Slug = item.Slug,
                     PublishedOn = item.PublishedOn.ToString(),
                     Status = item.Status,
-                    Author = item.ApplicationUsers.MapToViewModelSimple().SingleOrDefault()
+                    Author = item.ApplicationUsers.MapToViewModelSimple().Single()
                 });
             }
 
@@ -145,7 +145,7 @@ public static PostViewModel MapToViewModel(this Post item)
                 HeaderImage = item.HeaderImage,
                 PublishedOn = item.PublishedOn.ToShortDateString(),
                 Categories = item.Categories.MapToViewModelSimple(),
-                Author = item.ApplicationUsers.MapToViewModelSimple().SingleOrDefault()
+                Author = item.ApplicationUsers.MapToViewModelSimple().Single()
             };
         }
 
@@ -255,7 +255,7 @@ public static IEnumerable<PostViewModel> MapToViewModelForPartialView(this IEnum
                     HeaderImage = item.HeaderImage,
                     PublishedOn = item.PublishedOn.ToShortDateString(),
                     Categories = item.Categories.MapToViewModelSimple(),
-                    Author = item.ApplicationUsers.MapToViewModelSimple().SingleOrDefault()
+                    Author = item.ApplicationUsers.MapToViewModelSimple().Single()
                 });
             }
 
@@ -283,7 +283,7 @@ public static IEnumerable<PostViewModel> MapToViewModelForPartialViewForTags(thi
                     PublishedOn = item.PublishedOn.ToShortDateString(),
                     Categories = item.Categories.MapToViewModelSimple(),
                     Tags = item.Tags.MapToViewModelSimple(),
-                    Author = item.ApplicationUsers.MapToViewModelSimple().SingleOrDefault()
+                    Author = item.ApplicationUsers.MapToViewModelSimple().Single()
                 });
             }
 

CmsEngine.Application/Services/EmailService.cs

@@ -40,6 +40,8 @@ public async Task<ReturnValue> Save(ContactForm contactForm)
             {
                 logger.LogInformation("New e-mail");
                 var message = contactForm.MapToModel();
+                message.DateReceived = DateTime.Now;
+
                 await _unitOfWork.Emails.Insert(message);
 
                 await _unitOfWork.Save();