Fixed issue where method

string ABC<T>([InjectSourceOfType(typeof(Entity)] Entity entity, string someValue)) could not be resolved and concreted accordingly.
Puchaczov · Apr 20, 2024 · a7f5808 · a7f5808
1 parent 3c66280
commit a7f5808
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 5 deletions.
diff --git a/Musoq.Evaluator.Tests/GenericTests.cs b/Musoq.Evaluator.Tests/GenericTests.cs
@@ -151,4 +151,22 @@ public void WhenSkipAndTakeWithoutReductionRequired_ShouldPass()
         Assert.AreEqual(1, table.Count);
         Assert.AreEqual("e", Encoding.UTF8.GetString((byte[])table[0].Values[0]));
     }
+
+    [TestMethod]
+    public void WhenInferredValueIsNull_ShouldUseDefaultValue()
+    {
+        var table = TestResultMethodTemplate("GetCountryOrDefault('test')");
+
+        Assert.AreEqual(1, table.Count);
+        Assert.AreEqual("test", table[0].Values[0]);
+    }
+
+    [TestMethod]
+    public void WhenResolvedMethodIsGenericWithInjectSpecificSourceAttribute_ShouldConcretizeItAccordingly()
+    {
+        var table = TestResultMethodTemplate("GetCountryOrDefaultGeneric('test')");
+
+        Assert.AreEqual(1, table.Count);
+        Assert.AreEqual("test", table[0].Values[0]);
+    }
 }
diff --git a/Musoq.Evaluator.Tests/Schema/Basic/BasicEntityTestBase.cs b/Musoq.Evaluator.Tests/Schema/Basic/BasicEntityTestBase.cs
@@ -1,15 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Dynamic;
 using System.Linq;
 using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Musoq.Converter;
 using Musoq.Converter.Build;
 using Musoq.Evaluator.Tables;
-using Musoq.Evaluator.Tests.Schema.Dynamic;
-using Musoq.Evaluator.Tests.Schema.Unknown;
 using Musoq.Plugins;
 using Musoq.Schema;
 using Musoq.Tests.Common;

diff --git a/Musoq.Evaluator.Tests/Schema/Basic/Library.cs b/Musoq.Evaluator.Tests/Schema/Basic/Library.cs
@@ -109,6 +109,18 @@ public decimal GetPopulation([InjectSpecificSource(typeof(BasicEntity))] BasicEn
         {
             return entity.Population;
         }
+
+        [BindableMethod]
+        public string GetCountryOrDefault([InjectSpecificSource(typeof(BasicEntity))] BasicEntity entity, string @default)
+        {
+            return entity.Country ?? @default;
+        }
+
+        [BindableMethod]
+        public string GetCountryOrDefaultGeneric<TColumn>([InjectSpecificSource(typeof(BasicEntity))] BasicEntity entity, TColumn @default)
+        {
+            return entity.Country ?? @default.ToString();
+        }
 
         [BindableMethod]
         public string ThrowException()

diff --git a/Musoq.Evaluator/Visitors/BuildMetadataAndInferTypeVisitor.cs b/Musoq.Evaluator/Visitors/BuildMetadataAndInferTypeVisitor.cs
@@ -1687,10 +1687,17 @@ private static bool TryConstructGenericMethod(MethodInfo methodInfo, ArgsListNod
 
             foreach (var genericArgument in genericArguments)
             {
-                for (var i = 0; i < parameters.Length; i++)
+                var i = 0;
+                var shiftArgsWhenInjectSpecificSourcePresent = 0;
+                if (parameters[0].GetCustomAttribute<InjectSpecificSourceAttribute>() != null)
+                {
+                    i = 1;
+                    shiftArgsWhenInjectSpecificSourcePresent = 1;
+                }
+                for (; i < parameters.Length; i++)
                 {
                     var parameter = parameters[i];
-                    var returnType = args.Args.Where((arg, index) => index == i).Single().ReturnType;
+                    var returnType = args.Args.Where((_, index) => index == i - shiftArgsWhenInjectSpecificSourcePresent).Single().ReturnType;
                     var elementType = returnType.GetElementType();
 
                     if (returnType.IsGenericType && returnType.GetGenericTypeDefinition() == parameter.ParameterType.GetGenericTypeDefinition())