Merge pull request #219 from pticostaricags/development

Improving chat to show name instead of username
pticostaricags · Nov 13, 2024 · 6875f04 · 6875f04
2 parents 5947c15 + 726a671
commit 6875f04
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/FairPlayCombinedSln/FairPlayCombined.Models/Common/AspNetUsers/AspNetUsersModel.cs b/src/FairPlayCombinedSln/FairPlayCombined.Models/Common/AspNetUsers/AspNetUsersModel.cs
@@ -9,5 +9,14 @@ public class AspNetUsersModel : IListModel
 
         [StringLength(256)]
         public string? UserName { get; set; }
+        [Required]
+        [StringLength(50)]
+        public string? Name { get; set; }
+
+        [Required]
+        [StringLength(50)]
+        public string? Lastname { get; set; }
+
+        public string? FullName => $"{Name} {Lastname}";
     }
 }
diff --git a/src/FairPlayCombinedSln/FairPlayCombined.Services/FairPlayTube/UserMessageService.cs b/src/FairPlayCombinedSln/FairPlayCombined.Services/FairPlayTube/UserMessageService.cs
@@ -75,11 +75,11 @@ public partial class UserMessageService(
                 .OrderByDescending(p => p.RowCreationDateTime)
                 .Select(p => new UserMessageModel()
                 {
-                    FromApplicationUserFullName = p.FromApplicationUser.UserName,
+                    FromApplicationUserFullName = $"{p.FromApplicationUser.Name} {p.FromApplicationUser.Lastname}",
                     Message = p.Message,
                     ReadByDestinatary = p.ReadByDestinatary,
                     RowCreationDateTime = p.RowCreationDateTime,
-                    ToApplicationUserFullName = p.ToApplicationUser.UserName,
+                    ToApplicationUserFullName = $"{p.ToApplicationUser.Name} {p.ToApplicationUser.Lastname}",
                     ToApplicationUserId = p.ToApplicationUserId
                 }).ToArrayAsync(cancellationToken);
         }

diff --git a/src/FairPlayCombinedSln/FairPlayTube.SharedUI/Components/Pages/User/MyConversations.razor b/src/FairPlayCombinedSln/FairPlayTube.SharedUI/Components/Pages/User/MyConversations.razor
@@ -42,12 +42,12 @@
                             @if (context.Id == this.SelectedUser?.Id)
                             {
                                 <strong>
-                                    @context.UserName
+                                    @context.FullName
                                 </strong>
                             }
                             else
                             {
-                                @context.UserName
+                                @context.FullName
                             }
                         </FluentButton>
                     </TemplateColumn>