From b664d6c0259a17bd10e5e5dcc9c2f3ec7770d381 Mon Sep 17 00:00:00 2001 From: Hamid Reza Mohammadi Date: Thu, 4 Feb 2021 10:46:23 +0330 Subject: [PATCH] #72 removing GanjoorLinkViewModel constructor --- .../ViewModels/GanjoorLinkViewModel.cs | 40 -------------- RMuseum/RMuseum.xml | 14 ----- .../Implementation/ArtifactService.cs | 55 ++++++++++++++++--- 3 files changed, 47 insertions(+), 62 deletions(-) diff --git a/RMuseum/Models/GanjoorIntegration/ViewModels/GanjoorLinkViewModel.cs b/RMuseum/Models/GanjoorIntegration/ViewModels/GanjoorLinkViewModel.cs index bef274dc..d4656876 100644 --- a/RMuseum/Models/GanjoorIntegration/ViewModels/GanjoorLinkViewModel.cs +++ b/RMuseum/Models/GanjoorIntegration/ViewModels/GanjoorLinkViewModel.cs @@ -9,46 +9,6 @@ namespace RMuseum.Models.GanjoorIntegration.ViewModels /// public class GanjoorLinkViewModel { - /// - /// default constructor - /// - public GanjoorLinkViewModel() - { - - } - - /// - /// parameterized constructor - /// - /// - /// - /// - /// - public GanjoorLinkViewModel(GanjoorLink src, string entityName, string entityFriendlyUrl, Guid entityImageId) - { - Id = src.Id; - GanjoorPostId = src.GanjoorPostId; - GanjoorUrl = src.GanjoorUrl; - GanjoorTitle = src.GanjoorTitle; - EntityName = entityName; - EntityFriendlyUrl = entityFriendlyUrl; - EntityImageId = entityImageId; - ReviewResult = src.ReviewResult; - Synchronized = src.Synchronized; - RAppUser appUser = src.SuggestedBy; - SuggestedBy =new PublicRAppUser() - { - Id = appUser.Id, - Username = appUser.UserName, - Email = appUser.Email, - FirstName = appUser.FirstName, - SureName = appUser.SureName, - PhoneNumber = appUser.PhoneNumber, - RImageId = appUser.RImageId, - Status = appUser.Status - }; - } - /// /// Id /// diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml index 78696d02..2966d84c 100644 --- a/RMuseum/RMuseum.xml +++ b/RMuseum/RMuseum.xml @@ -3125,20 +3125,6 @@ Ganjoor Link View Model - - - default constructor - - - - - parameterized constructor - - - - - - Id diff --git a/RMuseum/Services/Implementation/ArtifactService.cs b/RMuseum/Services/Implementation/ArtifactService.cs index 3fb0fb9f..7e615667 100644 --- a/RMuseum/Services/Implementation/ArtifactService.cs +++ b/RMuseum/Services/Implementation/ArtifactService.cs @@ -2538,7 +2538,30 @@ namespace RMuseum.Services.Implementation entityImageId = item.Images.First().Id; } - GanjoorLinkViewModel viewModel = new GanjoorLinkViewModel(suggestion, entityName, entityFriendlyUrl, entityImageId); + GanjoorLinkViewModel viewModel + = new GanjoorLinkViewModel() + { + Id = suggestion.Id, + GanjoorPostId = suggestion.GanjoorPostId, + GanjoorUrl = suggestion.GanjoorUrl, + GanjoorTitle = suggestion.GanjoorTitle, + EntityName = entityName, + EntityFriendlyUrl = entityFriendlyUrl, + EntityImageId = entityImageId, + ReviewResult = suggestion.ReviewResult, + Synchronized = suggestion.Synchronized, + SuggestedBy = new PublicRAppUser() + { + Id = suggestion.SuggestedBy.Id, + Username = suggestion.SuggestedBy.UserName, + Email = suggestion.SuggestedBy.Email, + FirstName = suggestion.SuggestedBy.FirstName, + SureName = suggestion.SuggestedBy.SureName, + PhoneNumber = suggestion.SuggestedBy.PhoneNumber, + RImageId = suggestion.SuggestedBy.RImageId, + Status = suggestion.SuggestedBy.Status + } + }; return new RServiceResult(viewModel); } catch(Exception exp) @@ -2570,13 +2593,29 @@ namespace RMuseum.Services.Implementation { result.Add ( - new GanjoorLinkViewModel - ( - link, - link.Item == null ? link.Artifact.Name : link.Artifact.Name + " » " + link.Item.Name, - link.Item == null ? $"/items/{link.Artifact.FriendlyUrl}" : $"/items/{link.Artifact.FriendlyUrl}/{link.Item.FriendlyUrl}", - link.Item == null ? link.Artifact.CoverImageId : link.Item.Images.First().Id - ) + new GanjoorLinkViewModel() + { + Id = link.Id, + GanjoorPostId = link.GanjoorPostId, + GanjoorUrl = link.GanjoorUrl, + GanjoorTitle = link.GanjoorTitle, + EntityName = link.Item == null ? link.Artifact.Name : link.Artifact.Name + " » " + link.Item.Name, + EntityFriendlyUrl = link.Item == null ? $"/items/{link.Artifact.FriendlyUrl}" : $"/items/{link.Artifact.FriendlyUrl}/{link.Item.FriendlyUrl}", + EntityImageId = link.Item == null ? link.Artifact.CoverImageId : link.Item.Images.First().Id, + ReviewResult = link.ReviewResult, + Synchronized = link.Synchronized, + SuggestedBy = new PublicRAppUser() + { + Id = link.SuggestedBy.Id, + Username = link.SuggestedBy.UserName, + Email = link.SuggestedBy.Email, + FirstName = link.SuggestedBy.FirstName, + SureName = link.SuggestedBy.SureName, + PhoneNumber = link.SuggestedBy.PhoneNumber, + RImageId = link.SuggestedBy.RImageId, + Status = link.SuggestedBy.Status + } + } ); } return new RServiceResult(result.ToArray());