general architecture cleanup

remove pointless (currently) interfaces and other cruft

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;

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
 {

src/FilterLists.Data/Entities/Junctions/FilterListLanguage.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Data.Entities
+namespace FilterLists.Data.Entities.Junctions
 {
     public class FilterListLanguage : BaseEntity
     {

src/FilterLists.Data/Entities/Junctions/FilterListMaintainer.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Data.Entities
+namespace FilterLists.Data.Entities.Junctions
 {
     public class FilterListMaintainer : BaseEntity
     {

src/FilterLists.Data/Entities/Junctions/FilterListRule.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Data.Entities
+namespace FilterLists.Data.Entities.Junctions
 {
     public class FilterListRule : BaseEntity
     {

src/FilterLists.Data/Entities/Junctions/Fork.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Data.Entities
+namespace FilterLists.Data.Entities.Junctions
 {
     public class Fork : BaseEntity
     {

src/FilterLists.Data/Entities/Junctions/Merge.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Data.Entities
+namespace FilterLists.Data.Entities.Junctions
 {
     public class Merge : BaseEntity
     {

src/FilterLists.Data/Entities/Junctions/SoftwareSyntax.cs

@@ -1,4 +1,4 @@
-namespace FilterLists.Data.Entities
+namespace FilterLists.Data.Entities.Junctions
 {
     public class SoftwareSyntax : BaseEntity
     {

src/FilterLists.Data/Entities/Language.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using FilterLists.Data.Entities.Junctions;
 
 namespace FilterLists.Data.Entities
 {

src/FilterLists.Data/Entities/Maintainer.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using FilterLists.Data.Entities.Junctions;
 
 namespace FilterLists.Data.Entities
 {

src/FilterLists.Data/Entities/Rule.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using FilterLists.Data.Entities.Junctions;
 
 namespace FilterLists.Data.Entities
 {

src/FilterLists.Data/Entities/Software.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using FilterLists.Data.Entities.Junctions;
 
 namespace FilterLists.Data.Entities
 {

src/FilterLists.Data/Entities/Syntax.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using FilterLists.Data.Entities.Junctions;
 
 namespace FilterLists.Data.Entities
 {

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<FilterListLanguage>
     {

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<FilterListMaintainer>
     {

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<FilterListRule>
     {

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<Fork>
     {

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<Merge>
     {

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<SoftwareSyntax>
     {

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

src/FilterLists.Data/Repositories/Contracts/IFilterListRepository.cs

@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-using FilterLists.Data.Entities;
-
-namespace FilterLists.Data.Repositories.Contracts
-{
-    public interface IFilterListRepository
-    {
-        IEnumerable<FilterList> GetAll();
-        FilterList Get(int id);
-    }
-}

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<FilterList> GetAll()
         {
             return filterListsDbContext.FilterLists.AsEnumerable();
         }
-
-        public FilterList Get(int id)
-        {
-            return filterListsDbContext.FilterLists.Single(x => x.Id == id);
-        }
     }
 }

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;

src/FilterLists.Services/Contracts/IFilterListService.cs

@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-using FilterLists.Services.Models;
-
-namespace FilterLists.Services.Contracts
-{
-    public interface IFilterListService
-    {
-        IEnumerable<FilterListSummaryDto> GetAllSummaries();
-        FilterListDetailsDto GetDetails(int id);
-    }
-}

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<FilterListsDbContext>(options =>
                 options.UseMySql(configuration.GetConnectionString("FilterListsConnection"),
                     b => b.MigrationsAssembly("FilterLists.Api")));
-            services.TryAddScoped<IFilterListRepository, FilterListRepository>();
-            services.TryAddScoped<IFilterListService, FilterListService>();
+            services.TryAddScoped<FilterListRepository>();
+            services.TryAddScoped<FilterListService>();
             services.AddAutoMapper();
         }
     }

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<FilterListSummaryDto> GetAllSummaries()
+        {
+            return mapper.Map<IEnumerable<FilterListSummaryDto>>(filterListRepository.GetAll());
+        }
+
+        public IEnumerable<FilterListSeedDto> GetAllSeeds()
+        {
+            return mapper.Map<IEnumerable<FilterListSeedDto>>(filterListRepository.GetAll());
+        }
+    }
+}

src/FilterLists.Services/Implementations/FilterListService.cs

@@ -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<FilterListSummaryDto> GetAllSummaries()
-        {
-            return mapper.Map<IEnumerable<FilterListSummaryDto>>(filterListRepository.GetAll());
-        }
-
-        public FilterListDetailsDto GetDetails(int id)
-        {
-            var list = filterListRepository.Get(id);
-            var maintainer = list.FilterListMaintainers;
-            //return mapper.Map<FilterListSummaryDto>(filterListRepository.GetBy)
-            return null;
-        }
-    }
-}

src/FilterLists.Services/MappingProfile.cs

@@ -9,6 +9,7 @@ public class MappingProfile : MapperConfigurationExpression
         public MappingProfile()
         {
             CreateMap<FilterList, FilterListSummaryDto>();
+            CreateMap<FilterList, FilterListSeedDto>();
         }
     }
 }

src/FilterLists.Services/Models/FilterListDetailsDto.cs

@@ -1,9 +0,0 @@
-namespace FilterLists.Services.Models
-{
-    public class FilterListDetailsDto
-    {
-        public int Id;
-        public string Description { get; set; }
-        public string Name { get; set; }
-    }
-}

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; }
+    }
+}

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; }
     }