#2504 Remove package2catalog job and all code only used by this job (#…

…551)
NuGet · Jun 12, 2019 · f981490 · f981490
1 parent 711ecf4
commit f981490
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 355 deletions.
diff --git a/src/Catalog/Helpers/FeedHelpers.cs b/src/Catalog/Helpers/FeedHelpers.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using System.Web;
@@ -34,33 +33,6 @@ public static Uri MakeUriForPackage(string source, string id, string version)
             return UriUtils.GetNonhijackableUri(uri);
         }
 
-        /// <summary>
-        /// Returns a <see cref="SortedList{DateTime, IList{FeedPackageDetails}}"/> from the feed.
-        /// </summary>
-        /// <param name="keyDateFunc">The <see cref="DateTime"/> field to sort the <see cref="FeedPackageDetails"/> on.</param>
-        public static async Task<SortedList<DateTime, IList<FeedPackageDetails>>> GetPackagesInOrder(HttpClient client, Uri uri, Func<FeedPackageDetails, DateTime> keyDateFunc)
-        {
-            var result = new SortedList<DateTime, IList<FeedPackageDetails>>();
-
-            var allPackages = await GetPackages(client, uri);
-
-            foreach (var package in allPackages)
-            {
-                IList<FeedPackageDetails> packagesWithSameKeyDate;
-
-                var packageKeyDate = keyDateFunc(package);
-                if (!result.TryGetValue(packageKeyDate, out packagesWithSameKeyDate))
-                {
-                    packagesWithSameKeyDate = new List<FeedPackageDetails>();
-                    result.Add(packageKeyDate, packagesWithSameKeyDate);
-                }
-
-                packagesWithSameKeyDate.Add(package);
-            }
-
-            return result;
-        }
-
         /// <summary>
         /// Asynchronously gets a <see cref="IList{FeedPackageDetails}"/> from the feed.
         /// </summary>

diff --git a/src/Ng/Jobs/Package2CatalogJob.cs b/src/Ng/Jobs/Package2CatalogJob.cs
diff --git a/src/Ng/Ng.csproj b/src/Ng/Ng.csproj
@@ -78,7 +78,6 @@
     <Compile Include="Jobs\Monitoring2MonitoringJob.cs" />
     <Compile Include="Jobs\MonitoringProcessorJob.cs" />
     <Compile Include="Jobs\NgJob.cs" />
-    <Compile Include="Jobs\Package2CatalogJob.cs" />
     <Compile Include="Json\RegistrationBaseUrlRewritingJsonReader.cs" />
     <Compile Include="Json\InterceptingJsonReader.cs" />
     <Compile Include="Json\JTokenExtensions.cs" />

diff --git a/src/Ng/NgJobFactory.cs b/src/Ng/NgJobFactory.cs
@@ -13,7 +13,6 @@ public static class NgJobFactory
     {
         public static IDictionary<string, Type> JobMap = new Dictionary<string, Type>()
         {
-            { "package2catalog", typeof(Package2CatalogJob) },
             { "db2catalog", typeof(Db2CatalogJob) },
             { "catalog2registration", typeof(Catalog2RegistrationJob) },
             { "catalog2lucene", typeof(Catalog2LuceneJob) },

diff --git a/tests/CatalogTests/Helpers/FeedHelpersTests.cs b/tests/CatalogTests/Helpers/FeedHelpersTests.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -52,75 +51,13 @@ public async Task GetPackages_GetsAllPackages(IEnumerable<ODataPackage> oDataPac
             }
         }
 
-        public static IEnumerable<object[]> GetPackagesInOrder_GetsAllPackagesInOrder_data
-        {
-            get
-            {
-                var oDataPackages = ODataPackages;
-
-                var keyDateFuncs = new Func<FeedPackageDetails, DateTime>[]
-                {
-                    package => package.CreatedDate,
-                    package => package.LastEditedDate,
-                    package => package.PublishedDate,
-                };
-
-                return keyDateFuncs.Select(p => new object[] { oDataPackages, p });
-            }
-        }
-
-        [Theory]
-        [MemberData(nameof(GetPackagesInOrder_GetsAllPackagesInOrder_data))]
-        public async Task GetPackagesInOrder_GetsAllPackagesInOrder(IEnumerable<ODataPackage> oDataPackages, Func<FeedPackageDetails, DateTime> keyDateFunc)
-        {
-            //// Act
-            var feedPackagesInOrder = await TestGetPackagesInOrder(oDataPackages, keyDateFunc);
-
-            //// Assert
-            // All OData packages must exist in the result.
-            foreach (var oDataPackage in oDataPackages)
-            {
-                Assert.Contains(feedPackagesInOrder.SelectMany(p => p.Value),
-                    (feedPackage) =>
-                    {
-                        return ArePackagesEqual(feedPackage, oDataPackage);
-                    });
-            }
-
-            // The packages must be in order and grouped by timestamp.
-            var currentTimestamp = DateTime.MinValue;
-            foreach (var feedPackages in feedPackagesInOrder)
-            {
-                Assert.True(currentTimestamp < feedPackages.Key);
-
-                currentTimestamp = feedPackages.Key;
-                foreach (var feedPackage in feedPackages.Value)
-                {
-                    var packageKeyDate = keyDateFunc(feedPackage);
-                    Assert.Equal(packageKeyDate.Ticks, currentTimestamp.Ticks);
-
-                    VerifyDateTimesAreInUtc(feedPackage);
-                }
-            }
-        }
-
         private Task<IList<FeedPackageDetails>> TestGetPackagesAsync(IEnumerable<ODataPackage> oDataPackages)
         {
             return FeedHelpers.GetPackages(
                 new HttpClient(GetMessageHandlerForPackages(oDataPackages)),
                 new Uri(_baseUri + "/test"));
         }
 
-        private Task<SortedList<DateTime, IList<FeedPackageDetails>>> TestGetPackagesInOrder(
-            IEnumerable<ODataPackage> oDataPackages,
-            Func<FeedPackageDetails, DateTime> keyDateFunc)
-        {
-            return FeedHelpers.GetPackagesInOrder(
-                new HttpClient(GetMessageHandlerForPackages(oDataPackages)),
-                new Uri(_baseUri + "/test"),
-                keyDateFunc);
-        }
-
         private HttpMessageHandler GetMessageHandlerForPackages(IEnumerable<ODataPackage> oDataPackages)
         {
             var mockServer = new MockServerHttpClientHandler();

diff --git a/tests/NgTests/NgTests.csproj b/tests/NgTests/NgTests.csproj
@@ -75,7 +75,6 @@
     <Compile Include="JobNameTelemetryInitializerTests.cs" />
     <Compile Include="JobPropertiesTelemetryInitializerTests.cs" />
     <Compile Include="NgJobFactoryTests.cs" />
-    <Compile Include="Package2CatalogJobTests.cs" />
     <Compile Include="PackageFixup\FixPackageHashHandlerFacts.cs" />
     <Compile Include="PackageFixup\PackagesContainerCatalogProcessorFacts.cs" />
     <Compile Include="PackageFixup\ValidatePackageHashHandlerFacts.cs" />