fix publish script type mapping, add extension methods to Index types

nfdi4plants · Feb 29, 2024 · e70323b · e70323b
1 parent e8364ee
commit e70323b
Show file tree

Hide file tree

Showing 4 changed files with 115 additions and 3 deletions.
diff --git a/scripts/publish-pending-packages.fsx b/scripts/publish-pending-packages.fsx
@@ -47,9 +47,18 @@ type AVPRClient.ValidationPackage with
         p.PatchVersion <- i.Metadata.PatchVersion
         p.PackageContent <- File.ReadAllBytes(i.RepoPath)
         p.ReleaseDate <- DateTimeOffset.Now
-        p.Tags <- i.Metadata.Tags
+        p.Tags <- (
+            i.Metadata.Tags
+            |> Array.map (fun tag ->
+                let t = AVPRClient.OntologyAnnotation()
+                t.Name <- tag.Name
+                t.TermAccessionNumber <- tag.TermAccessionNumber
+                t.TermSourceREF <- tag.TermSourceREF
+                t
+            )
+        )
         p.ReleaseNotes <- i.Metadata.ReleaseNotes
-        p.Authors <- 
+        p.Authors <- (
             i.Metadata.Authors
             |> Array.map (fun author -> 
                 let a = AVPRClient.Author()
@@ -59,6 +68,7 @@ type AVPRClient.ValidationPackage with
                 a.AffiliationLink <- author.AffiliationLink
                 a
             )
+        )
         p
 
     static member toJson (p: AVPRClient.ValidationPackage) = 

diff --git a/src/AVPRClient/AVPRClient.csproj b/src/AVPRClient/AVPRClient.csproj
@@ -18,12 +18,16 @@
     <RepositoryType>git</RepositoryType>
     <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/RELEASE_NOTES.md"))</PackageReleaseNotes>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageVersion>0.0.2</PackageVersion>
+    <PackageVersion>0.0.3</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <None Include="README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\AVPRIndex\AVPRIndex.fsproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/AVPRClient/Extensions.cs b/src/AVPRClient/Extensions.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+using AVPRIndex;
+using YamlDotNet.Core.Tokens;
+using static AVPRIndex.Domain;
+
+namespace AVPRClient
+{
+    public static class Extensions
+    {
+        public static AVPRClient.ValidationPackage toValidationPackage(
+            this AVPRIndex.Domain.ValidationPackageIndex indexedPackage,
+            DateTimeOffset releaseDate
+        )
+        {
+            return new AVPRClient.ValidationPackage
+            {
+                Name = indexedPackage.Metadata.Name,
+                Description = indexedPackage.Metadata.Description,
+                MajorVersion = indexedPackage.Metadata.MajorVersion,
+                MinorVersion = indexedPackage.Metadata.MinorVersion,
+                PatchVersion = indexedPackage.Metadata.PatchVersion,
+                PackageContent = File.ReadAllBytes(indexedPackage.RepoPath),
+                ReleaseDate = releaseDate,
+                Tags =
+                    indexedPackage.Metadata.Tags
+                    .Select(tag =>
+                    {
+                        return new AVPRClient.OntologyAnnotation
+                        {
+                            Name = tag.Name,
+                            TermAccessionNumber = tag.TermAccessionNumber,
+                            TermSourceREF = tag.TermSourceREF
+                        };
+                    })
+                    .ToList(),
+                ReleaseNotes = indexedPackage.Metadata.ReleaseNotes,
+                Authors =
+                    indexedPackage.Metadata.Authors
+                    .Select(author =>
+                    {
+                        return new AVPRClient.Author
+                        {
+                            FullName = author.FullName,
+                            Email = author.Email,
+                            Affiliation = author.Affiliation,
+                            AffiliationLink = author.AffiliationLink
+                        };
+                    })
+                    .ToList()
+            };
+        }
+
+        public static AVPRClient.ValidationPackage toValidationPackage(
+            this AVPRIndex.Domain.ValidationPackageIndex indexedPackage
+        )
+        {
+            return indexedPackage.toValidationPackage(DateTimeOffset.Now);
+        }
+
+        public static AVPRClient.PackageContentHash toPackageContentHash(
+            this AVPRIndex.Domain.ValidationPackageIndex indexedPackage,
+            bool HashFileDirectly = false
+        )
+        {
+            if ( HashFileDirectly)
+            {
+                MD5 md5 = MD5.Create();
+                return new AVPRClient.PackageContentHash
+                {
+                    Hash = Convert.ToHexString(md5.ComputeHash(File.ReadAllBytes(indexedPackage.RepoPath))),
+                    PackageMajorVersion = indexedPackage.Metadata.MajorVersion,
+                    PackageMinorVersion = indexedPackage.Metadata.MinorVersion,
+                    PackagePatchVersion = indexedPackage.Metadata.PatchVersion
+                };
+            }
+            else
+            {
+                return new AVPRClient.PackageContentHash
+                {
+                    Hash = indexedPackage.ContentHash,
+                    PackageMajorVersion = indexedPackage.Metadata.MajorVersion,
+                    PackageMinorVersion = indexedPackage.Metadata.MinorVersion,
+                    PackagePatchVersion = indexedPackage.Metadata.PatchVersion
+                };
+            }
+        }
+    }
+}
diff --git a/src/AVPRClient/RELEASE_NOTES.md b/src/AVPRClient/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+## v0.0.3
+
+- Add extensions that connect AVPRIndex and AVPRClient types
+
 ## v0.0.2
 
 - Regen with for additional metadata fields