PR 25: Null fields are now taken care of for Integer Tagging

 - Null fields are now taken care of for Integer Tagging

Author: MrHinsh

GitVersion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: None
 mode: ContinuousDeployment
-next-version: 0.4.2
+next-version: 0.4.6
 branches: {}
 ignore:
   sha: []

TfsWitMigrator.Console/ApplicationInsights.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ApplicationInsights schemaVersion="2014-05-30" xmlns="http://schemas.microsoft.com/ApplicationInsights/2013/Settings">
-  <InstrumentationKey>6a59fbae-e6a1-4df4-9316-37b4db0fadde</InstrumentationKey>
+  <InstrumentationKey>a7622e0a-0b81-4be1-9e85-81d500642b6f</InstrumentationKey>
   <TelemetryChannel>
     <DeveloperMode>true</DeveloperMode>
     <DataUploadIntervalInSeconds>5</DataUploadIntervalInSeconds>

TfsWitMigrator.Core/FieldMaps/FieldMergeMap.cs

@@ -28,8 +28,11 @@ internal override void InternalExecute(WorkItem source, WorkItem target)
         {
             if (source.Fields.Contains(sourceField1) && source.Fields.Contains(sourceField2))
             {
-                  target.Fields[targetField].Value = string.Format(format, (string)source.Fields[sourceField1].Value.ToString(), (string)source.Fields[sourceField2].Value.ToString());
-                  Trace.WriteLine(string.Format("  [UPDATE] field merged {0}:{1}+{2} to {3}:{4}", source.Id, sourceField1, sourceField2, target.Id, targetField));
+                if (source.Fields[sourceField1].Value != null)
+                {
+                    target.Fields[targetField].Value = string.Format(format, (string)source.Fields[sourceField1].Value.ToString(), (string)source.Fields[sourceField2].Value.ToString());
+                    Trace.WriteLine(string.Format("  [UPDATE] field merged {0}:{1}+{2} to {3}:{4}", source.Id, sourceField1, sourceField2, target.Id, targetField));
+                }
             }
         }
     }

TfsWitMigrator.Core/FieldMaps/FieldToTagFieldMap.cs

@@ -24,18 +24,22 @@ public void Execute(WorkItem source, WorkItem target)
             {
                 List<string> newTags = target.Tags.Split(char.Parse(@";")).ToList();
                 // to tag
-                string value = (string)source.Fields[sourceField].Value;
-                if (string.IsNullOrEmpty(formatExpression))
+                if (source.Fields[sourceField].Value != null)
                 {
-                    newTags.Add(value);
-                }
-                else
-                {
-                    newTags.Add(string.Format(formatExpression, value));
-                }
+                    string value = source.Fields[sourceField].Value.ToString();
+                    if (string.IsNullOrEmpty(formatExpression))
+                    {
+                        newTags.Add(value);
+                    }
+                    else
+                    {
+                        newTags.Add(string.Format(formatExpression, value));
+                    }
 
-                target.Tags = string.Join(";", newTags.ToArray());
-                Trace.WriteLine(string.Format("  [UPDATE] field tagged {0}:{1} to {2}:Tag with foramt of {3}", source.Id, sourceField, target.Id, formatExpression));
+                    target.Tags = string.Join(";", newTags.ToArray());
+                    Trace.WriteLine(string.Format("  [UPDATE] field tagged {0}:{1} to {2}:Tag with foramt of {3}", source.Id, sourceField, target.Id, formatExpression));
+                }
+                
             }
         }
     }

TfsWitMigrator.Core/ProcessingContext/WorkItemUpdate.cs

@@ -59,7 +59,16 @@ internal override void InternalExecute()
                 {
                     if (!_whatIf)
                     {
-                        workitem.Save();
+                        try
+                        {
+                            workitem.Save();
+                        }
+                        catch (Exception)
+                        {
+                            System.Threading.Thread.Sleep(5000);
+                            workitem.Save();
+                        }
+                       
                     } else
                     {
                         Trace.WriteLine("No save done: (What IF: enabled)");