From cd0b16e0063440d8e381f24d46e204b219ebaa87 Mon Sep 17 00:00:00 2001 From: Hamid Reza Mohammadi Date: Thu, 4 Feb 2021 09:23:21 +0330 Subject: [PATCH] #72 removing PublicRAppUser constructors --- .../ViewModels/RecitationViewModel.cs | 16 +++- .../UserRecitationProfileViewModel.cs | 16 +++- .../ViewModels/GanjoorLinkViewModel.cs | 16 +++- RMuseum/RMuseum.xml | 2 +- .../Implementation/ArtifactService.cs | 41 ++++++++- .../Models/Auth/ViewModels/PublicRAppUser.cs | 27 ------ .../Auth/ViewModels/PublicRUserSession.cs | 12 ++- RSecurityBackend/RSecurityBackend.xml | 11 --- .../Services/Implementation/AppUserService.cs | 90 ++++++++++++++++--- 9 files changed, 168 insertions(+), 63 deletions(-) diff --git a/RMuseum/Models/GanjoorAudio/ViewModels/RecitationViewModel.cs b/RMuseum/Models/GanjoorAudio/ViewModels/RecitationViewModel.cs index b80fbf1c..c4e99452 100644 --- a/RMuseum/Models/GanjoorAudio/ViewModels/RecitationViewModel.cs +++ b/RMuseum/Models/GanjoorAudio/ViewModels/RecitationViewModel.cs @@ -22,12 +22,22 @@ namespace RMuseum.Models.GanjoorAudio.ViewModels /// constructor /// /// - /// + /// /// - public RecitationViewModel(Recitation src, RAppUser owner, GanjoorPoem poem) + public RecitationViewModel(Recitation src, RAppUser appUser, GanjoorPoem poem) { Id = src.Id; - Owner = new PublicRAppUser(owner); + Owner = new PublicRAppUser() + { + Id = appUser.Id, + Username = appUser.UserName, + Email = appUser.Email, + FirstName = appUser.FirstName, + SureName = appUser.SureName, + PhoneNumber = appUser.PhoneNumber, + RImageId = appUser.RImageId, + Status = appUser.Status + }; GanjoorAudioId = src.GanjoorAudioId; GanjoorPostId = src.GanjoorPostId; AudioOrder = src.AudioOrder; diff --git a/RMuseum/Models/GanjoorAudio/ViewModels/UserRecitationProfileViewModel.cs b/RMuseum/Models/GanjoorAudio/ViewModels/UserRecitationProfileViewModel.cs index ebeaafb2..2b3f82d2 100644 --- a/RMuseum/Models/GanjoorAudio/ViewModels/UserRecitationProfileViewModel.cs +++ b/RMuseum/Models/GanjoorAudio/ViewModels/UserRecitationProfileViewModel.cs @@ -1,4 +1,5 @@ -using RSecurityBackend.Models.Auth.ViewModels; +using RSecurityBackend.Models.Auth.Db; +using RSecurityBackend.Models.Auth.ViewModels; using System; namespace RMuseum.Models.GanjoorAudio.ViewModels @@ -21,8 +22,19 @@ namespace RMuseum.Models.GanjoorAudio.ViewModels /// public UserRecitationProfileViewModel(UserRecitationProfile src) { + RAppUser appUser = src.User; Id = src.Id; - User = src.User == null ? null : new PublicRAppUser(src.User); + User = src.User == null ? null : new PublicRAppUser() + { + Id = appUser.Id, + Username = appUser.UserName, + Email = appUser.Email, + FirstName = appUser.FirstName, + SureName = appUser.SureName, + PhoneNumber = appUser.PhoneNumber, + RImageId = appUser.RImageId, + Status = appUser.Status + }; UserId = src.UserId; Name = src.Name; FileSuffixWithoutDash = src.FileSuffixWithoutDash; diff --git a/RMuseum/Models/GanjoorIntegration/ViewModels/GanjoorLinkViewModel.cs b/RMuseum/Models/GanjoorIntegration/ViewModels/GanjoorLinkViewModel.cs index e9fff5d8..bef274dc 100644 --- a/RMuseum/Models/GanjoorIntegration/ViewModels/GanjoorLinkViewModel.cs +++ b/RMuseum/Models/GanjoorIntegration/ViewModels/GanjoorLinkViewModel.cs @@ -1,4 +1,5 @@ -using RSecurityBackend.Models.Auth.ViewModels; +using RSecurityBackend.Models.Auth.Db; +using RSecurityBackend.Models.Auth.ViewModels; using System; namespace RMuseum.Models.GanjoorIntegration.ViewModels @@ -34,7 +35,18 @@ namespace RMuseum.Models.GanjoorIntegration.ViewModels EntityImageId = entityImageId; ReviewResult = src.ReviewResult; Synchronized = src.Synchronized; - SuggestedBy = new PublicRAppUser(src.SuggestedBy); + RAppUser appUser = src.SuggestedBy; + SuggestedBy =new PublicRAppUser() + { + Id = appUser.Id, + Username = appUser.UserName, + Email = appUser.Email, + FirstName = appUser.FirstName, + SureName = appUser.SureName, + PhoneNumber = appUser.PhoneNumber, + RImageId = appUser.RImageId, + Status = appUser.Status + }; } /// diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml index 0fc4b152..77cb8d1e 100644 --- a/RMuseum/RMuseum.xml +++ b/RMuseum/RMuseum.xml @@ -2641,7 +2641,7 @@ constructor - + diff --git a/RMuseum/Services/Implementation/ArtifactService.cs b/RMuseum/Services/Implementation/ArtifactService.cs index 7631263d..c88a489c 100644 --- a/RMuseum/Services/Implementation/ArtifactService.cs +++ b/RMuseum/Services/Implementation/ArtifactService.cs @@ -12,6 +12,7 @@ using RMuseum.Models.GanjoorIntegration.ViewModels; using RMuseum.Models.ImportJob; using RMuseum.Models.Note; using RMuseum.Models.Note.ViewModels; +using RSecurityBackend.Models.Auth.Db; using RSecurityBackend.Models.Auth.ViewModels; using RSecurityBackend.Models.Generic; using RSecurityBackend.Services; @@ -2201,7 +2202,18 @@ namespace RMuseum.Services.Implementation List res = new List(); foreach (RUserNote note in notes) { - RUserNoteViewModel viewModel = new RUserNoteViewModel(note, new PublicRAppUser(note.RAppUser)); + RAppUser appUser = note.RAppUser; + RUserNoteViewModel viewModel = new RUserNoteViewModel(note, new PublicRAppUser() + { + Id = appUser.Id, + Username = appUser.UserName, + Email = appUser.Email, + FirstName = appUser.FirstName, + SureName = appUser.SureName, + PhoneNumber = appUser.PhoneNumber, + RImageId = appUser.RImageId, + Status = appUser.Status + }); viewModel.Notes = await _GetArtifactPublicNotes(artifactId, note.Id); res.Add(viewModel); } @@ -2271,7 +2283,18 @@ namespace RMuseum.Services.Implementation List res = new List(); foreach (RUserNote note in notes) { - RUserNoteViewModel viewModel = new RUserNoteViewModel(note, new PublicRAppUser(note.RAppUser)); + RAppUser appUser = note.RAppUser; + RUserNoteViewModel viewModel = new RUserNoteViewModel(note, new PublicRAppUser() + { + Id = appUser.Id, + Username = appUser.UserName, + Email = appUser.Email, + FirstName = appUser.FirstName, + SureName = appUser.SureName, + PhoneNumber = appUser.PhoneNumber, + RImageId = appUser.RImageId, + Status = appUser.Status + }); viewModel.Notes = await _GetArtifactItemPublicNotes(itemId, note.Id); res.Add(viewModel); } @@ -2397,7 +2420,19 @@ namespace RMuseum.Services.Implementation List finalList = new List(); foreach (RUserNote note in paginatedResult1.Notes) { - RUserNoteViewModel model = new RUserNoteViewModel(note, new PublicRAppUser(note.RAppUser)); + RAppUser appUser = note.RAppUser; + RUserNoteViewModel model = new RUserNoteViewModel(note, + new PublicRAppUser() + { + Id = appUser.Id, + Username = appUser.UserName, + Email = appUser.Email, + FirstName = appUser.FirstName, + SureName = appUser.SureName, + PhoneNumber = appUser.PhoneNumber, + RImageId = appUser.RImageId, + Status = appUser.Status + }); if (note.RArtifactMasterRecord != null) { if (note.RArtifactMasterRecord.Status != PublishStatus.Published) diff --git a/RSecurityBackend/Models/Auth/ViewModels/PublicRAppUser.cs b/RSecurityBackend/Models/Auth/ViewModels/PublicRAppUser.cs index 48c02588..460c240e 100644 --- a/RSecurityBackend/Models/Auth/ViewModels/PublicRAppUser.cs +++ b/RSecurityBackend/Models/Auth/ViewModels/PublicRAppUser.cs @@ -13,33 +13,6 @@ namespace RSecurityBackend.Models.Auth.ViewModels /// public class PublicRAppUser { - /// - /// constructor - /// - /// - public PublicRAppUser(RAppUser dbUserInfo) - { - if (dbUserInfo == null) - { - return; - } - Id = dbUserInfo.Id; - Username = dbUserInfo.UserName; - FirstName = dbUserInfo.FirstName; - SureName = dbUserInfo.SureName; - Email = dbUserInfo.Email; - PhoneNumber = dbUserInfo.PhoneNumber; - Status = dbUserInfo.Status; - RImageId = dbUserInfo.RImageId; - } - /// - /// default constructor - /// - public PublicRAppUser() - { - - } - /// /// Id /// diff --git a/RSecurityBackend/Models/Auth/ViewModels/PublicRUserSession.cs b/RSecurityBackend/Models/Auth/ViewModels/PublicRUserSession.cs index f6d0dbc5..8c048cae 100644 --- a/RSecurityBackend/Models/Auth/ViewModels/PublicRUserSession.cs +++ b/RSecurityBackend/Models/Auth/ViewModels/PublicRUserSession.cs @@ -16,7 +16,17 @@ namespace RSecurityBackend.Models.Auth.ViewModels public PublicRUserSession(RTemporaryUserSession src) { Id = src.Id; - RAppUser = new PublicRAppUser(src.RAppUser); + RAppUser = new PublicRAppUser() + { + Id = src.RAppUser.Id, + Username = src.RAppUser.UserName, + Email = src.RAppUser.Email, + FirstName = src.RAppUser.FirstName, + SureName = src.RAppUser.SureName, + PhoneNumber = src.RAppUser.PhoneNumber, + RImageId = src.RAppUser.RImageId, + Status = src.RAppUser.Status + }; ClientIPAddress = src.ClientIPAddress; ClientAppName = src.ClientAppName; Language = src.Language; diff --git a/RSecurityBackend/RSecurityBackend.xml b/RSecurityBackend/RSecurityBackend.xml index 88fd00fe..5e484169 100644 --- a/RSecurityBackend/RSecurityBackend.xml +++ b/RSecurityBackend/RSecurityBackend.xml @@ -1200,17 +1200,6 @@ a safe subset of RAppUser - - - constructor - - - - - - default constructor - - Id diff --git a/RSecurityBackend/Services/Implementation/AppUserService.cs b/RSecurityBackend/Services/Implementation/AppUserService.cs index 1628bf37..072007a6 100644 --- a/RSecurityBackend/Services/Implementation/AppUserService.cs +++ b/RSecurityBackend/Services/Implementation/AppUserService.cs @@ -117,7 +117,17 @@ namespace RSecurityBackend.Services.Implementation new LoggedOnUserModel() { SessionId = userSession.Id, - User = new PublicRAppUser(appUser), + User = new PublicRAppUser() + { + Id = appUser.Id, + Username = appUser.UserName, + Email = appUser.Email, + FirstName = appUser.FirstName, + SureName = appUser.SureName, + PhoneNumber = appUser.PhoneNumber, + RImageId = appUser.RImageId, + Status = appUser.Status + }, Token = userToken.Result, SecurableItem = securableItems.Result } @@ -186,7 +196,17 @@ namespace RSecurityBackend.Services.Implementation new LoggedOnUserModel() { SessionId = newSession.Id, - User = new PublicRAppUser(appUser), + User = new PublicRAppUser() + { + Id = appUser.Id, + Username = appUser.UserName, + Email = appUser.Email, + FirstName = appUser.FirstName, + SureName = appUser.SureName, + PhoneNumber = appUser.PhoneNumber, + RImageId = appUser.RImageId, + Status = appUser.Status + }, Token = userToken.Result, SecurableItem = securableItems.Result } @@ -304,9 +324,20 @@ namespace RSecurityBackend.Services.Implementation try { - RAppUser dbUserInfo = + RAppUser appUser = await _userManager.Users.Where(u => u.Id == userId).SingleOrDefaultAsync(); - return new RServiceResult(new PublicRAppUser(dbUserInfo)); + return new RServiceResult( + new PublicRAppUser() + { + Id = appUser.Id, + Username = appUser.UserName, + Email = appUser.Email, + FirstName = appUser.FirstName, + SureName = appUser.SureName, + PhoneNumber = appUser.PhoneNumber, + RImageId = appUser.RImageId, + Status = appUser.Status + }); } catch (Exception exp) { @@ -326,13 +357,24 @@ namespace RSecurityBackend.Services.Implementation { - RAppUser[] usersInfo = await _userManager.Users.ToArrayAsync(); + RAppUser[] appUsers = await _userManager.Users.ToArrayAsync(); List lstPublicUsersInfo = new List(); - foreach(RAppUser userInfo in usersInfo) + foreach(RAppUser appUser in appUsers) { - lstPublicUsersInfo.Add(new PublicRAppUser(userInfo)); + lstPublicUsersInfo.Add( + new PublicRAppUser() + { + Id = appUser.Id, + Username = appUser.UserName, + Email = appUser.Email, + FirstName = appUser.FirstName, + SureName = appUser.SureName, + PhoneNumber = appUser.PhoneNumber, + RImageId = appUser.RImageId, + Status = appUser.Status + }); } return new RServiceResult(lstPublicUsersInfo.ToArray()); } @@ -616,11 +658,22 @@ namespace RSecurityBackend.Services.Implementation foreach(RAppRole role in roles) { var usersInRole = _userManager.GetUsersInRoleAsync(role.Name); - foreach(var user in usersInRole.Result) + foreach(var appUser in usersInRole.Result) { - if(lstPublicUsersInfo.Where(u => u.Id == user.Id).FirstOrDefault() == null ) + if(lstPublicUsersInfo.Where(u => u.Id == appUser.Id).FirstOrDefault() == null ) { - lstPublicUsersInfo.Add(new PublicRAppUser(user)); + lstPublicUsersInfo.Add( + new PublicRAppUser() + { + Id = appUser.Id, + Username = appUser.UserName, + Email = appUser.Email, + FirstName = appUser.FirstName, + SureName = appUser.SureName, + PhoneNumber = appUser.PhoneNumber, + RImageId = appUser.RImageId, + Status = appUser.Status + }); } } } @@ -1296,10 +1349,21 @@ namespace RSecurityBackend.Services.Implementation { try { - RAppUser user = await _userManager.FindByEmailAsync(email); - if (user == null) + RAppUser appUser = await _userManager.FindByEmailAsync(email); + if (appUser == null) return new RServiceResult(null); - return new RServiceResult(new PublicRAppUser(user)); + return new RServiceResult( + new PublicRAppUser() + { + Id = appUser.Id, + Username = appUser.UserName, + Email = appUser.Email, + FirstName = appUser.FirstName, + SureName = appUser.SureName, + PhoneNumber = appUser.PhoneNumber, + RImageId = appUser.RImageId, + Status = appUser.Status + }); } catch(Exception exp) {