Merge pull request #867 from nickn00/Branch-to-fix-attachments

Fix Attachments fail to download from Jira
solidify · Oct 18, 2023 · 1924b33 · 1924b33
2 parents 56a7600 + c6b7caf
commit 1924b33
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/WorkItemMigrator/JiraExport/JiraItem.cs b/src/WorkItemMigrator/JiraExport/JiraItem.cs
@@ -205,11 +205,11 @@ private static void HandleAttachmentChange(JiraChangeItem item, List<RevisionAct
 
             if (UndoAttachmentChange(attachmentChange, attachments))
             {
-                attachmentChanges.Add(attachmentChange);
+                Logger.Log(LogLevel.Debug, $"Attachment {item.ToString ?? item.FromString} cannot be migrated because it was deleted.");
             }
             else
             {
-                Logger.Log(LogLevel.Debug, $"Attachment {item.ToString ?? item.FromString} cannot be migrated because it was deleted.");
+               attachmentChanges.Add(attachmentChange);
             }
         }
 
@@ -258,9 +258,9 @@ private static bool UndoAttachmentChange(RevisionAction<JiraAttachment> attachme
             if (attachmentChange.ChangeType == RevisionChangeType.Removed)
             {
                 Logger.Log(LogLevel.Debug, $"Skipping undo for attachment '{attachmentChange.ToString()}'.");
-                return false;
+                return RemoveAttachment(attachmentChange, attachments);
             }
-            return RemoveAttachment(attachmentChange, attachments);
+            return false;
         }
 
         private static bool RemoveAttachment(RevisionAction<JiraAttachment> attachmentChange, List<JiraAttachment> attachments)