diff --git a/RMuseum/Controllers/GanjoorController.cs b/RMuseum/Controllers/GanjoorController.cs index 619f3fe4..dd78205f 100644 --- a/RMuseum/Controllers/GanjoorController.cs +++ b/RMuseum/Controllers/GanjoorController.cs @@ -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 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); diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml index c7f6be0d..d1ca9124 100644 --- a/RMuseum/RMuseum.xml +++ b/RMuseum/RMuseum.xml @@ -12598,11 +12598,12 @@ - + Start finding missing rhthms - + + @@ -14829,11 +14830,12 @@ - + Start finding missing rhthms - + + diff --git a/RMuseum/Services/IGanjoorService.cs b/RMuseum/Services/IGanjoorService.cs index 2aec0cca..5abcbd9b 100644 --- a/RMuseum/Services/IGanjoorService.cs +++ b/RMuseum/Services/IGanjoorService.cs @@ -671,11 +671,12 @@ namespace RMuseum.Services /// /// Start finding missing rhthms /// - /// + /// + /// /// /// /// - RServiceResult StartFindingMissingRhythms(Guid userId, bool onlyPoemsWithRhymes, int poemsNum = 1000); + RServiceResult StartFindingMissingRhythms(Guid systemUserId, Guid deletedUserId, bool onlyPoemsWithRhymes, int poemsNum = 1000); /// /// find poem rhythm diff --git a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-ProbableMetres.cs b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-ProbableMetres.cs index 75b6c3a6..620f7848 100644 --- a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-ProbableMetres.cs +++ b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-ProbableMetres.cs @@ -20,11 +20,12 @@ namespace RMuseum.Services.Implementation /// /// Start finding missing rhthms /// - /// + /// + /// /// /// /// - public RServiceResult StartFindingMissingRhythms(Guid userId, bool onlyPoemsWithRhymes, int poemsNum = 1000) + public RServiceResult 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); }