diff --git a/.version b/.version index 6837eda..852baf2 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -0.26.30.51 \ No newline at end of file +0.27.31.52 \ No newline at end of file diff --git a/Netina.Api/Controllers/BlogCategoryController.cs b/Netina.Api/Controllers/BlogCategoryController.cs index 7379e5b..8a0c903 100644 --- a/Netina.Api/Controllers/BlogCategoryController.cs +++ b/Netina.Api/Controllers/BlogCategoryController.cs @@ -63,7 +63,9 @@ public class BlogCategoryController : ICarterModule // POST:Create Entity public async Task Post([FromBody] BlogCategorySDto dto, IRepositoryWrapper repositoryWrapper, CancellationToken cancellationToken) { - var ent = BlogCategory.Create(dto.Name,dto.Description); + var ent = BlogCategory.Create(dto.Name,dto.Description,dto.IsMain); + if (dto.ParentId != default) + ent.SetParent(dto.ParentId); repositoryWrapper.SetRepository().Add(ent); await repositoryWrapper.SaveChangesAsync(cancellationToken); return TypedResults.Ok(); @@ -76,7 +78,9 @@ public class BlogCategoryController : ICarterModule .FirstOrDefaultAsync(b => b.Id == dto.Id, cancellationToken); if (ent == null) throw new AppException("Blog not found"); - var newEnt = BlogCategory.Create(dto.Name, dto.Description); + var newEnt = BlogCategory.Create(dto.Name, dto.Description,dto.IsMain); + if (dto.ParentId != default) + ent.SetParent(dto.ParentId); newEnt.Id = ent.Id; repositoryWrapper.SetRepository().Update(newEnt); await repositoryWrapper.SaveChangesAsync(cancellationToken); diff --git a/Netina.Api/Controllers/SearchController.cs b/Netina.Api/Controllers/SearchController.cs index 272744a..07d331c 100644 --- a/Netina.Api/Controllers/SearchController.cs +++ b/Netina.Api/Controllers/SearchController.cs @@ -17,6 +17,10 @@ public class SearchController : ICarterModule group.MapGet("zarehbin", ZarehbinAsync) .WithDisplayName("Search Async") .HasApiVersion(1.0); + + group.MapGet("torob", TorobAsync) + .WithDisplayName("Get Torob Product Async") + .HasApiVersion(1.0); } private async Task SearchThumbAsync([FromQuery] string name, [FromServices] ISearchService searchService, CancellationToken cancellationToken) @@ -38,4 +42,7 @@ public class SearchController : ICarterModule else return TypedResults.Ok(await searchService.ZarehbinAsync(Guid.Parse(product_id), cancellationToken)); } + + private async Task TorobAsync([FromQuery] int page, [FromServices] IMediator mediator, CancellationToken cancellationToken) + => TypedResults.Ok(await mediator.Send(new GetTorobProductsQuery(page),cancellationToken)); } \ No newline at end of file diff --git a/Netina.Api/Controllers/SeedController.cs b/Netina.Api/Controllers/SeedController.cs index 0f1dee9..5e62a7e 100644 --- a/Netina.Api/Controllers/SeedController.cs +++ b/Netina.Api/Controllers/SeedController.cs @@ -164,13 +164,13 @@ public class SeedController : ICarterModule throw new AppException("Key is not valid", ApiResultStatusCode.UnAuthorized); Dictionary categories = new Dictionary(); - var baseCategory = BlogCategory.Create("دسته بندی نشده","دسته بندی برای بلاگ های دسته بندی نشده"); + var baseCategory = BlogCategory.Create("دسته بندی نشده","دسته بندی برای بلاگ های دسته بندی نشده",true); repositoryWrapper.SetRepository().Add(baseCategory); await repositoryWrapper.SaveChangesAsync(cancellationToken); categories.Add(0, baseCategory.Id); foreach (var requestDto in request) { - var ent = BlogCategory.Create(requestDto.Name,requestDto.Slug, requestDto.Description); + var ent = BlogCategory.Create(requestDto.Name,requestDto.Slug, requestDto.Description,false); repositoryWrapper.SetRepository().Add(ent); await repositoryWrapper.SaveChangesAsync(cancellationToken); categories.Add(requestDto.BaseCategoryId, ent.Id); diff --git a/Netina.Api/Controllers/WebSiteController.cs b/Netina.Api/Controllers/WebSiteController.cs index 566f9bc..70336a9 100644 --- a/Netina.Api/Controllers/WebSiteController.cs +++ b/Netina.Api/Controllers/WebSiteController.cs @@ -1,6 +1,4 @@ -using Netina.Domain.MartenEntities.Settings; - -namespace Netina.Api.Controllers; +namespace Netina.Api.Controllers; public class WebSiteController:ICarterModule { @@ -13,16 +11,6 @@ public class WebSiteController:ICarterModule .HasApiVersion(1.0); } - private async Task GetNavBarItemsAsync([FromServices]ISettingService settingService,CancellationToken cancellationToken) - { - var navBarSetting = await settingService.GetSettingAsync(nameof(NavMenuSetting), cancellationToken) as NavMenuSetting; - if (navBarSetting == null) - return TypedResults.Ok(); - navBarSetting.NavMenuItems.ForEach(n => - { - n.Children = navBarSetting.NavMenuItems.Where(ni => ni.ParentId == n.Id).ToList(); - }); - navBarSetting.NavMenuItems.Where(n=>n.ParentId != default).ToList().ForEach(ni=>navBarSetting.NavMenuItems.Remove(ni)); - return TypedResults.Ok(navBarSetting.NavMenuItems); - } + private async Task GetNavBarItemsAsync([FromServices] IMediator mediator, CancellationToken cancellationToken) + => TypedResults.Ok(await mediator.Send(new GetWebSiteNavBarCommand(),cancellationToken)); } \ No newline at end of file diff --git a/Netina.Api/Netina.Api.csproj b/Netina.Api/Netina.Api.csproj index 2d09ed0..fe45458 100644 --- a/Netina.Api/Netina.Api.csproj +++ b/Netina.Api/Netina.Api.csproj @@ -6,8 +6,8 @@ enable true Linux - 0.26.30.51 - 0.26.30.51 + 0.27.31.52 + 0.27.31.52 @@ -76,6 +76,7 @@ + diff --git a/Netina.Api/Program.cs b/Netina.Api/Program.cs index c3d3365..a200ed6 100644 --- a/Netina.Api/Program.cs +++ b/Netina.Api/Program.cs @@ -8,7 +8,7 @@ string env = builder.Environment.IsDevelopment() == true ? "Development" : "Prod builder.Host.UseContentRoot(Directory.GetCurrentDirectory()); if (builder.Environment.IsDevelopment()) { - string projectName = "Vesmeh"; + string projectName = "Hamyan"; builder.Configuration.AddJsonFile($"AppSettings/appsettings.json").AddJsonFile($"AppSettings/appsettings.{env}{projectName}.json"); } diff --git a/Netina.Common/Models/Api/FileUploadRequest.cs b/Netina.Common/Models/Api/FileUploadRequest.cs index 3e81d1a..f2f519c 100644 --- a/Netina.Common/Models/Api/FileUploadRequest.cs +++ b/Netina.Common/Models/Api/FileUploadRequest.cs @@ -3,13 +3,15 @@ public enum FileUploadType { [Display(Name = "Images")] - Image, + Image = 0, [Display(Name = "Handouts")] - Handout, + Handout = 1, [Display(Name = "Videos")] - Video, + Video = 2, [Display(Name = "site-maps")] - SiteMap + SiteMap = 3, + [Display(Name = "Logo")] + Logo = 4, } public class FileUploadRequest { diff --git a/Netina.Common/Netina.Common.csproj b/Netina.Common/Netina.Common.csproj index a752020..b49a057 100644 --- a/Netina.Common/Netina.Common.csproj +++ b/Netina.Common/Netina.Common.csproj @@ -1,6 +1,6 @@  - + - + diff --git a/Netina.Core/BaseServices/SiteMapService.cs b/Netina.Core/BaseServices/SiteMapService.cs index b3dae79..d614173 100644 --- a/Netina.Core/BaseServices/SiteMapService.cs +++ b/Netina.Core/BaseServices/SiteMapService.cs @@ -1,11 +1,9 @@ using System.IO.Compression; -using System.Web; using System.Xml; using Netina.Core.Models; using Netina.Domain.Entities.Blogs; using Netina.Domain.Entities.Brands; using Netina.Domain.Entities.ProductCategories; -using Netina.Domain.Entities.Products; namespace Netina.Core.BaseServices; diff --git a/Netina.Core/CoreServices/Abstracts/ISearchService.cs b/Netina.Core/CoreServices/Abstracts/ISearchService.cs index 2552f15..fa5a9e0 100644 --- a/Netina.Core/CoreServices/Abstracts/ISearchService.cs +++ b/Netina.Core/CoreServices/Abstracts/ISearchService.cs @@ -8,4 +8,5 @@ public interface ISearchService : IScopedDependency public Task ThumbSearchAsync(string name,CancellationToken cancellationToken = default); public Task ZarehbinAsync(int page,CancellationToken cancellationToken = default); public Task ZarehbinAsync(Guid productId,CancellationToken cancellationToken = default); + } \ No newline at end of file diff --git a/Netina.Core/CoreServices/CommandQueries/Commands/WebSiteCommands.cs b/Netina.Core/CoreServices/CommandQueries/Commands/WebSiteCommands.cs new file mode 100644 index 0000000..b448a63 --- /dev/null +++ b/Netina.Core/CoreServices/CommandQueries/Commands/WebSiteCommands.cs @@ -0,0 +1,3 @@ +namespace Netina.Core.CoreServices.CommandQueries.Commands; + +public sealed record GetWebSiteNavBarCommand() : IRequest>; \ No newline at end of file diff --git a/Netina.Core/CoreServices/SearchService.cs b/Netina.Core/CoreServices/SearchService.cs index 4165fb7..4515e24 100644 --- a/Netina.Core/CoreServices/SearchService.cs +++ b/Netina.Core/CoreServices/SearchService.cs @@ -1,4 +1,5 @@ -using Netina.Domain.Dtos.ResponseDtos.Zarehbin; +using Netina.Domain.Dtos.ResponseDtos.Torob; +using Netina.Domain.Dtos.ResponseDtos.Zarehbin; using Netina.Domain.Entities.ProductCategories; namespace Netina.Core.CoreServices; @@ -63,4 +64,5 @@ public class SearchService : ISearchService { throw new NotImplementedException(); } + } \ No newline at end of file diff --git a/Netina.Core/CoreServices/SearchServices/GetTorobProductsQueryHandler.cs b/Netina.Core/CoreServices/SearchServices/GetTorobProductsQueryHandler.cs new file mode 100644 index 0000000..cd87833 --- /dev/null +++ b/Netina.Core/CoreServices/SearchServices/GetTorobProductsQueryHandler.cs @@ -0,0 +1,32 @@ +using Netina.Domain.Dtos.ResponseDtos.Torob; + +namespace Netina.Core.CoreServices.SearchServices; + +public class GetTorobProductsQueryHandler : IRequestHandler> +{ + private readonly IRepositoryWrapper _repositoryWrapper; + private readonly SiteSettings _siteSetting; + + public GetTorobProductsQueryHandler(IRepositoryWrapper repositoryWrapper , IOptionsSnapshot optionsSnapshot) + { + _repositoryWrapper = repositoryWrapper; + _siteSetting = optionsSnapshot.Value; + } + public async Task> Handle(GetTorobProductsQuery request, CancellationToken cancellationToken) + { + var products = await _repositoryWrapper.SetRepository() + .TableNoTracking + .OrderByDescending(p => p.ModifiedAt == DateTime.MinValue ? p.CreatedAt : p.ModifiedAt) + .Select(ProductMapper.ProjectToTorobResponseDto) + .Skip(request.Page * 100) + .Take(100) + .ToListAsync(cancellationToken); + + products.ForEach(p => + { + p.page_url = $"{_siteSetting.WebSiteUrl}/products/{p.product_id}"; + }); + + return products; + } +} \ No newline at end of file diff --git a/Netina.Core/CoreServices/WebSiteServices/GetWebSiteNavBarCommandHandler.cs b/Netina.Core/CoreServices/WebSiteServices/GetWebSiteNavBarCommandHandler.cs new file mode 100644 index 0000000..1e2d799 --- /dev/null +++ b/Netina.Core/CoreServices/WebSiteServices/GetWebSiteNavBarCommandHandler.cs @@ -0,0 +1,81 @@ +using Netina.Domain.Entities.Blogs; +using Netina.Domain.Entities.ProductCategories; + +namespace Netina.Core.CoreServices.WebSiteServices; + +public class GetWebSiteNavBarCommandHandler : IRequestHandler> +{ + private readonly IRepositoryWrapper _repositoryWrapper; + private readonly ISettingService _settingService; + private readonly SiteSettings _siteSetting; + + public GetWebSiteNavBarCommandHandler(IRepositoryWrapper repositoryWrapper , ISettingService settingService,IOptionsSnapshot optionsSnapshot) + { + _repositoryWrapper = repositoryWrapper; + _settingService = settingService; + _siteSetting = optionsSnapshot.Value; + } + + public async Task> Handle(GetWebSiteNavBarCommand request, CancellationToken cancellationToken) + { + var navBarSetting = await _settingService.GetSettingAsync(nameof(NavMenuSetting), cancellationToken) as NavMenuSetting; + var navBarItems = new List(); + if (navBarSetting == null) + return new List(); + + navBarSetting.NavMenuItems.ForEach(n => + { + n.Children = navBarSetting.NavMenuItems.Where(ni => ni.ParentId == n.Id).ToList(); + }); + navBarSetting.NavMenuItems.Where(n => n.ParentId != default).ToList().ForEach(ni => navBarSetting.NavMenuItems.Remove(ni)); + if (navBarSetting.ShowBlogCategories) + { + + var baseCategories = await _repositoryWrapper.SetRepository() + .TableNoTracking + .OrderByDescending(c => c.CreatedAt) + .Select(BlogCategoryMapper.ProjectToSDto) + .ToListAsync(cancellationToken); + + return baseCategories.Where(c=>c.IsMain).Select(b => new NavMenuItem + { + Title = b.Name, + Url = $"{_siteSetting.WebSiteUrl}/categories/{b.Id}/{b.Slug}", + Id = b.Id, + ParentId = b.ParentId, + Children = baseCategories.Where(c=>c.ParentId == b.Id).Select(c=>new NavMenuItem + { + + Title = c.Name, + Url = $"{_siteSetting.WebSiteUrl}/categories/{c.Id}/{c.Slug}", + Id = c.Id, + }).ToList() + }).ToList(); + + } + else if (navBarSetting.ShowProductCategories) + { + var baseCategories = await _repositoryWrapper.SetRepository() + .TableNoTracking + .OrderByDescending(c => c.CreatedAt) + .Select(ProductCategoryMapper.ProjectToSDto) + .ToListAsync(cancellationToken); + + return baseCategories.Where(c => c.IsMain).Select(b => new NavMenuItem + { + Title = b.Name, + Url = $"{_siteSetting.WebSiteUrl}/categories/{b.Id}/{b.Slug}", + Id = b.Id, + ParentId = b.ParentId, + Children = baseCategories.Where(c => c.ParentId == b.Id).Select(c => new NavMenuItem + { + + Title = c.Name, + Url = $"{_siteSetting.WebSiteUrl}/categories/{c.Id}/{c.Slug}", + Id = c.Id, + }).ToList() + }).ToList(); + } + return navBarSetting.NavMenuItems; + } +} \ No newline at end of file diff --git a/Netina.Core/Netina.Core.csproj b/Netina.Core/Netina.Core.csproj index 33ca6f4..1236c52 100644 --- a/Netina.Core/Netina.Core.csproj +++ b/Netina.Core/Netina.Core.csproj @@ -24,6 +24,8 @@ + + @@ -47,6 +49,7 @@ + diff --git a/Netina.Core/QuartzServices/JobScheduler.cs b/Netina.Core/QuartzServices/JobScheduler.cs index 67d3b92..26843cc 100644 --- a/Netina.Core/QuartzServices/JobScheduler.cs +++ b/Netina.Core/QuartzServices/JobScheduler.cs @@ -23,7 +23,7 @@ public class JobScheduler .Build(); ITrigger trigger = TriggerBuilder.Create() .WithIdentity("SiteMapJobTrigger", "admin") - .WithSchedule(CronScheduleBuilder.AtHourAndMinuteOnGivenDaysOfWeek(3, 30, + .WithSchedule(CronScheduleBuilder.AtHourAndMinuteOnGivenDaysOfWeek(1, 10, DayOfWeek.Saturday, DayOfWeek.Sunday, DayOfWeek.Monday, diff --git a/Netina.Domain/CommandQueries/Queries/SearchQueries.cs b/Netina.Domain/CommandQueries/Queries/SearchQueries.cs new file mode 100644 index 0000000..2eacdfb --- /dev/null +++ b/Netina.Domain/CommandQueries/Queries/SearchQueries.cs @@ -0,0 +1,5 @@ +using Netina.Domain.Dtos.ResponseDtos.Torob; + +namespace Netina.Domain.CommandQueries.Queries; + +public sealed record GetTorobProductsQuery(int Page = 0) : IRequest>; \ No newline at end of file diff --git a/Netina.Domain/Dtos/FilterDtos/BaseFilterDto.cs b/Netina.Domain/Dtos/FilterDtos/BaseFilterDto.cs index 120e5ee..45f567f 100644 --- a/Netina.Domain/Dtos/FilterDtos/BaseFilterDto.cs +++ b/Netina.Domain/Dtos/FilterDtos/BaseFilterDto.cs @@ -7,4 +7,12 @@ public class BaseFilterDto public string QueryName { get; set; } = string.Empty; public QueryFilterType QueryType { get; set; } public List Options { get; set; } = new List(); +} +public class BaseFilterDto +{ + public string Name { get; set; } = string.Empty; + public string Type { get; set; } = string.Empty; + public string QueryName { get; set; } = string.Empty; + public QueryFilterType QueryType { get; set; } + public List> Options { get; set; } = new List>(); } \ No newline at end of file diff --git a/Netina.Domain/Dtos/FilterDtos/ExpressDeliveryFilter.cs b/Netina.Domain/Dtos/FilterDtos/ExpressDeliveryFilter.cs index 0c5157f..5ecb3d5 100644 --- a/Netina.Domain/Dtos/FilterDtos/ExpressDeliveryFilter.cs +++ b/Netina.Domain/Dtos/FilterDtos/ExpressDeliveryFilter.cs @@ -1,6 +1,6 @@ namespace Netina.Domain.Dtos.FilterDtos; -public class ExpressDeliveryFilter : BaseFilterDto +public class ExpressDeliveryFilter : BaseFilterDto { public ExpressDeliveryFilter() { @@ -8,6 +8,6 @@ public class ExpressDeliveryFilter : BaseFilterDto QueryName = "expressDelivery"; Type = "checkbox"; QueryType = QueryFilterType.Bool; - Options.Add(new FilterOptionDto{Id = 0,Title = "فقط ارسال سریع"}); + Options.Add(new FilterOptionDto{Id = 0,Title = "فقط ارسال سریع",Value = true}); } } \ No newline at end of file diff --git a/Netina.Domain/Dtos/FilterDtos/FilterOptionDto.cs b/Netina.Domain/Dtos/FilterDtos/FilterOptionDto.cs index 16a46e0..5ab9aee 100644 --- a/Netina.Domain/Dtos/FilterDtos/FilterOptionDto.cs +++ b/Netina.Domain/Dtos/FilterDtos/FilterOptionDto.cs @@ -4,4 +4,10 @@ public class FilterOptionDto { public int Id { get; set; } public string Title { get; set; } = string.Empty; +} +public class FilterOptionDto +{ + public int Id { get; set; } + public string Title { get; set; } = string.Empty; + public TValue? Value { get; set; } } \ No newline at end of file diff --git a/Netina.Domain/Dtos/LargDtos/ProductLDto.cs b/Netina.Domain/Dtos/LargDtos/ProductLDto.cs index c4771af..cc84cfc 100644 --- a/Netina.Domain/Dtos/LargDtos/ProductLDto.cs +++ b/Netina.Domain/Dtos/LargDtos/ProductLDto.cs @@ -23,6 +23,7 @@ public class ProductLDto : BaseDto public string BrandName { get; set; } = string.Empty; public Guid CategoryId { get; set; } public string CategoryName { get; set; } = string.Empty; + public string MainImage { get; set; } = string.Empty; public bool IsSpecialOffer { get; set; } public List Specifications { get; set; } = new(); diff --git a/Netina.Domain/Dtos/ResponseDtos/Torob/TorobPagedResponseDto.cs b/Netina.Domain/Dtos/ResponseDtos/Torob/TorobPagedResponseDto.cs new file mode 100644 index 0000000..118d7b5 --- /dev/null +++ b/Netina.Domain/Dtos/ResponseDtos/Torob/TorobPagedResponseDto.cs @@ -0,0 +1,6 @@ +namespace Netina.Domain.Dtos.ResponseDtos.Torob; +public class TorobPagedResponseDto +{ + public List Products { get; set; } = new(); +} + diff --git a/Netina.Domain/Dtos/ResponseDtos/Torob/TorobProductResponseDto.cs b/Netina.Domain/Dtos/ResponseDtos/Torob/TorobProductResponseDto.cs new file mode 100644 index 0000000..ce901da --- /dev/null +++ b/Netina.Domain/Dtos/ResponseDtos/Torob/TorobProductResponseDto.cs @@ -0,0 +1,10 @@ +namespace Netina.Domain.Dtos.ResponseDtos.Torob; + +public class TorobProductResponseDto +{ + public string product_id { get; set; } = string.Empty; + public string page_url { get; set; } = string.Empty; + public double price { get; set; } + public bool availibility { get; set; } + public double old_price { get; set; } +} \ No newline at end of file diff --git a/Netina.Domain/Dtos/ResponseDtos/Zarehbin/ZarehbinPagedResponseDto.cs b/Netina.Domain/Dtos/ResponseDtos/Zarehbin/ZarehbinPagedResponseDto.cs index f8eab50..f6eace2 100644 --- a/Netina.Domain/Dtos/ResponseDtos/Zarehbin/ZarehbinPagedResponseDto.cs +++ b/Netina.Domain/Dtos/ResponseDtos/Zarehbin/ZarehbinPagedResponseDto.cs @@ -5,22 +5,4 @@ public class ZarehbinPagedResponseDto public int count { get; set; } public int total_pages_count { get; set; } public List products { get; set; } = new(); -} - -public class ZarehbinProductResponseDto -{ - public string title { get; set; } = string.Empty; - public string subtitle { get; set; } = string.Empty; - public string id { get; set; } = string.Empty; - public string current_price { get; set; } = string.Empty; - public string old_price { get; set; } = string.Empty; - public string availability { get; set; } = string.Empty; - public List categories { get; set; } = new(); - public string image_link { get; set; } = string.Empty; - public List image_links { get; set; } = new(); - public string page_url { get; set; } = string.Empty; - public string short_desc { get; set; } = string.Empty; - public List> spec { get; set; } = new(); - public string registry { get; set; } = string.Empty; - public string guarantee { get; set; } = string.Empty; } \ No newline at end of file diff --git a/Netina.Domain/Dtos/ResponseDtos/Zarehbin/ZarehbinProductResponseDto.cs b/Netina.Domain/Dtos/ResponseDtos/Zarehbin/ZarehbinProductResponseDto.cs new file mode 100644 index 0000000..bbd17cb --- /dev/null +++ b/Netina.Domain/Dtos/ResponseDtos/Zarehbin/ZarehbinProductResponseDto.cs @@ -0,0 +1,19 @@ +namespace Netina.Domain.Dtos.ResponseDtos.Zarehbin; + +public class ZarehbinProductResponseDto +{ + public string title { get; set; } = string.Empty; + public string subtitle { get; set; } = string.Empty; + public string id { get; set; } = string.Empty; + public string current_price { get; set; } = string.Empty; + public string old_price { get; set; } = string.Empty; + public string availability { get; set; } = string.Empty; + public List categories { get; set; } = new(); + public string image_link { get; set; } = string.Empty; + public List image_links { get; set; } = new(); + public string page_url { get; set; } = string.Empty; + public string short_desc { get; set; } = string.Empty; + public List> spec { get; set; } = new(); + public string registry { get; set; } = string.Empty; + public string guarantee { get; set; } = string.Empty; +} \ No newline at end of file diff --git a/Netina.Domain/Dtos/SmallDtos/BlogCategorySDto.cs b/Netina.Domain/Dtos/SmallDtos/BlogCategorySDto.cs index 540efe2..7c56ca2 100644 --- a/Netina.Domain/Dtos/SmallDtos/BlogCategorySDto.cs +++ b/Netina.Domain/Dtos/SmallDtos/BlogCategorySDto.cs @@ -6,4 +6,6 @@ public class BlogCategorySDto : BaseDto public int BlogCount { get; set; } public string Description { get; set; } = string.Empty; public string Slug { get; set; } = string.Empty; + public bool IsMain { get; set; } + public Guid ParentId { get; set; } } \ No newline at end of file diff --git a/Netina.Domain/Entities/Blogs/Blog.Aggregate.cs b/Netina.Domain/Entities/Blogs/Blog.Aggregate.cs index 378f231..c815276 100644 --- a/Netina.Domain/Entities/Blogs/Blog.Aggregate.cs +++ b/Netina.Domain/Entities/Blogs/Blog.Aggregate.cs @@ -34,15 +34,20 @@ public partial class BlogStorageFile public partial class BlogCategory { - public static BlogCategory Create(string name, string description) + public static BlogCategory Create(string name, string description, bool isMain) { var slug = StringExtensions.GetSlug(name); - return new BlogCategory(name, slug, description); + return new BlogCategory(name, slug, description, isMain); } - public static BlogCategory Create(string name, string slug, string description) + public static BlogCategory Create(string name, string slug, string description,bool isMain) { if (slug.IsNullOrEmpty()) slug = StringExtensions.GetSlug(name); - return new BlogCategory(name, slug, description); + return new BlogCategory(name, slug, description, isMain); + } + + public void SetParent(Guid parentId) + { + ParentId = parentId; } } \ No newline at end of file diff --git a/Netina.Domain/Entities/Blogs/BlogCategory.cs b/Netina.Domain/Entities/Blogs/BlogCategory.cs index 9e01513..a4bede6 100644 --- a/Netina.Domain/Entities/Blogs/BlogCategory.cs +++ b/Netina.Domain/Entities/Blogs/BlogCategory.cs @@ -10,14 +10,18 @@ public partial class BlogCategory : ApiEntity } - public BlogCategory(string name,string slug, string description) + public BlogCategory(string name,string slug, string description,bool isMain) { Name = name; Slug = slug; Description = description; + IsMain = isMain; } public string Name { get; internal set; } = string.Empty; public string Slug { get; internal set; } = string.Empty; public string Description { get; internal set; } = string.Empty; + public bool IsMain { get; set; } + public Guid? ParentId { get; set; } + public BlogCategory? Parent { get; set; } public List Blogs { get; internal set; } = new(); } \ No newline at end of file diff --git a/Netina.Domain/Entities/Products/Product.cs b/Netina.Domain/Entities/Products/Product.cs index ed273c0..94aecd4 100644 --- a/Netina.Domain/Entities/Products/Product.cs +++ b/Netina.Domain/Entities/Products/Product.cs @@ -3,6 +3,7 @@ [AdaptTwoWays("[name]LDto", IgnoreAttributes = new[] { typeof(AdaptIgnoreAttribute) }, MapType = MapType.Map | MapType.MapToTarget | MapType.Projection)] [AdaptTwoWays("[name]SDto", IgnoreAttributes = new[] { typeof(AdaptIgnoreAttribute) }, MapType = MapType.Map | MapType.MapToTarget )] [AdaptTo("[name]SDto", IgnoreAttributes = new[] { typeof(AdaptIgnoreAttribute) }, MapType = MapType.Projection)] +[AdaptTo("TorobProductResponseDto", IgnoreAttributes = new[] { typeof(AdaptIgnoreAttribute) }, MapType = MapType.Projection)] //[AdaptTo("[name]SDto", IgnoreAttributes = new[] { typeof(AdaptIgnoreAttribute) }, MapType = MapType.Projection)] [GenerateMapper] public partial class Product : ApiEntity diff --git a/Netina.Domain/Mappers/ProductMapper.g.cs b/Netina.Domain/Mappers/ProductMapper.g.cs index 48354c3..8d3aa26 100644 --- a/Netina.Domain/Mappers/ProductMapper.g.cs +++ b/Netina.Domain/Mappers/ProductMapper.g.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Linq.Expressions; using Mapster.Models; using Netina.Domain.Dtos.LargDtos; +using Netina.Domain.Dtos.ResponseDtos.Torob; using Netina.Domain.Dtos.SmallDtos; using Netina.Domain.Entities.Brands; using Netina.Domain.Entities.ProductCategories; @@ -342,7 +343,6 @@ namespace Netina.Domain.Mappers MainImage = p44.Files.FirstOrDefault(funcMain17) != null ? p44.Files.FirstOrDefault(funcMain18).FileLocation : (p44.Files.Count > 0 ? p44.Files.FirstOrDefault().FileLocation : string.Empty), CategoryId = p44.CategoryId, BrandId = p44.BrandId, - BrandName = p44.Brand == null ? null : p44.Brand.PersianName, CategoryName = p44.Category == null ? null : p44.Category.Name, ModifiedAt = p44.ModifiedAt, Id = p44.Id, @@ -376,7 +376,6 @@ namespace Netina.Domain.Mappers result.MainImage = p45.Files.FirstOrDefault(funcMain17) != null ? p45.Files.FirstOrDefault(funcMain18).FileLocation : (p45.Files.Count > 0 ? p45.Files.FirstOrDefault().FileLocation : string.Empty); result.CategoryId = p45.CategoryId; result.BrandId = p45.BrandId; - result.BrandName = p45.Brand == null ? null : p45.Brand.PersianName; result.CategoryName = p45.Category == null ? null : p45.Category.Name; result.ModifiedAt = p45.ModifiedAt; result.Id = p45.Id; @@ -405,12 +404,17 @@ namespace Netina.Domain.Mappers MainImage = p47.Files.FirstOrDefault(f => f.IsPrimary) != null ? p47.Files.FirstOrDefault(f => f.IsPrimary).FileLocation : (p47.Files.Count > 0 ? p47.Files.FirstOrDefault().FileLocation : string.Empty), CategoryId = p47.CategoryId, BrandId = p47.BrandId, - BrandName = p47.Brand == null ? null : p47.Brand.PersianName, - CategoryName = p47.Category == null ? null : p47.Category.Name, + CategoryName = p47.Category.Name, ModifiedAt = p47.ModifiedAt, Id = p47.Id, CreatedAt = p47.CreatedAt }; + public static Expression> ProjectToTorobResponseDto => p48 => new TorobProductResponseDto() + { + product_id = p48.Id.ToString(), + price = p48.Cost, + availibility = p48.IsEnable + }; private static List funcMain1(List p2) { diff --git a/Netina.Domain/MapsterRegister.cs b/Netina.Domain/MapsterRegister.cs index 15fcccd..6030982 100644 --- a/Netina.Domain/MapsterRegister.cs +++ b/Netina.Domain/MapsterRegister.cs @@ -1,4 +1,5 @@ -using Netina.Domain.Entities.Accounting; +using Netina.Domain.Dtos.ResponseDtos.Torob; +using Netina.Domain.Entities.Accounting; namespace Netina.Domain; @@ -56,6 +57,16 @@ public class MapsterRegister : IRegister .Map("BrandName", o => o.Brand == null ? null : o.Brand.PersianName) .IgnoreNullValues(false) .TwoWays(); + config.NewConfig() + .Map("MainImage", o => o.Files.FirstOrDefault(f => f.IsPrimary) != null ? o.Files.FirstOrDefault(f => f.IsPrimary).FileLocation : o.Files.Count > 0 ? o.Files.FirstOrDefault().FileLocation : string.Empty) + .IgnoreNullValues(false) + .TwoWays(); + config.NewConfig() + .Map(s=>s.availibility,o=>o.IsEnable) + .Map(s=>s.price , o=>o.Cost) + .Map(s=>s.product_id,o=>o.Id.ToString()) + .IgnoreNullValues(false) + .TwoWays(); ConfigOrderMappers(config); diff --git a/Netina.Domain/MartenEntities/Settings/NetinaSetting.cs b/Netina.Domain/MartenEntities/Settings/NetinaSetting.cs new file mode 100644 index 0000000..8031ba8 --- /dev/null +++ b/Netina.Domain/MartenEntities/Settings/NetinaSetting.cs @@ -0,0 +1,6 @@ +namespace Netina.Domain.MartenEntities.Settings; +public class NetinaSetting +{ + public int WebSiteType { get; set; } +} + diff --git a/Netina.Domain/MartenEntities/Settings/ShopSetting.cs b/Netina.Domain/MartenEntities/Settings/ShopSetting.cs index eb5e886..f3c9be3 100644 --- a/Netina.Domain/MartenEntities/Settings/ShopSetting.cs +++ b/Netina.Domain/MartenEntities/Settings/ShopSetting.cs @@ -17,4 +17,5 @@ public class ShopSetting public double TaxesFee { get; set; } public double ServiceFee { get; set; } public bool ServiceIsPercent { get; set; } + public string LogoUrl { get; set; } = string.Empty; } \ No newline at end of file diff --git a/Netina.Domain/Netina.Domain.csproj b/Netina.Domain/Netina.Domain.csproj index 7a4b189..13192c2 100644 --- a/Netina.Domain/Netina.Domain.csproj +++ b/Netina.Domain/Netina.Domain.csproj @@ -1,6 +1,6 @@  - + - + diff --git a/Netina.Infrastructure/Services/UploadFileService.cs b/Netina.Infrastructure/Services/UploadFileService.cs index a3ef8b1..f2778bd 100644 --- a/Netina.Infrastructure/Services/UploadFileService.cs +++ b/Netina.Infrastructure/Services/UploadFileService.cs @@ -8,10 +8,13 @@ namespace Netina.Infrastructure.Services; public class UploadFileService : IUploadFileService { private readonly IStorageService _storageService; + private readonly SiteSettings _siteSetting; - public UploadFileService(IStorageService storageService) + public UploadFileService(IStorageService storageService,IOptionsSnapshot optionsSnapshot) { _storageService = storageService; + _siteSetting = optionsSnapshot.Value; + } public async Task UploadImageAsync(FileUploadRequest uploadRequest) { @@ -23,13 +26,24 @@ public class UploadFileService : IUploadFileService await uploadRequest.ImageResize(originalMedFileStream, mediumFileStream, 1280); await uploadRequest.ImageResize(originalThumbFileStream, thumbnailFileStream, 200); - var medFileName = await _storageService.UploadObjectFromFileAsync(uploadRequest.FileName, $"{uploadRequest.FileUploadType.ToDisplay()}/Med", uploadRequest.ContentType, mediumFileStream); - await _storageService.UploadObjectFromFileAsync(medFileName, $"{uploadRequest.FileUploadType.ToDisplay()}/Thumb", uploadRequest.ContentType, thumbnailFileStream, false); + string medFileName; + if (uploadRequest.FileUploadType == FileUploadType.Logo) + { + uploadRequest.FileName = $"Main.{uploadRequest.FileName.Split('.').Last()}"; + medFileName = await _storageService.UploadObjectFromFileAsync(uploadRequest.FileName, $"{uploadRequest.FileUploadType.ToDisplay()}/Med", uploadRequest.ContentType, mediumFileStream,false); + await _storageService.UploadObjectFromFileAsync(medFileName, $"{uploadRequest.FileUploadType.ToDisplay()}/Thumb", uploadRequest.ContentType, thumbnailFileStream, false); + } + else + { + medFileName = await _storageService.UploadObjectFromFileAsync(uploadRequest.FileName, $"{uploadRequest.FileUploadType.ToDisplay()}/Med", uploadRequest.ContentType, mediumFileStream); + await _storageService.UploadObjectFromFileAsync(medFileName, $"{uploadRequest.FileUploadType.ToDisplay()}/Thumb", uploadRequest.ContentType, thumbnailFileStream, false); + } + var response = new FileUploadResponse { FileName = medFileName, FileLocation = $"{uploadRequest.FileUploadType.ToDisplay()}/Med/{medFileName}", - FileUrl = $"https://storage.vesmook.com/{uploadRequest.FileUploadType.ToDisplay()}/Med/{medFileName}" + FileUrl = $"{_siteSetting.StorageBaseUrl}/{uploadRequest.FileUploadType.ToDisplay()}/Med/{medFileName}" }; return response; } diff --git a/Netina.Repository/Abstracts/ICurrentUserService.cs b/Netina.Repository/Abstracts/ICurrentUserService.cs index 4e089f3..58588a5 100644 --- a/Netina.Repository/Abstracts/ICurrentUserService.cs +++ b/Netina.Repository/Abstracts/ICurrentUserService.cs @@ -1,5 +1,4 @@ using System.IdentityModel.Tokens.Jwt; -using Netina.Common.Models; namespace Netina.Repository.Abstracts; diff --git a/Netina.Repository/Behaviors/ValidationBehavior.cs b/Netina.Repository/Behaviors/ValidationBehavior.cs index 33e3e38..1f8599c 100644 --- a/Netina.Repository/Behaviors/ValidationBehavior.cs +++ b/Netina.Repository/Behaviors/ValidationBehavior.cs @@ -1,5 +1,4 @@ using FluentValidation; -using Netina.Common.Models.Exception; using ValidationException = Netina.Common.Models.Exception.ValidationException; namespace Netina.Repository.Behaviors; diff --git a/Netina.Repository/Extensions/ModelBuilderExtensions.cs b/Netina.Repository/Extensions/ModelBuilderExtensions.cs index ba6180d..3ad87e4 100644 --- a/Netina.Repository/Extensions/ModelBuilderExtensions.cs +++ b/Netina.Repository/Extensions/ModelBuilderExtensions.cs @@ -1,6 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Entity; -using Netina.Repository.Models; namespace Netina.Repository.Extensions; diff --git a/Netina.Repository/Handlers/Accounting/CreateOrUpdatePaymentCommandHandler.cs b/Netina.Repository/Handlers/Accounting/CreateOrUpdatePaymentCommandHandler.cs index b0f118a..016a8a3 100644 --- a/Netina.Repository/Handlers/Accounting/CreateOrUpdatePaymentCommandHandler.cs +++ b/Netina.Repository/Handlers/Accounting/CreateOrUpdatePaymentCommandHandler.cs @@ -1,9 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; using Netina.Domain.Entities.Accounting; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Accounting; diff --git a/Netina.Repository/Handlers/Accounting/GetPaymentQueryHandler.cs b/Netina.Repository/Handlers/Accounting/GetPaymentQueryHandler.cs index bfc915d..3f88cef 100644 --- a/Netina.Repository/Handlers/Accounting/GetPaymentQueryHandler.cs +++ b/Netina.Repository/Handlers/Accounting/GetPaymentQueryHandler.cs @@ -1,10 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.SmallDtos; using Netina.Domain.Entities.Accounting; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Accounting; diff --git a/Netina.Repository/Handlers/Accounting/GetPaymentsQueryHandler.cs b/Netina.Repository/Handlers/Accounting/GetPaymentsQueryHandler.cs index c5e6f27..c1be426 100644 --- a/Netina.Repository/Handlers/Accounting/GetPaymentsQueryHandler.cs +++ b/Netina.Repository/Handlers/Accounting/GetPaymentsQueryHandler.cs @@ -1,8 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.SmallDtos; using Netina.Domain.Entities.Accounting; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Accounting; diff --git a/Netina.Repository/Handlers/Addresses/CreateAddressCommandHandler.cs b/Netina.Repository/Handlers/Addresses/CreateAddressCommandHandler.cs index 3b2d493..f9e5a74 100644 --- a/Netina.Repository/Handlers/Addresses/CreateAddressCommandHandler.cs +++ b/Netina.Repository/Handlers/Addresses/CreateAddressCommandHandler.cs @@ -1,11 +1,4 @@ -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Entities.Users; -using Netina.Repository.Abstracts; -using Netina.Repository.Repositories.Base.Contracts; - -namespace Netina.Repository.Handlers.Addresses; +namespace Netina.Repository.Handlers.Addresses; public class CreateAddressCommandHandler : IRequestHandler { diff --git a/Netina.Repository/Handlers/Addresses/DeleteAddressCommandHandler.cs b/Netina.Repository/Handlers/Addresses/DeleteAddressCommandHandler.cs index cb8c652..ad5436b 100644 --- a/Netina.Repository/Handlers/Addresses/DeleteAddressCommandHandler.cs +++ b/Netina.Repository/Handlers/Addresses/DeleteAddressCommandHandler.cs @@ -1,9 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Entities.Users; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Addresses; diff --git a/Netina.Repository/Handlers/Brands/DeleteBrandCommandHandler.cs b/Netina.Repository/Handlers/Brands/DeleteBrandCommandHandler.cs index 14a72f7..8a253b8 100644 --- a/Netina.Repository/Handlers/Brands/DeleteBrandCommandHandler.cs +++ b/Netina.Repository/Handlers/Brands/DeleteBrandCommandHandler.cs @@ -1,8 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; using Netina.Domain.Entities.Brands; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Brands; diff --git a/Netina.Repository/Handlers/Brands/GetBrandsQueryHandler.cs b/Netina.Repository/Handlers/Brands/GetBrandsQueryHandler.cs index e584bea..7b2f0cd 100644 --- a/Netina.Repository/Handlers/Brands/GetBrandsQueryHandler.cs +++ b/Netina.Repository/Handlers/Brands/GetBrandsQueryHandler.cs @@ -1,9 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.SmallDtos; using Netina.Domain.Entities.Brands; -using Netina.Domain.Entities.Products; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Brands; diff --git a/Netina.Repository/Handlers/Brands/Validators/CreateBrandCommandValidator.cs b/Netina.Repository/Handlers/Brands/Validators/CreateBrandCommandValidator.cs index 9a6c21b..a239ffc 100644 --- a/Netina.Repository/Handlers/Brands/Validators/CreateBrandCommandValidator.cs +++ b/Netina.Repository/Handlers/Brands/Validators/CreateBrandCommandValidator.cs @@ -1,5 +1,4 @@ using FluentValidation; -using Netina.Domain.CommandQueries.Commands; namespace Netina.Repository.Handlers.Brands.Validators; diff --git a/Netina.Repository/Handlers/Brands/Validators/UpdateBrandCommandValidator.cs b/Netina.Repository/Handlers/Brands/Validators/UpdateBrandCommandValidator.cs index 4f814fc..7506895 100644 --- a/Netina.Repository/Handlers/Brands/Validators/UpdateBrandCommandValidator.cs +++ b/Netina.Repository/Handlers/Brands/Validators/UpdateBrandCommandValidator.cs @@ -1,5 +1,4 @@ using FluentValidation; -using Netina.Domain.CommandQueries.Commands; namespace Netina.Repository.Handlers.Brands.Validators; diff --git a/Netina.Repository/Handlers/Complexes/CreateOrUpdateComplexCommandHandler.cs b/Netina.Repository/Handlers/Complexes/CreateOrUpdateComplexCommandHandler.cs index 1242419..2f05a9d 100644 --- a/Netina.Repository/Handlers/Complexes/CreateOrUpdateComplexCommandHandler.cs +++ b/Netina.Repository/Handlers/Complexes/CreateOrUpdateComplexCommandHandler.cs @@ -1,5 +1,4 @@ -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.DocumentEntities.Complexes; +using Netina.Domain.DocumentEntities.Complexes; namespace Netina.Repository.Handlers.Complexes; diff --git a/Netina.Repository/Handlers/Complexes/Validators/CreateBrandCommandValidator.cs b/Netina.Repository/Handlers/Complexes/Validators/CreateBrandCommandValidator.cs index d91e156..af2fb0e 100644 --- a/Netina.Repository/Handlers/Complexes/Validators/CreateBrandCommandValidator.cs +++ b/Netina.Repository/Handlers/Complexes/Validators/CreateBrandCommandValidator.cs @@ -1,5 +1,4 @@ using FluentValidation; -using Netina.Domain.CommandQueries.Commands; namespace Netina.Repository.Handlers.Complexes.Validators; diff --git a/Netina.Repository/Handlers/Discounts/CreateDiscountCommandHandler.cs b/Netina.Repository/Handlers/Discounts/CreateDiscountCommandHandler.cs index 53393dd..d290ab7 100644 --- a/Netina.Repository/Handlers/Discounts/CreateDiscountCommandHandler.cs +++ b/Netina.Repository/Handlers/Discounts/CreateDiscountCommandHandler.cs @@ -1,10 +1,4 @@ -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Dtos.LargDtos; -using Netina.Domain.Entities.Discounts; -using Netina.Domain.Enums; -using Netina.Repository.Repositories.Base.Contracts; - -namespace Netina.Repository.Handlers.Discounts; +namespace Netina.Repository.Handlers.Discounts; public class CreateDiscountCommandHandler : IRequestHandler { diff --git a/Netina.Repository/Handlers/Discounts/DeleteDiscountCommandHandler.cs b/Netina.Repository/Handlers/Discounts/DeleteDiscountCommandHandler.cs index 99d90b5..65f77e6 100644 --- a/Netina.Repository/Handlers/Discounts/DeleteDiscountCommandHandler.cs +++ b/Netina.Repository/Handlers/Discounts/DeleteDiscountCommandHandler.cs @@ -1,9 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Entities.Discounts; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Discounts; diff --git a/Netina.Repository/Handlers/Discounts/GetDiscountQueryHandler.cs b/Netina.Repository/Handlers/Discounts/GetDiscountQueryHandler.cs index c0ef6a9..e3d2897 100644 --- a/Netina.Repository/Handlers/Discounts/GetDiscountQueryHandler.cs +++ b/Netina.Repository/Handlers/Discounts/GetDiscountQueryHandler.cs @@ -1,10 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.LargDtos; -using Netina.Domain.Entities.Discounts; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Discounts; diff --git a/Netina.Repository/Handlers/Discounts/GetDiscountsQueryHandler.cs b/Netina.Repository/Handlers/Discounts/GetDiscountsQueryHandler.cs index 86ad478..da8f6d4 100644 --- a/Netina.Repository/Handlers/Discounts/GetDiscountsQueryHandler.cs +++ b/Netina.Repository/Handlers/Discounts/GetDiscountsQueryHandler.cs @@ -1,8 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.SmallDtos; -using Netina.Domain.Entities.Discounts; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Discounts; diff --git a/Netina.Repository/Handlers/Discounts/UpdateDiscountCommandHandler.cs b/Netina.Repository/Handlers/Discounts/UpdateDiscountCommandHandler.cs index b947a5c..c022c55 100644 --- a/Netina.Repository/Handlers/Discounts/UpdateDiscountCommandHandler.cs +++ b/Netina.Repository/Handlers/Discounts/UpdateDiscountCommandHandler.cs @@ -1,10 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Entities.Discounts; -using Netina.Domain.Enums; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Discounts; diff --git a/Netina.Repository/Handlers/Discounts/Validators/CreateDiscountCommandValidator.cs b/Netina.Repository/Handlers/Discounts/Validators/CreateDiscountCommandValidator.cs index e153a5f..3d57534 100644 --- a/Netina.Repository/Handlers/Discounts/Validators/CreateDiscountCommandValidator.cs +++ b/Netina.Repository/Handlers/Discounts/Validators/CreateDiscountCommandValidator.cs @@ -1,6 +1,4 @@ using FluentValidation; -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Enums; namespace Netina.Repository.Handlers.Discounts.Validators; diff --git a/Netina.Repository/Handlers/Newsletters/CreateNewsletterMemberCommandHandler.cs b/Netina.Repository/Handlers/Newsletters/CreateNewsletterMemberCommandHandler.cs index fabd5f7..0d3e140 100644 --- a/Netina.Repository/Handlers/Newsletters/CreateNewsletterMemberCommandHandler.cs +++ b/Netina.Repository/Handlers/Newsletters/CreateNewsletterMemberCommandHandler.cs @@ -1,9 +1,5 @@ using Microsoft.EntityFrameworkCore; using Microsoft.IdentityModel.Tokens; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Entities.Users; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Newsletters; diff --git a/Netina.Repository/Handlers/Newsletters/GetNewsletterMembersQueryHandler.cs b/Netina.Repository/Handlers/Newsletters/GetNewsletterMembersQueryHandler.cs index a9ee32e..1d7a40f 100644 --- a/Netina.Repository/Handlers/Newsletters/GetNewsletterMembersQueryHandler.cs +++ b/Netina.Repository/Handlers/Newsletters/GetNewsletterMembersQueryHandler.cs @@ -1,8 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.SmallDtos; -using Netina.Domain.Entities.Users; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Newsletters; diff --git a/Netina.Repository/Handlers/Newsletters/Validators/CreateNewsletterMemberCommandValidator.cs b/Netina.Repository/Handlers/Newsletters/Validators/CreateNewsletterMemberCommandValidator.cs index ac8e960..e50ee7f 100644 --- a/Netina.Repository/Handlers/Newsletters/Validators/CreateNewsletterMemberCommandValidator.cs +++ b/Netina.Repository/Handlers/Newsletters/Validators/CreateNewsletterMemberCommandValidator.cs @@ -1,7 +1,5 @@ using FluentValidation; using Microsoft.IdentityModel.Tokens; -using Netina.Common.Extensions; -using Netina.Domain.CommandQueries.Commands; namespace Netina.Repository.Handlers.Newsletters.Validators; diff --git a/Netina.Repository/Handlers/Orders/CreateBaseOrderCommandHandler.cs b/Netina.Repository/Handlers/Orders/CreateBaseOrderCommandHandler.cs index 4f419bf..601abf7 100644 --- a/Netina.Repository/Handlers/Orders/CreateBaseOrderCommandHandler.cs +++ b/Netina.Repository/Handlers/Orders/CreateBaseOrderCommandHandler.cs @@ -1,9 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; using Netina.Domain.Entities.Orders; -using Netina.Domain.Entities.Users; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Orders; diff --git a/Netina.Repository/Handlers/Orders/DeleteOrderCommandHandler.cs b/Netina.Repository/Handlers/Orders/DeleteOrderCommandHandler.cs index c89e23e..d510445 100644 --- a/Netina.Repository/Handlers/Orders/DeleteOrderCommandHandler.cs +++ b/Netina.Repository/Handlers/Orders/DeleteOrderCommandHandler.cs @@ -1,9 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; using Netina.Domain.Entities.Orders; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Orders; diff --git a/Netina.Repository/Handlers/Orders/GetOrderLDtoQueryHandler.cs b/Netina.Repository/Handlers/Orders/GetOrderLDtoQueryHandler.cs index 151f1bd..18d4998 100644 --- a/Netina.Repository/Handlers/Orders/GetOrderLDtoQueryHandler.cs +++ b/Netina.Repository/Handlers/Orders/GetOrderLDtoQueryHandler.cs @@ -1,10 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.LargDtos; using Netina.Domain.Entities.Orders; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Orders; diff --git a/Netina.Repository/Handlers/Orders/GetOrderQueryHandler.cs b/Netina.Repository/Handlers/Orders/GetOrderQueryHandler.cs index b050ed9..c511402 100644 --- a/Netina.Repository/Handlers/Orders/GetOrderQueryHandler.cs +++ b/Netina.Repository/Handlers/Orders/GetOrderQueryHandler.cs @@ -1,9 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Queries; using Netina.Domain.Entities.Orders; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Orders; diff --git a/Netina.Repository/Handlers/Orders/GetOrdersQueryHandler.cs b/Netina.Repository/Handlers/Orders/GetOrdersQueryHandler.cs index 452c176..392d2d6 100644 --- a/Netina.Repository/Handlers/Orders/GetOrdersQueryHandler.cs +++ b/Netina.Repository/Handlers/Orders/GetOrdersQueryHandler.cs @@ -1,12 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Extensions; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.SmallDtos; using Netina.Domain.Entities.Orders; -using Netina.Domain.Enums; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Orders; diff --git a/Netina.Repository/Handlers/Orders/GetUserOrdersQueryHandler.cs b/Netina.Repository/Handlers/Orders/GetUserOrdersQueryHandler.cs index 33b9a07..455cd91 100644 --- a/Netina.Repository/Handlers/Orders/GetUserOrdersQueryHandler.cs +++ b/Netina.Repository/Handlers/Orders/GetUserOrdersQueryHandler.cs @@ -1,12 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.SmallDtos; using Netina.Domain.Entities.Orders; -using Netina.Domain.Entities.Users; -using Netina.Repository.Abstracts; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Orders; diff --git a/Netina.Repository/Handlers/ProductCategories/CreateProductCategoryCommandHandler.cs b/Netina.Repository/Handlers/ProductCategories/CreateProductCategoryCommandHandler.cs index a4f0ce8..0cb8744 100644 --- a/Netina.Repository/Handlers/ProductCategories/CreateProductCategoryCommandHandler.cs +++ b/Netina.Repository/Handlers/ProductCategories/CreateProductCategoryCommandHandler.cs @@ -1,9 +1,4 @@ -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Dtos.LargDtos; -using Netina.Domain.Entities.ProductCategories; -using Netina.Repository.Repositories.Base.Contracts; - -namespace Netina.Repository.Handlers.ProductCategories; +namespace Netina.Repository.Handlers.ProductCategories; public class CreateProductCategoryCommandHandler : IRequestHandler { diff --git a/Netina.Repository/Handlers/ProductCategories/DeleteProductCategoryCommandHandler.cs b/Netina.Repository/Handlers/ProductCategories/DeleteProductCategoryCommandHandler.cs index 3b09d90..21238ad 100644 --- a/Netina.Repository/Handlers/ProductCategories/DeleteProductCategoryCommandHandler.cs +++ b/Netina.Repository/Handlers/ProductCategories/DeleteProductCategoryCommandHandler.cs @@ -1,9 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Entities.ProductCategories; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.ProductCategories; diff --git a/Netina.Repository/Handlers/ProductCategories/GetProductCategoriesQueryHandler.cs b/Netina.Repository/Handlers/ProductCategories/GetProductCategoriesQueryHandler.cs index 244ba99..48e6b73 100644 --- a/Netina.Repository/Handlers/ProductCategories/GetProductCategoriesQueryHandler.cs +++ b/Netina.Repository/Handlers/ProductCategories/GetProductCategoriesQueryHandler.cs @@ -1,8 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.SmallDtos; -using Netina.Domain.Entities.ProductCategories; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.ProductCategories; diff --git a/Netina.Repository/Handlers/ProductCategories/GetProductCategoryChildrenQueryHandler.cs b/Netina.Repository/Handlers/ProductCategories/GetProductCategoryChildrenQueryHandler.cs index 3eefb06..28a847c 100644 --- a/Netina.Repository/Handlers/ProductCategories/GetProductCategoryChildrenQueryHandler.cs +++ b/Netina.Repository/Handlers/ProductCategories/GetProductCategoryChildrenQueryHandler.cs @@ -1,8 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Entities.ProductCategories; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.ProductCategories; diff --git a/Netina.Repository/Handlers/ProductCategories/GetProductCategoryQueryHandler.cs b/Netina.Repository/Handlers/ProductCategories/GetProductCategoryQueryHandler.cs index fc4159f..a13f531 100644 --- a/Netina.Repository/Handlers/ProductCategories/GetProductCategoryQueryHandler.cs +++ b/Netina.Repository/Handlers/ProductCategories/GetProductCategoryQueryHandler.cs @@ -1,10 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.LargDtos; -using Netina.Domain.Entities.ProductCategories; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.ProductCategories; diff --git a/Netina.Repository/Handlers/ProductCategories/UpdateProductCategoryCommandHandler.cs b/Netina.Repository/Handlers/ProductCategories/UpdateProductCategoryCommandHandler.cs index b5933a3..84e2d76 100644 --- a/Netina.Repository/Handlers/ProductCategories/UpdateProductCategoryCommandHandler.cs +++ b/Netina.Repository/Handlers/ProductCategories/UpdateProductCategoryCommandHandler.cs @@ -1,9 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Entities.ProductCategories; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.ProductCategories; diff --git a/Netina.Repository/Handlers/ProductCategories/Validators/CreateProductCategoryCommandValidator.cs b/Netina.Repository/Handlers/ProductCategories/Validators/CreateProductCategoryCommandValidator.cs index 932239d..61db496 100644 --- a/Netina.Repository/Handlers/ProductCategories/Validators/CreateProductCategoryCommandValidator.cs +++ b/Netina.Repository/Handlers/ProductCategories/Validators/CreateProductCategoryCommandValidator.cs @@ -1,5 +1,4 @@ using FluentValidation; -using Netina.Domain.CommandQueries.Commands; namespace Netina.Repository.Handlers.ProductCategories.Validators; diff --git a/Netina.Repository/Handlers/ProductCategories/Validators/UpdateProductCategoryCommandValidator.cs b/Netina.Repository/Handlers/ProductCategories/Validators/UpdateProductCategoryCommandValidator.cs index c94231e..095b3df 100644 --- a/Netina.Repository/Handlers/ProductCategories/Validators/UpdateProductCategoryCommandValidator.cs +++ b/Netina.Repository/Handlers/ProductCategories/Validators/UpdateProductCategoryCommandValidator.cs @@ -1,5 +1,4 @@ using FluentValidation; -using Netina.Domain.CommandQueries.Commands; namespace Netina.Repository.Handlers.ProductCategories.Validators; diff --git a/Netina.Repository/Handlers/Products/ChangeProductDisplayedCommandHandler.cs b/Netina.Repository/Handlers/Products/ChangeProductDisplayedCommandHandler.cs index 45103f6..3a37075 100644 --- a/Netina.Repository/Handlers/Products/ChangeProductDisplayedCommandHandler.cs +++ b/Netina.Repository/Handlers/Products/ChangeProductDisplayedCommandHandler.cs @@ -1,8 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Entities.Products; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Products; diff --git a/Netina.Repository/Handlers/Products/CreateProductCommandHandler.cs b/Netina.Repository/Handlers/Products/CreateProductCommandHandler.cs index 36202ea..9687a19 100644 --- a/Netina.Repository/Handlers/Products/CreateProductCommandHandler.cs +++ b/Netina.Repository/Handlers/Products/CreateProductCommandHandler.cs @@ -1,10 +1,4 @@ -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Dtos.LargDtos; -using Netina.Domain.Entities.Products; -using Netina.Domain.Enums; -using Netina.Repository.Repositories.Base.Contracts; - -namespace Netina.Repository.Handlers.Products; +namespace Netina.Repository.Handlers.Products; public class CreateProductCommandHandler : IRequestHandler { diff --git a/Netina.Repository/Handlers/Products/DeleteProductCommandHandler.cs b/Netina.Repository/Handlers/Products/DeleteProductCommandHandler.cs index b375d79..bbb587b 100644 --- a/Netina.Repository/Handlers/Products/DeleteProductCommandHandler.cs +++ b/Netina.Repository/Handlers/Products/DeleteProductCommandHandler.cs @@ -1,9 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Entities.Products; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Products; diff --git a/Netina.Repository/Handlers/Products/GetProductsQueryHandler.cs b/Netina.Repository/Handlers/Products/GetProductsQueryHandler.cs index b874a23..8ddf449 100644 --- a/Netina.Repository/Handlers/Products/GetProductsQueryHandler.cs +++ b/Netina.Repository/Handlers/Products/GetProductsQueryHandler.cs @@ -1,13 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.ResponseDtos; -using Netina.Domain.Dtos.SmallDtos; -using Netina.Domain.Entities.Discounts; -using Netina.Domain.Entities.Products; -using Netina.Domain.Enums; -using Netina.Repository.Abstracts; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Products; diff --git a/Netina.Repository/Handlers/Products/UpdateProductCommandHandler.cs b/Netina.Repository/Handlers/Products/UpdateProductCommandHandler.cs index 12f7caf..1f62aad 100644 --- a/Netina.Repository/Handlers/Products/UpdateProductCommandHandler.cs +++ b/Netina.Repository/Handlers/Products/UpdateProductCommandHandler.cs @@ -1,11 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Dtos.LargDtos; -using Netina.Domain.Entities.Products; -using Netina.Domain.Enums; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Products; diff --git a/Netina.Repository/Handlers/Products/Validators/CreateProductCommandValidator.cs b/Netina.Repository/Handlers/Products/Validators/CreateProductCommandValidator.cs index 0e74a11..7290d3c 100644 --- a/Netina.Repository/Handlers/Products/Validators/CreateProductCommandValidator.cs +++ b/Netina.Repository/Handlers/Products/Validators/CreateProductCommandValidator.cs @@ -1,5 +1,4 @@ using FluentValidation; -using Netina.Domain.CommandQueries.Commands; namespace Netina.Repository.Handlers.Products.Validators; diff --git a/Netina.Repository/Handlers/Products/Validators/UpdateProductCommandValidator.cs b/Netina.Repository/Handlers/Products/Validators/UpdateProductCommandValidator.cs index 6c95cb7..4c815e6 100644 --- a/Netina.Repository/Handlers/Products/Validators/UpdateProductCommandValidator.cs +++ b/Netina.Repository/Handlers/Products/Validators/UpdateProductCommandValidator.cs @@ -1,5 +1,4 @@ using FluentValidation; -using Netina.Domain.CommandQueries.Commands; namespace Netina.Repository.Handlers.Products.Validators; diff --git a/Netina.Repository/Handlers/Reviews/CreateReviewCommandHandler.cs b/Netina.Repository/Handlers/Reviews/CreateReviewCommandHandler.cs index 50cff1b..cda3f9c 100644 --- a/Netina.Repository/Handlers/Reviews/CreateReviewCommandHandler.cs +++ b/Netina.Repository/Handlers/Reviews/CreateReviewCommandHandler.cs @@ -1,9 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Dtos.SmallDtos; -using Netina.Domain.Entities.Products; -using Netina.Repository.Repositories.Base.Contracts; using AppException = Netina.Common.Models.Exception.AppException; namespace Netina.Repository.Handlers.Reviews; diff --git a/Netina.Repository/Handlers/Reviews/DeleteReviewCommandHandler.cs b/Netina.Repository/Handlers/Reviews/DeleteReviewCommandHandler.cs index dcdb37d..a71c664 100644 --- a/Netina.Repository/Handlers/Reviews/DeleteReviewCommandHandler.cs +++ b/Netina.Repository/Handlers/Reviews/DeleteReviewCommandHandler.cs @@ -1,9 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Entities.Products; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Reviews; diff --git a/Netina.Repository/Handlers/Reviews/GetReviewQueryHandler.cs b/Netina.Repository/Handlers/Reviews/GetReviewQueryHandler.cs index 63caa20..9dd46a5 100644 --- a/Netina.Repository/Handlers/Reviews/GetReviewQueryHandler.cs +++ b/Netina.Repository/Handlers/Reviews/GetReviewQueryHandler.cs @@ -1,10 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.LargDtos; -using Netina.Domain.Entities.Products; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Reviews; diff --git a/Netina.Repository/Handlers/Reviews/GetReviewsQueryHandler.cs b/Netina.Repository/Handlers/Reviews/GetReviewsQueryHandler.cs index 3e1d79e..4cc9dab 100644 --- a/Netina.Repository/Handlers/Reviews/GetReviewsQueryHandler.cs +++ b/Netina.Repository/Handlers/Reviews/GetReviewsQueryHandler.cs @@ -1,8 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.SmallDtos; -using Netina.Domain.Entities.Products; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Reviews; diff --git a/Netina.Repository/Handlers/Reviews/Validators/CreateReviewCommandValidator.cs b/Netina.Repository/Handlers/Reviews/Validators/CreateReviewCommandValidator.cs index ab5e4e9..2bd6876 100644 --- a/Netina.Repository/Handlers/Reviews/Validators/CreateReviewCommandValidator.cs +++ b/Netina.Repository/Handlers/Reviews/Validators/CreateReviewCommandValidator.cs @@ -1,5 +1,4 @@ using FluentValidation; -using Netina.Domain.CommandQueries.Commands; namespace Netina.Repository.Handlers.Reviews.Validators; diff --git a/Netina.Repository/Handlers/Reviews/Validators/UpdateReviewCommandValidator.cs b/Netina.Repository/Handlers/Reviews/Validators/UpdateReviewCommandValidator.cs index 670e14e..646da75 100644 --- a/Netina.Repository/Handlers/Reviews/Validators/UpdateReviewCommandValidator.cs +++ b/Netina.Repository/Handlers/Reviews/Validators/UpdateReviewCommandValidator.cs @@ -1,5 +1,4 @@ using FluentValidation; -using Netina.Domain.CommandQueries.Commands; namespace Netina.Repository.Handlers.Reviews.Validators; diff --git a/Netina.Repository/Handlers/Warehouses/CreateShippingCommandHandler.cs b/Netina.Repository/Handlers/Warehouses/CreateShippingCommandHandler.cs index 511cbfb..229ab7c 100644 --- a/Netina.Repository/Handlers/Warehouses/CreateShippingCommandHandler.cs +++ b/Netina.Repository/Handlers/Warehouses/CreateShippingCommandHandler.cs @@ -1,7 +1,4 @@ -using Netina.Domain.CommandQueries.Commands; -using Netina.Domain.Dtos.SmallDtos; -using Netina.Domain.Entities.Warehouses; -using Netina.Repository.Repositories.Base.Contracts; +using Netina.Domain.Entities.Warehouses; namespace Netina.Repository.Handlers.Warehouses; diff --git a/Netina.Repository/Handlers/Warehouses/DeleteShippingCommandHandler.cs b/Netina.Repository/Handlers/Warehouses/DeleteShippingCommandHandler.cs index fe3e648..1995015 100644 --- a/Netina.Repository/Handlers/Warehouses/DeleteShippingCommandHandler.cs +++ b/Netina.Repository/Handlers/Warehouses/DeleteShippingCommandHandler.cs @@ -1,9 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; using Netina.Domain.Entities.Warehouses; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Warehouses; diff --git a/Netina.Repository/Handlers/Warehouses/GetShippingQueryHandler.cs b/Netina.Repository/Handlers/Warehouses/GetShippingQueryHandler.cs index f36b594..e92a2e0 100644 --- a/Netina.Repository/Handlers/Warehouses/GetShippingQueryHandler.cs +++ b/Netina.Repository/Handlers/Warehouses/GetShippingQueryHandler.cs @@ -1,10 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.SmallDtos; using Netina.Domain.Entities.Warehouses; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Warehouses; diff --git a/Netina.Repository/Handlers/Warehouses/GetShippingsQueryHandler.cs b/Netina.Repository/Handlers/Warehouses/GetShippingsQueryHandler.cs index 798d23d..5e8f082 100644 --- a/Netina.Repository/Handlers/Warehouses/GetShippingsQueryHandler.cs +++ b/Netina.Repository/Handlers/Warehouses/GetShippingsQueryHandler.cs @@ -1,8 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Domain.CommandQueries.Queries; -using Netina.Domain.Dtos.SmallDtos; using Netina.Domain.Entities.Warehouses; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Warehouses; diff --git a/Netina.Repository/Handlers/Warehouses/UpdateShippingCommandHandler.cs b/Netina.Repository/Handlers/Warehouses/UpdateShippingCommandHandler.cs index 536be7d..a7bfe41 100644 --- a/Netina.Repository/Handlers/Warehouses/UpdateShippingCommandHandler.cs +++ b/Netina.Repository/Handlers/Warehouses/UpdateShippingCommandHandler.cs @@ -1,9 +1,5 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Api; -using Netina.Common.Models.Exception; -using Netina.Domain.CommandQueries.Commands; using Netina.Domain.Entities.Warehouses; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Handlers.Warehouses; diff --git a/Netina.Repository/Handlers/Warehouses/Validators/CreateShippingCommandValidator.cs b/Netina.Repository/Handlers/Warehouses/Validators/CreateShippingCommandValidator.cs index 2077b1b..5cc3d9c 100644 --- a/Netina.Repository/Handlers/Warehouses/Validators/CreateShippingCommandValidator.cs +++ b/Netina.Repository/Handlers/Warehouses/Validators/CreateShippingCommandValidator.cs @@ -1,5 +1,4 @@ using FluentValidation; -using Netina.Domain.CommandQueries.Commands; namespace Netina.Repository.Handlers.Warehouses.Validators; diff --git a/Netina.Repository/Handlers/Warehouses/Validators/UpdateShippingCommandValidator.cs b/Netina.Repository/Handlers/Warehouses/Validators/UpdateShippingCommandValidator.cs index cc2c106..a9dd838 100644 --- a/Netina.Repository/Handlers/Warehouses/Validators/UpdateShippingCommandValidator.cs +++ b/Netina.Repository/Handlers/Warehouses/Validators/UpdateShippingCommandValidator.cs @@ -1,5 +1,4 @@ using FluentValidation; -using Netina.Domain.CommandQueries.Commands; namespace Netina.Repository.Handlers.Warehouses.Validators; diff --git a/Netina.Repository/Models/ApplicationContext.cs b/Netina.Repository/Models/ApplicationContext.cs index 0e3e81b..4468692 100644 --- a/Netina.Repository/Models/ApplicationContext.cs +++ b/Netina.Repository/Models/ApplicationContext.cs @@ -1,8 +1,5 @@ using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Entity; -using Netina.Domain.Entities.Users; -using Netina.Repository.Extensions; namespace Netina.Repository.Models; diff --git a/Netina.Repository/Repositories/Base/BaseRepository.cs b/Netina.Repository/Repositories/Base/BaseRepository.cs index fbe3b20..58b8db0 100644 --- a/Netina.Repository/Repositories/Base/BaseRepository.cs +++ b/Netina.Repository/Repositories/Base/BaseRepository.cs @@ -1,12 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Extensions; -using Netina.Common.Models.Api; -using Netina.Common.Models.Entity; -using Netina.Common.Models.Exception; -using Netina.Domain.Entities.Products; -using Netina.Repository.Abstracts; -using Netina.Repository.Models; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Repositories.Base { diff --git a/Netina.Repository/Repositories/Base/Contracts/IBaseRepository.cs b/Netina.Repository/Repositories/Base/Contracts/IBaseRepository.cs index f81140a..2a4ab75 100644 --- a/Netina.Repository/Repositories/Base/Contracts/IBaseRepository.cs +++ b/Netina.Repository/Repositories/Base/Contracts/IBaseRepository.cs @@ -1,6 +1,4 @@ -using Netina.Common.Models.Entity; - -namespace Netina.Repository.Repositories.Base.Contracts +namespace Netina.Repository.Repositories.Base.Contracts { public interface IBaseRepository : IDisposable, IReadRepository, IWriteRepository where T : class, IApiEntity { diff --git a/Netina.Repository/Repositories/Base/Contracts/IReadRepository.cs b/Netina.Repository/Repositories/Base/Contracts/IReadRepository.cs index 55a8fcb..889b4e8 100644 --- a/Netina.Repository/Repositories/Base/Contracts/IReadRepository.cs +++ b/Netina.Repository/Repositories/Base/Contracts/IReadRepository.cs @@ -1,5 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Entity; namespace Netina.Repository.Repositories.Base.Contracts { diff --git a/Netina.Repository/Repositories/Base/Contracts/IRepository.cs b/Netina.Repository/Repositories/Base/Contracts/IRepository.cs index b17eb70..f453e9a 100644 --- a/Netina.Repository/Repositories/Base/Contracts/IRepository.cs +++ b/Netina.Repository/Repositories/Base/Contracts/IRepository.cs @@ -1,5 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Entity; namespace Netina.Repository.Repositories.Base.Contracts { diff --git a/Netina.Repository/Repositories/Base/Contracts/IWriteRepository.cs b/Netina.Repository/Repositories/Base/Contracts/IWriteRepository.cs index baec96b..3112f5b 100644 --- a/Netina.Repository/Repositories/Base/Contracts/IWriteRepository.cs +++ b/Netina.Repository/Repositories/Base/Contracts/IWriteRepository.cs @@ -1,6 +1,4 @@ -using Netina.Common.Models.Entity; - -namespace Netina.Repository.Repositories.Base.Contracts +namespace Netina.Repository.Repositories.Base.Contracts { public interface IWriteRepository where T : class, IApiEntity { diff --git a/Netina.Repository/Repositories/Base/ReadRepository.cs b/Netina.Repository/Repositories/Base/ReadRepository.cs index 1265ba2..84793b4 100644 --- a/Netina.Repository/Repositories/Base/ReadRepository.cs +++ b/Netina.Repository/Repositories/Base/ReadRepository.cs @@ -1,9 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Extensions; -using Netina.Common.Models.Entity; -using Netina.Common.Models.Exception; -using Netina.Repository.Models; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Repositories.Base { diff --git a/Netina.Repository/Repositories/Base/Repository.cs b/Netina.Repository/Repositories/Base/Repository.cs index 03997ab..fcbf2fb 100644 --- a/Netina.Repository/Repositories/Base/Repository.cs +++ b/Netina.Repository/Repositories/Base/Repository.cs @@ -1,7 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Netina.Common.Models.Entity; -using Netina.Repository.Models; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Repositories.Base { diff --git a/Netina.Repository/Repositories/Base/WriteRepository.cs b/Netina.Repository/Repositories/Base/WriteRepository.cs index f4f20a1..132d775 100644 --- a/Netina.Repository/Repositories/Base/WriteRepository.cs +++ b/Netina.Repository/Repositories/Base/WriteRepository.cs @@ -1,10 +1,5 @@  using Microsoft.EntityFrameworkCore; -using Netina.Common.Extensions; -using Netina.Common.Models.Entity; -using Netina.Repository.Abstracts; -using Netina.Repository.Models; -using Netina.Repository.Repositories.Base.Contracts; namespace Netina.Repository.Repositories.Base { diff --git a/Netina.Repository/Repositories/Marten/IMartenRepository.cs b/Netina.Repository/Repositories/Marten/IMartenRepository.cs index 77391b1..8ea6e41 100644 --- a/Netina.Repository/Repositories/Marten/IMartenRepository.cs +++ b/Netina.Repository/Repositories/Marten/IMartenRepository.cs @@ -1,6 +1,4 @@ using System.Linq.Expressions; -using Netina.Common.Models; -using Netina.Common.Models.Entity; namespace Netina.Repository.Repositories.Marten; diff --git a/Netina.Repository/Repositories/Marten/IMartenRepositoryWrapper.cs b/Netina.Repository/Repositories/Marten/IMartenRepositoryWrapper.cs index 0972d4b..0e20046 100644 --- a/Netina.Repository/Repositories/Marten/IMartenRepositoryWrapper.cs +++ b/Netina.Repository/Repositories/Marten/IMartenRepositoryWrapper.cs @@ -1,7 +1,4 @@ -using Netina.Common.Models; -using Netina.Common.Models.Entity; - -namespace Netina.Repository.Repositories.Marten; +namespace Netina.Repository.Repositories.Marten; public interface IMartenRepositoryWrapper : IScopedDependency { diff --git a/Netina.Repository/Repositories/UnitOfWork/IUnitOfWork.cs b/Netina.Repository/Repositories/UnitOfWork/IUnitOfWork.cs index 63b042e..68691cf 100644 --- a/Netina.Repository/Repositories/UnitOfWork/IUnitOfWork.cs +++ b/Netina.Repository/Repositories/UnitOfWork/IUnitOfWork.cs @@ -1,6 +1,4 @@ -using Netina.Common.Models; - -namespace Netina.Repository.Repositories.UnitOfWork; +namespace Netina.Repository.Repositories.UnitOfWork; public interface IUnitOfWork : IScopedDependency { diff --git a/Netina.Repository/Repositories/UnitOfWork/UnitOfWork.cs b/Netina.Repository/Repositories/UnitOfWork/UnitOfWork.cs index ded895a..b6271e7 100644 --- a/Netina.Repository/Repositories/UnitOfWork/UnitOfWork.cs +++ b/Netina.Repository/Repositories/UnitOfWork/UnitOfWork.cs @@ -1,8 +1,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.EntityFrameworkCore.Storage; -using Netina.Common.Models.Entity; -using Netina.Repository.Models; namespace Netina.Repository.Repositories.UnitOfWork; diff --git a/Netina.Repository/RepositoryConfig.cs b/Netina.Repository/RepositoryConfig.cs index 3144c5b..4a885eb 100644 --- a/Netina.Repository/RepositoryConfig.cs +++ b/Netina.Repository/RepositoryConfig.cs @@ -1,6 +1,4 @@ -using Netina.Repository.Services.Abstracts; - -namespace Netina.Repository; +namespace Netina.Repository; public static class RepositoryConfig { diff --git a/Netina.Repository/Services/Abstracts/IDbInitializerService.cs b/Netina.Repository/Services/Abstracts/IDbInitializerService.cs index 8122e77..738a48a 100644 --- a/Netina.Repository/Services/Abstracts/IDbInitializerService.cs +++ b/Netina.Repository/Services/Abstracts/IDbInitializerService.cs @@ -1,6 +1,4 @@ -using Netina.Common.Models; - -namespace Netina.Repository.Services.Abstracts; +namespace Netina.Repository.Services.Abstracts; public interface IDbInitializerService : IScopedDependency diff --git a/Netina.Repository/Services/DbInitializerService.cs b/Netina.Repository/Services/DbInitializerService.cs index c997f23..0dfc94d 100644 --- a/Netina.Repository/Services/DbInitializerService.cs +++ b/Netina.Repository/Services/DbInitializerService.cs @@ -1,8 +1,4 @@ using Microsoft.EntityFrameworkCore; -using Microsoft.IdentityModel.Tokens; -using System.Web; -using Netina.Domain.Entities.Blogs; -using Netina.Domain.Entities.Brands; namespace Netina.Repository.Services;