From ada035217eaa1b9199bb94d3e13a3e73a6487027 Mon Sep 17 00:00:00 2001
From: Jelle Bekker <jelle.bekker@ortec.com>
Date: Mon, 30 Oct 2023 11:07:37 +0100
Subject: [PATCH] Fix extracting user picker value for Jira Server

---
 src/WorkItemMigrator/JiraExport/JiraItem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WorkItemMigrator/JiraExport/JiraItem.cs b/src/WorkItemMigrator/JiraExport/JiraItem.cs
index a64b3056..a45f56bc 100644
--- a/src/WorkItemMigrator/JiraExport/JiraItem.cs
+++ b/src/WorkItemMigrator/JiraExport/JiraItem.cs
@@ -486,11 +486,11 @@ private static Dictionary<string, object> ExtractFields(string key, JObject remo
                     value = prop.Value.Value<string>();
                 }
                 // User picker
-                else if (type == JTokenType.Object && prop.Value["accountId"] != null
+                else if (type == JTokenType.Object && (prop.Value["accountId"] != null || prop.Value["name"] != null)
                     && prop.Value["emailAddress"] != null && prop.Value["avatarUrls"] != null
                     && prop.Value["displayName"] != null)
                 {
-                    value = prop.Value["accountId"].ToString();
+                    value = extractAccountIdOrUsername(prop.Value);
                 }
                 else if (prop.Value.Type == JTokenType.Date)
                 {