From e15f4fd1f550a816b3868996424361d8b5fcbc19 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Mon, 1 Jul 2019 15:27:41 -0500
Subject: [PATCH] mv some non-domain entities out of core

---
 src/FilterLists.Agent/Core/Interfaces/IListInfoRepository.cs   | 2 +-
 src/FilterLists.Agent/Features/Lists/CaptureLists.cs           | 2 +-
 .../{Core/Entities => Features/Urls/Models}/LicenseUrls.cs     | 3 ++-
 .../{Core/Entities => Features/Urls/Models}/ListUrls.cs        | 3 ++-
 .../{Core/Entities => Features/Urls/Models}/MaintainerUrls.cs  | 3 ++-
 .../{Core/Entities => Features/Urls/Models}/SoftwareUrls.cs    | 3 ++-
 .../{Core/Entities => Features/Urls/Models}/SyntaxUrls.cs      | 3 ++-
 src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs         | 2 +-
 .../Infrastructure/Repositories/ListInfoRepository.cs          | 2 +-
 .../Infrastructure/Repositories/UrlsRepository.cs              | 1 +
 10 files changed, 15 insertions(+), 9 deletions(-)
 rename src/FilterLists.Agent/{Core/Entities => Features/Urls/Models}/LicenseUrls.cs (66%)
 rename src/FilterLists.Agent/{Core/Entities => Features/Urls/Models}/ListUrls.cs (88%)
 rename src/FilterLists.Agent/{Core/Entities => Features/Urls/Models}/MaintainerUrls.cs (65%)
 rename src/FilterLists.Agent/{Core/Entities => Features/Urls/Models}/SoftwareUrls.cs (70%)
 rename src/FilterLists.Agent/{Core/Entities => Features/Urls/Models}/SyntaxUrls.cs (66%)

diff --git a/src/FilterLists.Agent/Core/Interfaces/IListInfoRepository.cs b/src/FilterLists.Agent/Core/Interfaces/IListInfoRepository.cs
index 91bbcb18e..8e500aecd 100644
--- a/src/FilterLists.Agent/Core/Interfaces/IListInfoRepository.cs
+++ b/src/FilterLists.Agent/Core/Interfaces/IListInfoRepository.cs
@@ -6,6 +6,6 @@ namespace FilterLists.Agent.Core.Interfaces
 {
     public interface IListInfoRepository
     {
-        Task<IEnumerable<ListInfo>> GetAll();
+        Task<IEnumerable<ListInfo>> GetAllAsync();
     }
 }
\ No newline at end of file
diff --git a/src/FilterLists.Agent/Features/Lists/CaptureLists.cs b/src/FilterLists.Agent/Features/Lists/CaptureLists.cs
index bcc8bdde3..d187ddd95 100644
--- a/src/FilterLists.Agent/Features/Lists/CaptureLists.cs
+++ b/src/FilterLists.Agent/Features/Lists/CaptureLists.cs
@@ -24,7 +24,7 @@ public Handler(IMediator mediator, IListInfoRepository listInfoRepository)
 
             protected override async Task Handle(Command request, CancellationToken cancellationToken)
             {
-                var lists = await _repo.GetAll();
+                var lists = await _repo.GetAllAsync();
                 await _mediator.Send(new DownloadLists.Command(lists), cancellationToken);
                 await _mediator.Send(new CommitLists.Command(), cancellationToken);
             }
diff --git a/src/FilterLists.Agent/Core/Entities/LicenseUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/LicenseUrls.cs
similarity index 66%
rename from src/FilterLists.Agent/Core/Entities/LicenseUrls.cs
rename to src/FilterLists.Agent/Features/Urls/Models/LicenseUrls.cs
index 5fa8dd1c9..89109101b 100644
--- a/src/FilterLists.Agent/Core/Entities/LicenseUrls.cs
+++ b/src/FilterLists.Agent/Features/Urls/Models/LicenseUrls.cs
@@ -1,7 +1,8 @@
 using System;
+using FilterLists.Agent.Core.Entities;
 using JetBrains.Annotations;
 
-namespace FilterLists.Agent.Core.Entities
+namespace FilterLists.Agent.Features.Urls.Models
 {
     [UsedImplicitly]
     public class LicenseUrls : IEntityUrls
diff --git a/src/FilterLists.Agent/Core/Entities/ListUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/ListUrls.cs
similarity index 88%
rename from src/FilterLists.Agent/Core/Entities/ListUrls.cs
rename to src/FilterLists.Agent/Features/Urls/Models/ListUrls.cs
index 53170ec11..e91239f0e 100644
--- a/src/FilterLists.Agent/Core/Entities/ListUrls.cs
+++ b/src/FilterLists.Agent/Features/Urls/Models/ListUrls.cs
@@ -1,7 +1,8 @@
 using System;
+using FilterLists.Agent.Core.Entities;
 using JetBrains.Annotations;
 
-namespace FilterLists.Agent.Core.Entities
+namespace FilterLists.Agent.Features.Urls.Models
 {
     [UsedImplicitly]
     public class ListUrls : IEntityUrls
diff --git a/src/FilterLists.Agent/Core/Entities/MaintainerUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/MaintainerUrls.cs
similarity index 65%
rename from src/FilterLists.Agent/Core/Entities/MaintainerUrls.cs
rename to src/FilterLists.Agent/Features/Urls/Models/MaintainerUrls.cs
index 075467818..c7e717e41 100644
--- a/src/FilterLists.Agent/Core/Entities/MaintainerUrls.cs
+++ b/src/FilterLists.Agent/Features/Urls/Models/MaintainerUrls.cs
@@ -1,7 +1,8 @@
 using System;
+using FilterLists.Agent.Core.Entities;
 using JetBrains.Annotations;
 
-namespace FilterLists.Agent.Core.Entities
+namespace FilterLists.Agent.Features.Urls.Models
 {
     [UsedImplicitly]
     public class MaintainerUrls : IEntityUrls
diff --git a/src/FilterLists.Agent/Core/Entities/SoftwareUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/SoftwareUrls.cs
similarity index 70%
rename from src/FilterLists.Agent/Core/Entities/SoftwareUrls.cs
rename to src/FilterLists.Agent/Features/Urls/Models/SoftwareUrls.cs
index a813e0902..8ec6a8b73 100644
--- a/src/FilterLists.Agent/Core/Entities/SoftwareUrls.cs
+++ b/src/FilterLists.Agent/Features/Urls/Models/SoftwareUrls.cs
@@ -1,7 +1,8 @@
 using System;
+using FilterLists.Agent.Core.Entities;
 using JetBrains.Annotations;
 
-namespace FilterLists.Agent.Core.Entities
+namespace FilterLists.Agent.Features.Urls.Models
 {
     [UsedImplicitly]
     public class SoftwareUrls : IEntityUrls
diff --git a/src/FilterLists.Agent/Core/Entities/SyntaxUrls.cs b/src/FilterLists.Agent/Features/Urls/Models/SyntaxUrls.cs
similarity index 66%
rename from src/FilterLists.Agent/Core/Entities/SyntaxUrls.cs
rename to src/FilterLists.Agent/Features/Urls/Models/SyntaxUrls.cs
index e4330d2fa..0a944d830 100644
--- a/src/FilterLists.Agent/Core/Entities/SyntaxUrls.cs
+++ b/src/FilterLists.Agent/Features/Urls/Models/SyntaxUrls.cs
@@ -1,7 +1,8 @@
 using System;
+using FilterLists.Agent.Core.Entities;
 using JetBrains.Annotations;
 
-namespace FilterLists.Agent.Core.Entities
+namespace FilterLists.Agent.Features.Urls.Models
 {
     [UsedImplicitly]
     public class SyntaxUrls : IEntityUrls
diff --git a/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs b/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs
index ff65af667..6bd7647dd 100644
--- a/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs
+++ b/src/FilterLists.Agent/Features/Urls/ValidateAllUrls.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
-using FilterLists.Agent.Core.Entities;
 using FilterLists.Agent.Core.Interfaces;
+using FilterLists.Agent.Features.Urls.Models;
 using MediatR;
 
 namespace FilterLists.Agent.Features.Urls
diff --git a/src/FilterLists.Agent/Infrastructure/Repositories/ListInfoRepository.cs b/src/FilterLists.Agent/Infrastructure/Repositories/ListInfoRepository.cs
index 900c84ea1..1499c307a 100644
--- a/src/FilterLists.Agent/Infrastructure/Repositories/ListInfoRepository.cs
+++ b/src/FilterLists.Agent/Infrastructure/Repositories/ListInfoRepository.cs
@@ -16,7 +16,7 @@ public ListInfoRepository(IFilterListsApiClient apiClient)
             _apiClient = apiClient;
         }
 
-        public async Task<IEnumerable<ListInfo>> GetAll()
+        public async Task<IEnumerable<ListInfo>> GetAllAsync()
         {
             var listsRequest = new RestRequest("lists");
             return await _apiClient.ExecuteAsync<IEnumerable<ListInfo>>(listsRequest);
diff --git a/src/FilterLists.Agent/Infrastructure/Repositories/UrlsRepository.cs b/src/FilterLists.Agent/Infrastructure/Repositories/UrlsRepository.cs
index 1e8984d04..005bb65d7 100644
--- a/src/FilterLists.Agent/Infrastructure/Repositories/UrlsRepository.cs
+++ b/src/FilterLists.Agent/Infrastructure/Repositories/UrlsRepository.cs
@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using FilterLists.Agent.Core.Entities;
 using FilterLists.Agent.Core.Interfaces;
+using FilterLists.Agent.Features.Urls.Models;
 using FilterLists.Agent.Infrastructure.Clients;
 using RestSharp;