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

#415 bug fix

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2023-12-13 16:14:47 +03:30
parent 0c263f9d7c
commit c86f83a39a
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
RMuseum/Controllers/RecitationController.cs
View File

@ -411,14 +411,35 @@ namespace RMuseum.Controllers
if(narration.Result.RecitationType == RecitationType.Commentary)
{
var recitation = (await _audioService.Get(narration.Result.Id)).Result;
recitation.ReviewStatus = AudioReviewStatus.Pending;
var resPendingModeration = await _audioService.UpdatePoemNarration(recitation.Id, recitation);
if(!string.IsNullOrEmpty(resPendingModeration.ExceptionString))
if (narration.Result.Owner.Id == loggedOnUserId)
{
return BadRequest(resPendingModeration.ExceptionString);
Guid sessionId = new Guid(User.Claims.FirstOrDefault(c => c.Type == "SessionId").Value);
RServiceResult<bool>
serviceResult =
await _userPermissionChecker.Check
(
loggedOnUserId,
sessionId,
User.Claims.Any(c => c.Type == "Language") ? User.Claims.First(c => c.Type == "Language").Value : "fa-IR",
RMuseumSecurableItem.AudioRecitationEntityShortName,
RMuseumSecurableItem.ModerateOperationShortName
);
if (!string.IsNullOrEmpty(serviceResult.ExceptionString))
return BadRequest(serviceResult.ExceptionString);
if (!serviceResult.Result)
{
var recitation = (await _audioService.Get(narration.Result.Id)).Result;
recitation.ReviewStatus = AudioReviewStatus.Pending;
var resPendingModeration = await _audioService.UpdatePoemNarration(recitation.Id, recitation);
if (!string.IsNullOrEmpty(resPendingModeration.ExceptionString))
{
return BadRequest(resPendingModeration.ExceptionString);
}
return Ok(resPendingModeration.ExceptionString);
}
}
return Ok(resPendingModeration.ExceptionString );
}
var res = await _audioService.ModeratePoemNarration(id, loggedOnUserId, model);

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

@ -2502,7 +2502,7 @@ namespace RMuseum.Services.Implementation
&&
((string.IsNullOrEmpty(rhyme) && s.SectionType == PoemSectionType.WholePoem) || (!string.IsNullOrEmpty(rhyme) && s.RhymeLetters == rhyme))
&&
((format == GanjoorPoemFormat.Unknown && s.PoemFormat == null ) || s.PoemFormat == format)
(format == GanjoorPoemFormat.Unknown || s.PoemFormat == format)
&&
(catId == null || catIdList.Contains(s.Poem.CatId))
)