Remove DataModel.User from viewModel

Author: leotsarev

src/JoinRpg.Portal/Views/Finances/ByMaster.cshtml

@@ -3,7 +3,7 @@
 
 
 @{
-    ViewBag.Title = Model.UserDetails.User.GetDisplayName() + " — сводка по деньгам";
+    ViewBag.Title = Model.UserDetails.User.DisplayName + " — сводка по деньгам";
 }
 
 <h2>@ViewBag.Title</h2>

src/JoinRpg.Portal/Views/Shared/DisplayTemplates/UserLinkViewModel.cshtml

@@ -0,0 +1,7 @@
+@model JoinRpg.Web.Models.UserProfile.UserLinkViewModel
+@if (Model == null)
+{
+    <span>нет</span>
+    return;
+}
+<a class="join-user" href="@Url.Action("Details", "User", new {Model.UserId})"><i class="glyphicon glyphicon-user"></i>@Model.DisplayName</a>

src/JoinRpg.WebPortal.Models/UserProfile/UserLinkViewModel.cs

@@ -0,0 +1,18 @@
+using JoinRpg.DataModel;
+using JoinRpg.Domain;
+
+namespace JoinRpg.Web.Models.UserProfile
+{
+    public record UserLinkViewModel(
+        int UserId,
+        string DisplayName)
+    {
+        public UserLinkViewModel(User user) : this(user.UserId, user.GetDisplayName().Trim())
+        {
+
+        }
+
+        public static UserLinkViewModel? FromOptional(User user)
+            => user is null ? null : new UserLinkViewModel(user);
+    }
+}

src/JoinRpg.WebPortal.Models/UserProfile/UserProfileViewModel.cs

@@ -7,6 +7,7 @@
 using JoinRpg.DataModel;
 using JoinRpg.Domain;
 using JoinRpg.PrimitiveTypes;
+using JoinRpg.Web.Models.UserProfile;
 
 namespace JoinRpg.Web.Models
 {
@@ -62,7 +63,7 @@ public class UserProfileDetailsViewModel
 
         public AvatarIdentification Avatar { get; }
         [Editable(false)]
-        public User User { get; } //TODO: Start using ViewModel here
+        public UserLinkViewModel User { get; }
 
         public AccessReason Reason { get; }
 
@@ -76,9 +77,9 @@ public UserProfileDetailsViewModel(User user, User currentUser)
         {
 
         }
-        public UserProfileDetailsViewModel([NotNull] User user, AccessReason reason)
+        public UserProfileDetailsViewModel(User user, AccessReason reason)
         {
-            User = user ?? throw new ArgumentNullException(nameof(user));
+            User = new UserLinkViewModel(user);
             Reason = reason;
             SocialNetworkAccess = (ContactsAccessTypeView)user.GetSocialNetworkAccess();
             Avatar = AvatarIdentification.FromOptional(user.SelectedAvatarId);