diff --git a/RMuseum/Models/GanjoorAudio/ViewModels/RecitationPublishingTrackerViewModel.cs b/RMuseum/Models/GanjoorAudio/ViewModels/RecitationPublishingTrackerViewModel.cs index 37f784c2..14887663 100644 --- a/RMuseum/Models/GanjoorAudio/ViewModels/RecitationPublishingTrackerViewModel.cs +++ b/RMuseum/Models/GanjoorAudio/ViewModels/RecitationPublishingTrackerViewModel.cs @@ -1,6 +1,4 @@ -using RMuseum.Models.Ganjoor; -using RSecurityBackend.Models.Auth.Db; -using System; +using System; namespace RMuseum.Models.GanjoorAudio.ViewModels { @@ -9,36 +7,7 @@ namespace RMuseum.Models.GanjoorAudio.ViewModels /// public class RecitationPublishingTrackerViewModel { - /// - /// Constructor - /// - /// - /// - /// - /// - public RecitationPublishingTrackerViewModel(RecitationPublishingTracker tracker, GanjoorPoem poem, RAppUser user, Recitation recitation) - { - UserEmail = user.Email; - PoemFullTitle = poem.FullTitle; - ArtistName = recitation.AudioArtist; - Operation = recitation.AudioSyncStatus == AudioSyncStatus.NewItem ? "جدید" : - recitation.AudioSyncStatus == AudioSyncStatus.SoundOrXMLFilesChanged ? "جایگزینی فایل" : - recitation.AudioSyncStatus == AudioSyncStatus.MetadataChanged ? "تغییر اطلاعات" : - recitation.AudioSyncStatus == AudioSyncStatus.Deleted ? "حذف" : - "نامشخص (انجام شده)"; - InProgress = !tracker.Finished && string.IsNullOrEmpty(tracker.LastException); - XmlFileCopied = tracker.XmlFileCopied; - Mp3FileCopied = tracker.Mp3FileCopied; - FirstDbUpdated = tracker.FirstDbUpdated; - SecondDbUpdated = tracker.SecondDbUpdated; - Succeeded = tracker.Finished; - Error = !string.IsNullOrEmpty(tracker.LastException); - LastException = tracker.LastException; - StartDate = tracker.StartDate; - FinishDate = tracker.FinishDate; - } - - /// + /// /// user email /// public string UserEmail { get; set; } diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml index 77cb8d1e..2a33008d 100644 --- a/RMuseum/RMuseum.xml +++ b/RMuseum/RMuseum.xml @@ -2527,15 +2527,6 @@ RecitationPublishingTracker View Model - - - Constructor - - - - - - user email diff --git a/RMuseum/Services/Implementation/RecitationService.cs b/RMuseum/Services/Implementation/RecitationService.cs index 9aa35c6a..b07a1394 100644 --- a/RMuseum/Services/Implementation/RecitationService.cs +++ b/RMuseum/Services/Implementation/RecitationService.cs @@ -1913,8 +1913,27 @@ namespace RMuseum.Services.Implementationa && (!unfinished || (unfinished && !tracker.Finished)) orderby tracker.StartDate descending - select new RecitationPublishingTrackerViewModel(tracker, poem, recitation.Owner, recitation); - + select new RecitationPublishingTrackerViewModel() + { + UserEmail = recitation.Owner.Email, + PoemFullTitle = poem.FullTitle, + ArtistName = recitation.AudioArtist, + Operation = recitation.AudioSyncStatus == AudioSyncStatus.NewItem ? "جدید" : + recitation.AudioSyncStatus == AudioSyncStatus.SoundOrXMLFilesChanged ? "جایگزینی فایل" : + recitation.AudioSyncStatus == AudioSyncStatus.MetadataChanged ? "تغییر اطلاعات" : + recitation.AudioSyncStatus == AudioSyncStatus.Deleted ? "حذف" : + "نامشخص (انجام شده)", + InProgress = !tracker.Finished && string.IsNullOrEmpty(tracker.LastException), + XmlFileCopied = tracker.XmlFileCopied, + Mp3FileCopied = tracker.Mp3FileCopied, + FirstDbUpdated = tracker.FirstDbUpdated, + SecondDbUpdated = tracker.SecondDbUpdated, + Succeeded = tracker.Finished, + Error = !string.IsNullOrEmpty(tracker.LastException), + LastException = tracker.LastException, + StartDate = tracker.StartDate, + FinishDate = tracker.FinishDate + }; (PaginationMetadata PagingMeta, RecitationPublishingTrackerViewModel[] Items) paginatedResult = await QueryablePaginator.Paginate(source, paging);