Bugfix/path set minor (#4)

* fix: dry path set
maranmaran · Jun 16, 2023 · 3525772 · 3525772
1 parent 82fedbf
commit 3525772
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/source/Directory.Build.props b/source/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>2.0.1</Version>
+    <Version>2.0.2</Version>
     <Authors>Marko Urh</Authors>
     <Company>Perun</Company>
     <Copyright>Copyright (c) 2023 Marko Urh and other authors.</Copyright>

diff --git a/source/Perun.Differ/Models.cs b/source/Perun.Differ/Models.cs
@@ -20,26 +20,34 @@ public sealed class Difference
         public string CustomFieldPath { get; set; }
         public string CustomFieldName { get; set; }
 
+        public Difference()
+        {
+        }
+
         public Difference(string fullPath, string customFullPath, object leftValue, object rightValue)
         {
-            FullPath = fullPath;
-
-            var fullPathSplit = FullPath.Split('.');
-            FieldName = FullPath.Split('.').LastOrDefault();
-            FieldPath = string.Join(".", fullPathSplit.Take(fullPathSplit.Length - 1));
+            LeftValue = leftValue;
+            RightValue = rightValue;
 
-            if (fullPath != customFullPath)
+            (FullPath, FieldName, FieldPath) = SetPath(fullPath);
+            if (fullPath != customFullPath && customFullPath != null)
             {
-                CustomFullPath = customFullPath;
-
-                var customSplit = CustomFullPath.Split('.');
+                (CustomFullPath, CustomFieldName, CustomFieldPath) = SetPath(customFullPath);
+            }
+        }
 
-                CustomFieldName = CustomFullPath.Split('.').LastOrDefault();
-                CustomFieldPath = string.Join(".", customSplit.Take(customSplit.Length - 1));
+        private (string, string, string) SetPath(string fullPath)
+        {
+            if (fullPath == null)
+            {
+                return (null, null, null);
             }
 
-            LeftValue = leftValue;
-            RightValue = rightValue;
+            var pathSplit = fullPath.Split('.');
+            var fieldName = pathSplit.LastOrDefault();
+            var fieldPath = string.Join(".", pathSplit.Take(pathSplit.Length - 1));
+
+            return (fullPath, fieldName, fieldPath);
         }
     }
 }