Add search response builder abstraction (#698)

Refactors the search implementations to share their response building logic. This reduces the logic in search providers to prepare for supporting the NuGet V2 protocol.

Part of #43

Author: loic-sharma

src/BaGet.Azure/Search/AzureSearchService.cs

@@ -161,7 +161,7 @@ public async Task<DependentsResponse> FindDependentsAsync(
 
             var response = await _searchClient.Documents.SearchAsync<PackageDocument>(query, parameters, cancellationToken: cancellationToken);
             var results = response.Results
-                .Select(r => new DependentResult
+                .Select(r => new PackageDependent
                 {
                     Id = r.Document.Id,
                     Description = r.Document.Description,

src/BaGet.Azure/Table/PackageEntityExtensions.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BaGet.Core;
+using Newtonsoft.Json;
+
+namespace BaGet.Azure
+{
+    public static class PackageEntityExtensions
+    {
+        public static Package AsPackage(this PackageEntity entity)
+        {
+            return new Package
+            {
+                Id = entity.Id,
+                NormalizedVersionString = entity.NormalizedVersion,
+                OriginalVersionString = entity.OriginalVersion,
+
+                // TODO: Convert to System.Text.Json
+                Authors = JsonConvert.DeserializeObject<string[]>(entity.Authors),
+                Description = entity.Description,
+                Downloads = entity.Downloads,
+                HasReadme = entity.HasReadme,
+                HasEmbeddedIcon = entity.HasEmbeddedIcon,
+                IsPrerelease = entity.IsPrerelease,
+                Language = entity.Language,
+                Listed = entity.Listed,
+                MinClientVersion = entity.MinClientVersion,
+                Published = entity.Published,
+                RequireLicenseAcceptance = entity.RequireLicenseAcceptance,
+                SemVerLevel = (SemVerLevel)entity.SemVerLevel,
+                Summary = entity.Summary,
+                Title = entity.Title,
+                ReleaseNotes = entity.ReleaseNotes,
+                IconUrl = ParseUri(entity.IconUrl),
+                LicenseUrl = ParseUri(entity.LicenseUrl),
+                ProjectUrl = ParseUri(entity.ProjectUrl),
+                RepositoryUrl = ParseUri(entity.RepositoryUrl),
+                RepositoryType = entity.RepositoryType,
+                Tags = JsonConvert.DeserializeObject<string[]>(entity.Tags),
+                Dependencies = ParseDependencies(entity.Dependencies),
+                PackageTypes = ParsePackageTypes(entity.PackageTypes),
+                TargetFrameworks = ParseTargetFrameworks(entity.TargetFrameworks),
+            };
+        }
+
+        private static Uri ParseUri(string input)
+        {
+            return string.IsNullOrEmpty(input) ? null : new Uri(input);
+        }
+
+        private static List<PackageDependency> ParseDependencies(string input)
+        {
+            // TODO: Convert to System.Text.Json
+            return JsonConvert.DeserializeObject<List<DependencyModel>>(input)
+                .Select(e => new PackageDependency
+                {
+                    Id = e.Id,
+                    VersionRange = e.VersionRange,
+                    TargetFramework = e.TargetFramework,
+                })
+                .ToList();
+        }
+
+        private static List<PackageType> ParsePackageTypes(string input)
+        {
+            // TODO: Convert to System.Text.Json
+            return JsonConvert.DeserializeObject<List<PackageTypeModel>>(input)
+                .Select(e => new PackageType
+                {
+                    Name = e.Name,
+                    Version = e.Version
+                })
+                .ToList();
+        }
+
+        private static List<TargetFramework> ParseTargetFrameworks(string targetFrameworks)
+        {
+            // TODO: Convert to System.Text.Json
+            return JsonConvert.DeserializeObject<List<string>>(targetFrameworks)
+                .Select(f => new TargetFramework { Moniker = f })
+                .ToList();
+        }
+    }
+}

src/BaGet.Azure/Table/TablePackageService.cs

@@ -6,7 +6,6 @@
 using BaGet.Core;
 using Microsoft.Azure.Cosmos.Table;
 using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
 using NuGet.Versioning;
 
 namespace BaGet.Azure
@@ -64,7 +63,7 @@ public async Task<bool> AddDownloadAsync(
                         id.ToLowerInvariant(),
                         version.ToNormalizedString().ToLowerInvariant());
 
-                    var result = await _table.ExecuteAsync(operation);
+                    var result = await _table.ExecuteAsync(operation, cancellationToken);
                     var entity = result.Result as PackageDownloadsEntity;
 
                     if (entity == null)
@@ -80,6 +79,7 @@ public async Task<bool> AddDownloadAsync(
                 catch (StorageException e)
                     when (attempt < MaxPreconditionFailures && e.IsPreconditionFailedException())
                 {
+                    attempt++;
                     _logger.LogWarning(
                         e,
                         $"Retrying due to precondition failure, attempt {{Attempt}} of {MaxPreconditionFailures}..",
@@ -111,10 +111,9 @@ public async Task<bool> ExistsAsync(
                 version.ToNormalizedString().ToLowerInvariant(),
                 MinimalColumnSet);
 
-            var result = await _table.ExecuteAsync(operation, cancellationToken);
-            var entity = result.Result as PackageEntity;
+            var execution = await _table.ExecuteAsync(operation, cancellationToken);
 
-            return entity != null;
+            return execution.Result is PackageEntity;
         }
 
         public async Task<IReadOnlyList<Package>> FindAsync(string id, bool includeUnlisted, CancellationToken cancellationToken)
@@ -142,7 +141,7 @@ public async Task<IReadOnlyList<Package>> FindAsync(string id, bool includeUnlis
                 token = segment.ContinuationToken;
 
                 // Write out the properties for each entity returned.
-                results.AddRange(segment.Results.Select(AsPackage));
+                results.AddRange(segment.Results.Select(r => r.AsPackage()));
             }
             while (token != null);
 
@@ -173,7 +172,7 @@ public async Task<Package> FindOrNullAsync(
                 return null;
             }
 
-            return AsPackage(entity);
+            return entity.AsPackage();
         }
 
         public async Task<bool> HardDeletePackageAsync(string id, NuGetVersion version, CancellationToken cancellationToken)
@@ -212,72 +211,5 @@ private async Task<bool> TryUpdatePackageAsync(TableOperation operation, Cancell
 
             return true;
         }
-
-        private Package AsPackage(PackageEntity entity)
-        {
-            var targetFrameworks = JsonConvert.DeserializeObject<List<string>>(entity.TargetFrameworks)
-                .Select(f => new TargetFramework { Moniker = f })
-                .ToList();
-
-            return new Package
-            {
-                Id = entity.Id,
-                NormalizedVersionString = entity.NormalizedVersion,
-                OriginalVersionString = entity.OriginalVersion,
-
-                Authors = JsonConvert.DeserializeObject<string[]>(entity.Authors),
-                Description = entity.Description,
-                Downloads = entity.Downloads,
-                HasReadme = entity.HasReadme,
-                HasEmbeddedIcon = entity.HasEmbeddedIcon,
-                IsPrerelease = entity.IsPrerelease,
-                Language = entity.Language,
-                Listed = entity.Listed,
-                MinClientVersion = entity.MinClientVersion,
-                Published = entity.Published,
-                RequireLicenseAcceptance = entity.RequireLicenseAcceptance,
-                SemVerLevel = (SemVerLevel)entity.SemVerLevel,
-                Summary = entity.Summary,
-                Title = entity.Title,
-                ReleaseNotes = entity.ReleaseNotes,
-                IconUrl = ParseUri(entity.IconUrl),
-                LicenseUrl = ParseUri(entity.LicenseUrl),
-                ProjectUrl = ParseUri(entity.ProjectUrl),
-                RepositoryUrl = ParseUri(entity.RepositoryUrl),
-                RepositoryType = entity.RepositoryType,
-                Tags = JsonConvert.DeserializeObject<string[]>(entity.Tags),
-                Dependencies = ParseDependencies(entity.Dependencies),
-                PackageTypes = ParsePackageTypes(entity.PackageTypes),
-                TargetFrameworks = targetFrameworks,
-            };
-        }
-
-        private Uri ParseUri(string input)
-        {
-            return string.IsNullOrEmpty(input) ? null : new Uri(input);
-        }
-
-        private List<PackageDependency> ParseDependencies(string input)
-        {
-            return JsonConvert.DeserializeObject<List<DependencyModel>>(input)
-                .Select(e => new PackageDependency
-                {
-                    Id = e.Id,
-                    VersionRange = e.VersionRange,
-                    TargetFramework = e.TargetFramework,
-                })
-                .ToList();
-        }
-
-        private List<PackageType> ParsePackageTypes(string input)
-        {
-            return JsonConvert.DeserializeObject<List<PackageTypeModel>>(input)
-                .Select(e => new PackageType
-                {
-                    Name = e.Name,
-                    Version = e.Version
-                })
-                .ToList();
-        }
     }
 }