From 4fa8093f4c68e2fc89004233132b8dbd8ec6da29 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Mon, 22 Jan 2018 18:49:05 -0600 Subject: [PATCH] general architecture cleanup remove pointless (currently) interfaces and other cruft --- .../V1/Controllers/ListsController.cs | 7 ++-- src/FilterLists.Data/Entities/FilterList.cs | 1 + .../{ => Junctions}/FilterListLanguage.cs | 2 +- .../{ => Junctions}/FilterListMaintainer.cs | 2 +- .../{ => Junctions}/FilterListRule.cs | 2 +- .../Entities/{ => Junctions}/Fork.cs | 2 +- .../Entities/{ => Junctions}/Merge.cs | 2 +- .../{ => Junctions}/SoftwareSyntax.cs | 2 +- src/FilterLists.Data/Entities/Language.cs | 1 + src/FilterLists.Data/Entities/Maintainer.cs | 1 + src/FilterLists.Data/Entities/Rule.cs | 1 + src/FilterLists.Data/Entities/Software.cs | 1 + src/FilterLists.Data/Entities/Syntax.cs | 1 + .../FilterListLanguageTypeConfiguration.cs | 4 +-- .../FilterListMaintainerTypeConfiguration.cs | 4 +-- .../FilterListRuleTypeConfiguration.cs | 4 +-- .../{ => Junctions}/ForkTypeConfiguration.cs | 4 +-- .../{ => Junctions}/MergeTypeConfiguration.cs | 4 +-- .../SoftwareSyntaxTypeConfiguration.cs | 4 +-- src/FilterLists.Data/FilterListsDbContext.cs | 2 ++ .../Contracts/IFilterListRepository.cs | 11 ------- .../FilterListRepository.cs | 10 ++---- .../Extensions/SeedFilterListsDbContext.cs | 1 + .../Contracts/IFilterListService.cs | 11 ------- .../Extensions/ConfigureServicesCollection.cs | 9 ++--- src/FilterLists.Services/FilterListService.cs | 29 ++++++++++++++++ .../Implementations/FilterListService.cs | 33 ------------------- src/FilterLists.Services/MappingProfile.cs | 1 + .../Models/FilterListDetailsDto.cs | 9 ----- .../Models/FilterListSeedDto.cs | 22 +++++++++++++ .../Models/FilterListSummaryDto.cs | 2 +- 31 files changed, 89 insertions(+), 100 deletions(-) rename src/FilterLists.Data/Entities/{ => Junctions}/FilterListLanguage.cs (83%) rename src/FilterLists.Data/Entities/{ => Junctions}/FilterListMaintainer.cs (84%) rename src/FilterLists.Data/Entities/{ => Junctions}/FilterListRule.cs (82%) rename src/FilterLists.Data/Entities/{ => Junctions}/Fork.cs (84%) rename src/FilterLists.Data/Entities/{ => Junctions}/Merge.cs (84%) rename src/FilterLists.Data/Entities/{ => Junctions}/SoftwareSyntax.cs (82%) rename src/FilterLists.Data/EntityTypeConfigurations/{ => Junctions}/FilterListLanguageTypeConfiguration.cs (83%) rename src/FilterLists.Data/EntityTypeConfigurations/{ => Junctions}/FilterListMaintainerTypeConfiguration.cs (84%) rename src/FilterLists.Data/EntityTypeConfigurations/{ => Junctions}/FilterListRuleTypeConfiguration.cs (83%) rename src/FilterLists.Data/EntityTypeConfigurations/{ => Junctions}/ForkTypeConfiguration.cs (82%) rename src/FilterLists.Data/EntityTypeConfigurations/{ => Junctions}/MergeTypeConfiguration.cs (82%) rename src/FilterLists.Data/EntityTypeConfigurations/{ => Junctions}/SoftwareSyntaxTypeConfiguration.cs (83%) delete mode 100644 src/FilterLists.Data/Repositories/Contracts/IFilterListRepository.cs rename src/FilterLists.Data/Repositories/{Implementations => }/FilterListRepository.cs (61%) delete mode 100644 src/FilterLists.Services/Contracts/IFilterListService.cs create mode 100644 src/FilterLists.Services/FilterListService.cs delete mode 100644 src/FilterLists.Services/Implementations/FilterListService.cs delete mode 100644 src/FilterLists.Services/Models/FilterListDetailsDto.cs create mode 100644 src/FilterLists.Services/Models/FilterListSeedDto.cs diff --git a/src/FilterLists.Api/V1/Controllers/ListsController.cs b/src/FilterLists.Api/V1/Controllers/ListsController.cs index cd306da83..f774fcdc8 100644 --- a/src/FilterLists.Api/V1/Controllers/ListsController.cs +++ b/src/FilterLists.Api/V1/Controllers/ListsController.cs @@ -1,19 +1,20 @@ using System; -using FilterLists.Services.Contracts; +using FilterLists.Services; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Caching.Memory; namespace FilterLists.Api.V1.Controllers { [ApiVersion("1.0")] + [Route("[controller]")] [Produces("application/json")] [ResponseCache(CacheProfileName = "Long-Lived")] public class ListsController : Controller { - private readonly IFilterListService filterListService; + private readonly FilterListService filterListService; private readonly IMemoryCache memoryCache; - public ListsController(IMemoryCache memoryCache, IFilterListService filterListService) + public ListsController(IMemoryCache memoryCache, FilterListService filterListService) { this.memoryCache = memoryCache; this.filterListService = filterListService; diff --git a/src/FilterLists.Data/Entities/FilterList.cs b/src/FilterLists.Data/Entities/FilterList.cs index 7c5a8af87..88f5674ff 100644 --- a/src/FilterLists.Data/Entities/FilterList.cs +++ b/src/FilterLists.Data/Entities/FilterList.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using FilterLists.Data.Entities.Junctions; namespace FilterLists.Data.Entities { diff --git a/src/FilterLists.Data/Entities/FilterListLanguage.cs b/src/FilterLists.Data/Entities/Junctions/FilterListLanguage.cs similarity index 83% rename from src/FilterLists.Data/Entities/FilterListLanguage.cs rename to src/FilterLists.Data/Entities/Junctions/FilterListLanguage.cs index f0dcec2a2..58d6c3254 100644 --- a/src/FilterLists.Data/Entities/FilterListLanguage.cs +++ b/src/FilterLists.Data/Entities/Junctions/FilterListLanguage.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Data.Entities +namespace FilterLists.Data.Entities.Junctions { public class FilterListLanguage : BaseEntity { diff --git a/src/FilterLists.Data/Entities/FilterListMaintainer.cs b/src/FilterLists.Data/Entities/Junctions/FilterListMaintainer.cs similarity index 84% rename from src/FilterLists.Data/Entities/FilterListMaintainer.cs rename to src/FilterLists.Data/Entities/Junctions/FilterListMaintainer.cs index f76c8159c..3a8aeac0e 100644 --- a/src/FilterLists.Data/Entities/FilterListMaintainer.cs +++ b/src/FilterLists.Data/Entities/Junctions/FilterListMaintainer.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Data.Entities +namespace FilterLists.Data.Entities.Junctions { public class FilterListMaintainer : BaseEntity { diff --git a/src/FilterLists.Data/Entities/FilterListRule.cs b/src/FilterLists.Data/Entities/Junctions/FilterListRule.cs similarity index 82% rename from src/FilterLists.Data/Entities/FilterListRule.cs rename to src/FilterLists.Data/Entities/Junctions/FilterListRule.cs index 808042248..406814a8a 100644 --- a/src/FilterLists.Data/Entities/FilterListRule.cs +++ b/src/FilterLists.Data/Entities/Junctions/FilterListRule.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Data.Entities +namespace FilterLists.Data.Entities.Junctions { public class FilterListRule : BaseEntity { diff --git a/src/FilterLists.Data/Entities/Fork.cs b/src/FilterLists.Data/Entities/Junctions/Fork.cs similarity index 84% rename from src/FilterLists.Data/Entities/Fork.cs rename to src/FilterLists.Data/Entities/Junctions/Fork.cs index c00943e37..b2dc13952 100644 --- a/src/FilterLists.Data/Entities/Fork.cs +++ b/src/FilterLists.Data/Entities/Junctions/Fork.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Data.Entities +namespace FilterLists.Data.Entities.Junctions { public class Fork : BaseEntity { diff --git a/src/FilterLists.Data/Entities/Merge.cs b/src/FilterLists.Data/Entities/Junctions/Merge.cs similarity index 84% rename from src/FilterLists.Data/Entities/Merge.cs rename to src/FilterLists.Data/Entities/Junctions/Merge.cs index aafd065ca..3b19f4e9e 100644 --- a/src/FilterLists.Data/Entities/Merge.cs +++ b/src/FilterLists.Data/Entities/Junctions/Merge.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Data.Entities +namespace FilterLists.Data.Entities.Junctions { public class Merge : BaseEntity { diff --git a/src/FilterLists.Data/Entities/SoftwareSyntax.cs b/src/FilterLists.Data/Entities/Junctions/SoftwareSyntax.cs similarity index 82% rename from src/FilterLists.Data/Entities/SoftwareSyntax.cs rename to src/FilterLists.Data/Entities/Junctions/SoftwareSyntax.cs index e9210cca3..247e214ca 100644 --- a/src/FilterLists.Data/Entities/SoftwareSyntax.cs +++ b/src/FilterLists.Data/Entities/Junctions/SoftwareSyntax.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Data.Entities +namespace FilterLists.Data.Entities.Junctions { public class SoftwareSyntax : BaseEntity { diff --git a/src/FilterLists.Data/Entities/Language.cs b/src/FilterLists.Data/Entities/Language.cs index 26cc64ac7..178aca1ae 100644 --- a/src/FilterLists.Data/Entities/Language.cs +++ b/src/FilterLists.Data/Entities/Language.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using FilterLists.Data.Entities.Junctions; namespace FilterLists.Data.Entities { diff --git a/src/FilterLists.Data/Entities/Maintainer.cs b/src/FilterLists.Data/Entities/Maintainer.cs index da02ea818..64b6f46e9 100644 --- a/src/FilterLists.Data/Entities/Maintainer.cs +++ b/src/FilterLists.Data/Entities/Maintainer.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using FilterLists.Data.Entities.Junctions; namespace FilterLists.Data.Entities { diff --git a/src/FilterLists.Data/Entities/Rule.cs b/src/FilterLists.Data/Entities/Rule.cs index 9c3033df9..41b15b313 100644 --- a/src/FilterLists.Data/Entities/Rule.cs +++ b/src/FilterLists.Data/Entities/Rule.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using FilterLists.Data.Entities.Junctions; namespace FilterLists.Data.Entities { diff --git a/src/FilterLists.Data/Entities/Software.cs b/src/FilterLists.Data/Entities/Software.cs index a0e59ab96..d3d918697 100644 --- a/src/FilterLists.Data/Entities/Software.cs +++ b/src/FilterLists.Data/Entities/Software.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using FilterLists.Data.Entities.Junctions; namespace FilterLists.Data.Entities { diff --git a/src/FilterLists.Data/Entities/Syntax.cs b/src/FilterLists.Data/Entities/Syntax.cs index 913cf8dca..7a25dabe3 100644 --- a/src/FilterLists.Data/Entities/Syntax.cs +++ b/src/FilterLists.Data/Entities/Syntax.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using FilterLists.Data.Entities.Junctions; namespace FilterLists.Data.Entities { diff --git a/src/FilterLists.Data/EntityTypeConfigurations/FilterListLanguageTypeConfiguration.cs b/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListLanguageTypeConfiguration.cs similarity index 83% rename from src/FilterLists.Data/EntityTypeConfigurations/FilterListLanguageTypeConfiguration.cs rename to src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListLanguageTypeConfiguration.cs index 78184d002..1e462ba2e 100644 --- a/src/FilterLists.Data/EntityTypeConfigurations/FilterListLanguageTypeConfiguration.cs +++ b/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListLanguageTypeConfiguration.cs @@ -1,8 +1,8 @@ -using FilterLists.Data.Entities; +using FilterLists.Data.Entities.Junctions; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -namespace FilterLists.Data.EntityTypeConfigurations +namespace FilterLists.Data.EntityTypeConfigurations.Junctions { public class FilterListLanguageTypeConfiguration : BaseEntityTypeConfiguration { diff --git a/src/FilterLists.Data/EntityTypeConfigurations/FilterListMaintainerTypeConfiguration.cs b/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListMaintainerTypeConfiguration.cs similarity index 84% rename from src/FilterLists.Data/EntityTypeConfigurations/FilterListMaintainerTypeConfiguration.cs rename to src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListMaintainerTypeConfiguration.cs index e49fe40c2..ee6746836 100644 --- a/src/FilterLists.Data/EntityTypeConfigurations/FilterListMaintainerTypeConfiguration.cs +++ b/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListMaintainerTypeConfiguration.cs @@ -1,8 +1,8 @@ -using FilterLists.Data.Entities; +using FilterLists.Data.Entities.Junctions; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -namespace FilterLists.Data.EntityTypeConfigurations +namespace FilterLists.Data.EntityTypeConfigurations.Junctions { public class FilterListMaintainerTypeConfiguration : BaseEntityTypeConfiguration { diff --git a/src/FilterLists.Data/EntityTypeConfigurations/FilterListRuleTypeConfiguration.cs b/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListRuleTypeConfiguration.cs similarity index 83% rename from src/FilterLists.Data/EntityTypeConfigurations/FilterListRuleTypeConfiguration.cs rename to src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListRuleTypeConfiguration.cs index 3b0da3a07..c67d4e184 100644 --- a/src/FilterLists.Data/EntityTypeConfigurations/FilterListRuleTypeConfiguration.cs +++ b/src/FilterLists.Data/EntityTypeConfigurations/Junctions/FilterListRuleTypeConfiguration.cs @@ -1,8 +1,8 @@ -using FilterLists.Data.Entities; +using FilterLists.Data.Entities.Junctions; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -namespace FilterLists.Data.EntityTypeConfigurations +namespace FilterLists.Data.EntityTypeConfigurations.Junctions { public class FilterListRuleTypeConfiguration : BaseEntityTypeConfiguration { diff --git a/src/FilterLists.Data/EntityTypeConfigurations/ForkTypeConfiguration.cs b/src/FilterLists.Data/EntityTypeConfigurations/Junctions/ForkTypeConfiguration.cs similarity index 82% rename from src/FilterLists.Data/EntityTypeConfigurations/ForkTypeConfiguration.cs rename to src/FilterLists.Data/EntityTypeConfigurations/Junctions/ForkTypeConfiguration.cs index bcdea34c9..c2b4aae21 100644 --- a/src/FilterLists.Data/EntityTypeConfigurations/ForkTypeConfiguration.cs +++ b/src/FilterLists.Data/EntityTypeConfigurations/Junctions/ForkTypeConfiguration.cs @@ -1,8 +1,8 @@ -using FilterLists.Data.Entities; +using FilterLists.Data.Entities.Junctions; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -namespace FilterLists.Data.EntityTypeConfigurations +namespace FilterLists.Data.EntityTypeConfigurations.Junctions { public class ForkTypeConfiguration : BaseEntityTypeConfiguration { diff --git a/src/FilterLists.Data/EntityTypeConfigurations/MergeTypeConfiguration.cs b/src/FilterLists.Data/EntityTypeConfigurations/Junctions/MergeTypeConfiguration.cs similarity index 82% rename from src/FilterLists.Data/EntityTypeConfigurations/MergeTypeConfiguration.cs rename to src/FilterLists.Data/EntityTypeConfigurations/Junctions/MergeTypeConfiguration.cs index e91ad8b63..f5a8a9bf1 100644 --- a/src/FilterLists.Data/EntityTypeConfigurations/MergeTypeConfiguration.cs +++ b/src/FilterLists.Data/EntityTypeConfigurations/Junctions/MergeTypeConfiguration.cs @@ -1,8 +1,8 @@ -using FilterLists.Data.Entities; +using FilterLists.Data.Entities.Junctions; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -namespace FilterLists.Data.EntityTypeConfigurations +namespace FilterLists.Data.EntityTypeConfigurations.Junctions { public class MergeTypeConfiguration : BaseEntityTypeConfiguration { diff --git a/src/FilterLists.Data/EntityTypeConfigurations/SoftwareSyntaxTypeConfiguration.cs b/src/FilterLists.Data/EntityTypeConfigurations/Junctions/SoftwareSyntaxTypeConfiguration.cs similarity index 83% rename from src/FilterLists.Data/EntityTypeConfigurations/SoftwareSyntaxTypeConfiguration.cs rename to src/FilterLists.Data/EntityTypeConfigurations/Junctions/SoftwareSyntaxTypeConfiguration.cs index 8e42ab2d0..4121b3908 100644 --- a/src/FilterLists.Data/EntityTypeConfigurations/SoftwareSyntaxTypeConfiguration.cs +++ b/src/FilterLists.Data/EntityTypeConfigurations/Junctions/SoftwareSyntaxTypeConfiguration.cs @@ -1,8 +1,8 @@ -using FilterLists.Data.Entities; +using FilterLists.Data.Entities.Junctions; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -namespace FilterLists.Data.EntityTypeConfigurations +namespace FilterLists.Data.EntityTypeConfigurations.Junctions { public class SoftwareSyntaxTypeConfiguration : BaseEntityTypeConfiguration { diff --git a/src/FilterLists.Data/FilterListsDbContext.cs b/src/FilterLists.Data/FilterListsDbContext.cs index 32dcd61c7..7e86403ea 100644 --- a/src/FilterLists.Data/FilterListsDbContext.cs +++ b/src/FilterLists.Data/FilterListsDbContext.cs @@ -1,5 +1,7 @@ using FilterLists.Data.Entities; +using FilterLists.Data.Entities.Junctions; using FilterLists.Data.EntityTypeConfigurations; +using FilterLists.Data.EntityTypeConfigurations.Junctions; using Microsoft.EntityFrameworkCore; namespace FilterLists.Data diff --git a/src/FilterLists.Data/Repositories/Contracts/IFilterListRepository.cs b/src/FilterLists.Data/Repositories/Contracts/IFilterListRepository.cs deleted file mode 100644 index 992a654e3..000000000 --- a/src/FilterLists.Data/Repositories/Contracts/IFilterListRepository.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections.Generic; -using FilterLists.Data.Entities; - -namespace FilterLists.Data.Repositories.Contracts -{ - public interface IFilterListRepository - { - IEnumerable GetAll(); - FilterList Get(int id); - } -} \ No newline at end of file diff --git a/src/FilterLists.Data/Repositories/Implementations/FilterListRepository.cs b/src/FilterLists.Data/Repositories/FilterListRepository.cs similarity index 61% rename from src/FilterLists.Data/Repositories/Implementations/FilterListRepository.cs rename to src/FilterLists.Data/Repositories/FilterListRepository.cs index ff5f9885d..439c29ffb 100644 --- a/src/FilterLists.Data/Repositories/Implementations/FilterListRepository.cs +++ b/src/FilterLists.Data/Repositories/FilterListRepository.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; using System.Linq; using FilterLists.Data.Entities; -using FilterLists.Data.Repositories.Contracts; -namespace FilterLists.Data.Repositories.Implementations +namespace FilterLists.Data.Repositories { - public class FilterListRepository : IFilterListRepository + public class FilterListRepository { private readonly FilterListsDbContext filterListsDbContext; @@ -18,10 +17,5 @@ public IEnumerable GetAll() { return filterListsDbContext.FilterLists.AsEnumerable(); } - - public FilterList Get(int id) - { - return filterListsDbContext.FilterLists.Single(x => x.Id == id); - } } } \ No newline at end of file diff --git a/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs b/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs index 701bfc2c1..85a607083 100644 --- a/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs +++ b/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using FilterLists.Data.Entities; +using FilterLists.Data.Entities.Junctions; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; using Newtonsoft.Json; diff --git a/src/FilterLists.Services/Contracts/IFilterListService.cs b/src/FilterLists.Services/Contracts/IFilterListService.cs deleted file mode 100644 index 78ad8d37d..000000000 --- a/src/FilterLists.Services/Contracts/IFilterListService.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections.Generic; -using FilterLists.Services.Models; - -namespace FilterLists.Services.Contracts -{ - public interface IFilterListService - { - IEnumerable GetAllSummaries(); - FilterListDetailsDto GetDetails(int id); - } -} \ No newline at end of file diff --git a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs index bbdd898cd..7494bffa5 100644 --- a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs +++ b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs @@ -1,9 +1,6 @@ using AutoMapper; using FilterLists.Data; -using FilterLists.Data.Repositories.Contracts; -using FilterLists.Data.Repositories.Implementations; -using FilterLists.Services.Contracts; -using FilterLists.Services.Implementations; +using FilterLists.Data.Repositories; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -19,8 +16,8 @@ public static void AddFilterListsServices(this IServiceCollection services, ICon services.AddEntityFrameworkMySql().AddDbContextPool(options => options.UseMySql(configuration.GetConnectionString("FilterListsConnection"), b => b.MigrationsAssembly("FilterLists.Api"))); - services.TryAddScoped(); - services.TryAddScoped(); + services.TryAddScoped(); + services.TryAddScoped(); services.AddAutoMapper(); } } diff --git a/src/FilterLists.Services/FilterListService.cs b/src/FilterLists.Services/FilterListService.cs new file mode 100644 index 000000000..31b2a95d7 --- /dev/null +++ b/src/FilterLists.Services/FilterListService.cs @@ -0,0 +1,29 @@ +using System.Collections.Generic; +using AutoMapper; +using FilterLists.Data.Repositories; +using FilterLists.Services.Models; + +namespace FilterLists.Services +{ + public class FilterListService + { + private readonly FilterListRepository filterListRepository; + private readonly IMapper mapper; + + public FilterListService(FilterListRepository filterListRepository, IMapper mapper) + { + this.filterListRepository = filterListRepository; + this.mapper = mapper; + } + + public IEnumerable GetAllSummaries() + { + return mapper.Map>(filterListRepository.GetAll()); + } + + public IEnumerable GetAllSeeds() + { + return mapper.Map>(filterListRepository.GetAll()); + } + } +} \ No newline at end of file diff --git a/src/FilterLists.Services/Implementations/FilterListService.cs b/src/FilterLists.Services/Implementations/FilterListService.cs deleted file mode 100644 index 1f417cec1..000000000 --- a/src/FilterLists.Services/Implementations/FilterListService.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Collections.Generic; -using AutoMapper; -using FilterLists.Data.Repositories.Contracts; -using FilterLists.Services.Contracts; -using FilterLists.Services.Models; - -namespace FilterLists.Services.Implementations -{ - public class FilterListService : IFilterListService - { - private readonly IFilterListRepository filterListRepository; - private readonly IMapper mapper; - - public FilterListService(IFilterListRepository filterListRepository, IMapper mapper) - { - this.filterListRepository = filterListRepository; - this.mapper = mapper; - } - - public IEnumerable GetAllSummaries() - { - return mapper.Map>(filterListRepository.GetAll()); - } - - public FilterListDetailsDto GetDetails(int id) - { - var list = filterListRepository.Get(id); - var maintainer = list.FilterListMaintainers; - //return mapper.Map(filterListRepository.GetBy) - return null; - } - } -} \ No newline at end of file diff --git a/src/FilterLists.Services/MappingProfile.cs b/src/FilterLists.Services/MappingProfile.cs index 0e2141c83..6a8da9472 100644 --- a/src/FilterLists.Services/MappingProfile.cs +++ b/src/FilterLists.Services/MappingProfile.cs @@ -9,6 +9,7 @@ public class MappingProfile : MapperConfigurationExpression public MappingProfile() { CreateMap(); + CreateMap(); } } } \ No newline at end of file diff --git a/src/FilterLists.Services/Models/FilterListDetailsDto.cs b/src/FilterLists.Services/Models/FilterListDetailsDto.cs deleted file mode 100644 index 4f0bf04b3..000000000 --- a/src/FilterLists.Services/Models/FilterListDetailsDto.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace FilterLists.Services.Models -{ - public class FilterListDetailsDto - { - public int Id; - public string Description { get; set; } - public string Name { get; set; } - } -} \ No newline at end of file diff --git a/src/FilterLists.Services/Models/FilterListSeedDto.cs b/src/FilterLists.Services/Models/FilterListSeedDto.cs new file mode 100644 index 000000000..23df5df47 --- /dev/null +++ b/src/FilterLists.Services/Models/FilterListSeedDto.cs @@ -0,0 +1,22 @@ +using System; + +namespace FilterLists.Services.Models +{ + public class FilterListSeedDto + { + public int Id { get; set; } + public string Description { get; set; } + public string DescriptionSourceUrl { get; set; } + public DateTime? DiscontinuedDate { get; set; } + public string DonateUrl { get; set; } + public string EmailAddress { get; set; } + public string ForumUrl { get; set; } + public string HomeUrl { get; set; } + public string IssuesUrl { get; set; } + public int? LicenseId { get; set; } + public string Name { get; set; } + public string SubmissionUrl { get; set; } + public int? SyntaxId { get; set; } + public string ViewUrl { get; set; } + } +} \ No newline at end of file diff --git a/src/FilterLists.Services/Models/FilterListSummaryDto.cs b/src/FilterLists.Services/Models/FilterListSummaryDto.cs index 7ea88792a..141901ae9 100644 --- a/src/FilterLists.Services/Models/FilterListSummaryDto.cs +++ b/src/FilterLists.Services/Models/FilterListSummaryDto.cs @@ -2,7 +2,7 @@ { public class FilterListSummaryDto { - public int Id; + public int Id { get; set; } public string Description { get; set; } public string Name { get; set; } }