Remove the remaining curated feed code from the gallery (#6712)

Any remaining references to "curated feeds" are required for backwards compatibility
Progress on #6699

Author: joelverhagen

src/NuGet.Services.Search.Client/Client/SearchClient.cs

@@ -74,7 +74,6 @@ public async Task<ServiceResponse<SearchResults>> Search(
             string query,
             string projectTypeFilter = null,
             bool includePrerelease = false,
-            string curatedFeed = null,
             SortOrder sortBy = SortOrder.Relevance,
             int skip = 0,
             int take = 10,
@@ -111,11 +110,6 @@ public async Task<ServiceResponse<SearchResults>> Search(
                 nameValue.Add("prerelease", "true");
             }
 
-            if (!String.IsNullOrEmpty(curatedFeed))
-            {
-                nameValue.Add("feed", curatedFeed);
-            }
-
             if (!isLuceneQuery)
             {
                 nameValue.Add("luceneQuery", "false");

src/NuGetGallery.Core/Entities/EntitiesContext.cs

@@ -48,8 +48,6 @@ public EntitiesContext(DbConnection connection, bool readOnly)
         }
 
         public bool ReadOnly { get; private set; }
-        public IDbSet<CuratedFeed> CuratedFeeds { get; set; }
-        public IDbSet<CuratedPackage> CuratedPackages { get; set; }
         public IDbSet<PackageRegistration> PackageRegistrations { get; set; }
         public IDbSet<Credential> Credentials { get; set; }
         public IDbSet<Scope> Scopes { get; set; }
@@ -300,27 +298,6 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
             modelBuilder.Entity<PackageFramework>()
                 .HasKey(pf => pf.Key);
 
-            modelBuilder.Entity<CuratedFeed>()
-                .HasKey(cf => cf.Key);
-
-            modelBuilder.Entity<CuratedFeed>()
-                .HasMany<CuratedPackage>(cf => cf.Packages)
-                .WithRequired(cp => cp.CuratedFeed)
-                .HasForeignKey(cp => cp.CuratedFeedKey);
-
-            modelBuilder.Entity<CuratedFeed>()
-                .HasMany<User>(cf => cf.Managers)
-                .WithMany()
-                .Map(c => c.ToTable("CuratedFeedManagers")
-                           .MapLeftKey("CuratedFeedKey")
-                           .MapRightKey("UserKey"));
-
-            modelBuilder.Entity<CuratedPackage>()
-                .HasKey(cp => cp.Key);
-
-            modelBuilder.Entity<CuratedPackage>()
-                .HasRequired(cp => cp.PackageRegistration);
-
             modelBuilder.Entity<PackageDelete>()
                 .HasKey(pd => pd.Key)
                 .HasMany(pd => pd.Packages)

src/NuGetGallery.Core/Entities/IEntitiesContext.cs

@@ -10,8 +10,6 @@ namespace NuGetGallery
     public interface IEntitiesContext
     {
         IDbSet<Certificate> Certificates { get; set; }
-        IDbSet<CuratedFeed> CuratedFeeds { get; set; }
-        IDbSet<CuratedPackage> CuratedPackages { get; set; }
         IDbSet<PackageRegistration> PackageRegistrations { get; set; }
         IDbSet<Credential> Credentials { get; set; }
         IDbSet<Scope> Scopes { get; set; }

src/NuGetGallery/App_Start/DefaultDependenciesModule.cs

@@ -153,16 +153,6 @@ protected override void Load(ContainerBuilder builder)
                 .As<IEntityRepository<ReservedNamespace>>()
                 .InstancePerLifetimeScope();
 
-            builder.RegisterType<EntityRepository<CuratedFeed>>()
-                .AsSelf()
-                .As<IEntityRepository<CuratedFeed>>()
-                .InstancePerLifetimeScope();
-
-            builder.RegisterType<EntityRepository<CuratedPackage>>()
-                .AsSelf()
-                .As<IEntityRepository<CuratedPackage>>()
-                .InstancePerLifetimeScope();
-
             builder.RegisterType<EntityRepository<PackageRegistration>>()
                 .AsSelf()
                 .As<IEntityRepository<PackageRegistration>>()
@@ -218,11 +208,6 @@ protected override void Load(ContainerBuilder builder)
                 .As<IEntityRepository<SymbolPackage>>()
                 .InstancePerLifetimeScope();
 
-            builder.RegisterType<CuratedFeedService>()
-                .AsSelf()
-                .As<ICuratedFeedService>()
-                .InstancePerLifetimeScope();
-
             var supportDbConnectionFactory = CreateDbConnectionFactory(
                 diagnosticsService,
                 nameof(SupportRequestDbContext),

src/NuGetGallery/Areas/Admin/DynamicData/OrderedFieldGenerator.cs

@@ -16,7 +16,6 @@ public class OrderedFieldGenerator : IAutoFieldGenerator
         private static readonly Dictionary<string, string[]> SortOrders = new Dictionary<string, string[]>()
         {
             {"Users", new [] { "Username", "EmailAddress", "UnconfirmedEmailAddress" } },
-            {"CuratedPackages", new [] { "PackageRegistration", "CuratedFeed", "Notes" } },
             {"EmailMessages", new [] { "Subject", "Body", "FromUser", "ToUser", "Sent" } },
             {"PackageDependencies", new [] { "Package", "Id", "VersionSpec", "TargetFramework" } },
             {"PackageFrameworks", new [] { "Package" } },

src/NuGetGallery/Configuration/AppConfiguration.cs

@@ -345,10 +345,6 @@ public string ExternalBrandingMessage
 
         public bool BlockSearchEngineIndexing { get; set; }
 
-        [DefaultValue(null)]
-        [TypeConverter(typeof(StringArrayConverter))]
-        public string[] DisabledCuratedFeeds { get; set; }
-
         [DefaultValue(null)]
         [TypeConverter(typeof(StringArrayConverter))]
         public string[] RedirectedCuratedFeeds { get; set; }

src/NuGetGallery/Configuration/IAppConfiguration.cs

@@ -350,12 +350,6 @@ public interface IAppConfiguration : IMessageServiceConfiguration
         /// </summary>
         bool BlockSearchEngineIndexing { get; set; }
 
-        /// <summary>
-        /// The name of zero or more curated feeds that are disabled. If a curated feed is disabled, it appears as if
-        /// it doesn't exist.
-        /// </summary>
-        string[] DisabledCuratedFeeds { get; set; }
-
         /// <summary>
         /// The name of zero or more curated feeds that are redirected to the main feed.
         /// </summary>

src/NuGetGallery/Controllers/ODataV1FeedController.cs

@@ -120,7 +120,6 @@ private async Task<IHttpActionResult> GetCore(ODataQueryOptions<V1FeedPackage> o
                     packages,
                     id,
                     version,
-                    curatedFeed: null,
                     semVerLevel: null);
 
                 // If intercepted, create a paged queryresult
@@ -230,7 +229,6 @@ public async Task<IHttpActionResult> Search(
                 searchTerm,
                 targetFramework,
                 includePrerelease: false, 
-                curatedFeed: null,
                 semVerLevel: null);
 
             // Packages provided by search service (even when not hijacked)

src/NuGetGallery/Controllers/ODataV2CuratedFeedController.cs

@@ -25,20 +25,17 @@ public class ODataV2CuratedFeedController
 
         private readonly IGalleryConfigurationService _configurationService;
         private readonly ISearchService _searchService;
-        private readonly ICuratedFeedService _curatedFeedService;
         private readonly IEntityRepository<Package> _packagesRepository;
 
         public ODataV2CuratedFeedController(
             IGalleryConfigurationService configurationService,
             ISearchService searchService,
-            ICuratedFeedService curatedFeedService,
             IEntityRepository<Package> packagesRepository,
             ITelemetryService telemetryService)
             : base(configurationService, telemetryService)
         {
             _configurationService = configurationService;
             _searchService = searchService;
-            _curatedFeedService = curatedFeedService;
             _packagesRepository = packagesRepository;
         }
 
@@ -165,7 +162,6 @@ private async Task<IHttpActionResult> GetCore(
                     packages,
                     id,
                     normalizedVersion,
-                    curatedFeed: result.CuratedFeed,
                     semVerLevel: semVerLevel);
 
                 // If intercepted, create a paged queryresult
@@ -286,7 +282,6 @@ public async Task<IHttpActionResult> Search(
                 searchTerm,
                 targetFramework,
                 includePrerelease,
-                curatedFeed: result.CuratedFeed,
                 semVerLevel: semVerLevel);
 
             // Packages provided by search service (even when not hijacked)
@@ -376,25 +371,14 @@ private bool IsCuratedFeedRedirected(string name)
 
         private CuratedFeedResult GetCuratedFeedResult(string curatedFeedName)
         {
-            IQueryable<Package> packages;
-            CuratedFeed curatedFeed;
             if (IsCuratedFeedRedirected(curatedFeedName))
             {
-                curatedFeed = null;
-                packages = _packagesRepository.GetAll();
+                return new CuratedFeedResult(_packagesRepository.GetAll());
             }
             else
             {
-                curatedFeed = _curatedFeedService.GetFeedByName(curatedFeedName);
-                if (curatedFeed == null)
-                {
-                    return new CuratedFeedResult(NotFound());
-                }
-
-                packages = _curatedFeedService.GetPackages(curatedFeedName);
+                return new CuratedFeedResult(NotFound());
             }
-
-            return new CuratedFeedResult(packages, curatedFeed);
         }
 
         private class CuratedFeedResult
@@ -404,14 +388,12 @@ public CuratedFeedResult(IHttpActionResult actionResult)
                 ActionResult = actionResult ?? throw new ArgumentNullException(nameof(actionResult));
             }
 
-            public CuratedFeedResult(IQueryable<Package> packages, CuratedFeed curatedFeed)
+            public CuratedFeedResult(IQueryable<Package> packages)
             {
                 Packages = packages ?? throw new ArgumentNullException(nameof(packages));
-                CuratedFeed = curatedFeed;
             }
 
             public IQueryable<Package> Packages { get; }
-            public CuratedFeed CuratedFeed { get; }
             public IHttpActionResult ActionResult { get; }
         }
     }

src/NuGetGallery/Controllers/ODataV2FeedController.cs

@@ -75,8 +75,7 @@ public async Task<IHttpActionResult> Get(
                         GetTraditionalHttpContext().Request, 
                         packages,
                         hijackableQueryParameters.Id, 
-                        hijackableQueryParameters.Version, 
-                        curatedFeed: null,
+                        hijackableQueryParameters.Version,
                         semVerLevel: semVerLevel);
 
                     // If intercepted, create a paged queryresult
@@ -245,7 +244,6 @@ private async Task<IHttpActionResult> GetCore(
                     packages, 
                     id, 
                     version, 
-                    curatedFeed: null,
                     semVerLevel: semVerLevel);
 
                 // If intercepted, create a paged queryresult
@@ -364,7 +362,6 @@ public async Task<IHttpActionResult> Search(
                 searchTerm, 
                 targetFramework, 
                 includePrerelease, 
-                curatedFeed: null,
                 semVerLevel: semVerLevel);
 
             // Packages provided by search service (even when not hijacked)