Fix primary key errors in pages after adding semver suffixes

nfdi4plants · Jun 21, 2024 · 6a9f1ff · 6a9f1ff
1 parent e9a697f
commit 6a9f1ff
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/src/PackageRegistryService/Pages/Components/PackageSummary.cs b/src/PackageRegistryService/Pages/Components/PackageSummary.cs
@@ -25,7 +25,7 @@ public static string RenderList(IEnumerable<PackageSummary> summaries)
 <tr>
 <th scope=""col"">Name</th>
 <th scope=""col"">Summary</th>
-<th scope=""col"">Latest version</th>
+<th scope=""col"">Latest stable version</th>
 <th scope=""col"">Release date</th>
 <th scope=""col"">Tags</th>
 <th scope=""col"">Total Downloads</th>

diff --git a/src/PackageRegistryService/Pages/Handlers/PackageHandlers.cs b/src/PackageRegistryService/Pages/Handlers/PackageHandlers.cs
@@ -4,32 +4,23 @@
 using PackageRegistryService.Pages.Components;
 using System.Text;
 using System.Xml.Linq;
+using static AVPRIndex.Domain;
 
 namespace PackageRegistryService.Pages.Handlers
 {
     public static class PackageHandlers
     {
         public static async Task<Results<ContentHttpResult, NotFound, BadRequest<string>>> Render(string packageName, string version, ValidationPackageDb database)
         {
-            var splt = version.Split('.');
-            if (splt.Length != 3)
+            var semVerOpt = SemVer.tryParse(version);
+            if (semVerOpt is null)
             {
-                return TypedResults.BadRequest("version was not a of valid format MAJOR.MINOR.REVISION");
+                return TypedResults.BadRequest($"{version} is not a valid semantic version.");
             }
+            var semVer = semVerOpt.Value;
 
-            int major; int minor; int revision;
-
-            if (
-                !int.TryParse(splt[0], out major)
-                || !int.TryParse(splt[1], out minor)
-                || !int.TryParse(splt[2], out revision)
-            )
-            {
-                return TypedResults.BadRequest("version was not a of valid format MAJOR.MINOR.REVISION");
-            }
-
-            var package = await database.ValidationPackages.FindAsync(packageName, major, minor, revision);
-            var downloads = await database.Downloads.FindAsync(packageName, major, minor, revision);
+            var package = await database.ValidationPackages.FindAsync(packageName, semVer.Major, semVer.Minor, semVer.Patch, semVer.PreRelease, semVer.BuildMetadata);
+            var downloads = await database.Downloads.FindAsync(packageName, semVer.Major, semVer.Minor, semVer.Patch, semVer.PreRelease, semVer.BuildMetadata);
 
             if (package == null)
             {
@@ -65,7 +56,7 @@ public static async Task<Results<ContentHttpResult, NotFound>> RenderLatest(stri
         {
             var packages = await
                 database.ValidationPackages
-                    .Where(p => p.Name == packageName)
+                    .Where(p => p.Name == packageName && p.BuildMetadataVersionSuffix == "" && p.BuildMetadataVersionSuffix == "")
                     .ToArrayAsync();
 
             var latestPackage =
@@ -80,7 +71,7 @@ public static async Task<Results<ContentHttpResult, NotFound>> RenderLatest(stri
                 return TypedResults.NotFound();
             }
 
-            var downloads = await database.Downloads.FindAsync(latestPackage.Name, latestPackage.MajorVersion, latestPackage.MinorVersion, latestPackage.PatchVersion);
+            var downloads = await database.Downloads.FindAsync(latestPackage.Name, latestPackage.MajorVersion, latestPackage.MinorVersion, latestPackage.PatchVersion, latestPackage.PreReleaseVersionSuffix, latestPackage.BuildMetadataVersionSuffix);
 
             var page = Layout.Render(
                 activeNavbarItem: "",

diff --git a/src/PackageRegistryService/Pages/Handlers/PackagesHandlers.cs b/src/PackageRegistryService/Pages/Handlers/PackagesHandlers.cs
@@ -35,6 +35,7 @@ public static async Task<ContentHttpResult> Render(ValidationPackageDb database)
 
                             var latestPackage =
                                 group
+                                    .Where(p => p.BuildMetadataVersionSuffix == "" && p.BuildMetadataVersionSuffix == "")
                                     .OrderByDescending(p => p.MajorVersion)
                                     .ThenByDescending(p => p.MinorVersion)
                                     .ThenByDescending(p => p.PatchVersion)