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

#200 updating GanjoorCommentFullViewModel with related couplet information

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2021-09-08 09:35:39 +04:30
parent a5b47e3d38
commit e3222b20cf
3 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
RMuseum/Models/Ganjoor/ViewModels/GanjoorCommentFullViewModel.cs
View File

@ -55,5 +55,26 @@ namespace RMuseum.Models.Ganjoor.ViewModels
/// this can be used by clients
/// </summary>
public bool MyComment { get; set; }
/// <summary>
/// verse1 id
/// </summary>
public int Verse1Id { get; set; }
/// <summary>
/// verse2 id
/// </summary>
public int Verse2Id { get; set; }
/// <summary>
/// couplet index
/// </summary>
public int CoupletIndex { get; set; }
/// <summary>
/// couplet summary
/// </summary>
public string CoupletSummary { get; set; }
}
}

20
RMuseum/RMuseum.xml
View File

@ -5462,6 +5462,26 @@
this can be used by clients
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.ViewModels.GanjoorCommentFullViewModel.Verse1Id">
<summary>
verse1 id
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.ViewModels.GanjoorCommentFullViewModel.Verse2Id">
<summary>
verse2 id
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.ViewModels.GanjoorCommentFullViewModel.CoupletIndex">
<summary>
couplet index
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.ViewModels.GanjoorCommentFullViewModel.CoupletSummary">
<summary>
couplet summary
</summary>
</member>
<member name="T:RMuseum.Models.Ganjoor.ViewModels.GanjoorCommentPostViewModel">
<summary>
new comment model

17
RMuseum/Services/Implementation/GanjoorService.cs
View File

@ -936,6 +936,9 @@ namespace RMuseum.Services.Implementation
HtmlComment = comment.HtmlComment,
PublishStatus = "",//invalid!
UserId = comment.UserId,
CoupletIndex = comment.CoupletIndex == null ? -1 : (int)comment.CoupletIndex,
Verse1Id = comment.Verse1Id == null ? -1 : (int)comment.Verse1Id,
Verse2Id = comment.Verse12d == null ? -1 : (int)comment.Verse12d,
InReplyTo = comment.InReplyTo == null ? null :
new GanjoorCommentSummaryViewModel()
{
@ -966,14 +969,20 @@ namespace RMuseum.Services.Implementation
foreach (GanjoorCommentFullViewModel comment in paginatedResult.Items)
{
comment.AuthorName = comment.AuthorName.ToPersianNumbers().ApplyCorrectYeKe();
if(comment.InReplyTo != null)
string replyText = comment.Verse1Id == -1 ? "" : (await _context.GanjoorVerses.Where(v => v.Id == comment.Verse1Id).FirstAsync()).Text;
if (comment.Verse2Id != -1)
{
string coupleText = comment.InReplyTo.Verse1Id == -1 ? "" : (await _context.GanjoorVerses.Where(v => v.Id == comment.InReplyTo.Verse1Id).FirstAsync()).Text;
replyText += $" {(await _context.GanjoorVerses.Where(v => v.Id == comment.Verse2Id).FirstAsync()).Text}";
}
comment.CoupletSummary = replyText;
if (comment.InReplyTo != null)
{
string replyCoupleText = comment.InReplyTo.Verse1Id == -1 ? "" : (await _context.GanjoorVerses.Where(v => v.Id == comment.InReplyTo.Verse1Id).FirstAsync()).Text;
if(comment.InReplyTo.Verse2Id != -1)
{
coupleText += $" {(await _context.GanjoorVerses.Where(v => v.Id == comment.InReplyTo.Verse2Id).FirstAsync()).Text}";
replyCoupleText += $" {(await _context.GanjoorVerses.Where(v => v.Id == comment.InReplyTo.Verse2Id).FirstAsync()).Text}";
}
comment.InReplyTo.CoupletSummary = coupleText;
comment.InReplyTo.CoupletSummary = replyCoupleText;
}
}