From d25050750e5d23b45f6c3817a6e22b0d5a3b78a7 Mon Sep 17 00:00:00 2001 From: Hamid Reza Mohammadi Date: Sun, 8 Nov 2020 17:48:26 +0330 Subject: [PATCH] fixes and improvements on updating narrations --- .../Controllers/AudioNarrationController.cs | 6 +-- .../PoemNarrationUpdateViewModel.cs | 41 ----------------- RMuseum/RMuseum.xml | 44 ++----------------- RMuseum/Services/IAudioNarrationService.cs | 2 +- .../Implementation/AudioNarrationService.cs | 8 ++-- 5 files changed, 11 insertions(+), 90 deletions(-) delete mode 100644 RMuseum/Models/GanjoorAudio/ViewModels/PoemNarrationUpdateViewModel.cs diff --git a/RMuseum/Controllers/AudioNarrationController.cs b/RMuseum/Controllers/AudioNarrationController.cs index 556fc440..b94b6c66 100644 --- a/RMuseum/Controllers/AudioNarrationController.cs +++ b/RMuseum/Controllers/AudioNarrationController.cs @@ -173,10 +173,10 @@ namespace RMuseum.Controllers [HttpPut("{id}")] [Authorize] - [ProducesResponseType((int)HttpStatusCode.OK, Type = typeof(PoemNarrationUpdateViewModel))] + [ProducesResponseType((int)HttpStatusCode.OK, Type = typeof(PoemNarrationViewModel))] [ProducesResponseType((int)HttpStatusCode.BadRequest, Type = typeof(string))] [ProducesResponseType((int)HttpStatusCode.Forbidden, Type = typeof(string))] - public async Task UpdatePoemNarration(int id, [FromBody] PoemNarrationUpdateViewModel metadata) + public async Task UpdatePoemNarration(int id, [FromBody] PoemNarrationViewModel metadata) { Guid loggedOnUserId = new Guid(User.Claims.FirstOrDefault(c => c.Type == "UserId").Value); @@ -214,7 +214,7 @@ namespace RMuseum.Controllers /// [HttpPut("moderate/{id}")] [Authorize(Policy = RMuseumSecurableItem.AudioNarrationEntityShortName + ":" + RMuseumSecurableItem.ModerateOperationShortName)] - [ProducesResponseType((int)HttpStatusCode.OK, Type = typeof(PoemNarrationUpdateViewModel))] + [ProducesResponseType((int)HttpStatusCode.OK, Type = typeof(bool))] [ProducesResponseType((int)HttpStatusCode.BadRequest, Type = typeof(string))] [ProducesResponseType((int)HttpStatusCode.Forbidden, Type = typeof(string))] public async Task ModeratePoemNarration(int id, [FromBody] PoemNarrationModerateViewModel model) diff --git a/RMuseum/Models/GanjoorAudio/ViewModels/PoemNarrationUpdateViewModel.cs b/RMuseum/Models/GanjoorAudio/ViewModels/PoemNarrationUpdateViewModel.cs deleted file mode 100644 index 989f97c4..00000000 --- a/RMuseum/Models/GanjoorAudio/ViewModels/PoemNarrationUpdateViewModel.cs +++ /dev/null @@ -1,41 +0,0 @@ -namespace RMuseum.Models.GanjoorAudio.ViewModels -{ - /// - /// Poem Narration View Model for updates - /// - public class PoemNarrationUpdateViewModel - { - /// - /// Audio Title - /// - public string AudioTitle { get; set; } - - /// - /// Audio Artist - /// - public string AudioArtist { get; set; } - - /// - /// Audio Artist Url - /// - public string AudioArtistUrl { get; set; } - - /// - /// Audio Source - /// - public string AudioSrc { get; set; } - - /// - /// Audio Src Url - /// - public string AudioSrcUrl { get; set; } - - /// - /// Review Status - /// - /// - /// changing from Draft => Pending or Pending => Draft is possible for owner, other changes need narration::moderate permission - /// - public AudioReviewStatus ReviewStatus { get; set; } - } -} diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml index f513d336..ecab5ff8 100644 --- a/RMuseum/RMuseum.xml +++ b/RMuseum/RMuseum.xml @@ -664,7 +664,7 @@ narration id - + updates narration metadata @@ -2061,44 +2061,6 @@ Rejection Message - - - Poem Narration View Model for updates - - - - - Audio Title - - - - - Audio Artist - - - - - Audio Artist Url - - - - - Audio Source - - - - - Audio Src Url - - - - - Review Status - - - changing from Draft => Pending or Pending => Draft is possible for owner, other changes need narration::moderate permission - - Poem Narration view model @@ -4013,7 +3975,7 @@ narration id - + updates metadata for narration @@ -4831,7 +4793,7 @@ narration id - + updates metadata for narration diff --git a/RMuseum/Services/IAudioNarrationService.cs b/RMuseum/Services/IAudioNarrationService.cs index 3a7d9867..0499be60 100644 --- a/RMuseum/Services/IAudioNarrationService.cs +++ b/RMuseum/Services/IAudioNarrationService.cs @@ -43,7 +43,7 @@ namespace RMuseum.Services /// /// /// - Task> UpdatePoemNarration(int id, PoemNarrationUpdateViewModel metadata); + Task> UpdatePoemNarration(int id, PoemNarrationViewModel metadata); /// /// imports narration data from ganjoor MySql database diff --git a/RMuseum/Services/Implementation/AudioNarrationService.cs b/RMuseum/Services/Implementation/AudioNarrationService.cs index 54c89d46..ae9c9073 100644 --- a/RMuseum/Services/Implementation/AudioNarrationService.cs +++ b/RMuseum/Services/Implementation/AudioNarrationService.cs @@ -142,13 +142,13 @@ namespace RMuseum.Services.Implementation /// /// /// - public async Task> UpdatePoemNarration(int id, PoemNarrationUpdateViewModel metadata) + public async Task> UpdatePoemNarration(int id, PoemNarrationViewModel metadata) { try { PoemNarration narration = await _context.AudioFiles.Where(a => a.Id == id).SingleOrDefaultAsync(); if(narration == null) - return new RServiceResult(false, "404"); + return new RServiceResult(null, "404"); narration.AudioTitle = metadata.AudioTitle; narration.AudioArtist = metadata.AudioArtist; narration.AudioArtistUrl = metadata.AudioArtistUrl; @@ -157,11 +157,11 @@ namespace RMuseum.Services.Implementation narration.ReviewStatus = metadata.ReviewStatus; _context.AudioFiles.Update(narration); await _context.SaveChangesAsync(); - return new RServiceResult(true); + return new RServiceResult(new PoemNarrationViewModel(narration, null, null)); } catch (Exception exp) { - return new RServiceResult(false, exp.ToString()); + return new RServiceResult(null, exp.ToString()); } }