Skip to content

Commit a328036

Browse files
authored
Fix populate closed date in work item (#2673)
If ClosedDate is not available in the source there will be errors. This should ignore it.
2 parents 6405291 + e7076cf commit a328036

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/MigrationTools.Clients.TfsObjectModel/Processors/TfsWorkItemMigrationProcessor.cs

+11-5
Original file line numberDiff line numberDiff line change
@@ -417,10 +417,6 @@ private void PopulateWorkItem(WorkItemData oldWorkItemData, WorkItemData newWork
417417
}
418418

419419
newWorkItem.Title = oldWorkItem.Title;
420-
if (newWorkItem.Fields.Contains("Microsoft.VSTS.Common.ClosedDate") && newWorkItem.Fields["Microsoft.VSTS.Common.ClosedDate"].IsEditable)
421-
{
422-
newWorkItem.Fields["Microsoft.VSTS.Common.ClosedDate"].Value = oldWorkItem.Fields["Microsoft.VSTS.Common.ClosedDate"].Value;
423-
}
424420
newWorkItem.State = oldWorkItem.State;
425421
try
426422
{
@@ -905,7 +901,17 @@ private void CheckClosedDateIsValid(WorkItemData sourceWorkItem, WorkItemData ta
905901
if (targetWorkItem.ToWorkItem().Fields[closedDateField].Value == null && (targetWorkItem.ToWorkItem().Fields["System.State"].Value.ToString() == "Closed" || targetWorkItem.ToWorkItem().Fields["System.State"].Value.ToString() == "Done"))
906902
{
907903
Log.LogWarning("The field {closedDateField} is set to Null and will revert to the current date on save! ", closedDateField);
908-
Log.LogWarning("Source Closed Date [#{sourceId}][Rev{sourceRev}]: {sourceClosedDate} ", sourceWorkItem.ToWorkItem().Id, sourceWorkItem.ToWorkItem().Rev, sourceWorkItem.ToWorkItem().Fields[closedDateField].Value);
904+
if (sourceWorkItem.ToWorkItem().Fields.Contains(closedDateField))
905+
{
906+
Log.LogWarning("Source Closed Date [#{sourceId}][Rev{sourceRev}]: {sourceClosedDate} ",
907+
sourceWorkItem.ToWorkItem().Id, sourceWorkItem.ToWorkItem().Rev,
908+
sourceWorkItem.ToWorkItem().Fields[closedDateField].Value);
909+
}
910+
else
911+
{
912+
Log.LogWarning("Source Closed Date [#{sourceId}][Rev{sourceRev}] is not Available ",
913+
sourceWorkItem.ToWorkItem().Id, sourceWorkItem.ToWorkItem().Rev);
914+
}
909915
}
910916
if (!sourceWorkItem.ToWorkItem().Fields.Contains(closedDateField))
911917
{

0 commit comments

Comments
 (0)