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

refactoring

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2021-09-27 09:12:16 +03:30
parent 4b753894a6
commit 08a492ceb9
2 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
RMuseum/RMuseum.xml
View File

@ -9957,6 +9957,14 @@
<param name="id"></param>
<returns></returns>
</member>
<member name="M:RMuseum.Services.Implementation.GanjoorService._GetVerseIdFromCoupletIndex(System.Int32,System.Int32)">
<summary>
verse id from couplet index
</summary>
<param name="poemId"></param>
<param name="coupletIndex"></param>
<returns></returns>
</member>
<member name="M:RMuseum.Services.Implementation.GanjoorService.GetPoemComments(System.Int32,System.Guid,System.Nullable{System.Int32})">
<summary>
get poem comments

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

@ -521,6 +521,30 @@ namespace RMuseum.Services.Implementation
return new RServiceResult<PublicRecitationViewModel[]>(await source.AsNoTracking().ToArrayAsync());
}
/// <summary>
/// verse id from couplet index
/// </summary>
/// <param name="poemId"></param>
/// <param name="coupletIndex"></param>
/// <returns></returns>
private async Task<int?> _GetVerseIdFromCoupletIndex(int poemId, int coupletIndex)
{
int? res = null;
var verses = await _context.GanjoorVerses.Where(v => v.PoemId == poemId).OrderBy(v => v.VOrder).ToListAsync();
int cIndex = -1;
for (int i = 0; i < verses.Count; i++)
{
if (verses[i].VersePosition != VersePosition.Left && verses[i].VersePosition != VersePosition.CenteredVerse2)
cIndex++;
if (cIndex == coupletIndex)
{
res = verses[i].Id;
break;
}
}
return res;
}
/// <summary>
@ -535,18 +559,7 @@ namespace RMuseum.Services.Implementation
int? Verse1Id = null;
if (coupletIndex != null)
{
var verses = await _context.GanjoorVerses.Where(v => v.PoemId == poemId).OrderBy(v => v.VOrder).ToListAsync();
int cIndex = -1;
for (int i = 0; i < verses.Count; i++)
{
if (verses[i].VersePosition != VersePosition.Left && verses[i].VersePosition != VersePosition.CenteredVerse2)
cIndex++;
if (cIndex == coupletIndex)
{
Verse1Id = verses[i].Id;
break;
}
}
Verse1Id = await _GetVerseIdFromCoupletIndex(poemId, (int)coupletIndex);
}
var source =
from comment in _context.GanjoorComments.Include(c => c.User)