Allow published symbols to be downloaded after re-upload failures and Blog updates (#7252)

Author: shishirx34

src/NuGet.Services.Entities/Extensions/PackageExtensions.cs

@@ -14,10 +14,22 @@ public static class PackageExtensions
         /// <returns>The latest symbol package if present, null otherwise</returns>
         public static SymbolPackage LatestSymbolPackage(this Package package)
         {
-            return package
-                .SymbolPackages?
-                .OrderByDescending(sp => sp.Created)
-                .FirstOrDefault();
+            return package.GetSymbolsPackagesInReverseOrder()?.FirstOrDefault();
+        }
+
+        /// <summary>
+        /// Get the last successfully uploaded symbols package for the given package.
+        /// </summary>
+        /// <param name="package"><see cref="Package"/> for which latest symbol package is to be retrieved.</param>
+        /// <returns>The last available symbol package if present, null otherwise</returns>
+        public static SymbolPackage LatestAvailableSymbolPackage(this Package package)
+        {
+            return package.GetSymbolsPackagesInReverseOrder()?.FirstOrDefault(sp => sp.StatusKey == PackageStatus.Available);
+        }
+
+        private static IOrderedEnumerable<SymbolPackage> GetSymbolsPackagesInReverseOrder(this Package package)
+        {
+            return package.SymbolPackages?.OrderByDescending(sp => sp.Created);
         }
 
         /// <summary>

src/NuGetGallery/Controllers/ApiController.cs

@@ -198,6 +198,11 @@ protected internal async Task<ActionResult> GetPackageInternal(string id, string
                     if (isSymbolPackage)
                     {
                         package = PackageService.FindPackageByIdAndVersionStrict(id, version);
+
+                        if (package == null)
+                        {
+                            return new HttpStatusCodeWithBodyResult(HttpStatusCode.NotFound, string.Format(CultureInfo.CurrentCulture, Strings.PackageWithIdAndVersionNotFound, id, version));
+                        }
                     }
                 }
                 else
@@ -235,12 +240,9 @@ protected internal async Task<ActionResult> GetPackageInternal(string id, string
 
             if (isSymbolPackage)
             {
-                var latestSymbolPackage = package?
-                    .SymbolPackages
-                    .OrderByDescending(sp => sp.Created)
-                    .FirstOrDefault();
+                var latestAvailableSymbolsPackage = package.LatestAvailableSymbolPackage();
 
-                if (latestSymbolPackage == null || latestSymbolPackage.StatusKey != PackageStatus.Available)
+                if (latestAvailableSymbolsPackage == null)
                 {
                     return new HttpStatusCodeWithBodyResult(HttpStatusCode.NotFound, string.Format(CultureInfo.CurrentCulture, Strings.SymbolsPackage_PackageNotAvailable, id, version));
                 }

src/NuGetGallery/ViewModels/DisplayPackageViewModel.cs

@@ -35,6 +35,9 @@ public DisplayPackageViewModel(Package package, User currentUser, PackageDepreca
             PackageFileSize = package.PackageFileSize;
 
             LatestSymbolsPackage = package.LatestSymbolPackage();
+            LatestAvailableSymbolsPackage = LatestSymbolsPackage != null && LatestSymbolsPackage.StatusKey == PackageStatus.Available
+                ? LatestSymbolsPackage
+                : package.LatestAvailableSymbolPackage();
 
             if (packageHistory.Any())
             {
@@ -114,6 +117,7 @@ private DisplayPackageViewModel(Package package, User currentUser, string pushed
         public int TotalDaysSinceCreated { get; private set; }
         public long PackageFileSize { get; private set; }
         public SymbolPackage LatestSymbolsPackage { get; private set; }
+        public SymbolPackage LatestAvailableSymbolsPackage { get; private set; }
 
         public bool HasSemVer2Version { get; }
         public bool HasSemVer2Dependency { get; }

src/NuGetGallery/Views/Packages/DisplayPackage.cshtml

@@ -9,7 +9,7 @@
 
     var absolutePackageUrl = Url.Absolute(Url.Package(Model.Id));
 
-    var hasSymbolsPackageAvailable = Model.LatestSymbolsPackage != null && Model.LatestSymbolsPackage.StatusKey == PackageStatus.Available;
+    var hasSymbolsPackageAvailable = Model.LatestAvailableSymbolsPackage != null;
     var showSymbolsPackageStatus = Model.LatestSymbolsPackage != null && Model.LatestSymbolsPackage.StatusKey != PackageStatus.Available;
 
     PackageManagerViewModel[] packageManagers;
@@ -163,6 +163,15 @@
     </div>
 }
 
+@helper AppendAvailableSymbolsMessage(bool hasSymbolsPackageAvailable)
+{
+    if(hasSymbolsPackageAvailable)
+    {
+        <br /><br />
+        <text><b>Please note:</b> The last successfully published symbols package is still available for debugging and download.</text>
+    }
+}
+
 @* The following two helpers must be on a single line each so no extra whitespace is introduced in the expression when rendered. *@
 @* Helpers themselves are needed not to introduce that extra whitespce, which happens if they are inlined. *@
 @helper MakeLicenseLink(CompositeLicenseExpressionSegment segment) {<a href="@LicenseExpressionRedirectUrlHelper.GetLicenseExpressionRedirectUrl(segment.Value)">@segment.Value</a>}
@@ -314,7 +323,7 @@
                 @ViewHelpers.AlertIsSemVer2Package(Model.HasSemVer2Version, Model.HasSemVer2Dependency)
             }
 
-            @if (showSymbolsPackageStatus)
+            @if (Model.CanDisplayPrivateMetadata && showSymbolsPackageStatus)
             {
                 if (Model.LatestSymbolsPackage.StatusKey == PackageStatus.Validating)
                 {
@@ -323,6 +332,8 @@
                             <strong>The symbols for this package have not been indexed yet.</strong> They are not available
                             for download from the NuGet.org symbol server. Symbols will be available for download after both validation and indexing are complete. 
                             Symbols validation and indexing may take up to an hour. <a href="https://aka.ms/NuGetSymbolsPackageValidation">Read more</a>.
+
+                        @AppendAvailableSymbolsMessage(hasSymbolsPackageAvailable)
                         </text>
                      )
                 }
@@ -346,6 +357,8 @@
                         {
                             <text>Please contact <a href="mailto:[email protected]">support@nuget.org</a> to help fix your symbols package.</text>
                         }
+
+                        @AppendAvailableSymbolsMessage(hasSymbolsPackageAvailable)
                     </text>)
                 }
             }

src/NuGetGallery/Views/Shared/Gallery/Header.cshtml

@@ -88,7 +88,7 @@
                         }
                         @DisplayNavigationItem("Documentation", "https://docs.microsoft.com/en-us/nuget/what-is-nuget")
                         @DisplayNavigationItem("Downloads", Url.Downloads())
-                        @DisplayNavigationItem("Blog", "https://blog.nuget.org/")
+                        @DisplayNavigationItem("Blog", "https://devblogs.microsoft.com/nuget/")
                     </ul>
                     @if (ShowAuthInHeader)
                     {

tests/NuGetGallery.Facts/Controllers/ApiControllerFacts.cs

@@ -1724,7 +1724,7 @@ public async Task GetPackageReturns404ForSymbolPackageIfPackageIsNotFound()
             [InlineData(PackageStatus.Deleted)]
             [InlineData(PackageStatus.FailedValidation)]
             [InlineData(PackageStatus.Validating)]
-            public async Task GetPackageReturns404ForNotAvailableLatestSymbolPackage(PackageStatus status)
+            public async Task GetPackageReturnsLastAvailableSymbolPackage(PackageStatus status)
             {
                 // Arrange
                 const string packageId = "Baz";
@@ -1751,12 +1751,17 @@ public async Task GetPackageReturns404ForNotAvailableLatestSymbolPackage(Package
                 controller.MockPackageService
                     .Setup(x => x.FindPackageByIdAndVersionStrict(packageId, packageVersion))
                     .Returns(package).Verifiable();
+                controller.MockSymbolPackageFileService
+                    .Setup(x => x.CreateDownloadSymbolPackageActionResultAsync(It.IsAny<Uri>(), packageId, packageVersion))
+                    .Returns(Task.FromResult<ActionResult>(new HttpStatusCodeWithBodyResult(HttpStatusCode.OK, "Test package")))
+                    .Verifiable();
 
                 // Act
                 var result = (HttpStatusCodeWithBodyResult)await controller.GetPackageInternal(packageId, packageVersion, isSymbolPackage: true);
 
                 // Assert
-                Assert.Equal((int)HttpStatusCode.NotFound, result.StatusCode);
+                Assert.Equal((int)HttpStatusCode.OK, result.StatusCode);
+                controller.MockSymbolPackageFileService.Verify();
             }
 
             [Theory]