Revert "Hotfix: Revert "Fix SemVerLevel propagation in Odata Next lin…

…ks. (#5582)" (#5623)" (#5624) This reverts commit 2425677.
NuGet · Mar 15, 2018 · a4dcd89 · a4dcd89
1 parent 2425677
commit a4dcd89
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 6 deletions.
diff --git a/src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs b/src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs
@@ -183,7 +183,7 @@ private async Task<IHttpActionResult> GetCore(
                         .ToV2FeedPackageQuery(GetSiteRoot(), _configurationService.Features.FriendlyLicenses, semVerLevelKey);
 
                     return QueryResult(options, pagedQueryable, MaxPageSize, totalHits, (o, s, resultCount) =>
-                       SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, new { id }, o, s));
+                       SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, new { id }, o, s, semVerLevelKey));
                 }
             }
             catch (Exception ex)
@@ -299,7 +299,8 @@ public async Task<IHttpActionResult> Search(
                             resultCount, 
                             new { searchTerm, targetFramework, includePrerelease }, 
                             o, 
-                            s);
+                            s,
+                            semVerLevelKey);
                     }
                     return null;
                 });

diff --git a/src/NuGetGallery/Controllers/ODataV2FeedController.cs b/src/NuGetGallery/Controllers/ODataV2FeedController.cs
@@ -92,7 +92,7 @@ public async Task<IHttpActionResult> Get(
                                 semVerLevelKey);
 
                         return QueryResult(options, pagedQueryable, MaxPageSize, totalHits, (o, s, resultCount) =>
-                           SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, null, o, s));
+                           SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, null, o, s, semVerLevelKey));
                     }
                 }
             }
@@ -251,7 +251,7 @@ private async Task<IHttpActionResult> GetCore(
                             semVerLevelKey);
 
                     return QueryResult(options, pagedQueryable, MaxPageSize, totalHits, (o, s, resultCount) =>
-                       SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, new { id }, o, s));
+                       SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, new { id }, o, s, semVerLevelKey));
                 }
             }
             catch (Exception ex)
@@ -358,7 +358,7 @@ public async Task<IHttpActionResult> Search(
                     // Strip it of for backward compatibility.
                     if (o.Top == null || (resultCount.HasValue && o.Top.Value >= resultCount.Value))
                     {
-                        return SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, new { searchTerm, targetFramework, includePrerelease }, o, s);
+                        return SearchAdaptor.GetNextLink(Request.RequestUri, resultCount, new { searchTerm, targetFramework, includePrerelease }, o, s, semVerLevelKey);
                     }
                     return null;
                 });

diff --git a/src/NuGetGallery/OData/SearchService/SearchAdaptor.cs b/src/NuGetGallery/OData/SearchService/SearchAdaptor.cs
@@ -291,7 +291,7 @@ private static bool TryReadSearchFilter(bool allVersionsInIndex, string url, boo
             return true;
         }
 
-        public static Uri GetNextLink(Uri currentRequestUri, long? totalResultCount, object queryParameters, ODataQueryOptions options, ODataQuerySettings settings)
+        public static Uri GetNextLink(Uri currentRequestUri, long? totalResultCount, object queryParameters, ODataQueryOptions options, ODataQuerySettings settings, int? semVerLevelKey = null)
         {
             if (!totalResultCount.HasValue || totalResultCount.Value <= MaxPageSize || totalResultCount.Value == 0)
             {
@@ -374,6 +374,16 @@ public static Uri GetNextLink(Uri currentRequestUri, long? totalResultCount, obj
                 queryBuilder.Append("&");
             }
 
+            if (semVerLevelKey != null)
+            {
+                if(semVerLevelKey == SemVerLevelKey.SemVer2)
+                {
+                    queryBuilder.Append("semVerLevel=");
+                    queryBuilder.Append(SemVerLevelKey.SemVerLevel2);
+                    queryBuilder.Append("&");
+                }
+            }
+
             var queryString = queryBuilder.ToString().TrimEnd('&');
 
             var builder = new UriBuilder(currentRequestUri);

diff --git a/tests/NuGetGallery.Facts/Services/SearchAdaptorFacts.cs b/tests/NuGetGallery.Facts/Services/SearchAdaptorFacts.cs
@@ -133,6 +133,23 @@ public void GeneratesNextLinkForComplexUrl()
                 // Assert
                 Assert.Equal(new Uri("https://localhost:8081/api/v2/Search()?searchTerm='foo'&$orderby=Id&$skip=200&$top=1000"), nextLink);
             }
+
+            [Fact]
+            public void GeneratesNextLinkForComplexUrlWithSemVerLevel2()
+            {
+                // Arrange
+                var requestUri = new Uri("https://localhost:8081/api/v2/Search()?searchTerm='foo'&$orderby=Id&$skip=100&$top=1000&semVerLevel=2.0.0");
+                var resultCount = 2000; // our result set contains 2000 elements
+
+                // Act
+                var nextLink = SearchAdaptor.GetNextLink(requestUri, resultCount, new { searchTerm = "foo" },
+                    GetODataQueryOptionsForTest(requestUri),
+                    GetODataQuerySettingsForTest(),
+                    SemVerLevelKey.SemVer2);
+
+                // Assert
+                Assert.Equal(new Uri("https://localhost:8081/api/v2/Search()?searchTerm='foo'&$orderby=Id&$skip=200&$top=1000&semVerLevel=2.0.0"), nextLink);
+            }
         }
     }
 }