From b2f2ebfcf7127b8b101d803fcf5dfc2cc56dc228 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Tue, 2 Jul 2019 10:53:48 -0500 Subject: [PATCH] organize Urls -> Models --- .../Models/{ => EntityUrlDtos}/LicenseUrls.cs | 2 +- .../Models/{ => EntityUrlDtos}/ListUrls.cs | 2 +- .../{ => EntityUrlDtos}/MaintainerUrls.cs | 2 +- .../Models/{ => EntityUrlDtos}/SoftwareUrls.cs | 2 +- .../Models/{ => EntityUrlDtos}/SyntaxUrls.cs | 2 +- .../DataFileUrlValidationResults.cs | 2 +- .../ValidationResults}/UrlValidationResult.cs | 2 +- .../Features/Urls/ValidateAllUrls.cs | 18 ++++++++++++------ .../Features/Urls/ValidateUrls.cs | 1 + .../Repositories/UrlRepository.cs | 2 +- 10 files changed, 21 insertions(+), 14 deletions(-) rename src/FilterLists.Agent/Features/Urls/Models/{ => EntityUrlDtos}/LicenseUrls.cs (71%) rename src/FilterLists.Agent/Features/Urls/Models/{ => EntityUrlDtos}/ListUrls.cs (91%) rename src/FilterLists.Agent/Features/Urls/Models/{ => EntityUrlDtos}/MaintainerUrls.cs (71%) rename src/FilterLists.Agent/Features/Urls/Models/{ => EntityUrlDtos}/SoftwareUrls.cs (75%) rename src/FilterLists.Agent/Features/Urls/Models/{ => EntityUrlDtos}/SyntaxUrls.cs (71%) rename src/FilterLists.Agent/Features/Urls/{ => Models/ValidationResults}/DataFileUrlValidationResults.cs (85%) rename src/FilterLists.Agent/Features/Urls/{ => Models/ValidationResults}/UrlValidationResult.cs (91%) diff --git a/src/FilterLists.Agent/Features/Urls/Models/LicenseUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/LicenseUrls.cs similarity index 71% rename from src/FilterLists.Agent/Features/Urls/Models/LicenseUrls.cs rename to src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/LicenseUrls.cs index 3ec2ae416..8620fcdcd 100644 --- a/src/FilterLists.Agent/Features/Urls/Models/LicenseUrls.cs +++ b/src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/LicenseUrls.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace FilterLists.Agent.Features.Urls.Models +namespace FilterLists.Agent.Features.Urls.Models.EntityUrlDtos { [UsedImplicitly] public class LicenseUrls diff --git a/src/FilterLists.Agent/Features/Urls/Models/ListUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/ListUrls.cs similarity index 91% rename from src/FilterLists.Agent/Features/Urls/Models/ListUrls.cs rename to src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/ListUrls.cs index 484ecf9d1..209d00661 100644 --- a/src/FilterLists.Agent/Features/Urls/Models/ListUrls.cs +++ b/src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/ListUrls.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace FilterLists.Agent.Features.Urls.Models +namespace FilterLists.Agent.Features.Urls.Models.EntityUrlDtos { [UsedImplicitly] public class ListUrls diff --git a/src/FilterLists.Agent/Features/Urls/Models/MaintainerUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/MaintainerUrls.cs similarity index 71% rename from src/FilterLists.Agent/Features/Urls/Models/MaintainerUrls.cs rename to src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/MaintainerUrls.cs index ca1e66242..f39b67746 100644 --- a/src/FilterLists.Agent/Features/Urls/Models/MaintainerUrls.cs +++ b/src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/MaintainerUrls.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace FilterLists.Agent.Features.Urls.Models +namespace FilterLists.Agent.Features.Urls.Models.EntityUrlDtos { [UsedImplicitly] public class MaintainerUrls diff --git a/src/FilterLists.Agent/Features/Urls/Models/SoftwareUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/SoftwareUrls.cs similarity index 75% rename from src/FilterLists.Agent/Features/Urls/Models/SoftwareUrls.cs rename to src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/SoftwareUrls.cs index 618a506d9..d4f21ab07 100644 --- a/src/FilterLists.Agent/Features/Urls/Models/SoftwareUrls.cs +++ b/src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/SoftwareUrls.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace FilterLists.Agent.Features.Urls.Models +namespace FilterLists.Agent.Features.Urls.Models.EntityUrlDtos { [UsedImplicitly] public class SoftwareUrls diff --git a/src/FilterLists.Agent/Features/Urls/Models/SyntaxUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/SyntaxUrls.cs similarity index 71% rename from src/FilterLists.Agent/Features/Urls/Models/SyntaxUrls.cs rename to src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/SyntaxUrls.cs index daa862e9f..6180d11b1 100644 --- a/src/FilterLists.Agent/Features/Urls/Models/SyntaxUrls.cs +++ b/src/FilterLists.Agent/Features/Urls/Models/EntityUrlDtos/SyntaxUrls.cs @@ -1,7 +1,7 @@ using System; using JetBrains.Annotations; -namespace FilterLists.Agent.Features.Urls.Models +namespace FilterLists.Agent.Features.Urls.Models.EntityUrlDtos { [UsedImplicitly] public class SyntaxUrls diff --git a/src/FilterLists.Agent/Features/Urls/DataFileUrlValidationResults.cs b/src/FilterLists.Agent/Features/Urls/Models/ValidationResults/DataFileUrlValidationResults.cs similarity index 85% rename from src/FilterLists.Agent/Features/Urls/DataFileUrlValidationResults.cs rename to src/FilterLists.Agent/Features/Urls/Models/ValidationResults/DataFileUrlValidationResults.cs index 3ad609128..35e45d104 100644 --- a/src/FilterLists.Agent/Features/Urls/DataFileUrlValidationResults.cs +++ b/src/FilterLists.Agent/Features/Urls/Models/ValidationResults/DataFileUrlValidationResults.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace FilterLists.Agent.Features.Urls +namespace FilterLists.Agent.Features.Urls.Models.ValidationResults { public class DataFileUrlValidationResults { diff --git a/src/FilterLists.Agent/Features/Urls/UrlValidationResult.cs b/src/FilterLists.Agent/Features/Urls/Models/ValidationResults/UrlValidationResult.cs similarity index 91% rename from src/FilterLists.Agent/Features/Urls/UrlValidationResult.cs rename to src/FilterLists.Agent/Features/Urls/Models/ValidationResults/UrlValidationResult.cs index f49453df8..99194c5d2 100644 --- a/src/FilterLists.Agent/Features/Urls/UrlValidationResult.cs +++ b/src/FilterLists.Agent/Features/Urls/Models/ValidationResults/UrlValidationResult.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace FilterLists.Agent.Features.Urls +namespace FilterLists.Agent.Features.Urls.Models.ValidationResults { public class UrlValidationResult { diff --git a/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs b/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs index defe44d9c..d186e8383 100644 --- a/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs +++ b/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs @@ -3,7 +3,8 @@ using System.Threading; using System.Threading.Tasks; using FilterLists.Agent.Core.Interfaces; -using FilterLists.Agent.Features.Urls.Models; +using FilterLists.Agent.Features.Urls.Models.EntityUrlDtos; +using FilterLists.Agent.Features.Urls.Models.ValidationResults; using MediatR; namespace FilterLists.Agent.Features.Urls @@ -30,27 +31,32 @@ protected override async Task Handle(Command request, CancellationToken cancella var results = new List(); var licenseUrls = await _repo.GetAllAsync(); - var licenseUrlErrors = (await _mediator.Send(new ValidateUrls.Command(licenseUrls), cancellationToken)).ToList(); + var licenseUrlErrors = (await _mediator.Send(new ValidateUrls.Command(licenseUrls), cancellationToken)) + .ToList(); if (licenseUrlErrors.Any()) results.Add(new DataFileUrlValidationResults("License.json", licenseUrlErrors)); var listUrls = await _repo.GetAllAsync(); - var listUrlErrors = (await _mediator.Send(new ValidateUrls.Command(listUrls), cancellationToken)).ToList(); + var listUrlErrors = + (await _mediator.Send(new ValidateUrls.Command(listUrls), cancellationToken)).ToList(); if (listUrlErrors.Any()) results.Add(new DataFileUrlValidationResults("FilterList.json", listUrlErrors)); var maintainerUrls = await _repo.GetAllAsync(); - var maintainerUrlErrors = (await _mediator.Send(new ValidateUrls.Command(maintainerUrls), cancellationToken)).ToList(); + var maintainerUrlErrors = + (await _mediator.Send(new ValidateUrls.Command(maintainerUrls), cancellationToken)).ToList(); if (maintainerUrlErrors.Any()) results.Add(new DataFileUrlValidationResults("Maintainer.json", maintainerUrlErrors)); var softwareUrls = await _repo.GetAllAsync(); - var softwareUrlErrors = (await _mediator.Send(new ValidateUrls.Command(softwareUrls), cancellationToken)).ToList(); + var softwareUrlErrors = + (await _mediator.Send(new ValidateUrls.Command(softwareUrls), cancellationToken)).ToList(); if (softwareUrlErrors.Any()) results.Add(new DataFileUrlValidationResults("Software.json", softwareUrlErrors)); var syntaxUrls = await _repo.GetAllAsync(); - var syntaxUrlErrors = (await _mediator.Send(new ValidateUrls.Command(syntaxUrls), cancellationToken)).ToList(); + var syntaxUrlErrors = (await _mediator.Send(new ValidateUrls.Command(syntaxUrls), cancellationToken)) + .ToList(); if (syntaxUrlErrors.Any()) results.Add(new DataFileUrlValidationResults("Syntax.json", syntaxUrlErrors)); diff --git a/src/FilterLists.Agent/Features/Urls/ValidateUrls.cs b/src/FilterLists.Agent/Features/Urls/ValidateUrls.cs index 13265fc5a..d35de6e7b 100644 --- a/src/FilterLists.Agent/Features/Urls/ValidateUrls.cs +++ b/src/FilterLists.Agent/Features/Urls/ValidateUrls.cs @@ -5,6 +5,7 @@ using System.Threading; using System.Threading.Tasks; using System.Threading.Tasks.Dataflow; +using FilterLists.Agent.Features.Urls.Models.ValidationResults; using FilterLists.Agent.Infrastructure.Clients; using MediatR; diff --git a/src/FilterLists.Agent/Infrastructure/Repositories/UrlRepository.cs b/src/FilterLists.Agent/Infrastructure/Repositories/UrlRepository.cs index 4819b3eb3..ed662c673 100644 --- a/src/FilterLists.Agent/Infrastructure/Repositories/UrlRepository.cs +++ b/src/FilterLists.Agent/Infrastructure/Repositories/UrlRepository.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using FilterLists.Agent.Core.Interfaces; -using FilterLists.Agent.Features.Urls.Models; +using FilterLists.Agent.Features.Urls.Models.EntityUrlDtos; using FilterLists.Agent.Infrastructure.Clients; using RestSharp;