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

#72 removing RUserNoteViewModel constructor

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2021-02-04 11:09:30 +03:30
parent b664d6c025
commit c017de485b
4 changed files with 214 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,4 @@
using RSecurityBackend.Models.Auth.Db;
using RSecurityBackend.Models.Auth.ViewModels;
using RSecurityBackend.Models.Auth.ViewModels;
using System;
namespace RMuseum.Models.GanjoorIntegration.ViewModels

38
RMuseum/Models/Note/ViewModels/RUserNoteViewModel.cs
View File

@ -1,5 +1,4 @@
using RMuseum.Models.Artifact;
using RSecurityBackend.Models.Auth.ViewModels;
using System;
using System.Globalization;
@ -10,32 +9,6 @@ namespace RMuseum.Models.Note.ViewModels
/// </summary>
public class RUserNoteViewModel
{
/// <summary>
/// Constructor
/// </summary>
/// <param name="src"></param>
/// <param name="user"></param>
public RUserNoteViewModel(RUserNote src, PublicRAppUser user)
{
Id = src.Id;
RAppUserId = src.RAppUserId;
UserName = (user.FirstName + " " + user.SureName);
RUserImageId = user.RImageId;
Modified = src.Modified;
NoteType = src.NoteType;
HtmlContent = src.HtmlContent;
ReferenceNoteId = src.ReferenceNoteId;
Status = src.Status;
Notes = new RUserNoteViewModel[] { };
PersianCalendar pc = new PersianCalendar();
DateTime = $"{pc.GetYear(src.DateTime)}/{pc.GetMonth(src.DateTime)}/{pc.GetDayOfMonth(src.DateTime)}&nbsp;{pc.GetHour(src.DateTime)}:{pc.GetMinute(src.DateTime)}";
LastModified = $"{pc.GetYear(src.LastModified)}/{pc.GetMonth(src.LastModified)}/{pc.GetDayOfMonth(src.LastModified)}&nbsp;{pc.GetHour(src.LastModified)}:{pc.GetMinute(src.LastModified)}";
}
/// <summary>
/// Id
/// </summary>
@ -130,5 +103,16 @@ namespace RMuseum.Models.Note.ViewModels
/// It os set only in certain cases
/// </remarks>
public RUserNoteViewModel[] Notes { get; set; }
/// <summary>
/// prepare note datetime
/// </summary>
/// <param name="dateTime"></param>
/// <returns></returns>
public static string PrepareNoteDateTime(DateTime dateTime)
{
PersianCalendar pc = new PersianCalendar();
return $"{pc.GetYear(dateTime)}/{pc.GetMonth(dateTime)}/{pc.GetDayOfMonth(dateTime)}&nbsp;{pc.GetHour(dateTime)}:{pc.GetMinute(dateTime)}";
}
}
}

14
RMuseum/RMuseum.xml
View File

@ -4767,13 +4767,6 @@
Safe User Note View Model
</summary>
</member>
<member name="M:RMuseum.Models.Note.ViewModels.RUserNoteViewModel.#ctor(RMuseum.Models.Note.RUserNote,RSecurityBackend.Models.Auth.ViewModels.PublicRAppUser)">
<summary>
Constructor
</summary>
<param name="src"></param>
<param name="user"></param>
</member>
<member name="P:RMuseum.Models.Note.ViewModels.RUserNoteViewModel.Id">
<summary>
Id
@ -4869,6 +4862,13 @@
It os set only in certain cases
</remarks>
</member>
<member name="M:RMuseum.Models.Note.ViewModels.RUserNoteViewModel.PrepareNoteDateTime(System.DateTime)">
<summary>
prepare note datetime
</summary>
<param name="dateTime"></param>
<returns></returns>
</member>
<member name="T:RMuseum.Models.UploadSession.UploadSession">
<summary>
Upload Session

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

@ -1985,8 +1985,26 @@ namespace RMuseum.Services.Implementation
$"<blockquote cite=\"/item/{artificat.FriendlyUrl}#{referenceNote.Id}\">{referenceNote.HtmlContent}</blockquote>"
);
}
}
return new RServiceResult<RUserNoteViewModel>(new RUserNoteViewModel(note, userInfo.Result));
}
return new RServiceResult<RUserNoteViewModel>
(
new RUserNoteViewModel()
{
Id = note.Id,
RAppUserId = note.RAppUserId,
UserName = userInfo.Result.FirstName + " " + userInfo.Result.SureName,
RUserImageId = userInfo.Result.RImageId,
Modified = note.Modified,
NoteType = note.NoteType,
HtmlContent = note.HtmlContent,
ReferenceNoteId = note.ReferenceNoteId,
Status = note.Status,
Notes = new RUserNoteViewModel[] { },
DateTime = RUserNoteViewModel.PrepareNoteDateTime(note.DateTime),
LastModified = RUserNoteViewModel.PrepareNoteDateTime(note.LastModified)
}
);
}
catch (Exception exp)
{
@ -2055,7 +2073,24 @@ namespace RMuseum.Services.Implementation
}
return new RServiceResult<RUserNoteViewModel>(new RUserNoteViewModel(note, userInfo.Result));
return new RServiceResult<RUserNoteViewModel>
(
new RUserNoteViewModel()
{
Id = note.Id,
RAppUserId = note.RAppUserId,
UserName = userInfo.Result.FirstName + " " + userInfo.Result.SureName,
RUserImageId = userInfo.Result.RImageId,
Modified = note.Modified,
NoteType = note.NoteType,
HtmlContent = note.HtmlContent,
ReferenceNoteId = note.ReferenceNoteId,
Status = note.Status,
Notes = new RUserNoteViewModel[] { },
DateTime = RUserNoteViewModel.PrepareNoteDateTime(note.DateTime),
LastModified = RUserNoteViewModel.PrepareNoteDateTime(note.LastModified)
}
);
}
catch (Exception exp)
{
@ -2105,7 +2140,24 @@ namespace RMuseum.Services.Implementation
await _context.SaveChangesAsync();
return new RServiceResult<RUserNoteViewModel>(new RUserNoteViewModel(note, userInfo.Result));
return new RServiceResult<RUserNoteViewModel>
(
new RUserNoteViewModel()
{
Id = note.Id,
RAppUserId = note.RAppUserId,
UserName = userInfo.Result.FirstName + " " + userInfo.Result.SureName,
RUserImageId = userInfo.Result.RImageId,
Modified = note.Modified,
NoteType = note.NoteType,
HtmlContent = note.HtmlContent,
ReferenceNoteId = note.ReferenceNoteId,
Status = note.Status,
Notes = new RUserNoteViewModel[] { },
DateTime = RUserNoteViewModel.PrepareNoteDateTime(note.DateTime),
LastModified = RUserNoteViewModel.PrepareNoteDateTime(note.LastModified)
}
);
}
catch (Exception exp)
{
@ -2185,7 +2237,24 @@ namespace RMuseum.Services.Implementation
List<RUserNoteViewModel> res = new List<RUserNoteViewModel>();
foreach (RUserNote note in notes)
res.Add(new RUserNoteViewModel(note, userInfo.Result));
res.Add
(
new RUserNoteViewModel()
{
Id = note.Id,
RAppUserId = note.RAppUserId,
UserName = userInfo.Result.FirstName + " " + userInfo.Result.SureName,
RUserImageId = userInfo.Result.RImageId,
Modified = note.Modified,
NoteType = note.NoteType,
HtmlContent = note.HtmlContent,
ReferenceNoteId = note.ReferenceNoteId,
Status = note.Status,
Notes = new RUserNoteViewModel[] { },
DateTime = RUserNoteViewModel.PrepareNoteDateTime(note.DateTime),
LastModified = RUserNoteViewModel.PrepareNoteDateTime(note.LastModified)
}
);
return new RServiceResult<RUserNoteViewModel[]>(res.ToArray());
}
@ -2212,17 +2281,38 @@ namespace RMuseum.Services.Implementation
foreach (RUserNote note in notes)
{
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
});
var 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
};
RUserNoteViewModel viewModel
=
new RUserNoteViewModel()
{
Id = note.Id,
RAppUserId = note.RAppUserId,
UserName = user.FirstName + " " + user.SureName,
RUserImageId = user.RImageId,
Modified = note.Modified,
NoteType = note.NoteType,
HtmlContent = note.HtmlContent,
ReferenceNoteId = note.ReferenceNoteId,
Status = note.Status,
Notes = new RUserNoteViewModel[] { },
DateTime = RUserNoteViewModel.PrepareNoteDateTime(note.DateTime),
LastModified = RUserNoteViewModel.PrepareNoteDateTime(note.LastModified)
};
viewModel.Notes = await _GetArtifactPublicNotes(artifactId, note.Id);
res.Add(viewModel);
}
@ -2266,7 +2356,24 @@ namespace RMuseum.Services.Implementation
List<RUserNoteViewModel> res = new List<RUserNoteViewModel>();
foreach (RUserNote note in notes)
res.Add(new RUserNoteViewModel(note, userInfo.Result));
res.Add
(
new RUserNoteViewModel()
{
Id = note.Id,
RAppUserId = note.RAppUserId,
UserName = userInfo.Result.FirstName + " " + userInfo.Result.SureName,
RUserImageId = userInfo.Result.RImageId,
Modified = note.Modified,
NoteType = note.NoteType,
HtmlContent = note.HtmlContent,
ReferenceNoteId = note.ReferenceNoteId,
Status = note.Status,
Notes = new RUserNoteViewModel[] { },
DateTime = RUserNoteViewModel.PrepareNoteDateTime(note.DateTime),
LastModified = RUserNoteViewModel.PrepareNoteDateTime(note.LastModified)
}
);
return new RServiceResult<RUserNoteViewModel[]>(res.ToArray());
}
@ -2293,17 +2400,38 @@ namespace RMuseum.Services.Implementation
foreach (RUserNote note in notes)
{
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
});
var 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
};
RUserNoteViewModel viewModel
=
new RUserNoteViewModel()
{
Id = note.Id,
RAppUserId = note.RAppUserId,
UserName = user.FirstName + " " + user.SureName,
RUserImageId = user.RImageId,
Modified = note.Modified,
NoteType = note.NoteType,
HtmlContent = note.HtmlContent,
ReferenceNoteId = note.ReferenceNoteId,
Status = note.Status,
Notes = new RUserNoteViewModel[] { },
DateTime = RUserNoteViewModel.PrepareNoteDateTime(note.DateTime),
LastModified = RUserNoteViewModel.PrepareNoteDateTime(note.LastModified)
};
viewModel.Notes = await _GetArtifactItemPublicNotes(itemId, note.Id);
res.Add(viewModel);
}
@ -2360,8 +2488,23 @@ namespace RMuseum.Services.Implementation
List<RUserNoteViewModel> finalList = new List<RUserNoteViewModel>();
foreach (RUserNote note in paginatedResult1.Notes)
{
RUserNoteViewModel model = new RUserNoteViewModel(note, user);
if (note.RArtifactMasterRecord != null)
RUserNoteViewModel model =
new RUserNoteViewModel()
{
Id = note.Id,
RAppUserId = note.RAppUserId,
UserName = user.FirstName + " " + user.SureName,
RUserImageId = user.RImageId,
Modified = note.Modified,
NoteType = note.NoteType,
HtmlContent = note.HtmlContent,
ReferenceNoteId = note.ReferenceNoteId,
Status = note.Status,
Notes = new RUserNoteViewModel[] { },
DateTime = RUserNoteViewModel.PrepareNoteDateTime(note.DateTime),
LastModified = RUserNoteViewModel.PrepareNoteDateTime(note.LastModified)
};
if (note.RArtifactMasterRecord != null)
{
if (!statusArray.Contains(note.RArtifactMasterRecord.Status))
continue; //this may result in paging bugs
@ -2430,7 +2573,8 @@ namespace RMuseum.Services.Implementation
foreach (RUserNote note in paginatedResult1.Notes)
{
RAppUser appUser = note.RAppUser;
RUserNoteViewModel model = new RUserNoteViewModel(note,
var user =
new PublicRAppUser()
{
Id = appUser.Id,
@ -2441,7 +2585,26 @@ namespace RMuseum.Services.Implementation
PhoneNumber = appUser.PhoneNumber,
RImageId = appUser.RImageId,
Status = appUser.Status
});
};
RUserNoteViewModel model
=
new RUserNoteViewModel()
{
Id = note.Id,
RAppUserId = note.RAppUserId,
UserName = user.FirstName + " " + user.SureName,
RUserImageId = user.RImageId,
Modified = note.Modified,
NoteType = note.NoteType,
HtmlContent = note.HtmlContent,
ReferenceNoteId = note.ReferenceNoteId,
Status = note.Status,
Notes = new RUserNoteViewModel[] { },
DateTime = RUserNoteViewModel.PrepareNoteDateTime(note.DateTime),
LastModified = RUserNoteViewModel.PrepareNoteDateTime(note.LastModified)
};
if (note.RArtifactMasterRecord != null)
{
if (note.RArtifactMasterRecord.Status != PublishStatus.Published)