Bug/87 email usernotfound (#92)

* Adding check for invalid user mapping lines. (#90)

* Refactoring #87

Author: MOlausson

src/WorkItemMigrator/Migration.Common/BaseMapper.cs

@@ -9,32 +9,11 @@ namespace Migration.Common
 {
     public class BaseMapper<TRevision> where TRevision : ISourceRevision
     {
-        public BaseMapper(string userMappingPath)
-        {
-            ParseUserMappings(userMappingPath);
-        }
-
         protected Dictionary<string, string> UserMapping { get; private set; } = new Dictionary<string, string>();
-        protected void ParseUserMappings(string userMappingPath)
-        {
-            if (!File.Exists(userMappingPath))
-            {
-                Logger.Log(LogLevel.Warning, $"User mapping file '{userMappingPath}' not found, ignoring mapping user identities.");
-                return;
-            }
-
-            string[] userMappings = File.ReadAllLines(userMappingPath);
-            foreach (var userMapping in userMappings)
-            {
-                var userMappingParts = userMapping.Split('=');
-                if (userMappingParts.Length == 2)
-                {
-                    string jiraUser = userMappingParts[0].Trim();
-                    string wiUser = userMappingParts[1].Trim();
 
-                    UserMapping.Add(jiraUser, wiUser);
-                }
-            }
+        public BaseMapper(string userMappingPath)
+        {
+            UserMapping = UserMapper.ParseUserMappings(userMappingPath);
         }
 
         protected virtual string MapUser(string sourceUser)

src/WorkItemMigrator/Migration.Common/Migration.Common.csproj

@@ -74,6 +74,7 @@
     <Compile Include="MigrationContext.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RevisionUtility.cs" />
+    <Compile Include="UserMapper.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config">

src/WorkItemMigrator/Migration.Common/MigrationContext.cs

@@ -23,7 +23,7 @@ private MigrationContext(string app, string workspacePath, string logLevel, bool
         {
             App = app;
             MigrationWorkspace = workspacePath;
-            ParseUserMappings(UserMappingPath);
+            UserMapping = UserMapper.ParseUserMappings(UserMappingPath);
             LogLevel = Logger.GetLogLevelFromString(logLevel);
             ForceFresh = forceFresh;
         }
@@ -43,28 +43,6 @@ public static MigrationContext Init(string app, string workspacePath, string log
             return Instance;
         }
 
-        private void ParseUserMappings(string userMappingPath)
-        {
-            if (!File.Exists(userMappingPath))
-            {
-                Logger.Log(LogLevel.Warning, $"User mapping file '{userMappingPath}' not found, ignoring mapping user identities.");
-                return;
-            }
-
-            string[] userMappings = File.ReadAllLines(userMappingPath);
-            foreach (var userMapping in userMappings)
-            {
-                var userMappingParts = userMapping.Split('=');
-                if (userMappingParts.Length == 2)
-                {
-                    string jiraUser = userMappingParts[0].Trim();
-                    string wiUser = userMappingParts[1].Trim();
-
-                    UserMapping.Add(jiraUser, wiUser);
-                }
-            }
-        }
-
         public WiItem GetItem(string originId)
         {
             var item =  this.Provider.Load(originId);

src/WorkItemMigrator/Migration.Common/UserMapper.cs

@@ -0,0 +1,37 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using Migration.Common.Log;
+
+namespace Migration.Common
+{
+    internal class UserMapper
+    {
+        public static Dictionary<string, string> ParseUserMappings(string userMappingPath)
+        {
+            var internalUserMapping = new Dictionary<string, string>();
+
+            if (!File.Exists(userMappingPath))
+            {
+                Logger.Log(LogLevel.Warning, $"User mapping file '{userMappingPath}' not found, ignoring mapping user identities.");
+            }
+            else
+            {
+                string[] userMappings = File.ReadAllLines(userMappingPath);
+                foreach (var userMapping in userMappings)
+                {
+                    var userMappingParts = userMapping.Split('=');
+                    if (userMappingParts.Length == 2)
+                    {
+                        string jiraUser = userMappingParts[0].Trim();
+                        string wiUser = userMappingParts[1].Trim();
+
+                        internalUserMapping.Add(jiraUser, wiUser);
+                    }
+                }
+            }
+
+            return internalUserMapping;
+        }
+    }
+}