Merge branch 'main' into feat/rework-projections

entitydb-io · Sep 17, 2023 · ed838e0 · ed838e0
2 parents 114d481 + 1f686b7
commit ed838e0
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 26 deletions.
diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Pack Projects into Nuget Packages
         run: dotnet pack EntityDb.sln --no-restore -c Release /p:Version='${{ needs.milestone.outputs.version }}-beta.${{ github.event.number }}.${{ github.run_number }}.${{ github.run_attempt }}'
       - name: Publish to Beta
-        run: dotnet nuget push ./**/*.nupkg -s ${{ secrets.NUGET_SOURCE }} -k ${{ secrets.NUGET_API_KEY }}
+        run: dotnet nuget push ./**/*.nupkg -s ${{ vars.NUGET_SOURCE }} -k ${{ secrets.NUGET_API_KEY }}
       - name: Packages & Symbols Artifact
         uses: actions/upload-artifact@v3.1.1
         with:

diff --git a/.github/workflows/publish-stable.yml b/.github/workflows/publish-stable.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Pack Projects into Nuget Packages
         run: dotnet pack EntityDb.sln --no-restore -c Release /p:Version=${{ needs.tag.outputs.version }}
       - name: Publish to Stable
-        run: dotnet nuget push ./**/*.nupkg -s ${{ secrets.NUGET_SOURCE }} -k ${{ secrets.NUGET_API_KEY }}
+        run: dotnet nuget push ./**/*.nupkg -s ${{ vars.NUGET_SOURCE }} -k ${{ secrets.NUGET_API_KEY }}
       - name: Packages & Symbols Artifact
         uses: actions/upload-artifact@v3.1.1
         with:

diff --git a/src/EntityDb.Common/TypeResolvers/DefaultPartialTypeResolver.cs b/src/EntityDb.Common/TypeResolvers/DefaultPartialTypeResolver.cs
@@ -1,11 +1,29 @@
 using EntityDb.Common.Envelopes;
+using Microsoft.Extensions.Options;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
 namespace EntityDb.Common.TypeResolvers;
 
 internal class DefaultPartialTypeResolver : IPartialTypeResolver
 {
+    private readonly IOptions<DefaultPartialTypeResolverOptions> _options;
+
+    public DefaultPartialTypeResolver(IOptions<DefaultPartialTypeResolverOptions> options)
+    {
+        _options = options;
+    }
+
+    private Assembly AssemblyResolver(AssemblyName assemblyName)
+    {
+        if (_options.Value.IgnoreVersion)
+        {
+            assemblyName.Version = null;
+        }
+
+        return Assembly.Load(assemblyName);
+    }
+
     public bool TryResolveType(EnvelopeHeaders envelopeHeaders, [NotNullWhen(true)] out Type? resolvedType)
     {
         if (EnvelopeHelper.NotThisPlatform(envelopeHeaders) ||
@@ -19,7 +37,7 @@ public bool TryResolveType(EnvelopeHeaders envelopeHeaders, [NotNullWhen(true)]
         resolvedType = Type.GetType
         (
             Assembly.CreateQualifiedName(assemblyFullName, typeFullName),
-            Assembly.Load,
+            AssemblyResolver,
             (assembly, typeName, ignoreCase) => assembly!.GetType(typeName, true, ignoreCase),
             true,
             false

diff --git a/src/EntityDb.Common/TypeResolvers/DefaultPartialTypeResolverOptions.cs b/src/EntityDb.Common/TypeResolvers/DefaultPartialTypeResolverOptions.cs
@@ -0,0 +1,13 @@
+namespace EntityDb.Common.TypeResolvers;
+
+/// <summary>
+///     Options for the default partial type resolver
+/// </summary>
+public class DefaultPartialTypeResolverOptions
+{
+    /// <summary>
+    ///     If you version your assemblies, you may want to ignore the
+    ///     version of the assembly for type resolving purposes.
+    /// </summary>
+    public bool IgnoreVersion { get; set; }
+}
diff --git a/src/EntityDb.EntityFramework/EntityDb.EntityFramework.csproj b/src/EntityDb.EntityFramework/EntityDb.EntityFramework.csproj
@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.10" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.10" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/test/EntityDb.Common.Tests/Implementations/Projections/OneToOneProjection.cs b/test/EntityDb.Common.Tests/Implementations/Projections/OneToOneProjection.cs
@@ -49,30 +49,30 @@ public VersionNumber GetVersionNumber()
 
     public OneToOneProjection Reduce(ISource source)
     {
-        if (source is ITransaction transaction)
+        if (source is not ITransaction transaction)
         {
-            var projection = this with
-            {
-                LastTransactionAt = transaction.TimeStamp,
-            };
+            throw new NotSupportedException();
+        }
 
-            foreach (var command in transaction.Commands)
-            {
-                if (command.Data is not IReducer<OneToOneProjection> reducer)
-                {
-                    continue;
-                }
+        var projection = this with
+        {
+            LastTransactionAt = transaction.TimeStamp,
+        };
 
-                projection = reducer.Reduce(projection) with
-                {
-                    VersionNumber = command.EntityVersionNumber,
-                };
+        foreach (var command in transaction.Commands)
+        {
+            if (command.Data is not IReducer<OneToOneProjection> reducer)
+            {
+                continue;
             }
 
-            return projection;
+            projection = reducer.Reduce(projection) with
+            {
+                VersionNumber = command.EntityVersionNumber,
+            };
         }
 
-        throw new NotSupportedException();
+        return projection;
     }
 
     public bool ShouldRecord()

diff --git a/test/EntityDb.Common.Tests/TypeResolvers/DefaultTypeResolverTests.cs b/test/EntityDb.Common.Tests/TypeResolvers/DefaultTypeResolverTests.cs
@@ -1,5 +1,7 @@
 using EntityDb.Common.Envelopes;
 using EntityDb.Common.TypeResolvers;
+using Microsoft.Extensions.Options;
+using Moq;
 using Shouldly;
 using Xunit;
 
@@ -14,7 +16,13 @@ public void GivenEmptyHeaders_WhenLoadingType_ThenReturnNull()
 
         var headers = new EnvelopeHeaders(new Dictionary<string, string>());
 
-        var typeResolver = new DefaultPartialTypeResolver();
+        var optionsMock = new Mock<IOptions<DefaultPartialTypeResolverOptions>>();
+
+        optionsMock
+            .SetupGet(x => x.Value)
+            .Returns(new DefaultPartialTypeResolverOptions());
+
+        var typeResolver = new DefaultPartialTypeResolver(optionsMock.Object);
 
         // ACT
 
@@ -37,7 +45,13 @@ public void GivenFullNames_WhenLoadingType_ThenReturnType()
 
         var headers = EnvelopeHelper.GetEnvelopeHeaders(expectedType, true, false);
 
-        var typeResolver = new DefaultPartialTypeResolver();
+        var optionsMock = new Mock<IOptions<DefaultPartialTypeResolverOptions>>();
+
+        optionsMock
+            .SetupGet(x => x.Value)
+            .Returns(new DefaultPartialTypeResolverOptions());
+
+        var typeResolver = new DefaultPartialTypeResolver(optionsMock.Object);
 
         // ACT
 
@@ -56,7 +70,13 @@ public void GivenMemberInfoName_WhenLoadingType_ThenReturnNull()
 
         var headers = EnvelopeHelper.GetEnvelopeHeaders(typeof(object), false);
 
-        var typeResolver = new DefaultPartialTypeResolver();
+        var optionsMock = new Mock<IOptions<DefaultPartialTypeResolverOptions>>();
+
+        optionsMock
+            .SetupGet(x => x.Value)
+            .Returns(new DefaultPartialTypeResolverOptions());
+
+        var typeResolver = new DefaultPartialTypeResolver(optionsMock.Object);
 
         // ACT
 
@@ -73,7 +93,13 @@ public void GivenNoTypeInformation_WhenLoadingType_ThenReturnNull()
     {
         // ARRANGE
 
-        var typeResolver = new DefaultPartialTypeResolver();
+        var optionsMock = new Mock<IOptions<DefaultPartialTypeResolverOptions>>();
+
+        optionsMock
+            .SetupGet(x => x.Value)
+            .Returns(new DefaultPartialTypeResolverOptions());
+
+        var typeResolver = new DefaultPartialTypeResolver(optionsMock.Object);
 
         var envelopeHeaders = new EnvelopeHeaders(new Dictionary<string, string>
         {
@@ -95,7 +121,13 @@ public void GivenGarbageTypeInformation_WhenLoadingType_ThenThrow()
     {
         // ARRANGE
 
-        var typeResolver = new DefaultPartialTypeResolver();
+        var optionsMock = new Mock<IOptions<DefaultPartialTypeResolverOptions>>();
+
+        optionsMock
+            .SetupGet(x => x.Value)
+            .Returns(new DefaultPartialTypeResolverOptions());
+
+        var typeResolver = new DefaultPartialTypeResolver(optionsMock.Object);
 
         var envelopeHeaders = new EnvelopeHeaders(new Dictionary<string, string>
         {