[NuGet symbol server]Delete snupkg with Package Hard/soft delete (#6423)

Author: shishirx34

src/NuGetGallery/Controllers/ApiController.cs

@@ -431,7 +431,7 @@ public virtual async Task<ActionResult> CreateSymbolPackagePutAsync()
 
                             // Ensure the corresponding package exists before pushing a snupkg.
                             var package = PackageService.FindPackageByIdAndVersionStrict(id, version.ToStringSafe());
-                            if (package == null)
+                            if (package == null || package.PackageStatusKey == PackageStatus.Deleted)
                             {
                                 return new HttpStatusCodeWithBodyResult(HttpStatusCode.NotFound, string.Format(
                                     CultureInfo.CurrentCulture,

src/NuGetGallery/Services/PackageDeleteService.cs

@@ -43,6 +43,9 @@ DELETE pr FROM PackageRegistrations AS pr
         private readonly IPackageDeleteConfiguration _config;
         private readonly IStatisticsService _statisticsService;
         private readonly ITelemetryService _telemetryService;
+        private readonly ISymbolPackageFileService _symbolPackageFileService;
+        private readonly ISymbolPackageService _symbolPackageService;
+        private readonly IEntityRepository<SymbolPackage> _symbolPackageRepository;
 
         public PackageDeleteService(
             IEntityRepository<Package> packageRepository,
@@ -55,7 +58,10 @@ public PackageDeleteService(
             IAuditingService auditingService,
             IPackageDeleteConfiguration config,
             IStatisticsService statisticsService,
-            ITelemetryService telemetryService)
+            ITelemetryService telemetryService,
+            ISymbolPackageFileService symbolPackageFileService,
+            ISymbolPackageService symbolPackageService,
+            IEntityRepository<SymbolPackage> symbolPackageRepository)
         {
             _packageRepository = packageRepository ?? throw new ArgumentNullException(nameof(packageRepository));
             _packageRegistrationRepository = packageRegistrationRepository ?? throw new ArgumentNullException(nameof(packageRegistrationRepository));
@@ -68,6 +74,9 @@ public PackageDeleteService(
             _config = config ?? throw new ArgumentNullException(nameof(config));
             _statisticsService = statisticsService ?? throw new ArgumentNullException(nameof(statisticsService));
             _telemetryService = telemetryService ?? throw new ArgumentNullException(nameof(telemetryService));
+            _symbolPackageFileService = symbolPackageFileService ?? throw new ArgumentNullException(nameof(symbolPackageFileService));
+            _symbolPackageService = symbolPackageService ?? throw new ArgumentNullException(nameof(symbolPackageService));
+            _symbolPackageRepository = symbolPackageRepository ?? throw new ArgumentNullException(nameof(symbolPackageRepository));
 
             if (config.HourLimitWithMaximumDownloads.HasValue
                 && config.StatisticsUpdateFrequencyInHours.HasValue
@@ -267,6 +276,15 @@ await _packageService.UpdatePackageStatusAsync(
                         PackageStatus.Deleted,
                         commitChanges: false);
 
+                    // Mark all associated symbol packages for deletion.
+                    foreach (var symbolPackage in package.SymbolPackages)
+                    {
+                        await _symbolPackageService.UpdateStatusAsync(
+                            symbolPackage,
+                            PackageStatus.Deleted,
+                            commitChanges: false);
+                    }
+
                     packageDelete.Packages.Add(package);
 
                     await _auditingService.SaveAuditRecordAsync(CreateAuditRecord(package, package.PackageRegistration, AuditedPackageAction.SoftDelete, reason));
@@ -278,6 +296,7 @@ await _packageService.UpdatePackageStatusAsync(
 
                 // Commit changes
                 await _packageRepository.CommitChangesAsync();
+                await _symbolPackageRepository.CommitChangesAsync();
                 await _packageDeletesRepository.CommitChangesAsync();
                 transaction.Commit();
             }
@@ -427,37 +446,52 @@ private async Task BackupPackageBinaries(IEnumerable<Package> packages)
             // Backup the package binaries and remove from main storage
             foreach (var package in packages)
             {
-                // Backup the package from the "validating" container.
-                using (var packageStream = await _packageFileService.DownloadValidationPackageFileAsync(package))
-                {
-                    if (packageStream != null)
-                    {
-                        await _packageFileService.StorePackageFileInBackupLocationAsync(package, packageStream);
-                    }
-                }
+                // Backup the package and symbols package from the "validating" container.
+                await BackupFromValidationsContainerAsync(_packageFileService, package);
+                await BackupFromValidationsContainerAsync(_symbolPackageFileService, package);
 
-                // Backup the package from the "packages" container.
-                using (var packageStream = await _packageFileService.DownloadPackageFileAsync(package))
-                {
-                    if (packageStream != null)
-                    {
-                        await _packageFileService.StorePackageFileInBackupLocationAsync(package, packageStream);
-                    }
-                }
+                // Backup the package and symbols package from the "packages"/"symbol-packages" containers, respectively.
+                await BackupFromPackagesContainerAsync(_packageFileService, package);
+                await BackupFromPackagesContainerAsync(_symbolPackageFileService, package);
 
                 var id = package.PackageRegistration.Id;
                 var version = string.IsNullOrEmpty(package.NormalizedVersion)
                             ? NuGetVersion.Parse(package.Version).ToNormalizedString()
                             : package.NormalizedVersion;
 
                 await _packageFileService.DeletePackageFileAsync(id, version);
+                await _symbolPackageFileService.DeletePackageFileAsync(id, version);
+
                 await _packageFileService.DeleteValidationPackageFileAsync(id, version);
+                await _symbolPackageFileService.DeleteValidationPackageFileAsync(id, version);
 
                 // Delete readme file for this package.
                 await TryDeleteReadMeMdFile(package);
             }
         }
 
+        private async Task BackupFromValidationsContainerAsync(ICorePackageFileService fileService, Package package)
+        {
+            using (var packageStream = await fileService.DownloadValidationPackageFileAsync(package))
+            {
+                if (packageStream != null)
+                {
+                    await fileService.StorePackageFileInBackupLocationAsync(package, packageStream);
+                }
+            }
+        }
+
+        private async Task BackupFromPackagesContainerAsync(ICorePackageFileService fileService, Package package)
+        {
+            using (var packageStream = await fileService.DownloadPackageFileAsync(package))
+            {
+                if (packageStream != null)
+                {
+                    await fileService.StorePackageFileInBackupLocationAsync(package, packageStream);
+                }
+            }
+        }
+
         /// <summary>
         /// Delete package readme.md file, if it exists.
         /// </summary>

tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs

@@ -265,7 +265,7 @@ public async Task CreateSymbolPackage_WillReturn400IfFileIsNotANuGetPackageInter
             }
 
             [Fact]
-            public async Task CreateSymbolPackage_WillReturn404IfCorrespondingPackageDoesnNotExist()
+            public async Task CreateSymbolPackage_WillReturn404IfCorrespondingPackageDoesNotExist()
             {
                 // Arrange
                 var user = new User() { EmailAddress = "[email protected]" };
@@ -287,6 +287,31 @@ public async Task CreateSymbolPackage_WillReturn404IfCorrespondingPackageDoesnNo
                 ResultAssert.IsStatusCode(result, HttpStatusCode.NotFound);
             }
 
+            [Fact]
+            public async Task CreateSymbolPackage_WillReturn404IfCorrespondingPackageIsDeleted()
+            {
+                // Arrange
+                var user = new User() { EmailAddress = "[email protected]" };
+
+                var controller = new TestableApiController(GetConfigurationService());
+                controller.SetCurrentUser(user);
+
+                var nuGetPackage = TestPackage.CreateTestPackageStream("theId", "1.0.42");
+                controller.SetupPackageFromInputStream(nuGetPackage);
+
+                controller.MockPackageService
+                    .Setup(x => x.FindPackageByIdAndVersionStrict(It.IsAny<string>(), It.IsAny<string>()))
+                    .Returns(new Package() {
+                        PackageStatusKey = PackageStatus.Deleted
+                    });
+
+                // Act
+                ActionResult result = await controller.CreateSymbolPackagePutAsync();
+
+                // Assert
+                ResultAssert.IsStatusCode(result, HttpStatusCode.NotFound);
+            }
+
             [Fact]
             public async Task CreateSymbolPackage_UnauthorizedUserWillGet403()
             {