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

listing missing rhythms with no systemic suggestions

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2022-12-15 14:03:00 +03:30
parent afc14bb32f
commit 8b2e0cf315
4 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RMuseum/Controllers/GanjoorController.cs
View File

@ -598,8 +598,10 @@ namespace RMuseum.Controllers
{
string systemEmail = $"{Configuration.GetSection("Ganjoor")["SystemEmail"]}";
var systemUserId = (Guid)(await _appUserService.FindUserByEmail(systemEmail)).Result.Id;
string deletedUserEmail = $"{Configuration.GetSection("Ganjoor")["DeleteUserEmail"]}";
var deletedUserId = (Guid)(await _appUserService.FindUserByEmail(deletedUserEmail)).Result.Id;
RServiceResult<bool> res =
_ganjoorService.StartFindingMissingRhythms(systemUserId, onlyPoemsWithRhymes, poemsNum);
_ganjoorService.StartFindingMissingRhythms(systemUserId, deletedUserId, onlyPoemsWithRhymes, poemsNum);
if (!string.IsNullOrEmpty(res.ExceptionString))
return BadRequest(res.ExceptionString);
return Ok(res.Result);

10
RMuseum/RMuseum.xml
View File

@ -12598,11 +12598,12 @@
<param name="retag"></param>
<returns></returns>
</member>
<member name="M:RMuseum.Services.IGanjoorService.StartFindingMissingRhythms(System.Guid,System.Boolean,System.Int32)">
<member name="M:RMuseum.Services.IGanjoorService.StartFindingMissingRhythms(System.Guid,System.Guid,System.Boolean,System.Int32)">
<summary>
Start finding missing rhthms
</summary>
<param name="userId"></param>
<param name="systemUserId"></param>
<param name="deletedUserId"></param>
<param name="onlyPoemsWithRhymes"></param>
<param name="poemsNum"></param>
<returns></returns>
@ -14829,11 +14830,12 @@
</summary>
<returns></returns>
</member>
<member name="M:RMuseum.Services.Implementation.GanjoorService.StartFindingMissingRhythms(System.Guid,System.Boolean,System.Int32)">
<member name="M:RMuseum.Services.Implementation.GanjoorService.StartFindingMissingRhythms(System.Guid,System.Guid,System.Boolean,System.Int32)">
<summary>
Start finding missing rhthms
</summary>
<param name="userId"></param>
<param name="systemUserId"></param>
<param name="deletedUserId"></param>
<param name="onlyPoemsWithRhymes"></param>
<param name="poemsNum"></param>
<returns></returns>

5
RMuseum/Services/IGanjoorService.cs
View File

@ -671,11 +671,12 @@ namespace RMuseum.Services
/// <summary>
/// Start finding missing rhthms
/// </summary>
/// <param name="userId"></param>
/// <param name="systemUserId"></param>
/// <param name="deletedUserId"></param>
/// <param name="onlyPoemsWithRhymes"></param>
/// <param name="poemsNum"></param>
/// <returns></returns>
RServiceResult<bool> StartFindingMissingRhythms(Guid userId, bool onlyPoemsWithRhymes, int poemsNum = 1000);
RServiceResult<bool> StartFindingMissingRhythms(Guid systemUserId, Guid deletedUserId, bool onlyPoemsWithRhymes, int poemsNum = 1000);
/// <summary>
/// find poem rhythm

54
RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-ProbableMetres.cs
View File

@ -20,11 +20,12 @@ namespace RMuseum.Services.Implementation
/// <summary>
/// Start finding missing rhthms
/// </summary>
/// <param name="userId"></param>
/// <param name="systemUserId"></param>
/// <param name="deletedUserId"></param>
/// <param name="onlyPoemsWithRhymes"></param>
/// <param name="poemsNum"></param>
/// <returns></returns>
public RServiceResult<bool> StartFindingMissingRhythms(Guid userId, bool onlyPoemsWithRhymes, int poemsNum = 1000)
public RServiceResult<bool> StartFindingMissingRhythms(Guid systemUserId, Guid deletedUserId, bool onlyPoemsWithRhymes, int poemsNum = 1000)
{
_backgroundTaskQueue.QueueBackgroundWorkItem
(
@ -72,33 +73,36 @@ namespace RMuseum.Services.Implementation
context.GanjoorPoemProbableMetres.Add(prometre);
var userId = !string.IsNullOrEmpty(res.Result) && res.Result != "dismissed" ? systemUserId : deletedUserId;
if(!string.IsNullOrEmpty(res.Result) && res.Result != "dismissed")
{
GanjoorPoemSectionCorrection dbCorrection = new GanjoorPoemSectionCorrection()
{
SectionId = section.Id,
UserId = userId,
Rhythm = res.Result,
Note = "وزنیابی سیستمی",
Date = DateTime.Now,
RhythmResult = CorrectionReviewResult.NotReviewed,
Reviewed = false,
AffectedThePoem = false,
RhymeLettersReviewResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse1VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse2VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse3VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse4VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse5VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse6VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse7VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse8VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse9VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse10VOrderResult = CorrectionReviewResult.NotReviewed,
};
context.GanjoorPoemSectionCorrections.Add(dbCorrection);
res.Result = "فاعلاتن فاعلاتن فاعلاتن فاعلن (رمل مثمن محذوف)";
}
GanjoorPoemSectionCorrection dbCorrection = new GanjoorPoemSectionCorrection()
{
SectionId = section.Id,
UserId = userId,
Rhythm = res.Result,
Note = "وزنیابی سیستمی",
Date = DateTime.Now,
RhythmResult = CorrectionReviewResult.NotReviewed,
Reviewed = false,
AffectedThePoem = false,
RhymeLettersReviewResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse1VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse2VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse3VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse4VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse5VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse6VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse7VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse8VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse9VOrderResult = CorrectionReviewResult.NotReviewed,
BreakFromVerse10VOrderResult = CorrectionReviewResult.NotReviewed,
};
context.GanjoorPoemSectionCorrections.Add(dbCorrection);
await jobProgressServiceEF.UpdateJob(job.Id, i);
}