diff --git a/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatViewModel.cs b/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatViewModel.cs index d582cb4f..845ce212 100644 --- a/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatViewModel.cs +++ b/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatViewModel.cs @@ -22,6 +22,11 @@ namespace RMuseum.Models.Ganjoor.ViewModels /// public string UrlSlug { get; set; } + /// + /// full url + /// + public string FullUrl { get; set; } + /// /// Next Category without Ancestors/Children/Poems info /// diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml index eb73f625..737baf75 100644 --- a/RMuseum/RMuseum.xml +++ b/RMuseum/RMuseum.xml @@ -645,6 +645,14 @@ + + + cat by url + + + + + get poem by id @@ -3468,6 +3476,11 @@ url => slug + + + full url + + Next Category without Ancestors/Children/Poems info @@ -4694,6 +4707,14 @@ + + + get cat by url + + + + + Get Poem By Id @@ -5464,6 +5485,14 @@ + + + get cat by url + + + + + get cat by id diff --git a/RMuseum/Services/Implementation/GanjoorService.cs b/RMuseum/Services/Implementation/GanjoorService.cs index 8299fc07..ec586f77 100644 --- a/RMuseum/Services/Implementation/GanjoorService.cs +++ b/RMuseum/Services/Implementation/GanjoorService.cs @@ -163,7 +163,8 @@ namespace RMuseum.Services.Implementation { Id = parent.Id, Title = parent.Title, - UrlSlug = parent.UrlSlug + UrlSlug = parent.UrlSlug, + FullUrl = parent.FullUrl }); parent = await _context.GanjoorCategories.Where(c => c.Id == parent.ParentId).FirstOrDefaultAsync(); @@ -185,7 +186,8 @@ namespace RMuseum.Services.Implementation { Id = c.Id, Title = c.Title, - UrlSlug = c.UrlSlug + UrlSlug = c.UrlSlug, + FullUrl = c.FullUrl //other fields null } ).SingleOrDefaultAsync(); @@ -205,7 +207,8 @@ namespace RMuseum.Services.Implementation { Id = c.Id, Title = c.Title, - UrlSlug = c.UrlSlug + UrlSlug = c.UrlSlug, + FullUrl = c.FullUrl //other fields null } ).SingleOrDefaultAsync(); @@ -215,6 +218,7 @@ namespace RMuseum.Services.Implementation Id = cat.Id, Title = cat.Title, UrlSlug = cat.UrlSlug, + FullUrl = cat.FullUrl, Next = nextCat, Previous = preCat, Ancestors = ancetors, @@ -224,7 +228,8 @@ namespace RMuseum.Services.Implementation { Id = c.Id, Title = c.Title, - UrlSlug = c.UrlSlug + UrlSlug = c.UrlSlug, + FullUrl = c.FullUrl } ).ToListAsync(), Poems = poems ? await _context.GanjoorPoems.Where(p => p.CatId == cat.Id).OrderBy(p => p.Id).Select