MAKS-IT/reactredux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(refactor): services and models refactoring

Browse Source
This commit is contained in:
Maksym Sadovnychyy 2022-08-30 13:11:59 +02:00
parent a1071da8bf
commit 514b194c7e
29 changed files with 227 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
db/DML/categories.json
View File

@ -3,11 +3,16 @@
"_id":"e154e33f-3cc7-468d-bb66-e0390ddb9ae0",
"siteId":"404c8232-9048-4519-bfba-6e78dc7005ca",
"l10n":[
{
"locale":0,
"slug":"default",
"text":"Default category"
}
{
"locale": 0,
"slug": "default",
"text": "Default category"
},
{
"locale": 2,
"slug": "predefinit",
"text": "Categoria predefinita"
}
]
}
]

6
webapi/Core/Abstractions/DomainObjects/PostItemBase.cs
View File

@ -15,16 +15,16 @@ namespace Core.Abstractions.DomainObjects {
public List<PostItemL10n> L10n { get; set; }
public List<Image> Images { get; set; }
public List<Image>? Images { get; set; }
public Guid Author { get; set; }
public DateTime Created { get; set; }
public List<string> Tags { get; set; }
public List<string>? Tags { get; set; }
public List<Guid> Categories { get; set; }
public List<Guid>? Categories { get; set; }
public bool? FamilyFriendly { get; set; }
}

2
webapi/Core/DomainObjects/Documents/Category.cs
View File

@ -10,7 +10,7 @@ namespace Core.DomainObjects {
unchecked {
int hash = 17;
hash = hash * 23 + Id.GetHashCode();
hash = hash * 23 + L10n.Sum(x => x.GetHashCode());
hash = hash + L10n.Sum(x => x.GetHashCode() * 23);
return hash;
}
}

1
webapi/Core/DomainObjects/L10n/CategoryL10n.cs
View File

@ -16,6 +16,7 @@ namespace Core.DomainObjects.L10n {
unchecked {
int hash = 17;
hash = hash * 23 + Locale.GetHashCode();
hash = hash * 23 + Slug.GetHashCode();
hash = hash * 23 + Text.GetHashCode();
return hash;
}

2
webapi/Core/DomainObjects/L10n/PostItemL10n.cs
View File

@ -11,7 +11,7 @@ namespace Core.DomainObjects.L10n {
public ContentTypes ContentType { get; set; }
public string PlainText { get; set; }
public string ShortText { get; set; }
public List<string> Badges { get; set; }
public List<string>? Badges { get; set; }
public override int GetHashCode() {
unchecked {

14
webapi/DataProviders/BlogCatalogDataProvider.cs
View File

@ -12,8 +12,8 @@ namespace DataProviders {
public interface IBlogCatalogDataProvider {
(Guid?, IDomainResult) Insert(BlogItem blogItem);
(BlogItem?, IDomainResult) Get(Guid siteId, Guid blogId);
(BlogItem?, IDomainResult) Get(Guid siteId, string slug);
(BlogItem?, IDomainResult) Get(Guid siteId, List<string> slugs);
(BlogItem?, IDomainResult) GetBySlug(Guid siteId, string slug);
(List<BlogItem>?, IDomainResult) GetBySlugs(Guid siteId, List<string> slugs);
(List<BlogItem>?, IDomainResult) GetAll(Guid siteId, int skip, int take);
(Guid?, IDomainResult) Update(BlogItem blogItem);
IDomainResult Delete(Guid id);
@ -43,11 +43,8 @@ namespace DataProviders {
return (list.First(), result);
}
public (BlogItem?, IDomainResult) Get(Guid siteId, string slug) =>
Get(siteId, new List<string> { slug });
public (BlogItem?, IDomainResult) Get(Guid siteId, List<string> slugs) {
var (list, result) = GetWithPredicate(x => x.SiteId == siteId && x.L10n.Any(y => slugs.Contains(y.Slug)), _collectionName);
public (BlogItem?, IDomainResult) GetBySlug(Guid siteId, string slug) {
var (list, result) = GetBySlugs(siteId, new List<string> { slug });
if (!result.IsSuccess || list == null)
return (null, result);
@ -55,6 +52,9 @@ namespace DataProviders {
return (list.First(), result);
}
public (List<BlogItem>?, IDomainResult) GetBySlugs(Guid siteId, List<string> slugs) =>
GetWithPredicate(x => x.SiteId == siteId && x.L10n.Any(y => slugs.Contains(y.Slug)), _collectionName);
public (List<BlogItem>?, IDomainResult) GetAll(Guid siteId, int skip, int take) =>
GetWithPredicate(x => x.SiteId == siteId, 0, 0, _collectionName);

14
webapi/DataProviders/CategoryDataProvider.cs
View File

@ -13,8 +13,8 @@ namespace DataProviders {
public interface ICategoryDataProvider {
(Guid?, IDomainResult) Insert(Category obj);
(Category?, IDomainResult) Get(Guid siteId, Guid categoryId);
(Category?, IDomainResult) Get(Guid siteId, string slug);
(Category?, IDomainResult) Get(Guid siteId, List<string> slugs);
(Category?, IDomainResult) GetBySlug(Guid siteId, string slug);
(List<Category>?, IDomainResult) GetBySlugs(Guid siteId, List<string> slugs);
(List<Category>?, IDomainResult) GetAll(Guid siteId);
(Guid?, IDomainResult) Update(Category obj);
IDomainResult Delete(Guid id);
@ -43,11 +43,8 @@ namespace DataProviders {
return (list.First(), result);
}
public (Category?, IDomainResult) Get(Guid siteId, string slug) =>
Get(siteId, new List<string> { slug });
public (Category?, IDomainResult) Get(Guid siteId, List<string> slugs) {
var (list, result) = GetWithPredicate(x => x.SiteId == siteId && x.L10n.Any(y => slugs.Contains(y.Slug)), _collectionName);
public (Category?, IDomainResult) GetBySlug(Guid siteId, string slug) {
var (list, result) = GetBySlugs(siteId, new List<string> { slug });
if (!result.IsSuccess || list == null)
return (null, result);
@ -55,6 +52,9 @@ namespace DataProviders {
return (list.First(), result);
}
public (List<Category>?, IDomainResult) GetBySlugs(Guid siteId, List<string> slugs) =>
GetWithPredicate(x => x.SiteId == siteId && x.L10n.Any(y => slugs.Contains(y.Slug)), _collectionName);
public (List<Category>?, IDomainResult) GetAll(Guid siteId) =>
GetWithPredicate(x => x.SiteId == siteId, _collectionName);

14
webapi/DataProviders/ShopCatalogDataProvider.cs
View File

@ -12,8 +12,8 @@ namespace DataProviders {
public interface IShopCatalogDataProvider {
(Guid?, IDomainResult) Insert(ShopItem obj);
(ShopItem?, IDomainResult) Get(Guid siteId, string sku);
//(ShopItem?, IDomainResult) Get(Guid siteId, string slug);
(ShopItem?, IDomainResult) Get(Guid siteId, List<string> slugs);
(ShopItem?, IDomainResult) GetBySlug(Guid siteId, string slug);
(List<ShopItem>?, IDomainResult) GetBySlugs(Guid siteId, List<string> slugs);
(List<ShopItem>?, IDomainResult) GetAll(Guid siteId, int skip, int take);
(Guid?, IDomainResult) Update(ShopItem shopCart);
IDomainResult Delete(Guid id);
@ -43,11 +43,8 @@ namespace DataProviders {
return (list.First(), result);
}
//public (ShopItem?, IDomainResult) Get(Guid siteId, string slug) =>
// Get(siteId, new List<string> { slug });
public (ShopItem?, IDomainResult) Get(Guid siteId, List<string> slugs) {
var (list, result) = GetWithPredicate(x => x.SiteId == siteId && x.L10n.Any(y => slugs.Contains(y.Slug)), _collectionName);
public (ShopItem?, IDomainResult) GetBySlug(Guid siteId, string slug) {
var (list, result) = GetBySlugs(siteId, new List<string> { slug });
if (!result.IsSuccess || list == null)
return (null, result);
@ -55,6 +52,9 @@ namespace DataProviders {
return (list.First(), result);
}
public (List<ShopItem>?, IDomainResult) GetBySlugs(Guid siteId, List<string> slugs) =>
GetWithPredicate(x => x.SiteId == siteId && x.L10n.Any(y => slugs.Contains(y.Slug)), _collectionName);
public (List<ShopItem>?, IDomainResult) GetAll(Guid siteId, int skip, int take) =>
GetWithPredicate(x => x.SiteId == siteId, skip, take, _collectionName);

2
webapi/WeatherForecast/Controllers/BlogItemController.cs
View File

@ -53,7 +53,7 @@ namespace WeatherForecast.Controllers {
/// <returns></returns>
[HttpGet("{siteId}")]
public IActionResult GetSlug([FromRoute] Guid siteId, [FromQuery] string slug) {
var result = _blogItemService.Get(siteId, slug);
var result = _blogItemService.GetSlug(siteId, slug);
return result.ToActionResult();
}

2
webapi/WeatherForecast/Controllers/CategoryItemController.cs
View File

@ -54,7 +54,7 @@ namespace WeatherForecast.Controllers {
/// <returns></returns>
[HttpGet("{siteId}")]
public IActionResult GetSlug([FromRoute] Guid siteId, [FromQuery] string slug) {
var result = _categoryItemService.Get(siteId, slug);
var result = _categoryItemService.GetSlug(siteId, slug);
return result.ToActionResult();
}

4
webapi/WeatherForecast/Controllers/CategoryItemsController.cs
View File

@ -36,9 +36,7 @@ namespace WeatherForecast.Controllers {
/// <returns></returns>
[HttpGet("{siteId}")]
public IActionResult Get([FromRoute] Guid siteId, [FromQuery] string? locale) {
var result = _categoryItemsService.Get(siteId, locale != null
? Enumeration.FromDisplayName<Locales>(locale)
: Locales.Us);
var result = _categoryItemsService.Get(siteId, locale);
return result.ToActionResult();
}

2
webapi/WeatherForecast/Controllers/ShopItemController.cs
View File

@ -56,7 +56,7 @@ namespace WeatherForecast.Controllers {
/// <returns></returns>
[HttpGet("{siteId}")]
public IActionResult GetSlug([FromRoute] Guid siteId, [FromQuery] string slug) {
var result = _shopItemService.Get(siteId, slug);
var result = _shopItemService.GetSlug(siteId, slug);
return result.ToActionResult();
}

58
webapi/WeatherForecast/Models/Abstractions/PostItemResponseModelBase.cs
View File

@ -2,26 +2,33 @@
using Core.Abstractions.Models;
using Core.DomainObjects;
using Core.Enumerations;
using WeatherForecast.Models.L10n;
namespace WeatherForecast.Models.Abstractions {
public abstract class PostItemResponseModelBase<T> : ResponseModelBase {
public string Slug { get; set; }
public Guid Id { get; set; }
public Guid SiteId { get; set; }
public List<PostItemL10nModel>? L10n { get; set; }
#region Localized costrutor
public string? Slug { get; set; }
public string? Description { get; set; }
public string? Title { get; set; }
public string? ShortText { get; set; }
public string? Text { get; set; }
public string? PlainText { get; set; }
public string? ContentType { get; set; }
public List<string>? Badges { get; set; }
#endregion
public string Description { get; set; }
public List<ImageModel> Images { get; set; }
public List<string> Badges { get; set; }
public string Title { get; set; }
public string ShortText { get; set; }
public string Text { get; set; }
public string PlainText { get; set; }
public AuthorModel Author { get; set; }
public DateTime Created { get; set; }
@ -32,7 +39,22 @@ namespace WeatherForecast.Models.Abstractions {
public bool? FamilyFriendly { get; set; }
public PostItemResponseModelBase(PostItemBase<T> postItem, List<Category> categories, Locales locale) {
public PostItemResponseModelBase(PostItemBase<T> postItem) {
Id = postItem.Id;
SiteId = postItem.SiteId;
// Author = new AuthorModel(postItem.Author);
Created = postItem.Created;
Tags = postItem.Tags;
FamilyFriendly = postItem.FamilyFriendly;
}
public PostItemResponseModelBase(PostItemBase<T> postItem, List<Category> categories) : this(postItem) {
L10n = postItem.L10n.Select(x => new PostItemL10nModel(x)).ToList();
Categories = categories.Select(x => new CategoryModel(x)).ToList();
Images = postItem.Images.Select(x => new ImageModel(x)).ToList();
}
public PostItemResponseModelBase(PostItemBase<T> postItem, List<Category> categories, Locales locale) : this(postItem) {
var postItemL10n = postItem.L10n.SingleOrDefault(x => x.Locale == locale);
if (postItemL10n != null) {
@ -45,18 +67,8 @@ namespace WeatherForecast.Models.Abstractions {
Badges = postItemL10n.Badges;
}
Categories = categories.Select(x => new CategoryModel(x, locale)).ToList();
// Author = new AuthorModel(postItem.Author);
Created = postItem.Created;
Tags = postItem.Tags;
Images = postItem.Images.Select(x => new ImageModel(x, locale)).ToList();
FamilyFriendly = postItem.FamilyFriendly;
}
}
}

12
webapi/WeatherForecast/Models/CategoryModel.cs
View File

@ -1,13 +1,19 @@
using Core.DomainObjects;
using Core.Enumerations;
using WeatherForecast.Models.L10n;
namespace WeatherForecast.Models {
public class CategoryModel {
public string Slug { get; set; }
public string Text { get; set; }
public List<CategoryL10nModel>? L10n { get; set; }
public string? Slug { get; set; }
public string? Text { get; set; }
public CategoryModel(Category category) {
L10n = category.L10n.Select(x => new CategoryL10nModel(x)).ToList();
}
public CategoryModel(Category category, Locales locale) {
var categoryL10n = category.L10n.SingleOrDefault(x => x.Locale == locale);
if (categoryL10n != null) {
Slug = categoryL10n.Slug;

11
webapi/WeatherForecast/Models/ImageModel.cs
View File

@ -1,12 +1,17 @@
using Core.DomainObjects;
using Core.Enumerations;
using WeatherForecast.Models.L10n;
namespace WeatherForecast.Models {
public class ImageModel {
public string Src { get; set; }
public string Alt { get; set; }
public List<ImageL10nModel>? L10n { get; set; }
public ImageModel() { }
public string? Src { get; set; }
public string? Alt { get; set; }
public ImageModel(Image image) {
L10n = image.L10n.Select(x => new ImageL10nModel(x)).ToList();
}
public ImageModel(Image image, Locales locale) {
Src = image.Src;

2
webapi/WeatherForecast/Models/L10n/CategoryL10nModel.cs
View File

@ -10,6 +10,8 @@ namespace WeatherForecast.Models.L10n {
public string Slug { get; set; }
public string Text { get; set; }
public CategoryL10nModel() { }
public CategoryL10nModel(CategoryL10n categoryL10n) {
Locale = categoryL10n.Locale.Name;
Slug = categoryL10n.Slug;

23
webapi/WeatherForecast/Models/L10n/ImageL10nModel.cs Normal file
View File

@ -0,0 +1,23 @@
using Core.Abstractions;
using Core.Abstractions.Models;
using Core.DomainObjects.L10n;
using Core.Enumerations;
namespace WeatherForecast.Models.L10n {
public class ImageL10nModel : ModelBase {
public string Locale { get; set; }
public string Alt { get; set; }
public ImageL10nModel() { }
public ImageL10nModel(ImageL10n imageL10n) {
Locale = imageL10n.Locale.Name;
Alt = imageL10n.Alt;
}
public ImageL10n ToDomainObject() => new ImageL10n {
Locale = Enumeration.FromDisplayName<Locales>(Locale),
Alt = Alt
};
}
}

5
webapi/WeatherForecast/Models/L10n/PostItemL10nModel.cs
View File

@ -13,9 +13,12 @@ namespace WeatherForecast.Models.L10n {
public string ShortText { get; set; }
public string Text { get; set; }
public string PlainText { get; set; }
public string ContentType { get; set; }
public List<string> Badges { get; set; }
public List<string>? Badges { get; set; }
public PostItemL10nModel() { }
public PostItemL10nModel(PostItemL10n postItemL10n) {
Locale = postItemL10n.Locale.Name;

21
webapi/WeatherForecast/Models/Requests/PostBlogItemRequestModel.cs
View File

@ -1,10 +1,23 @@
using Core.Abstractions.Models;
using Core.DomainObjects.Documents;
using WeatherForecast.Models.Abstractions;
namespace WeatherForecast.Models.Requests {
public class PostBlogItemRequestModel : RequestModelBase<BlogItem> {
public override BlogItem ToDomainObject() {
throw new NotImplementedException();
}
public class PostBlogItemRequestModel : PostItemRequestModelBase<BlogItem> {
public uint? ReadTime { get; set; }
public uint? Likes { get; set; }
public override BlogItem ToDomainObject() => new BlogItem {
L10n = L10n.Select(x => x.ToDomainObject()).ToList(),
// Images
// Author
Created = DateTime.UtcNow,
Tags = Tags,
Categories = Categories,
FamilyFriendly = FamilyFriendly,
ReadTime = ReadTime,
Likes = Likes
};
}
}

21
webapi/WeatherForecast/Models/Requests/PutBlogItemRequestModel.cs
View File

@ -1,10 +1,23 @@
using Core.Abstractions.Models;
using Core.DomainObjects.Documents;
using WeatherForecast.Models.Abstractions;
namespace WeatherForecast.Models.Requests {
public class PutBlogItemRequestModel : RequestModelBase<BlogItem> {
public override BlogItem ToDomainObject() {
throw new NotImplementedException();
}
public class PutBlogItemRequestModel : PostItemRequestModelBase<BlogItem> {
public uint? ReadTime { get; set; }
public uint? Likes { get; set; }
public override BlogItem ToDomainObject() => new BlogItem {
L10n = L10n.Select(x => x.ToDomainObject()).ToList(),
// Images
// Author
Created = DateTime.UtcNow,
Tags = Tags,
Categories = Categories,
FamilyFriendly = FamilyFriendly,
ReadTime = ReadTime,
Likes = Likes
};
}
}

5
webapi/WeatherForecast/Models/Responses/GetBlogItemResponseModel.cs
View File

@ -12,6 +12,11 @@ namespace WeatherForecast.Models.Responses {
public uint? Likes { get; set; }
public GetBlogItemResponseModel(BlogItem blogItem, List<Category> categories) : base(blogItem, categories) {
ReadTime = blogItem.ReadTime;
Likes = blogItem.Likes;
}
public GetBlogItemResponseModel(BlogItem blogItem, List<Category> categories, Locales locale) : base(blogItem, categories, locale) {
ReadTime = blogItem.ReadTime;
Likes = blogItem.Likes;

11
webapi/WeatherForecast/Models/Responses/GetCategoryItemResponseModel.cs
View File

@ -5,17 +5,26 @@ using WeatherForecast.Models.L10n;
namespace WeatherForecast.Models.Responses {
public class GetCategoryItemResponseModel : ResponseModelBase {
public Guid Id { get; set; }
public Guid SiteId { get; set; }
public string? Slug { get; set; }
public string? Text { get; set; }
public List<CategoryL10nModel>? L10n { get; set; }
public GetCategoryItemResponseModel(Category category) {
Id = category.Id;
SiteId = category.SiteId;
L10n = category.L10n.Select(x => new CategoryL10nModel(x)).ToList();
}
public GetCategoryItemResponseModel(Category category, Locales locale) {
Id = category.Id;
SiteId = category.SiteId;
var l10n = category.L10n.SingleOrDefault(x => x.Locale == locale);
if (l10n != null) {
Slug = l10n.Slug;

8
webapi/WeatherForecast/Models/Responses/GetShopItemResponseModel.cs
View File

@ -13,6 +13,14 @@ namespace WeatherForecast.Models {
public decimal? NewPrice { get; set; }
public uint? Quantity { get; set; }
public GetShopItemResponseModel(ShopItem shopCatalogItem, List<Category> categories) : base(shopCatalogItem, categories) {
Sku = shopCatalogItem.Sku;
Rating = shopCatalogItem.Rating;
Price = shopCatalogItem.Price;
NewPrice = shopCatalogItem.NewPrice;
Quantity = shopCatalogItem.Quantity;
}
public GetShopItemResponseModel(ShopItem shopCatalogItem, List<Category> categories, Locales locale) : base(shopCatalogItem, categories, locale) {
Sku = shopCatalogItem.Sku;
Rating = shopCatalogItem.Rating;

16
webapi/WeatherForecast/Services/BlogItemService.cs
View File

@ -10,7 +10,7 @@ namespace WeatherForecast.Services {
public interface IBlogItemService {
(Guid?, IDomainResult) Post(Guid siteId, PostBlogItemRequestModel requestModel);
(GetBlogItemResponseModel, IDomainResult) Get(Guid siteId, Guid blogId);
(GetBlogItemResponseModel, IDomainResult) Get(Guid siteId, string slug);
(GetBlogItemResponseModel, IDomainResult) GetSlug(Guid siteId, string slug);
(Guid?, IDomainResult) Update(Guid siteId, Guid blogId, PutBlogItemRequestModel requestData);
IDomainResult Delete(Guid siteId, Guid blogId);
}
@ -22,10 +22,12 @@ namespace WeatherForecast.Services {
public BlogItemService(
ILogger<BlogItemService> logger,
IBlogCatalogDataProvider blogCatalogDataProvider
IBlogCatalogDataProvider blogCatalogDataProvider,
ICategoryDataProvider categoryDataProvider
) {
_logger = logger;
_blogCatalogDataProvider = blogCatalogDataProvider;
_categoryDataProvider = categoryDataProvider;
}
public (Guid?, IDomainResult) Post(Guid siteId, PostBlogItemRequestModel requestModel) {
@ -40,18 +42,18 @@ namespace WeatherForecast.Services {
var categories = new List<Category>();
foreach (var catId in item.Categories) {
var (category, getCategoryResult) = _categoryDataProvider.Get(catId, siteId);
var (category, getCategoryResult) = _categoryDataProvider.Get(siteId, catId);
if (!getCategoryResult.IsSuccess || category == null)
return (null, getCategoryResult);
categories.Add(category);
}
return IDomainResult.Success(new GetBlogItemResponseModel(item, categories, Locales.Us));
return IDomainResult.Success(new GetBlogItemResponseModel(item, categories));
}
public (GetBlogItemResponseModel?, IDomainResult) Get(Guid siteId, string slug) {
var (item, result) = _blogCatalogDataProvider.Get(siteId, slug);
public (GetBlogItemResponseModel?, IDomainResult) GetSlug(Guid siteId, string slug) {
var (item, result) = _blogCatalogDataProvider.GetBySlug(siteId, slug);
if (!result.IsSuccess || item == null)
return (null, result);
@ -60,7 +62,7 @@ namespace WeatherForecast.Services {
var categories = new List<Category>();
foreach (var catId in item.Categories) {
var (category, getCategoryResult) = _categoryDataProvider.Get(catId, siteId);
var (category, getCategoryResult) = _categoryDataProvider.Get(siteId, catId);
if (!getCategoryResult.IsSuccess || category == null)
return (null, getCategoryResult);

2
webapi/WeatherForecast/Services/BlogItemsService.cs
View File

@ -36,7 +36,7 @@ namespace WeatherForecast.Services {
foreach (var item in items) {
var categories = new List<Category>();
foreach (var catId in item.Categories) {
var (cat, getCategoryResult) = _categoryDataProvider.Get(catId, siteId);
var (cat, getCategoryResult) = _categoryDataProvider.Get(siteId, catId);
if (!getCategoryResult.IsSuccess || cat == null)
return (null, getCategoryResult);

8
webapi/WeatherForecast/Services/CategoryItemService.cs
View File

@ -8,7 +8,7 @@ namespace WeatherForecast.Services {
public interface ICategoryItemService {
(Guid?, IDomainResult) Post(Guid siteId, PostCategoryItemRequestModel requestModel);
(GetCategoryItemResponseModel?, IDomainResult) Get(Guid siteId, Guid categoryId);
(GetCategoryItemResponseModel?, IDomainResult) Get(Guid siteId, string slug);
(GetCategoryItemResponseModel?, IDomainResult) GetSlug(Guid siteId, string slug);
(Guid?, IDomainResult) Update(Guid siteId, Guid categoryId, PutCategoryItemRequestModel requestData);
IDomainResult Delete(Guid siteId, Guid categoryId);
}
@ -27,7 +27,7 @@ namespace WeatherForecast.Services {
}
public (Guid?, IDomainResult) Post(Guid siteId, PostCategoryItemRequestModel requestModel) {
var (_, getResult) = _categoryDataProvider.Get(siteId, requestModel.L10n.Select(x => x.Slug).ToList());
var (_, getResult) = _categoryDataProvider.GetBySlugs(siteId, requestModel.L10n.Select(x => x.Slug).ToList());
if (getResult.IsSuccess)
return IDomainResult.Failed<Guid?>();
@ -51,8 +51,8 @@ namespace WeatherForecast.Services {
return IDomainResult.Success(new GetCategoryItemResponseModel(item));
}
public (GetCategoryItemResponseModel?, IDomainResult) Get(Guid siteId, string slug) {
var (item, result) = _categoryDataProvider.Get(siteId, slug);
public (GetCategoryItemResponseModel?, IDomainResult) GetSlug(Guid siteId, string slug) {
var (item, result) = _categoryDataProvider.GetBySlug(siteId, slug);
if (!result.IsSuccess || item == null)
return (null, result);

13
webapi/WeatherForecast/Services/CategoryItemsService.cs
View File

@ -1,4 +1,5 @@
using Core.Enumerations;
using Core.Abstractions;
using Core.Enumerations;
using DataProviders;
using DomainResults.Common;
using WeatherForecast.Models.Responses;
@ -6,7 +7,7 @@ using WeatherForecast.Models.Responses;
namespace WeatherForecast.Services {
public interface ICategoryItemsService {
(List<GetCategoryItemResponseModel>?, IDomainResult) Get(Guid siteId, Locales locale);
(List<GetCategoryItemResponseModel>?, IDomainResult) Get(Guid siteId, string? locale);
IDomainResult Delete(Guid siteId);
}
@ -23,12 +24,16 @@ namespace WeatherForecast.Services {
_categoryDataProvider = categoryDataProvider;
}
public (List<GetCategoryItemResponseModel>?, IDomainResult) Get(Guid siteId, Locales locale) {
public (List<GetCategoryItemResponseModel>?, IDomainResult) Get(Guid siteId, string? locale) {
var (items, result) = _categoryDataProvider.GetAll(siteId);
if (!result.IsSuccess || items == null)
return (null, result);
return IDomainResult.Success(items.Select(x => new GetCategoryItemResponseModel(x, locale)).ToList());
if (locale != null) {
return IDomainResult.Success(items.Select(x => new GetCategoryItemResponseModel(x, Enumeration.FromDisplayName<Locales>(locale) ?? Locales.Us)).ToList());
}
return IDomainResult.Success(items.Select(x => new GetCategoryItemResponseModel(x)).ToList());
}
public IDomainResult Delete(Guid siteId) => _categoryDataProvider.DeleteAll(siteId);

26
webapi/WeatherForecast/Services/ShopItemService.cs
View File

@ -12,6 +12,8 @@ namespace WeatherForecast.Services {
public interface IShopItemService {
(Guid?, IDomainResult) Post(Guid siteId, string sku, PostShopItemRequestModel requestModel);
(GetShopItemResponseModel, IDomainResult) Get(Guid siteId, string sku);
(GetShopItemResponseModel, IDomainResult) GetSlug(Guid siteId, string slug);
(Guid?, IDomainResult) Update(Guid siteId, string sku, PutShopItemRequestModel requestData);
IDomainResult Delete(Guid siteId, string sku);
}
@ -77,14 +79,34 @@ namespace WeatherForecast.Services {
var categories = new List<Category>();
foreach (var catId in item.Categories) {
var (category, getCategoryResult) = _categoryDataProvider.Get(catId, siteId);
var (category, getCategoryResult) = _categoryDataProvider.Get(siteId, catId);
if (!getCategoryResult.IsSuccess || category == null)
return (null, getCategoryResult);
categories.Add(category);
}
return IDomainResult.Success(new GetShopItemResponseModel(item, categories, Locales.Us));
return IDomainResult.Success(new GetShopItemResponseModel(item, categories));
}
public (GetShopItemResponseModel, IDomainResult) GetSlug(Guid siteId, string slug) {
var (item, result) = _shopCatalogDataProvider.GetBySlug(siteId, slug);
if (!result.IsSuccess || item == null)
return (null, result);
var locale = item.L10n.SingleOrDefault(x => x.Slug == slug)?.Locale ?? Locales.Us;
var categories = new List<Category>();
foreach (var catId in item.Categories) {
var (category, getCategoryResult) = _categoryDataProvider.Get(siteId, catId);
if (!getCategoryResult.IsSuccess || category == null)
return (null, getCategoryResult);
categories.Add(category);
}
return IDomainResult.Success(new GetShopItemResponseModel(item, categories, locale));
}
public (Guid?, IDomainResult) Update(Guid siteId, string sku, PutShopItemRequestModel requestData) {

2
webapi/WeatherForecast/Services/ShopItemsService.cs
View File

@ -38,7 +38,7 @@ namespace WeatherForecast.Services {
foreach (var item in items) {
var categories = new List<Category>();
foreach (var catId in item.Categories) {
var (cat, getCategoryResult) = _categoryDataProvider.Get(catId, siteId);
var (cat, getCategoryResult) = _categoryDataProvider.Get(siteId, catId);
if (!getCategoryResult.IsSuccess || cat == null)
return (null, getCategoryResult);