Merge pull request #1653 from NuGet/tilovell/1370-ManagePackagesPageB…

…rokenForBhuva Tilovell/1370 manage packages page broken for bhuva
NuGet · Oct 22, 2013 · 1385bc7 · 1385bc7
2 parents 6bb3c05 + 2e7f79a
commit 1385bc7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/NuGetGallery/Services/PackageService.cs b/src/NuGetGallery/Services/PackageService.cs
@@ -158,9 +158,9 @@ public IQueryable<Package> GetPackagesForListing(bool includePrerelease)
         public IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted)
         {
             // Like DisplayPackage we should prefer to show you information from the latest stable version,
-            // but show you the latest version otherwise.
+            // but show you the latest version (potentially latest UNLISTED version) otherwise.
 
-            var latestStablePackageVersions = _packageRepository.GetAll()
+            IQueryable<Package> latestStablePackageVersions = _packageRepository.GetAll()
                 .Where(p => 
                     p.PackageRegistration.Owners.Any(owner => owner.Key == user.Key)
                     && p.IsLatestStable)
@@ -174,12 +174,21 @@ public IEnumerable<Package> FindPackagesByOwner(User user, bool includeUnlisted)
                 .Include(p => p.PackageRegistration)
                 .Include(p => p.PackageRegistration.Owners);
 
+            if (includeUnlisted)
+            {
+                latestPackageVersions = _packageRegistrationRepository.GetAll()
+                .Where(pr => pr.Owners.Where(owner => owner.Username == user.Username).Any())
+                .Select(pr => pr.Packages.OrderByDescending(p => p.Version).FirstOrDefault())
+                .Include(p => p.PackageRegistration)
+                .Include(p => p.PackageRegistration.Owners);
+            }
+
             var mergedResults = new Dictionary<string, Package>(StringComparer.OrdinalIgnoreCase);
             foreach (var package in latestPackageVersions)
             {
                 mergedResults.Add(package.PackageRegistration.Id, package);
             }
-            foreach (var package in latestStablePackageVersions)
+            foreach (var package in latestStablePackageVersions.Where(p => p != null))
             {
                 mergedResults[package.PackageRegistration.Id] = package;
             }

diff --git a/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs b/tests/NuGetGallery.Facts/Services/PackageServiceFacts.cs
@@ -1204,7 +1204,7 @@ public void ReturnsAnUnlistedPackageWhenIncludeUnlistedIsTrue()
             {
                 var owner = new User { Username = "someone" };
                 var packageRegistration = new PackageRegistration { Id = "theId", Owners = { owner } };
-                var package = new Package { Version = "1.0", PackageRegistration = packageRegistration, Listed = true, IsLatest = true, IsLatestStable = true };
+                var package = new Package { Version = "1.0", PackageRegistration = packageRegistration, Listed = false, IsLatest = false, IsLatestStable = false };
                 packageRegistration.Packages.Add(package);
 
                 var context = GetFakeContext();