From a206b4132d7c4cdf8bfeb2b1112e31040f45732d Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Tue, 17 Apr 2018 19:54:03 -0500 Subject: [PATCH] avoid naming types and namespaces with the same identifier - ndepend --- .gitignore | 2 +- src/FilterLists.Agent/Program.cs | 2 +- src/FilterLists.Api/V1/Controllers/ForksController.cs | 4 ++-- src/FilterLists.Api/V1/Controllers/LanguagesController.cs | 4 ++-- src/FilterLists.Api/V1/Controllers/LicensesController.cs | 4 ++-- src/FilterLists.Api/V1/Controllers/ListsController.cs | 6 +++--- .../V1/Controllers/ListsLanguagesController.cs | 4 ++-- .../V1/Controllers/ListsMaintainersController.cs | 4 ++-- src/FilterLists.Api/V1/Controllers/MaintainersController.cs | 4 ++-- src/FilterLists.Api/V1/Controllers/MergesController.cs | 4 ++-- src/FilterLists.Api/V1/Controllers/SoftwareController.cs | 4 ++-- .../V1/Controllers/SoftwareSyntaxesController.cs | 4 ++-- src/FilterLists.Api/V1/Controllers/SyntaxesController.cs | 4 ++-- .../Extensions/ConfigureServicesCollection.cs | 6 +++--- .../{FilterListService => FilterList}/FilterListService.cs | 2 +- .../FilterListServiceExtensions.cs | 2 +- .../{FilterListService => FilterList}/ListDetailsDto.cs | 2 +- .../{FilterListService => FilterList}/ListSummaryDto.cs | 2 +- .../{FilterListService => FilterList}/MappingProfiles.cs | 6 +++--- .../{SeedService => Seed}/Models/FilterListSeedDto.cs | 2 +- .../Models/Junctions/FilterListLanguageSeedDto.cs | 2 +- .../Models/Junctions/FilterListMaintainerSeedDto.cs | 2 +- .../{SeedService => Seed}/Models/Junctions/ForkSeedDto.cs | 2 +- .../{SeedService => Seed}/Models/Junctions/MergeSeedDto.cs | 2 +- .../Models/Junctions/SoftwareSyntaxSeedDto.cs | 2 +- .../{SeedService => Seed}/Models/LanguageSeedDto.cs | 2 +- .../{SeedService => Seed}/Models/LicenseSeedDto.cs | 2 +- .../{SeedService => Seed}/Models/MaintainerSeedDto.cs | 2 +- .../{SeedService => Seed}/Models/SoftwareSeedDto.cs | 2 +- .../{SeedService => Seed}/Models/SyntaxSeedDto.cs | 2 +- .../{SeedService => Seed}/SeedService.cs | 2 +- .../{SnapshotService => Snapshot}/FilterListViewUrlDto.cs | 2 +- .../RawRuleLinterExtensions.cs | 2 +- .../{SnapshotService => Snapshot}/SnapshotBatchDe.cs | 6 +++--- .../{SnapshotService => Snapshot}/SnapshotDe.cs | 6 +++--- .../{SnapshotService => Snapshot}/SnapshotService.cs | 2 +- 36 files changed, 56 insertions(+), 56 deletions(-) rename src/FilterLists.Services/{FilterListService => FilterList}/FilterListService.cs (96%) rename src/FilterLists.Services/{FilterListService => FilterList}/FilterListServiceExtensions.cs (93%) rename src/FilterLists.Services/{FilterListService => FilterList}/ListDetailsDto.cs (97%) rename src/FilterLists.Services/{FilterListService => FilterList}/ListSummaryDto.cs (89%) rename src/FilterLists.Services/{FilterListService => FilterList}/MappingProfiles.cs (87%) rename src/FilterLists.Services/{SeedService => Seed}/Models/FilterListSeedDto.cs (94%) rename src/FilterLists.Services/{SeedService => Seed}/Models/Junctions/FilterListLanguageSeedDto.cs (70%) rename src/FilterLists.Services/{SeedService => Seed}/Models/Junctions/FilterListMaintainerSeedDto.cs (70%) rename src/FilterLists.Services/{SeedService => Seed}/Models/Junctions/ForkSeedDto.cs (70%) rename src/FilterLists.Services/{SeedService => Seed}/Models/Junctions/MergeSeedDto.cs (70%) rename src/FilterLists.Services/{SeedService => Seed}/Models/Junctions/SoftwareSyntaxSeedDto.cs (68%) rename src/FilterLists.Services/{SeedService => Seed}/Models/LanguageSeedDto.cs (88%) rename src/FilterLists.Services/{SeedService => Seed}/Models/LicenseSeedDto.cs (84%) rename src/FilterLists.Services/{SeedService => Seed}/Models/MaintainerSeedDto.cs (83%) rename src/FilterLists.Services/{SeedService => Seed}/Models/SoftwareSeedDto.cs (80%) rename src/FilterLists.Services/{SeedService => Seed}/Models/SyntaxSeedDto.cs (76%) rename src/FilterLists.Services/{SeedService => Seed}/SeedService.cs (97%) rename src/FilterLists.Services/{SnapshotService => Snapshot}/FilterListViewUrlDto.cs (72%) rename src/FilterLists.Services/{SnapshotService => Snapshot}/RawRuleLinterExtensions.cs (96%) rename src/FilterLists.Services/{SnapshotService => Snapshot}/SnapshotBatchDe.cs (87%) rename src/FilterLists.Services/{SnapshotService => Snapshot}/SnapshotDe.cs (97%) rename src/FilterLists.Services/{SnapshotService => Snapshot}/SnapshotService.cs (98%) diff --git a/.gitignore b/.gitignore index 90214f87b..f0bdc0559 100644 --- a/.gitignore +++ b/.gitignore @@ -334,4 +334,4 @@ appsettings.development.json appsettings.production.json src/FilterLists.Agent/appsettings.json src/FilterLists.Web/wwwroot/dist -NDependOut/ \ No newline at end of file +NDependOut*/ \ No newline at end of file diff --git a/src/FilterLists.Agent/Program.cs b/src/FilterLists.Agent/Program.cs index 25fa6c975..4c185e399 100644 --- a/src/FilterLists.Agent/Program.cs +++ b/src/FilterLists.Agent/Program.cs @@ -1,7 +1,7 @@ using System; using System.IO; using FilterLists.Services.DependencyInjection.Extensions; -using FilterLists.Services.SnapshotService; +using FilterLists.Services.Snapshot; using Microsoft.ApplicationInsights; using Microsoft.ApplicationInsights.Extensibility; using Microsoft.Extensions.Configuration; diff --git a/src/FilterLists.Api/V1/Controllers/ForksController.cs b/src/FilterLists.Api/V1/Controllers/ForksController.cs index 2942b6ab2..72e2f838a 100644 --- a/src/FilterLists.Api/V1/Controllers/ForksController.cs +++ b/src/FilterLists.Api/V1/Controllers/ForksController.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using FilterLists.Data.Entities.Junctions; -using FilterLists.Services.SeedService; -using FilterLists.Services.SeedService.Models.Junctions; +using FilterLists.Services.Seed; +using FilterLists.Services.Seed.Models.Junctions; using Microsoft.AspNetCore.Mvc; namespace FilterLists.Api.V1.Controllers diff --git a/src/FilterLists.Api/V1/Controllers/LanguagesController.cs b/src/FilterLists.Api/V1/Controllers/LanguagesController.cs index 2d2b0533e..0dae5aa5b 100644 --- a/src/FilterLists.Api/V1/Controllers/LanguagesController.cs +++ b/src/FilterLists.Api/V1/Controllers/LanguagesController.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using FilterLists.Data.Entities; -using FilterLists.Services.SeedService; -using FilterLists.Services.SeedService.Models; +using FilterLists.Services.Seed; +using FilterLists.Services.Seed.Models; using Microsoft.AspNetCore.Mvc; namespace FilterLists.Api.V1.Controllers diff --git a/src/FilterLists.Api/V1/Controllers/LicensesController.cs b/src/FilterLists.Api/V1/Controllers/LicensesController.cs index 1241412bc..32fb3a6fd 100644 --- a/src/FilterLists.Api/V1/Controllers/LicensesController.cs +++ b/src/FilterLists.Api/V1/Controllers/LicensesController.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using FilterLists.Data.Entities; -using FilterLists.Services.SeedService; -using FilterLists.Services.SeedService.Models; +using FilterLists.Services.Seed; +using FilterLists.Services.Seed.Models; using Microsoft.AspNetCore.Mvc; namespace FilterLists.Api.V1.Controllers diff --git a/src/FilterLists.Api/V1/Controllers/ListsController.cs b/src/FilterLists.Api/V1/Controllers/ListsController.cs index 82c3924e0..d835e70a4 100644 --- a/src/FilterLists.Api/V1/Controllers/ListsController.cs +++ b/src/FilterLists.Api/V1/Controllers/ListsController.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; using FilterLists.Data.Entities; -using FilterLists.Services.FilterListService; -using FilterLists.Services.SeedService; -using FilterLists.Services.SeedService.Models; +using FilterLists.Services.FilterList; +using FilterLists.Services.Seed; +using FilterLists.Services.Seed.Models; using Microsoft.AspNetCore.Mvc; namespace FilterLists.Api.V1.Controllers diff --git a/src/FilterLists.Api/V1/Controllers/ListsLanguagesController.cs b/src/FilterLists.Api/V1/Controllers/ListsLanguagesController.cs index 303545ad3..f0e231747 100644 --- a/src/FilterLists.Api/V1/Controllers/ListsLanguagesController.cs +++ b/src/FilterLists.Api/V1/Controllers/ListsLanguagesController.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using FilterLists.Data.Entities.Junctions; -using FilterLists.Services.SeedService; -using FilterLists.Services.SeedService.Models.Junctions; +using FilterLists.Services.Seed; +using FilterLists.Services.Seed.Models.Junctions; using Microsoft.AspNetCore.Mvc; namespace FilterLists.Api.V1.Controllers diff --git a/src/FilterLists.Api/V1/Controllers/ListsMaintainersController.cs b/src/FilterLists.Api/V1/Controllers/ListsMaintainersController.cs index 853164350..26c7d3224 100644 --- a/src/FilterLists.Api/V1/Controllers/ListsMaintainersController.cs +++ b/src/FilterLists.Api/V1/Controllers/ListsMaintainersController.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using FilterLists.Data.Entities.Junctions; -using FilterLists.Services.SeedService; -using FilterLists.Services.SeedService.Models.Junctions; +using FilterLists.Services.Seed; +using FilterLists.Services.Seed.Models.Junctions; using Microsoft.AspNetCore.Mvc; namespace FilterLists.Api.V1.Controllers diff --git a/src/FilterLists.Api/V1/Controllers/MaintainersController.cs b/src/FilterLists.Api/V1/Controllers/MaintainersController.cs index f790f8575..362a1d00e 100644 --- a/src/FilterLists.Api/V1/Controllers/MaintainersController.cs +++ b/src/FilterLists.Api/V1/Controllers/MaintainersController.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using FilterLists.Data.Entities; -using FilterLists.Services.SeedService; -using FilterLists.Services.SeedService.Models; +using FilterLists.Services.Seed; +using FilterLists.Services.Seed.Models; using Microsoft.AspNetCore.Mvc; namespace FilterLists.Api.V1.Controllers diff --git a/src/FilterLists.Api/V1/Controllers/MergesController.cs b/src/FilterLists.Api/V1/Controllers/MergesController.cs index 0c169c6d3..6a754bb8c 100644 --- a/src/FilterLists.Api/V1/Controllers/MergesController.cs +++ b/src/FilterLists.Api/V1/Controllers/MergesController.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using FilterLists.Data.Entities.Junctions; -using FilterLists.Services.SeedService; -using FilterLists.Services.SeedService.Models.Junctions; +using FilterLists.Services.Seed; +using FilterLists.Services.Seed.Models.Junctions; using Microsoft.AspNetCore.Mvc; namespace FilterLists.Api.V1.Controllers diff --git a/src/FilterLists.Api/V1/Controllers/SoftwareController.cs b/src/FilterLists.Api/V1/Controllers/SoftwareController.cs index 111f7e5e2..8eaebf1a7 100644 --- a/src/FilterLists.Api/V1/Controllers/SoftwareController.cs +++ b/src/FilterLists.Api/V1/Controllers/SoftwareController.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using FilterLists.Data.Entities; -using FilterLists.Services.SeedService; -using FilterLists.Services.SeedService.Models; +using FilterLists.Services.Seed; +using FilterLists.Services.Seed.Models; using Microsoft.AspNetCore.Mvc; namespace FilterLists.Api.V1.Controllers diff --git a/src/FilterLists.Api/V1/Controllers/SoftwareSyntaxesController.cs b/src/FilterLists.Api/V1/Controllers/SoftwareSyntaxesController.cs index 5390e7307..ca2992869 100644 --- a/src/FilterLists.Api/V1/Controllers/SoftwareSyntaxesController.cs +++ b/src/FilterLists.Api/V1/Controllers/SoftwareSyntaxesController.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using FilterLists.Data.Entities.Junctions; -using FilterLists.Services.SeedService; -using FilterLists.Services.SeedService.Models.Junctions; +using FilterLists.Services.Seed; +using FilterLists.Services.Seed.Models.Junctions; using Microsoft.AspNetCore.Mvc; namespace FilterLists.Api.V1.Controllers diff --git a/src/FilterLists.Api/V1/Controllers/SyntaxesController.cs b/src/FilterLists.Api/V1/Controllers/SyntaxesController.cs index b145f3dbc..8f64e00bd 100644 --- a/src/FilterLists.Api/V1/Controllers/SyntaxesController.cs +++ b/src/FilterLists.Api/V1/Controllers/SyntaxesController.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using FilterLists.Data.Entities; -using FilterLists.Services.SeedService; -using FilterLists.Services.SeedService.Models; +using FilterLists.Services.Seed; +using FilterLists.Services.Seed.Models; using Microsoft.AspNetCore.Mvc; namespace FilterLists.Api.V1.Controllers diff --git a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs index 5da3c692c..289630b9f 100644 --- a/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs +++ b/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs @@ -17,9 +17,9 @@ public static void AddFilterListsServices(this IServiceCollection services, ICon options.UseMySql(configuration.GetConnectionString("FilterListsConnection"), b => b.MigrationsAssembly("FilterLists.Api")) .EnableSensitiveDataLogging()); - services.TryAddScoped(); - services.TryAddScoped(); - services.TryAddScoped(); + services.TryAddScoped(); + services.TryAddScoped(); + services.TryAddScoped(); services.AddAutoMapper(); } } diff --git a/src/FilterLists.Services/FilterListService/FilterListService.cs b/src/FilterLists.Services/FilterList/FilterListService.cs similarity index 96% rename from src/FilterLists.Services/FilterListService/FilterListService.cs rename to src/FilterLists.Services/FilterList/FilterListService.cs index 77a540edf..87c9f7e58 100644 --- a/src/FilterLists.Services/FilterListService/FilterListService.cs +++ b/src/FilterLists.Services/FilterList/FilterListService.cs @@ -5,7 +5,7 @@ using FilterLists.Data; using Microsoft.EntityFrameworkCore; -namespace FilterLists.Services.FilterListService +namespace FilterLists.Services.FilterList { public class FilterListService { diff --git a/src/FilterLists.Services/FilterListService/FilterListServiceExtensions.cs b/src/FilterLists.Services/FilterList/FilterListServiceExtensions.cs similarity index 93% rename from src/FilterLists.Services/FilterListService/FilterListServiceExtensions.cs rename to src/FilterLists.Services/FilterList/FilterListServiceExtensions.cs index b71ca658d..46547a384 100644 --- a/src/FilterLists.Services/FilterListService/FilterListServiceExtensions.cs +++ b/src/FilterLists.Services/FilterList/FilterListServiceExtensions.cs @@ -1,7 +1,7 @@ using System.Linq; using System.Threading.Tasks; -namespace FilterLists.Services.FilterListService +namespace FilterLists.Services.FilterList { public static class FilterListServiceExtensions { diff --git a/src/FilterLists.Services/FilterListService/ListDetailsDto.cs b/src/FilterLists.Services/FilterList/ListDetailsDto.cs similarity index 97% rename from src/FilterLists.Services/FilterListService/ListDetailsDto.cs rename to src/FilterLists.Services/FilterList/ListDetailsDto.cs index d0fb10056..c78038d11 100644 --- a/src/FilterLists.Services/FilterListService/ListDetailsDto.cs +++ b/src/FilterLists.Services/FilterList/ListDetailsDto.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace FilterLists.Services.FilterListService +namespace FilterLists.Services.FilterList { public class ListDetailsDto { diff --git a/src/FilterLists.Services/FilterListService/ListSummaryDto.cs b/src/FilterLists.Services/FilterList/ListSummaryDto.cs similarity index 89% rename from src/FilterLists.Services/FilterListService/ListSummaryDto.cs rename to src/FilterLists.Services/FilterList/ListSummaryDto.cs index d512cbd35..5c900a3e6 100644 --- a/src/FilterLists.Services/FilterListService/ListSummaryDto.cs +++ b/src/FilterLists.Services/FilterList/ListSummaryDto.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace FilterLists.Services.FilterListService +namespace FilterLists.Services.FilterList { public class ListSummaryDto { diff --git a/src/FilterLists.Services/FilterListService/MappingProfiles.cs b/src/FilterLists.Services/FilterList/MappingProfiles.cs similarity index 87% rename from src/FilterLists.Services/FilterListService/MappingProfiles.cs rename to src/FilterLists.Services/FilterList/MappingProfiles.cs index 1927354eb..df6c16e73 100644 --- a/src/FilterLists.Services/FilterListService/MappingProfiles.cs +++ b/src/FilterLists.Services/FilterList/MappingProfiles.cs @@ -2,18 +2,18 @@ using AutoMapper; using FilterLists.Data.Entities; -namespace FilterLists.Services.FilterListService +namespace FilterLists.Services.FilterList { public class MappingProfiles : Profile { public MappingProfiles() { - CreateMap() + CreateMap() .ForMember(dto => dto.Languages, conf => conf.MapFrom(list => list.FilterListLanguages.Select(listLangs => listLangs.Language))); - CreateMap() + CreateMap() .ForMember(dto => dto.Languages, conf => conf.MapFrom(list => list.FilterListLanguages.Select(listLangs => listLangs.Language.Name))) diff --git a/src/FilterLists.Services/SeedService/Models/FilterListSeedDto.cs b/src/FilterLists.Services/Seed/Models/FilterListSeedDto.cs similarity index 94% rename from src/FilterLists.Services/SeedService/Models/FilterListSeedDto.cs rename to src/FilterLists.Services/Seed/Models/FilterListSeedDto.cs index c8a502880..91f834338 100644 --- a/src/FilterLists.Services/SeedService/Models/FilterListSeedDto.cs +++ b/src/FilterLists.Services/Seed/Models/FilterListSeedDto.cs @@ -1,6 +1,6 @@ using System; -namespace FilterLists.Services.SeedService.Models +namespace FilterLists.Services.Seed.Models { public class FilterListSeedDto { diff --git a/src/FilterLists.Services/SeedService/Models/Junctions/FilterListLanguageSeedDto.cs b/src/FilterLists.Services/Seed/Models/Junctions/FilterListLanguageSeedDto.cs similarity index 70% rename from src/FilterLists.Services/SeedService/Models/Junctions/FilterListLanguageSeedDto.cs rename to src/FilterLists.Services/Seed/Models/Junctions/FilterListLanguageSeedDto.cs index 63d2d5076..dde76dd3b 100644 --- a/src/FilterLists.Services/SeedService/Models/Junctions/FilterListLanguageSeedDto.cs +++ b/src/FilterLists.Services/Seed/Models/Junctions/FilterListLanguageSeedDto.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Services.SeedService.Models.Junctions +namespace FilterLists.Services.Seed.Models.Junctions { public class FilterListLanguageSeedDto { diff --git a/src/FilterLists.Services/SeedService/Models/Junctions/FilterListMaintainerSeedDto.cs b/src/FilterLists.Services/Seed/Models/Junctions/FilterListMaintainerSeedDto.cs similarity index 70% rename from src/FilterLists.Services/SeedService/Models/Junctions/FilterListMaintainerSeedDto.cs rename to src/FilterLists.Services/Seed/Models/Junctions/FilterListMaintainerSeedDto.cs index 0e5f2e898..77a6eb9f1 100644 --- a/src/FilterLists.Services/SeedService/Models/Junctions/FilterListMaintainerSeedDto.cs +++ b/src/FilterLists.Services/Seed/Models/Junctions/FilterListMaintainerSeedDto.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Services.SeedService.Models.Junctions +namespace FilterLists.Services.Seed.Models.Junctions { public class FilterListMaintainerSeedDto { diff --git a/src/FilterLists.Services/SeedService/Models/Junctions/ForkSeedDto.cs b/src/FilterLists.Services/Seed/Models/Junctions/ForkSeedDto.cs similarity index 70% rename from src/FilterLists.Services/SeedService/Models/Junctions/ForkSeedDto.cs rename to src/FilterLists.Services/Seed/Models/Junctions/ForkSeedDto.cs index f50a8b12a..7a8eacec6 100644 --- a/src/FilterLists.Services/SeedService/Models/Junctions/ForkSeedDto.cs +++ b/src/FilterLists.Services/Seed/Models/Junctions/ForkSeedDto.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Services.SeedService.Models.Junctions +namespace FilterLists.Services.Seed.Models.Junctions { public class ForkSeedDto { diff --git a/src/FilterLists.Services/SeedService/Models/Junctions/MergeSeedDto.cs b/src/FilterLists.Services/Seed/Models/Junctions/MergeSeedDto.cs similarity index 70% rename from src/FilterLists.Services/SeedService/Models/Junctions/MergeSeedDto.cs rename to src/FilterLists.Services/Seed/Models/Junctions/MergeSeedDto.cs index 258c7bcf3..1d09b68e2 100644 --- a/src/FilterLists.Services/SeedService/Models/Junctions/MergeSeedDto.cs +++ b/src/FilterLists.Services/Seed/Models/Junctions/MergeSeedDto.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Services.SeedService.Models.Junctions +namespace FilterLists.Services.Seed.Models.Junctions { public class MergeSeedDto { diff --git a/src/FilterLists.Services/SeedService/Models/Junctions/SoftwareSyntaxSeedDto.cs b/src/FilterLists.Services/Seed/Models/Junctions/SoftwareSyntaxSeedDto.cs similarity index 68% rename from src/FilterLists.Services/SeedService/Models/Junctions/SoftwareSyntaxSeedDto.cs rename to src/FilterLists.Services/Seed/Models/Junctions/SoftwareSyntaxSeedDto.cs index 822fc4c8e..9a70fbd0c 100644 --- a/src/FilterLists.Services/SeedService/Models/Junctions/SoftwareSyntaxSeedDto.cs +++ b/src/FilterLists.Services/Seed/Models/Junctions/SoftwareSyntaxSeedDto.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Services.SeedService.Models.Junctions +namespace FilterLists.Services.Seed.Models.Junctions { public class SoftwareSyntaxSeedDto { diff --git a/src/FilterLists.Services/SeedService/Models/LanguageSeedDto.cs b/src/FilterLists.Services/Seed/Models/LanguageSeedDto.cs similarity index 88% rename from src/FilterLists.Services/SeedService/Models/LanguageSeedDto.cs rename to src/FilterLists.Services/Seed/Models/LanguageSeedDto.cs index 0cc8a7ac5..707cfc9e5 100644 --- a/src/FilterLists.Services/SeedService/Models/LanguageSeedDto.cs +++ b/src/FilterLists.Services/Seed/Models/LanguageSeedDto.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Services.SeedService.Models +namespace FilterLists.Services.Seed.Models { public class LanguageSeedDto { diff --git a/src/FilterLists.Services/SeedService/Models/LicenseSeedDto.cs b/src/FilterLists.Services/Seed/Models/LicenseSeedDto.cs similarity index 84% rename from src/FilterLists.Services/SeedService/Models/LicenseSeedDto.cs rename to src/FilterLists.Services/Seed/Models/LicenseSeedDto.cs index dfcd3ef4a..c433e9391 100644 --- a/src/FilterLists.Services/SeedService/Models/LicenseSeedDto.cs +++ b/src/FilterLists.Services/Seed/Models/LicenseSeedDto.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Services.SeedService.Models +namespace FilterLists.Services.Seed.Models { public class LicenseSeedDto { diff --git a/src/FilterLists.Services/SeedService/Models/MaintainerSeedDto.cs b/src/FilterLists.Services/Seed/Models/MaintainerSeedDto.cs similarity index 83% rename from src/FilterLists.Services/SeedService/Models/MaintainerSeedDto.cs rename to src/FilterLists.Services/Seed/Models/MaintainerSeedDto.cs index ad1234978..cf663727a 100644 --- a/src/FilterLists.Services/SeedService/Models/MaintainerSeedDto.cs +++ b/src/FilterLists.Services/Seed/Models/MaintainerSeedDto.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Services.SeedService.Models +namespace FilterLists.Services.Seed.Models { public class MaintainerSeedDto { diff --git a/src/FilterLists.Services/SeedService/Models/SoftwareSeedDto.cs b/src/FilterLists.Services/Seed/Models/SoftwareSeedDto.cs similarity index 80% rename from src/FilterLists.Services/SeedService/Models/SoftwareSeedDto.cs rename to src/FilterLists.Services/Seed/Models/SoftwareSeedDto.cs index 45651b267..c28f4eca7 100644 --- a/src/FilterLists.Services/SeedService/Models/SoftwareSeedDto.cs +++ b/src/FilterLists.Services/Seed/Models/SoftwareSeedDto.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Services.SeedService.Models +namespace FilterLists.Services.Seed.Models { public class SoftwareSeedDto { diff --git a/src/FilterLists.Services/SeedService/Models/SyntaxSeedDto.cs b/src/FilterLists.Services/Seed/Models/SyntaxSeedDto.cs similarity index 76% rename from src/FilterLists.Services/SeedService/Models/SyntaxSeedDto.cs rename to src/FilterLists.Services/Seed/Models/SyntaxSeedDto.cs index dd98a5dbd..4a677216a 100644 --- a/src/FilterLists.Services/SeedService/Models/SyntaxSeedDto.cs +++ b/src/FilterLists.Services/Seed/Models/SyntaxSeedDto.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Services.SeedService.Models +namespace FilterLists.Services.Seed.Models { public class SyntaxSeedDto { diff --git a/src/FilterLists.Services/SeedService/SeedService.cs b/src/FilterLists.Services/Seed/SeedService.cs similarity index 97% rename from src/FilterLists.Services/SeedService/SeedService.cs rename to src/FilterLists.Services/Seed/SeedService.cs index c1fb1dd43..3feaece51 100644 --- a/src/FilterLists.Services/SeedService/SeedService.cs +++ b/src/FilterLists.Services/Seed/SeedService.cs @@ -6,7 +6,7 @@ using FilterLists.Data; using Microsoft.EntityFrameworkCore; -namespace FilterLists.Services.SeedService +namespace FilterLists.Services.Seed { public class SeedService { diff --git a/src/FilterLists.Services/SnapshotService/FilterListViewUrlDto.cs b/src/FilterLists.Services/Snapshot/FilterListViewUrlDto.cs similarity index 72% rename from src/FilterLists.Services/SnapshotService/FilterListViewUrlDto.cs rename to src/FilterLists.Services/Snapshot/FilterListViewUrlDto.cs index b62621007..2647dc1c7 100644 --- a/src/FilterLists.Services/SnapshotService/FilterListViewUrlDto.cs +++ b/src/FilterLists.Services/Snapshot/FilterListViewUrlDto.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Services.SnapshotService +namespace FilterLists.Services.Snapshot { public class FilterListViewUrlDto { diff --git a/src/FilterLists.Services/SnapshotService/RawRuleLinterExtensions.cs b/src/FilterLists.Services/Snapshot/RawRuleLinterExtensions.cs similarity index 96% rename from src/FilterLists.Services/SnapshotService/RawRuleLinterExtensions.cs rename to src/FilterLists.Services/Snapshot/RawRuleLinterExtensions.cs index 1d4f66932..314901487 100644 --- a/src/FilterLists.Services/SnapshotService/RawRuleLinterExtensions.cs +++ b/src/FilterLists.Services/Snapshot/RawRuleLinterExtensions.cs @@ -1,4 +1,4 @@ -namespace FilterLists.Services.SnapshotService +namespace FilterLists.Services.Snapshot { public static class RawRuleLinterExtensions { diff --git a/src/FilterLists.Services/SnapshotService/SnapshotBatchDe.cs b/src/FilterLists.Services/Snapshot/SnapshotBatchDe.cs similarity index 87% rename from src/FilterLists.Services/SnapshotService/SnapshotBatchDe.cs rename to src/FilterLists.Services/Snapshot/SnapshotBatchDe.cs index 5537bb793..e0ac2eb82 100644 --- a/src/FilterLists.Services/SnapshotService/SnapshotBatchDe.cs +++ b/src/FilterLists.Services/Snapshot/SnapshotBatchDe.cs @@ -6,16 +6,16 @@ using FilterLists.Data.Entities.Junctions; using FilterLists.Services.Extensions; -namespace FilterLists.Services.SnapshotService +namespace FilterLists.Services.Snapshot { public class SnapshotBatchDe { private readonly FilterListsDbContext dbContext; private readonly IEnumerable rawRules; - private readonly Snapshot snapshot; + private readonly Data.Entities.Snapshot snapshot; private IQueryable rules; - public SnapshotBatchDe(FilterListsDbContext dbContext, Snapshot snapshot, IEnumerable rawRules) + public SnapshotBatchDe(FilterListsDbContext dbContext, Data.Entities.Snapshot snapshot, IEnumerable rawRules) { this.dbContext = dbContext; this.snapshot = snapshot; diff --git a/src/FilterLists.Services/SnapshotService/SnapshotDe.cs b/src/FilterLists.Services/Snapshot/SnapshotDe.cs similarity index 97% rename from src/FilterLists.Services/SnapshotService/SnapshotDe.cs rename to src/FilterLists.Services/Snapshot/SnapshotDe.cs index 831deb0b5..6ac5fba87 100644 --- a/src/FilterLists.Services/SnapshotService/SnapshotDe.cs +++ b/src/FilterLists.Services/Snapshot/SnapshotDe.cs @@ -9,7 +9,7 @@ using FilterLists.Data.Entities.Junctions; using FilterLists.Services.Extensions; -namespace FilterLists.Services.SnapshotService +namespace FilterLists.Services.Snapshot { public class SnapshotDe { @@ -20,7 +20,7 @@ public class SnapshotDe private readonly FilterListsDbContext dbContext; private readonly FilterListViewUrlDto list; - private Snapshot snapshot; + private Data.Entities.Snapshot snapshot; public SnapshotDe(FilterListsDbContext dbContext, FilterListViewUrlDto list) { @@ -50,7 +50,7 @@ private async Task CaptureSnapshot() private async Task AddSnapshot() { - snapshot = new Snapshot {FilterListId = list.Id}; + snapshot = new Data.Entities.Snapshot {FilterListId = list.Id}; await dbContext.Snapshots.AddAsync(snapshot); } diff --git a/src/FilterLists.Services/SnapshotService/SnapshotService.cs b/src/FilterLists.Services/Snapshot/SnapshotService.cs similarity index 98% rename from src/FilterLists.Services/SnapshotService/SnapshotService.cs rename to src/FilterLists.Services/Snapshot/SnapshotService.cs index 7bafb4437..13d645ad1 100644 --- a/src/FilterLists.Services/SnapshotService/SnapshotService.cs +++ b/src/FilterLists.Services/Snapshot/SnapshotService.cs @@ -6,7 +6,7 @@ using FilterLists.Data; using Microsoft.EntityFrameworkCore; -namespace FilterLists.Services.SnapshotService +namespace FilterLists.Services.Snapshot { public class SnapshotService {