removed duplicate Marten type format handling (#47)

DAXGRID · Dec 9, 2024 · 99878c5 · 99878c5
1 parent b9b6579
commit 99878c5
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/OpenFTTH.EventSourcing/Postgres/PostgresEventStore.cs b/OpenFTTH.EventSourcing/Postgres/PostgresEventStore.cs
@@ -84,9 +84,7 @@ public T Load<T>(Guid id, long? version = null) where T : AggregateBase
             var reader = cmd.ExecuteReader();
             while (reader.Read())
             {
-                var splittedDotnetType = ((string)reader["mt_dotnet_type"]).Split(",");
-                var typeName = splittedDotnetType[0];
-                var assemblyName = splittedDotnetType[1];
+                var (assemblyName, typeName) = GetMartenDotNetTypeFormat((string)reader["mt_dotnet_type"]);
 
                 if (!types.ContainsKey(typeName))
                 {
@@ -210,9 +208,7 @@ WHERE mt_dotnet_type IN ({eventTypesInClause})
 
             while (reader.Read())
             {
-                var splittedDotnetType = ((string)reader["mt_dotnet_type"]).Split(",");
-                var typeName = splittedDotnetType[0];
-                var assemblyName = splittedDotnetType[1];
+                var (assemblyName, typeName) = GetMartenDotNetTypeFormat((string)reader["mt_dotnet_type"]);
 
                 if (!types.ContainsKey(typeName))
                 {
@@ -260,9 +256,7 @@ WHERE mt_dotnet_type IN ({eventTypesInClause})
 
             while (await reader.ReadAsync().ConfigureAwait(false))
             {
-                var splittedDotnetType = ((string)reader["mt_dotnet_type"]).Split(",");
-                var typeName = splittedDotnetType[0];
-                var assemblyName = splittedDotnetType[1];
+                var (assemblyName, typeName) = GetMartenDotNetTypeFormat((string)reader["mt_dotnet_type"]);
 
                 if (!types.ContainsKey(typeName))
                 {
@@ -321,9 +315,7 @@ where mt_dotnet_type IN ({eventTypesInClause})
             {
                 eventsProcessed++;
 
-                var splittedDotnetType = ((string)reader["mt_dotnet_type"]).Split(",");
-                var typeName = splittedDotnetType[0];
-                var assemblyName = splittedDotnetType[1];
+                var (assemblyName, typeName) = GetMartenDotNetTypeFormat((string)reader["mt_dotnet_type"]);
 
                 if (!types.ContainsKey(typeName))
                 {
@@ -392,9 +384,7 @@ where mt_dotnet_type IN ({eventTypesInClause})
             {
                 eventsProcessed++;
 
-                var splittedDotnetType = ((string)reader["mt_dotnet_type"]).Split(",");
-                var typeName = splittedDotnetType[0];
-                var assemblyName = splittedDotnetType[1];
+                var (assemblyName, typeName) = GetMartenDotNetTypeFormat((string)reader["mt_dotnet_type"]);
 
                 if (!types.ContainsKey(typeName))
                 {
@@ -531,5 +521,11 @@ private static Type LoadType(string assemblyName, string typeName)
         {
             return Assembly.Load(assemblyName).GetType(typeName);
         }
+
+        private static (string assemblyName, string typeName) GetMartenDotNetTypeFormat(string martenDotnetType)
+        {
+            var splittedDotnetType = martenDotnetType.Split(",");
+            return (splittedDotnetType[1], splittedDotnetType[0]);
+        }
     }
 }