Merge pull request #647 from solidify/feature/fix-closed-date

Feature/fix closed date

Author: Alexander-Hjelm

src/WorkItemMigrator/WorkItemImport/WitClient/WitClientUtils.cs

@@ -231,22 +231,8 @@ public void EnsureFieldsOnStateChange(WiRevision rev, WorkItem wi)
 
             if (rev.Index != 0 && rev.Fields.HasAnyByRefName(WiFieldReference.State))
             {
-                var wiState = wi.Fields[WiFieldReference.State].ToString() ?? string.Empty;
-                var revState = rev.Fields.GetFieldValueOrDefault<string>(WiFieldReference.State) ?? string.Empty;
-                if (wiState.Equals("Done", StringComparison.InvariantCultureIgnoreCase) && revState.Equals("New", StringComparison.InvariantCultureIgnoreCase))
-                {
-                    rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ClosedDate, Value = null });
-                    rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ClosedBy, Value = null });
-
-                }
-                if (!wiState.Equals("New", StringComparison.InvariantCultureIgnoreCase) && revState.Equals("New", StringComparison.InvariantCultureIgnoreCase))
-                {
-                    rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ActivatedDate, Value = null });
-                    rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ActivatedBy, Value = null });
-                }
-
-                if (revState.Equals("Done", StringComparison.InvariantCultureIgnoreCase) && !rev.Fields.HasAnyByRefName(WiFieldReference.ClosedBy))
-                    rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ClosedBy, Value = rev.Author });
+                CorrectClosedByAndClosedDate(rev, wi);
+                CorrectActivatedByAndActivatedDate(rev, wi);
             }
         }
 
@@ -575,6 +561,38 @@ private void CorrectImagePath(WorkItem wi, WiItem wiItem, WiRevision rev, ref st
             }
         }
 
+        private void CorrectClosedByAndClosedDate(WiRevision rev, WorkItem wi)
+        {
+            var wiState = wi.Fields[WiFieldReference.State].ToString() ?? string.Empty;
+            var revState = rev.Fields.GetFieldValueOrDefault<string>(WiFieldReference.State) ?? string.Empty;
+
+            if (wiState.Equals("Done", StringComparison.InvariantCultureIgnoreCase) && revState.Equals("New", StringComparison.InvariantCultureIgnoreCase))
+            {
+                rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ClosedDate, Value = null });
+                rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ClosedBy, Value = null });
+            }
+
+            if (revState.Equals("Done", StringComparison.InvariantCultureIgnoreCase))
+            {
+                if (!rev.Fields.HasAnyByRefName(WiFieldReference.ClosedDate))
+                    rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ClosedDate, Value = rev.Time });
+
+                if (!rev.Fields.HasAnyByRefName(WiFieldReference.ClosedBy))
+                    rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ClosedBy, Value = rev.Author });
+            }
+        }
+        private void CorrectActivatedByAndActivatedDate(WiRevision rev, WorkItem wi)
+        {
+            var wiState = wi.Fields[WiFieldReference.State].ToString() ?? string.Empty;
+            var revState = rev.Fields.GetFieldValueOrDefault<string>(WiFieldReference.State) ?? string.Empty;
+
+            if (!wiState.Equals("New", StringComparison.InvariantCultureIgnoreCase) && revState.Equals("New", StringComparison.InvariantCultureIgnoreCase))
+            {
+                rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ActivatedDate, Value = null });
+                rev.Fields.Add(new WiField() { ReferenceName = WiFieldReference.ActivatedBy, Value = null });
+            }
+        }
+
         private void AddSingleAttachmentToWorkItemAndSave(WiAttachment att, WorkItem wi)
         {
             // Upload attachment
@@ -805,4 +823,4 @@ private int GetRelatedWorkItemIdFromLink(WorkItemRelation link)
             return int.Parse(link.Url.Split('/').Last());
         }
     }
-}
+}