Deprecation information should flow into V3 (#7173)

Author: Scott Bommarito

src/NuGetGallery.Core/Entities/EntitiesContext.cs

@@ -58,6 +58,7 @@ public EntitiesContext(DbConnection connection, bool readOnly)
 
         public bool ReadOnly { get; private set; }
         public DbSet<Package> Packages { get; set; }
+        public DbSet<PackageDeprecation> Deprecations { get; set; }
         public DbSet<PackageRegistration> PackageRegistrations { get; set; }
         public DbSet<Credential> Credentials { get; set; }
         public DbSet<Scope> Scopes { get; set; }

src/NuGetGallery.Core/Entities/IEntitiesContext.cs

@@ -12,6 +12,7 @@ public interface IEntitiesContext : IDisposable
     {
         DbSet<Certificate> Certificates { get; set; }
         DbSet<Package> Packages { get; set; }
+        DbSet<PackageDeprecation> Deprecations { get; set; }
         DbSet<PackageRegistration> PackageRegistrations { get; set; }
         DbSet<Credential> Credentials { get; set; }
         DbSet<Scope> Scopes { get; set; }

src/NuGetGallery.Services/AccountManagement/DeleteAccountService.cs

@@ -22,6 +22,7 @@ public class DeleteAccountService : IDeleteAccountService
         private readonly IEntityRepository<PackageDelete> _packageDeleteRepository;
         private readonly IEntitiesContext _entitiesContext;
         private readonly IPackageService _packageService;
+        private readonly IPackageUpdateService _packageUpdateService;
         private readonly IPackageOwnershipManagementService _packageOwnershipManagementService;
         private readonly IReservedNamespaceService _reservedNamespaceService;
         private readonly ISecurityPolicyService _securityPolicyService;
@@ -42,6 +43,7 @@ public DeleteAccountService(
             IEntityRepository<Scope> scopeRepository,
             IEntitiesContext entitiesContext,
             IPackageService packageService,
+            IPackageUpdateService packageUpdateService,
             IPackageOwnershipManagementService packageOwnershipManagementService,
             IReservedNamespaceService reservedNamespaceService,
             ISecurityPolicyService securityPolicyService,
@@ -58,6 +60,7 @@ public DeleteAccountService(
             _scopeRepository = scopeRepository ?? throw new ArgumentNullException(nameof(scopeRepository));
             _entitiesContext = entitiesContext ?? throw new ArgumentNullException(nameof(entitiesContext));
             _packageService = packageService ?? throw new ArgumentNullException(nameof(packageService));
+            _packageUpdateService = packageUpdateService ?? throw new ArgumentNullException(nameof(packageUpdateService));
             _packageOwnershipManagementService = packageOwnershipManagementService ?? throw new ArgumentNullException(nameof(packageOwnershipManagementService));
             _reservedNamespaceService = reservedNamespaceService ?? throw new ArgumentNullException(nameof(reservedNamespaceService));
             _securityPolicyService = securityPolicyService ?? throw new ArgumentNullException(nameof(securityPolicyService));
@@ -210,7 +213,7 @@ private async Task RemovePackageOwnership(User user, User requestingUser, Accoun
                     }
                     else if (orphanPackagePolicy == AccountDeletionOrphanPackagePolicy.UnlistOrphans)
                     {
-                        await _packageService.MarkPackageUnlistedAsync(package, commitChanges: false);
+                        await _packageUpdateService.MarkPackageUnlistedAsync(package, commitChanges: false, updateIndex: false);
                     }
                 }
 

src/NuGetGallery.Services/NuGetGallery.Services.csproj

@@ -82,8 +82,10 @@
     <Compile Include="Models\StorageType.cs" />
     <Compile Include="PackageManagement\ActionOnNewPackageContext.cs" />
     <Compile Include="PackageManagement\IPackageOwnerRequestService.cs" />
+    <Compile Include="PackageManagement\IIndexingService.cs" />
     <Compile Include="PackageManagement\IPackageOwnershipManagementService.cs" />
     <Compile Include="PackageManagement\IPackageService.cs" />
+    <Compile Include="PackageManagement\IPackageUpdateService.cs" />
     <Compile Include="PackageManagement\IReservedNamespaceService.cs" />
     <Compile Include="PackageManagement\PackageDeleteDecision.cs" />
     <Compile Include="PackageManagement\PackageHelper.cs" />
@@ -99,6 +101,7 @@
     <Compile Include="Permissions\PermissionsCheckResult.cs" />
     <Compile Include="Permissions\PermissionsHelpers.cs" />
     <Compile Include="Permissions\PermissionsRequirement.cs" />
+    <Compile Include="PackageManagement\PackageUpdateService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Providers\DateTimeProvider.cs" />
     <Compile Include="Providers\IDateTimeProvider.cs" />

…uGetGallery/Services/IIndexingService.cs …es/PackageManagement/IIndexingService.cssrc/NuGetGallery/Services/IIndexingService.cs renamed to src/NuGetGallery.Services/PackageManagement/IIndexingService.cs src/NuGetGallery/Services/IIndexingService.cs renamed to src/NuGetGallery.Services/PackageManagement/IIndexingService.cs

@@ -2,11 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using NuGet.Services.Entities;
-using NuGetGallery.Configuration;
-using WebBackgrounder;
 
 namespace NuGetGallery
 {
@@ -20,8 +17,6 @@ public interface IIndexingService
         Task<int> GetDocumentCount();
         Task<long> GetIndexSizeInBytes();
 
-        void RegisterBackgroundJobs(IList<IJob> jobs, IAppConfiguration configuration);
-
         string IndexPath { get; }
 
         bool IsLocal { get; }

src/NuGetGallery.Services/PackageManagement/IPackageService.cs

@@ -98,9 +98,6 @@ Package FilterLatestPackage(
         Task PublishPackageAsync(string id, string version, bool commitChanges = true);
         Task PublishPackageAsync(Package package, bool commitChanges = true);
 
-        Task MarkPackageUnlistedAsync(Package package, bool commitChanges = true);
-        Task MarkPackageListedAsync(Package package, bool commitChanges = true);
-
         /// <summary>
         /// Performs database changes to add a new package owner while removing the corresponding package owner request.
         /// </summary>

src/NuGetGallery.Services/PackageManagement/IPackageUpdateService.cs

@@ -0,0 +1,37 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using NuGet.Services.Entities;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace NuGetGallery
+{
+    public interface IPackageUpdateService
+    {
+        /// <summary>
+        /// Marks <paramref name="package"/> as unlisted.
+        /// </summary>
+        /// <param name="package">The package to unlist.</param>
+        /// <param name="commitChanges">Whether or not changes should be committed.</param>
+        /// <param name="updateIndex">If true, <see cref="IIndexingService.UpdatePackage(Package)"/> will be called.</param>
+        Task MarkPackageUnlistedAsync(Package package, bool commitChanges = true, bool updateIndex = true);
+
+        /// <summary>
+        /// Marks <paramref name="package"/> as listed.
+        /// </summary>
+        /// <param name="package">The package to list.</param>
+        /// <param name="commitChanges">Whether or not changes should be committed.</param>
+        /// <param name="updateIndex">If true, <see cref="IIndexingService.UpdatePackage(Package)"/> will be called.</param>
+        Task MarkPackageListedAsync(Package package, bool commitChanges = true, bool updateIndex = true);
+
+        /// <summary>
+        /// Marks the packages in <paramref name="packages"/> as updated.
+        /// </summary>
+        /// <param name="packages">
+        /// The packages to mark as updated. All packages must have the same <see cref="PackageRegistration"/>.
+        /// </param>
+        /// <param name="updateIndex">If true, <see cref="IIndexingService.UpdatePackage(Package)"/> will be called.</param>
+        Task UpdatePackagesAsync(IReadOnlyList<Package> packages, bool updateIndex = true);
+    }
+}

src/NuGetGallery.Services/PackageManagement/PackageService.cs

@@ -423,81 +423,6 @@ private bool WillPackageBeOrphanedIfOwnerRemovedHelper(IEnumerable<User> owners,
             return true;
         }
 
-        public async Task MarkPackageListedAsync(Package package, bool commitChanges = true)
-        {
-            if (package == null)
-            {
-                throw new ArgumentNullException(nameof(package));
-            }
-
-            if (package.Listed)
-            {
-                return;
-            }
-
-            if (package.PackageStatusKey == PackageStatus.Deleted)
-            {
-                throw new InvalidOperationException("A deleted package should never be listed!");
-            }
-
-            if (package.PackageStatusKey == PackageStatus.FailedValidation)
-            {
-                throw new InvalidOperationException("A package that failed validation should never be listed!");
-            }
-
-            if (!package.Listed && (package.IsLatestStable || package.IsLatest))
-            {
-                throw new InvalidOperationException("An unlisted package should never be latest or latest stable!");
-            }
-
-            package.Listed = true;
-            package.LastUpdated = DateTime.UtcNow;
-            // NOTE: LastEdited will be overwritten by a trigger defined in the migration named "AddTriggerForPackagesLastEdited".
-            package.LastEdited = DateTime.UtcNow;
-
-            await UpdateIsLatestAsync(package.PackageRegistration, commitChanges: false);
-
-            await _auditingService.SaveAuditRecordAsync(new PackageAuditRecord(package, AuditedPackageAction.List));
-
-            _telemetryService.TrackPackageListed(package);
-
-            if (commitChanges)
-            {
-                await _packageRepository.CommitChangesAsync();
-            }
-        }
-
-        public async Task MarkPackageUnlistedAsync(Package package, bool commitChanges = true)
-        {
-            if (package == null)
-            {
-                throw new ArgumentNullException(nameof(package));
-            }
-            if (!package.Listed)
-            {
-                return;
-            }
-
-            package.Listed = false;
-            package.LastUpdated = DateTime.UtcNow;
-            // NOTE: LastEdited will be overwritten by a trigger defined in the migration named "AddTriggerForPackagesLastEdited".
-            package.LastEdited = DateTime.UtcNow;
-
-            if (package.IsLatest || package.IsLatestStable)
-            {
-                await UpdateIsLatestAsync(package.PackageRegistration, commitChanges: false);
-            }
-
-            await _auditingService.SaveAuditRecordAsync(new PackageAuditRecord(package, AuditedPackageAction.Unlist));
-
-            _telemetryService.TrackPackageUnlisted(package);
-
-            if (commitChanges)
-            {
-                await _packageRepository.CommitChangesAsync();
-            }
-        }
-
         private PackageRegistration CreateOrGetPackageRegistration(User owner, PackageMetadata packageMetadata, bool isVerified)
         {
             var packageRegistration = FindPackageRegistrationById(packageMetadata.Id);