From eead895dfbcdeb84b0db969fb06c17cbfc1675f7 Mon Sep 17 00:00:00 2001
From: Hamid Reza Mohammadi <mohammadi.hr@gmail.com>
Date: Mon, 15 Mar 2021 15:48:36 +0330
Subject: [PATCH] #91 replacing user.(FirstName + SureName) with Nickname

---
 .../Implementation/ArtifactService.cs         | 22 +++++++++----------
 .../Services/Implementation/GanjoorService.cs | 12 +++++-----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/RMuseum/Services/Implementation/ArtifactService.cs b/RMuseum/Services/Implementation/ArtifactService.cs
index 27ee2e8c..180710f1 100644
--- a/RMuseum/Services/Implementation/ArtifactService.cs
+++ b/RMuseum/Services/Implementation/ArtifactService.cs
@@ -1991,7 +1991,7 @@ namespace RMuseum.Services.Implementation
                         await _notificationService.PushNotification
                             (
                             referenceNote.RAppUserId,
-                            $"پاسخگویی {userInfo.Result.FirstName} {userInfo.Result.SureName} به یادداشت شما دربارهٔ {artificat.Name}",
+                            $"پاسخگویی {userInfo.Result.NickName} به یادداشت شما دربارهٔ {artificat.Name}",
                             $"برای مشاهدهٔ پاسخ ارائه شده <a href=\"/items/{artificat.FriendlyUrl}#{note.Id}\">اینجا</a> را ببینید.<br />" +
                             $"پاسخ داده شده: <br />" +
                             $"<blockquote cite=\"/item/{artificat.FriendlyUrl}#{note.Id}\">{note.HtmlContent}</blockquote><br />" +
@@ -2007,7 +2007,7 @@ namespace RMuseum.Services.Implementation
                     {
                         Id = note.Id,
                         RAppUserId = note.RAppUserId,
-                        UserName = userInfo.Result.FirstName + " " + userInfo.Result.SureName,
+                        UserName = userInfo.Result.NickName,
                         RUserImageId = userInfo.Result.RImageId,
                         Modified = note.Modified,
                         NoteType = note.NoteType,
@@ -2076,7 +2076,7 @@ namespace RMuseum.Services.Implementation
                         await _notificationService.PushNotification
                             (
                             referenceNote.RAppUserId,
-                            $"پاسخگویی {userInfo.Result.FirstName} {userInfo.Result.SureName} به یادداشت شما دربارهٔ {artificat.Name} « {item.Name}",
+                            $"پاسخگویی {userInfo.Result.NickName} به یادداشت شما دربارهٔ {artificat.Name} « {item.Name}",
                             $"برای مشاهدهٔ پاسخ ارائه شده <a href=\"/items/{artificat.FriendlyUrl}/{item.FriendlyUrl}#{note.Id}\">اینجا</a> را ببینید.<br />" +
                             $"پاسخ داده شده: <br />" +
                             $"<blockquote cite=\"/item/{artificat.FriendlyUrl}/{item.FriendlyUrl}#{note.Id}\">{note.HtmlContent}</blockquote><br />" +
@@ -2093,7 +2093,7 @@ namespace RMuseum.Services.Implementation
                     {
                         Id = note.Id,
                         RAppUserId = note.RAppUserId,
-                        UserName = userInfo.Result.FirstName + " " + userInfo.Result.SureName,
+                        UserName = userInfo.Result.NickName,
                         RUserImageId = userInfo.Result.RImageId,
                         Modified = note.Modified,
                         NoteType = note.NoteType,
@@ -2160,7 +2160,7 @@ namespace RMuseum.Services.Implementation
                     {
                         Id = note.Id,
                         RAppUserId = note.RAppUserId,
-                        UserName = userInfo.Result.FirstName + " " + userInfo.Result.SureName,
+                        UserName = userInfo.Result.NickName,
                         RUserImageId = userInfo.Result.RImageId,
                         Modified = note.Modified,
                         NoteType = note.NoteType,
@@ -2257,7 +2257,7 @@ namespace RMuseum.Services.Implementation
                         {
                             Id = note.Id,
                             RAppUserId = note.RAppUserId,
-                            UserName = userInfo.Result.FirstName + " " + userInfo.Result.SureName,
+                            UserName = userInfo.Result.NickName,
                             RUserImageId = userInfo.Result.RImageId,
                             Modified = note.Modified,
                             NoteType = note.NoteType,
@@ -2319,7 +2319,7 @@ namespace RMuseum.Services.Implementation
                     {
                         Id = note.Id,
                         RAppUserId = note.RAppUserId,
-                        UserName = user.FirstName + " " + user.SureName,
+                        UserName = user.NickName,
                         RUserImageId = user.RImageId,
                         Modified = note.Modified,
                         NoteType = note.NoteType,
@@ -2380,7 +2380,7 @@ namespace RMuseum.Services.Implementation
                         {
                             Id = note.Id,
                             RAppUserId = note.RAppUserId,
-                            UserName = userInfo.Result.FirstName + " " + userInfo.Result.SureName,
+                            UserName = userInfo.Result.NickName,
                             RUserImageId = userInfo.Result.RImageId,
                             Modified = note.Modified,
                             NoteType = note.NoteType,
@@ -2441,7 +2441,7 @@ namespace RMuseum.Services.Implementation
                     {
                         Id = note.Id,
                         RAppUserId = note.RAppUserId,
-                        UserName = user.FirstName + " " + user.SureName,
+                        UserName = user.NickName,
                         RUserImageId = user.RImageId,
                         Modified = note.Modified,
                         NoteType = note.NoteType,
@@ -2514,7 +2514,7 @@ namespace RMuseum.Services.Implementation
                         {
                             Id = note.Id,
                             RAppUserId = note.RAppUserId,
-                            UserName = user.FirstName + " " + user.SureName,
+                            UserName = user.NickName,
                             RUserImageId = user.RImageId,
                             Modified = note.Modified,
                             NoteType = note.NoteType,
@@ -2617,7 +2617,7 @@ namespace RMuseum.Services.Implementation
                         {
                             Id = note.Id,
                             RAppUserId = note.RAppUserId,
-                            UserName = user.FirstName + " " + user.SureName,
+                            UserName = user.NickName,
                             RUserImageId = user.RImageId,
                             Modified = note.Modified,
                             NoteType = note.NoteType,
diff --git a/RMuseum/Services/Implementation/GanjoorService.cs b/RMuseum/Services/Implementation/GanjoorService.cs
index eec31ffc..3d6d6d18 100644
--- a/RMuseum/Services/Implementation/GanjoorService.cs
+++ b/RMuseum/Services/Implementation/GanjoorService.cs
@@ -490,7 +490,7 @@ namespace RMuseum.Services.Implementation
                       select new GanjoorCommentSummaryViewModel()
                       {
                           Id = comment.Id,
-                          AuthorName = comment.User == null ? comment.AuthorName : $"{comment.User.FirstName} {comment.User.SureName}".Trim(),
+                          AuthorName = comment.User == null ? comment.AuthorName : $"{comment.User.NickName}",
                           AuthorUrl = comment.AuthorUrl,
                           CommentDate = comment.CommentDate,
                           HtmlComment = comment.HtmlComment,
@@ -572,7 +572,7 @@ namespace RMuseum.Services.Implementation
                     new GanjoorCommentSummaryViewModel()
                     {
                         Id = comment.Id,
-                        AuthorName = $"{userRes.Result.FirstName} {userRes.Result.SureName}".Trim(),
+                        AuthorName = $"{userRes.Result.NickName}",
                         AuthorUrl = comment.AuthorUrl,
                         CommentDate = comment.CommentDate,
                         HtmlComment = comment.HtmlComment,
@@ -746,7 +746,7 @@ namespace RMuseum.Services.Implementation
                      select new GanjoorCommentFullViewModel()
                      {
                          Id = comment.Id,
-                         AuthorName = comment.User == null ? comment.AuthorName : $"{comment.User.FirstName} {comment.User.SureName}".Trim(),
+                         AuthorName = comment.User == null ? comment.AuthorName : $"{comment.User.NickName}",
                          AuthorUrl = comment.AuthorUrl,
                          CommentDate = comment.CommentDate,
                          HtmlComment = comment.HtmlComment,
@@ -754,7 +754,7 @@ namespace RMuseum.Services.Implementation
                             new GanjoorCommentSummaryViewModel()
                             {
                                 Id = comment.InReplyTo.Id,
-                                AuthorName = comment.InReplyTo.User == null ? comment.InReplyTo.AuthorName : $"{comment.InReplyTo.User.FirstName} {comment.InReplyTo.User.SureName}".Trim(),
+                                AuthorName = comment.InReplyTo.User == null ? comment.InReplyTo.AuthorName : $"{comment.InReplyTo.User.NickName}",
                                 AuthorUrl = comment.InReplyTo.AuthorUrl,
                                 CommentDate = comment.InReplyTo.CommentDate,
                                 HtmlComment = comment.InReplyTo.HtmlComment,
@@ -860,7 +860,7 @@ namespace RMuseum.Services.Implementation
                          Comment = new GanjoorCommentFullViewModel()
                          {
                              Id = comment.Id,
-                             AuthorName = comment.User == null ? comment.AuthorName : $"{comment.User.FirstName} {comment.User.SureName}".Trim(),
+                             AuthorName = comment.User == null ? comment.AuthorName : $"{comment.User.NickName}",
                              AuthorUrl = comment.AuthorUrl,
                              CommentDate = comment.CommentDate,
                              HtmlComment = comment.HtmlComment,
@@ -868,7 +868,7 @@ namespace RMuseum.Services.Implementation
                             new GanjoorCommentSummaryViewModel()
                             {
                                 Id = comment.InReplyTo.Id,
-                                AuthorName = comment.InReplyTo.User == null ? comment.InReplyTo.AuthorName : $"{comment.InReplyTo.User.FirstName} {comment.InReplyTo.User.SureName}".Trim(),
+                                AuthorName = comment.InReplyTo.User == null ? comment.InReplyTo.AuthorName : $"{comment.InReplyTo.User.NickName}",
                                 AuthorUrl = comment.InReplyTo.AuthorUrl,
                                 CommentDate = comment.InReplyTo.CommentDate,
                                 HtmlComment = comment.InReplyTo.HtmlComment,