Add generic job support for assemblyQualifiedNameWithoutVersion method

src/Horarium.Test/TypeName/AssemblyQualifiedNameWithoutVersionTests.cs

@@ -0,0 +1,75 @@
+using System;
+using Xunit;
+
+namespace Horarium.Test
+{
+    public class AssemblyQualifiedNameWithoutVersionTests
+    {
+        [Fact]
+        public void GetName_ForNonGenericJob_ShouldRemoveVersion()
+        {
+            var jobName = new SecondNonGenericJob().GetType().AssemblyQualifiedNameWithoutVersion();
+
+            var type = Type.GetType(jobName, true);
+            var instance = Activator.CreateInstance(type);
+
+            Assert.NotNull(instance);
+            Assert.IsType<SecondNonGenericJob>(instance);
+            Assert.Equal("Horarium.Test.SecondNonGenericJob, Horarium.Test", jobName);
+        }
+
+        [Fact]
+        public void GetName_ForGenericJobWithTwoArguments_ShouldRemoveVersionForAllTypes()
+        {
+            var jobName = new GenericJobWithTwoArguments<SecondNonGenericJob, FirstNonGenericJob>().GetType().AssemblyQualifiedNameWithoutVersion();
+
+            var type = Type.GetType(jobName, true);
+            var instance = Activator.CreateInstance(type);
+
+            Assert.NotNull(instance);
+            Assert.IsType<GenericJobWithTwoArguments<SecondNonGenericJob, FirstNonGenericJob>>(instance);
+            Assert.Equal("Horarium.Test.GenericJobWithTwoArguments`2[[Horarium.Test.SecondNonGenericJob, Horarium.Test], [Horarium.Test.FirstNonGenericJob, Horarium.Test]], Horarium.Test", jobName);
+        }
+
+        [Fact]
+        public void GetName_ForGenericJobWithTwoNestedGenericArguments_ShouldRemoveVersionForAllTypes()
+        {
+            var jobName = new GenericJobWithTwoArguments<GenericJob<FirstNonGenericJob>, GenericJob<SecondNonGenericJob>>()
+                .GetType()
+                .AssemblyQualifiedNameWithoutVersion();
+
+            var type = Type.GetType(jobName, true);
+            var instance = Activator.CreateInstance(type);
+
+            Assert.NotNull(instance);
+            Assert.IsType<GenericJobWithTwoArguments<GenericJob<FirstNonGenericJob>, GenericJob<SecondNonGenericJob>>>(instance);
+            // Assert.Equal("Horarium.Test.GenericJobWithTwoArguments`2[[Horarium.Test.GenericJob`1[[Horarium.Test.FirstNonGenericJob, Horarium.Test]], Horarium.Test], [Horarium.Test.GenericJob`1[[Horarium.Test.SecondNonGenericJob, Horarium.Test]], Horarium.Test]], Horarium.Test", jobName);
+        }
+
+        [Fact]
+        public void GetName_ForGenericJobWithSingleGenericArgument_ShouldRemoveVersionForAllTypes()
+        {
+            var jobName = new GenericJob<SecondNonGenericJob>().GetType().AssemblyQualifiedNameWithoutVersion();
+
+            var type = Type.GetType(jobName, true);
+            var instance = Activator.CreateInstance(type);
+
+            Assert.NotNull(instance);
+            Assert.IsType<GenericJob<SecondNonGenericJob>>(instance);
+            Assert.Equal("Horarium.Test.GenericJob`1[[Horarium.Test.SecondNonGenericJob, Horarium.Test]], Horarium.Test", jobName);
+        }
+
+        [Fact]
+        public void GetName_ForGenericJobWithSingleNestedGenericArgument_ShouldRemoveVersionForAllTypes()
+        {
+            var jobName = new GenericJob<GenericJob<SecondNonGenericJob>>().GetType().AssemblyQualifiedNameWithoutVersion();
+
+            var type = Type.GetType(jobName, true);
+            var instance = Activator.CreateInstance(type);
+
+            Assert.NotNull(instance);
+            Assert.IsType<GenericJob<GenericJob<SecondNonGenericJob>>>(instance);
+            Assert.Equal("Horarium.Test.GenericJob`1[[Horarium.Test.GenericJob`1[[Horarium.Test.SecondNonGenericJob, Horarium.Test]], Horarium.Test]], Horarium.Test", jobName);
+        }
+    }
+}

src/Horarium.Test/TypeName/FirstNonGenericJob.cs

@@ -0,0 +1,4 @@
+namespace Horarium.Test
+{
+    public class FirstNonGenericJob { }
+}

src/Horarium.Test/TypeName/GenericJob.cs

@@ -0,0 +1,4 @@
+namespace Horarium.Test
+{
+    public class GenericJob<TFirst> { }
+}

src/Horarium.Test/TypeName/GenericJobWithTwoArguments.cs

@@ -0,0 +1,4 @@
+namespace Horarium.Test
+{
+    public class GenericJobWithTwoArguments<TFirst, TSecond> { }
+}

src/Horarium.Test/TypeName/SecondNonGenericJob.cs

@@ -0,0 +1,4 @@
+namespace Horarium.Test
+{
+    public class SecondNonGenericJob { }
+}

src/Horarium/Utils.cs

@@ -1,8 +1,11 @@
 using System;
+using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using Cronos;
 using Newtonsoft.Json;
 
+[assembly:InternalsVisibleTo("Horarium.Test")]
 namespace Horarium
 {
     internal static class Utils
@@ -19,14 +22,32 @@ public static object FromJson(this string json, Type type, JsonSerializerSetting
 
         public static string AssemblyQualifiedNameWithoutVersion(this Type type)
         {
-            string retValue = type.FullName + ", " + type.GetTypeInfo().Assembly.GetName().Name;
-            return retValue;
+            if (!type.IsGenericType)
+            {
+                return $"{type.FullName}, {type.GetTypeInfo().Assembly.GetName().Name}";
+            }
+
+            if (string.IsNullOrWhiteSpace(type.FullName))
+            {
+                throw new ArgumentException($"Не удалось получить имя тип {type}");
+            }
+
+            var genericArguments = type
+                .GetGenericArguments()
+                .Select(typeArgument => $"[{typeArgument.AssemblyQualifiedNameWithoutVersion()}]")
+                .ToArray();
+
+            var genericPart = string.Join(", ", genericArguments);
+
+            var bracketIndex = type.FullName.IndexOf("[", StringComparison.Ordinal);
+
+            return $"{type.FullName.Substring(0, bracketIndex)}[{genericPart}], {type.GetTypeInfo().Assembly.GetName().Name}";
         }
-        
+
         public static DateTime? ParseAndGetNextOccurrence(string cron)
         {
             var expression = CronExpression.Parse(cron, CronFormat.IncludeSeconds);
-            
+
             return expression.GetNextOccurrence(DateTime.UtcNow, TimeZoneInfo.Local);
         }
     }