Catalog packages

src/isnd/Services/PackageManager.cs

@@ -79,23 +79,6 @@ namespace isnd.Services
             return catalog;
 
         }
-        public Page CatalogPage()
-        {
-            var scope = dbContext.Packages
-                .Where(P => P.Versions.Count > 0)
-                .Select(
-                    p => new PackageRef { Id = p.Id, Version = p.Versions.Max().FullString });
-
-            return new Page
-            {
-                Items = scope.ToList()
-            };
-        }
-        public void PublishCatalog()
-        {
-
-        }
-
         public AutoCompleteResult AutoComplete(string id,
              int skip, int take, bool prerelease = false,
              string packageType = null)
@@ -157,7 +140,8 @@ namespace isnd.Services
             var oldPages = CurrentCatalogPages;
             CurrentCatalogIndex = new CatalogIndex
             {
-                Id = extApiUrl
+                Id = extApiUrl,
+                Items = new List<PageRef>()
             };
             CurrentCatalogPages = new List<Page>();
 
@@ -175,8 +159,8 @@ namespace isnd.Services
                         Parent = isndSettings.ExternalUrl + "/package",
                         CommitId = commit.CommitId,
                         CommitTimeStamp = commit.CommitTimeStamp,
-                        Id = this.isndSettings.ExternalUrl + "/package/index-" + p++
-
+                        Id = this.isndSettings.ExternalUrl + "/package/index-" + p++,
+                        Items = new List<PackageRef>()
                     };
                     CurrentCatalogPages.Add(page);
                     pageRef = new PageRef
@@ -188,8 +172,9 @@ namespace isnd.Services
                 }
                 var validPkgs = dbContext.Packages
                 .Include(pkg => pkg.Versions)
+                .Include(pkg => pkg.LatestVersion)
                 .Where(
-                    pkg => pkg.Versions.Count() > 0
+                    pkg => pkg.Versions.Count() > 0 && pkg.CommitId == commit.CommitId
                 );
                 // pkg.Versions.OrderByDescending(vi => vi.CommitNId).First().FullString
                 foreach (var pkg in validPkgs)
@@ -202,7 +187,7 @@ namespace isnd.Services
                         LastCommit = v.LatestCommit,
                         CommitId = v.LatestCommit.CommitId,
                         CommitTimeStamp = v.LatestCommit.CommitTimeStamp,
-                        RefId = page.Id,
+                        RefId = v.NugetLink,
                         Id = v.PackageId
                     };
                     page.Items.Add(pkgref);