From a3cb9fc0a5c1e1a36114ae53d3443e9a6d5b30df Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 13 Jul 2019 12:40:37 -0500
Subject: [PATCH] misc renames

---
 .../Urls/{FilterListsEntity.cs => Entity.cs}     |  2 +-
 src/FilterLists.Agent/Core/Urls/EntityUrl.cs     | 10 +++++-----
 .../Features/Urls/BuildGitHubIssueBody.cs        |  4 ++--
 .../FilterListsApi/EntityUrlRepository.cs        | 16 ++++++++--------
 .../Infrastructure/Web/UrlValidator.cs           |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)
 rename src/FilterLists.Agent/Core/Urls/{FilterListsEntity.cs => Entity.cs} (81%)

diff --git a/src/FilterLists.Agent/Core/Urls/FilterListsEntity.cs b/src/FilterLists.Agent/Core/Urls/Entity.cs
similarity index 81%
rename from src/FilterLists.Agent/Core/Urls/FilterListsEntity.cs
rename to src/FilterLists.Agent/Core/Urls/Entity.cs
index f5f0e57dd..af7451a2c 100644
--- a/src/FilterLists.Agent/Core/Urls/FilterListsEntity.cs
+++ b/src/FilterLists.Agent/Core/Urls/Entity.cs
@@ -1,6 +1,6 @@
 namespace FilterLists.Agent.Core.Urls
 {
-    public enum FilterListsEntity
+    public enum Entity
     {
         License,
         FilterList,
diff --git a/src/FilterLists.Agent/Core/Urls/EntityUrl.cs b/src/FilterLists.Agent/Core/Urls/EntityUrl.cs
index f8640908f..2957d32ca 100644
--- a/src/FilterLists.Agent/Core/Urls/EntityUrl.cs
+++ b/src/FilterLists.Agent/Core/Urls/EntityUrl.cs
@@ -8,19 +8,19 @@ namespace FilterLists.Agent.Core.Urls
 {
     public class EntityUrl
     {
-        public EntityUrl(FilterListsEntity filterListsEntity, int id, Uri viewUrl)
+        public EntityUrl(Entity entity, int id, Uri url)
         {
-            FilterListsEntity = filterListsEntity;
+            Entity = entity;
             Id = id;
-            ViewUrl = viewUrl;
+            Url = url;
         }
 
-        public FilterListsEntity FilterListsEntity { get; }
+        public Entity Entity { get; }
 
         [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
         public int Id { [UsedImplicitly] get; }
 
-        public Uri ViewUrl { get; }
+        public Uri Url { get; }
 
         public List<string> ValidationMessages { get; } = new List<string>();
 
diff --git a/src/FilterLists.Agent/Features/Urls/BuildGitHubIssueBody.cs b/src/FilterLists.Agent/Features/Urls/BuildGitHubIssueBody.cs
index ae87893a2..416d5025a 100644
--- a/src/FilterLists.Agent/Features/Urls/BuildGitHubIssueBody.cs
+++ b/src/FilterLists.Agent/Features/Urls/BuildGitHubIssueBody.cs
@@ -27,7 +27,7 @@ protected override string Handle(Command request)
             {
                 var body = new StringBuilder();
                 body.Append(IssueHeader);
-                var entityInvalidUrlGroups = request.InvalidEntityUrls.GroupBy(i => i.FilterListsEntity);
+                var entityInvalidUrlGroups = request.InvalidEntityUrls.GroupBy(i => i.Entity);
                 foreach (var entityInvalidUrls in entityInvalidUrlGroups)
                 {
                     body.Append(
@@ -36,7 +36,7 @@ protected override string Handle(Command request)
                     foreach (var invalidUrl in entityInvalidUrls)
                     {
                         body.Append(
-                            $"<li><a href=\"{invalidUrl.ViewUrl.OriginalString}\">{invalidUrl.ViewUrl.OriginalString}</a>");
+                            $"<li><a href=\"{invalidUrl.Url.OriginalString}\">{invalidUrl.Url.OriginalString}</a>");
                         body.Append("<ul>");
                         foreach (var message in invalidUrl.ValidationMessages)
                             body.Append($"<li>{message}</li>");
diff --git a/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrlRepository.cs b/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrlRepository.cs
index 10e7df6c4..79ceefcc3 100644
--- a/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrlRepository.cs
+++ b/src/FilterLists.Agent/Infrastructure/FilterListsApi/EntityUrlRepository.cs
@@ -13,14 +13,14 @@ namespace FilterLists.Agent.Infrastructure.FilterListsApi
     [UsedImplicitly]
     public class EntityUrlRepository : IEntityUrlRepository
     {
-        private static readonly Dictionary<string, (string, FilterListsEntity)> EndpointAndEntityByDto =
-            new Dictionary<string, (string, FilterListsEntity)>
+        private static readonly Dictionary<string, (string, Entity)> EndpointAndEntityByDto =
+            new Dictionary<string, (string, Entity)>
             {
-                {nameof(LicenseUrls), ("licenses", FilterListsEntity.License)},
-                {nameof(ListUrls), ("lists", FilterListsEntity.FilterList)},
-                {nameof(MaintainerUrls), ("maintainers", FilterListsEntity.Maintainer)},
-                {nameof(SoftwareUrls), ("software", FilterListsEntity.Software)},
-                {nameof(SyntaxUrls), ("syntaxes", FilterListsEntity.Syntax)}
+                {nameof(LicenseUrls), ("licenses", Entity.License)},
+                {nameof(ListUrls), ("lists", Entity.FilterList)},
+                {nameof(MaintainerUrls), ("maintainers", Entity.Maintainer)},
+                {nameof(SoftwareUrls), ("software", Entity.Software)},
+                {nameof(SyntaxUrls), ("syntaxes", Entity.Syntax)}
             };
 
         private readonly IFilterListsApiClient _apiClient;
@@ -51,7 +51,7 @@ private async Task<IEnumerable<EntityUrl>> GetAllForEntity<TModel>(CancellationT
                 var id = (int)propertyInfos.First(p => p.Name == nameof(LicenseUrls.Id)).GetValue(e);
                 return propertyInfos.Where(p => p.GetValue(e) != null && p.PropertyType == typeof(Uri)).Select(p =>
                     new EntityUrl(EndpointAndEntityByDto[typeof(TModel).Name].Item2, id, (Uri)p.GetValue(e)));
-            }).GroupBy(e => e.ViewUrl).Select(e => e.First());
+            }).GroupBy(e => e.Url).Select(e => e.First());
         }
     }
 }
\ No newline at end of file
diff --git a/src/FilterLists.Agent/Infrastructure/Web/UrlValidator.cs b/src/FilterLists.Agent/Infrastructure/Web/UrlValidator.cs
index cc0b00a3a..642c8e2eb 100644
--- a/src/FilterLists.Agent/Infrastructure/Web/UrlValidator.cs
+++ b/src/FilterLists.Agent/Infrastructure/Web/UrlValidator.cs
@@ -28,7 +28,7 @@ public UrlValidator(HttpClient httpClient, ILogger<UrlValidator> logger)
 
         public async Task<EntityUrl> ValidateAsync(EntityUrl entityUrl, CancellationToken cancellationToken)
         {
-            var url = entityUrl.ViewUrl;
+            var url = entityUrl.Url;
             try
             {
                 using var response =