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

Changing PoemNarration key from Guid to int

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2020-10-26 21:34:33 +03:30
parent c8a55d6a82
commit ce6012ad62
9 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RMuseum/Controllers/AudioNarrationController.cs
View File

@ -84,7 +84,7 @@ namespace RMuseum.Controllers
[ProducesResponseType((int)HttpStatusCode.OK, Type = typeof(PoemNarrationUpdateViewModel))]
[ProducesResponseType((int)HttpStatusCode.BadRequest, Type = typeof(string))]
[ProducesResponseType((int)HttpStatusCode.Forbidden, Type = typeof(string))]
public async Task<IActionResult> UpdatePoemNarration(Guid id, [FromBody] PoemNarrationUpdateViewModel metadata)
public async Task<IActionResult> UpdatePoemNarration(int id, [FromBody] PoemNarrationUpdateViewModel metadata)
{
Guid loggedOnUserId = new Guid(User.Claims.FirstOrDefault(c => c.Type == "UserId").Value);
@ -125,7 +125,7 @@ namespace RMuseum.Controllers
[ProducesResponseType((int)HttpStatusCode.OK, Type = typeof(PoemNarrationUpdateViewModel))]
[ProducesResponseType((int)HttpStatusCode.BadRequest, Type = typeof(string))]
[ProducesResponseType((int)HttpStatusCode.Forbidden, Type = typeof(string))]
public async Task<IActionResult> ModeratePoemNarration(Guid id, [FromBody] PoemNarrationModerateViewModel model)
public async Task<IActionResult> ModeratePoemNarration(int id, [FromBody] PoemNarrationModerateViewModel model)
{
Guid loggedOnUserId = new Guid(User.Claims.FirstOrDefault(c => c.Type == "UserId").Value);

7
RMuseum/Migrations/20200830054142_AudioFiles.Designer.cs generated
View File

@ -340,9 +340,10 @@ namespace RMuseum.Migrations
modelBuilder.Entity("RMuseum.Models.GanjoorAudio.PoemNarration", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
b.Property<string>("AudioArtist")
.HasColumnType("nvarchar(max)");

3
RMuseum/Migrations/20200830054142_AudioFiles.cs
View File

@ -11,7 +11,8 @@ namespace RMuseum.Migrations
name: "AudioFiles",
columns: table => new
{
Id = table.Column<Guid>(nullable: false),
Id = table.Column<int>(nullable: false)
.Annotation("SqlServer:Identity", "1, 1"),
OwnerId = table.Column<Guid>(nullable: false),
GanjoorAudioId = table.Column<int>(nullable: false),
GanjoorPostId = table.Column<int>(nullable: false),

2
RMuseum/Models/GanjoorAudio/PoemNarration.cs
View File

@ -12,7 +12,7 @@ namespace RMuseum.Models.GanjoorAudio
/// <summary>
/// Id
/// </summary>
public Guid Id { get; set; }
public int Id { get; set; }
/// <summary>
/// Owner User

4
RMuseum/Models/GanjoorAudio/ViewModels/PoemNarrationViewModel.cs
View File

@ -18,7 +18,7 @@ namespace RMuseum.Models.GanjoorAudio.ViewModels
public PoemNarrationViewModel(PoemNarration src, GanjoorPoem poem)
{
Id = src.Id;
Owner = new PublicRAppUser(src.Owner);
Owner = src.Owner == null ? null : new PublicRAppUser(src.Owner);
GanjoorAudioId = src.GanjoorAudioId;
GanjoorPostId = src.GanjoorPostId;
AudioOrder = src.AudioOrder;
@ -65,7 +65,7 @@ namespace RMuseum.Models.GanjoorAudio.ViewModels
/// <summary>
/// Id
/// </summary>
public Guid Id { get; set; }
public int Id { get; set; }
/// <summary>
/// Owner User

16
RMuseum/RMuseum.xml
View File

@ -635,7 +635,7 @@
<param name="status">default: -1, unfiltered</param>
<returns></returns>
</member>
<member name="M:RMuseum.Controllers.AudioNarrationController.UpdatePoemNarration(System.Guid,RMuseum.Models.GanjoorAudio.ViewModels.PoemNarrationUpdateViewModel)">
<member name="M:RMuseum.Controllers.AudioNarrationController.UpdatePoemNarration(System.Int32,RMuseum.Models.GanjoorAudio.ViewModels.PoemNarrationUpdateViewModel)">
<summary>
updates narration metadata
</summary>
@ -647,7 +647,7 @@
</remarks>
<returns></returns>
</member>
<member name="M:RMuseum.Controllers.AudioNarrationController.ModeratePoemNarration(System.Guid,RMuseum.Models.GanjoorAudio.ViewModels.PoemNarrationModerateViewModel)">
<member name="M:RMuseum.Controllers.AudioNarrationController.ModeratePoemNarration(System.Int32,RMuseum.Models.GanjoorAudio.ViewModels.PoemNarrationModerateViewModel)">
<summary>
Moderate pending narration
</summary>
@ -3885,14 +3885,14 @@
<param name="status"></param>
<returns></returns>
</member>
<member name="M:RMuseum.Services.IAudioNarrationService.Get(System.Guid)">
<member name="M:RMuseum.Services.IAudioNarrationService.Get(System.Int32)">
<summary>
return selected narration information
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:RMuseum.Services.IAudioNarrationService.UpdatePoemNarration(System.Guid,RMuseum.Models.GanjoorAudio.ViewModels.PoemNarrationUpdateViewModel)">
<member name="M:RMuseum.Services.IAudioNarrationService.UpdatePoemNarration(System.Int32,RMuseum.Models.GanjoorAudio.ViewModels.PoemNarrationUpdateViewModel)">
<summary>
updates metadata for narration
</summary>
@ -3929,7 +3929,7 @@
<param name="files"></param>
<returns></returns>
</member>
<member name="M:RMuseum.Services.IAudioNarrationService.ModeratePoemNarration(System.Guid,System.Guid,RMuseum.Models.GanjoorAudio.ViewModels.PoemNarrationModerateViewModel)">
<member name="M:RMuseum.Services.IAudioNarrationService.ModeratePoemNarration(System.Int32,System.Guid,RMuseum.Models.GanjoorAudio.ViewModels.PoemNarrationModerateViewModel)">
<summary>
Moderate pending narration
</summary>
@ -4689,14 +4689,14 @@
<param name="status"></param>
<returns></returns>
</member>
<member name="M:RMuseum.Services.Implementation.AudioNarrationService.Get(System.Guid)">
<member name="M:RMuseum.Services.Implementation.AudioNarrationService.Get(System.Int32)">
<summary>
return selected narration information
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:RMuseum.Services.Implementation.AudioNarrationService.UpdatePoemNarration(System.Guid,RMuseum.Models.GanjoorAudio.ViewModels.PoemNarrationUpdateViewModel)">
<member name="M:RMuseum.Services.Implementation.AudioNarrationService.UpdatePoemNarration(System.Int32,RMuseum.Models.GanjoorAudio.ViewModels.PoemNarrationUpdateViewModel)">
<summary>
updates metadata for narration
</summary>
@ -4732,7 +4732,7 @@
<param name="files"></param>
<returns></returns>
</member>
<member name="M:RMuseum.Services.Implementation.AudioNarrationService.ModeratePoemNarration(System.Guid,System.Guid,RMuseum.Models.GanjoorAudio.ViewModels.PoemNarrationModerateViewModel)">
<member name="M:RMuseum.Services.Implementation.AudioNarrationService.ModeratePoemNarration(System.Int32,System.Guid,RMuseum.Models.GanjoorAudio.ViewModels.PoemNarrationModerateViewModel)">
<summary>
Moderate pending narration
</summary>

6
RMuseum/Services/IAudioNarrationService.cs
View File

@ -27,7 +27,7 @@ namespace RMuseum.Services
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
Task<RServiceResult<PoemNarrationViewModel>> Get(Guid id);
Task<RServiceResult<PoemNarrationViewModel>> Get(int id);
/// <summary>
/// updates metadata for narration
@ -35,7 +35,7 @@ namespace RMuseum.Services
/// <param name="id"></param>
/// <param name="metadata"></param>
/// <returns></returns>
Task<RServiceResult<bool>> UpdatePoemNarration(Guid id, PoemNarrationUpdateViewModel metadata);
Task<RServiceResult<bool>> UpdatePoemNarration(int id, PoemNarrationUpdateViewModel metadata);
/// <summary>
/// imports narration data from ganjoor MySql database
@ -73,7 +73,7 @@ namespace RMuseum.Services
/// <param name="moderatorId"></param>
/// <param name="model"></param>
/// <returns></returns>
Task<RServiceResult<bool>> ModeratePoemNarration(Guid id, Guid moderatorId, PoemNarrationModerateViewModel model);
Task<RServiceResult<bool>> ModeratePoemNarration(int id, Guid moderatorId, PoemNarrationModerateViewModel model);
/// <summary>
/// Get Upload Session (including files)

17
RMuseum/Services/Implementation/AudioNarrationService.cs
View File

@ -38,15 +38,16 @@ namespace RMuseum.Services.Implementation
{
try
{
var source =
_context.AudioFiles
var narrations = _context.AudioFiles
.Include(a => a.Owner)
.Where(a =>
(filteredUserId == Guid.Empty || a.OwnerId == filteredUserId)
&&
(status == AudioReviewStatus.All || a.ReviewStatus == status)
)
.OrderByDescending(a => a.UploadDate)
.OrderByDescending(a => a.Id);
var source =
narrations
.Join(
_context.GanjoorPoems,
audio => audio.GanjoorPostId,
@ -54,8 +55,6 @@ namespace RMuseum.Services.Implementation
(audio, poem) => new PoemNarrationViewModel(audio, poem)
);
(PaginationMetadata PagingMeta, PoemNarrationViewModel[] Items) paginatedResult =
await QueryablePaginator<PoemNarrationViewModel>.Paginate(source, paging);
@ -74,7 +73,7 @@ namespace RMuseum.Services.Implementation
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<RServiceResult<PoemNarrationViewModel>> Get(Guid id)
public async Task<RServiceResult<PoemNarrationViewModel>> Get(int id)
{
try
{
@ -101,7 +100,7 @@ namespace RMuseum.Services.Implementation
/// <param name="id"></param>
/// <param name="metadata"></param>
/// <returns></returns>
public async Task<RServiceResult<bool>> UpdatePoemNarration(Guid id, PoemNarrationUpdateViewModel metadata)
public async Task<RServiceResult<bool>> UpdatePoemNarration(int id, PoemNarrationUpdateViewModel metadata)
{
try
{
@ -148,7 +147,7 @@ namespace RMuseum.Services.Implementation
"SELECT audio_ID, audio_post_ID, audio_order, audio_xml, audio_ogg, audio_mp3, " +
"audio_title, audio_artist, audio_artist_url, audio_src, audio_src_url, audio_guid, " +
"audio_fchecksum, audio_mp3bsize, audio_oggbsize, audio_date " +
"FROM adab.ganja_gaudio ORDER BY audio_ID",
"FROM adab.ganja_gaudio ORDER BY audio_date",
connection
))
{
@ -528,7 +527,7 @@ namespace RMuseum.Services.Implementation
/// <param name="moderatorId"></param>
/// <param name="model"></param>
/// <returns></returns>
public async Task<RServiceResult<bool>> ModeratePoemNarration(Guid id, Guid moderatorId, PoemNarrationModerateViewModel model)
public async Task<RServiceResult<bool>> ModeratePoemNarration(int id, Guid moderatorId, PoemNarrationModerateViewModel model)
{
try
{

19
RSecurityBackend/Models/Auth/ViewModels/PublicRAppUser.cs
View File

@ -19,17 +19,18 @@ namespace RSecurityBackend.Models.Auth.ViewModels
/// <param name="dbUserInfo"></param>
public PublicRAppUser(RAppUser dbUserInfo)
{
if (dbUserInfo != null)
if (dbUserInfo == null)
{
Id = dbUserInfo.Id;
Username = dbUserInfo.UserName;
FirstName = dbUserInfo.FirstName;
SureName = dbUserInfo.SureName;
Email = dbUserInfo.Email;
PhoneNumber = dbUserInfo.PhoneNumber;
Status = dbUserInfo.Status;
RImageId = dbUserInfo.RImageId;
return;
}
Id = dbUserInfo.Id;
Username = dbUserInfo.UserName;
FirstName = dbUserInfo.FirstName;
SureName = dbUserInfo.SureName;
Email = dbUserInfo.Email;
PhoneNumber = dbUserInfo.PhoneNumber;
Status = dbUserInfo.Status;
RImageId = dbUserInfo.RImageId;
}
/// <summary>
/// default constructor