anas/divan
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

#72 removing PublicRAppUser constructors

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2021-02-04 09:23:21 +03:30
parent 20db5e7867
commit cd0b16e006
9 changed files with 168 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
RMuseum/Models/GanjoorAudio/ViewModels/RecitationViewModel.cs
View File

@ -22,12 +22,22 @@ namespace RMuseum.Models.GanjoorAudio.ViewModels
/// constructor
/// </summary>
/// <param name="src"></param>
/// <param name="owner"></param>
/// <param name="appUser"></param>
/// <param name="poem"></param>
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;

16
RMuseum/Models/GanjoorAudio/ViewModels/UserRecitationProfileViewModel.cs
View File

@ -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
/// <param name="src"></param>
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;

16
RMuseum/Models/GanjoorIntegration/ViewModels/GanjoorLinkViewModel.cs
View File

@ -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
};
}
/// <summary>

2
RMuseum/RMuseum.xml
View File

@ -2641,7 +2641,7 @@
constructor
</summary>
<param name="src"></param>
<param name="owner"></param>
<param name="appUser"></param>
<param name="poem"></param>
</member>
<member name="P:RMuseum.Models.GanjoorAudio.ViewModels.RecitationViewModel.Id">

41
RMuseum/Services/Implementation/ArtifactService.cs
View File

@ -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<RUserNoteViewModel> res = new List<RUserNoteViewModel>();
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<RUserNoteViewModel> res = new List<RUserNoteViewModel>();
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<RUserNoteViewModel> finalList = new List<RUserNoteViewModel>();
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)

27
RSecurityBackend/Models/Auth/ViewModels/PublicRAppUser.cs
View File

@ -13,33 +13,6 @@ namespace RSecurityBackend.Models.Auth.ViewModels
/// </remarks>
public class PublicRAppUser
{
/// <summary>
/// constructor
/// </summary>
/// <param name="dbUserInfo"></param>
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;
}
/// <summary>
/// default constructor
/// </summary>
public PublicRAppUser()
{
}
/// <summary>
/// Id
/// </summary>

12
RSecurityBackend/Models/Auth/ViewModels/PublicRUserSession.cs
View File

@ -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;

11
RSecurityBackend/RSecurityBackend.xml
View File

@ -1200,17 +1200,6 @@
a safe subset of RAppUser
</remarks>
</member>
<member name="M:RSecurityBackend.Models.Auth.ViewModels.PublicRAppUser.#ctor(RSecurityBackend.Models.Auth.Db.RAppUser)">
<summary>
constructor
</summary>
<param name="dbUserInfo"></param>
</member>
<member name="M:RSecurityBackend.Models.Auth.ViewModels.PublicRAppUser.#ctor">
<summary>
default constructor
</summary>
</member>
<member name="P:RSecurityBackend.Models.Auth.ViewModels.PublicRAppUser.Id">
<summary>
Id

90
RSecurityBackend/Services/Implementation/AppUserService.cs
View File

@ -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<PublicRAppUser>(new PublicRAppUser(dbUserInfo));
return new RServiceResult<PublicRAppUser>(
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<PublicRAppUser> lstPublicUsersInfo = new List<PublicRAppUser>();
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<PublicRAppUser[]>(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<PublicRAppUser>(null);
return new RServiceResult<PublicRAppUser>(new PublicRAppUser(user));
return new RServiceResult<PublicRAppUser>(
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)
{