From f42f711bde13c46156985153941f880386a598c8 Mon Sep 17 00:00:00 2001 From: atefehmohseni <57154674+atefehmohseni@users.noreply.github.com> Date: Mon, 18 Nov 2024 21:28:54 -0800 Subject: [PATCH 01/10] Update pr.go --- scm/driver/bitbucket/pr.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/driver/bitbucket/pr.go b/scm/driver/bitbucket/pr.go index ead47a82..38610bf5 100644 --- a/scm/driver/bitbucket/pr.go +++ b/scm/driver/bitbucket/pr.go @@ -193,7 +193,7 @@ func convertPullRequest(from *pr) *scm.PullRequest { Sha: from.Destination.Commit.Hash, }, Author: scm.User{ - Login: from.Author.Nickname, + Login: from.Author.UUID, Name: from.Author.DisplayName, Avatar: from.Author.Links.Avatar.Href, }, From ad49c0a6b9215301ac063978682a9e32752a724a Mon Sep 17 00:00:00 2001 From: atefehmohseni <57154674+atefehmohseni@users.noreply.github.com> Date: Mon, 18 Nov 2024 21:47:51 -0800 Subject: [PATCH 02/10] Update prs.json.golden --- scm/driver/bitbucket/testdata/prs.json.golden | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/driver/bitbucket/testdata/prs.json.golden b/scm/driver/bitbucket/testdata/prs.json.golden index 29cafe90..99a5905f 100644 --- a/scm/driver/bitbucket/testdata/prs.json.golden +++ b/scm/driver/bitbucket/testdata/prs.json.golden @@ -23,7 +23,7 @@ "Name": "Lachlan-Vass/ios-date-picker-component-duplicate-marc-1579222909688" }, "Author": { - "Login": "Lachlan", + "Login": "ef9d9075-f870-417f-b424-83adbc8efa54", "Name": "Lachlan Vass", "Avatar": "https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net/5c7c7b1a0b79db7c3e33eca2/6b6b8178-0da0-4a37-b0dd-f8b5e3628eaa/128" }, From 494c7c7d222363cf025fe38c3b213aac98dba043 Mon Sep 17 00:00:00 2001 From: atefehmohseni <57154674+atefehmohseni@users.noreply.github.com> Date: Mon, 18 Nov 2024 21:48:08 -0800 Subject: [PATCH 03/10] Update pr.json.golden --- scm/driver/bitbucket/testdata/pr.json.golden | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/driver/bitbucket/testdata/pr.json.golden b/scm/driver/bitbucket/testdata/pr.json.golden index 8132df37..eb0f2c04 100644 --- a/scm/driver/bitbucket/testdata/pr.json.golden +++ b/scm/driver/bitbucket/testdata/pr.json.golden @@ -22,7 +22,7 @@ "Name": "Lachlan-Vass/ios-date-picker-component-duplicate-marc-1579222909688" }, "Author": { - "Login": "Lachlan", + "Login": "ef9d9075-f870-417f-b424-83adbc8efa54", "Name": "Lachlan Vass", "Avatar": "https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net/5c7c7b1a0b79db7c3e33eca2/6b6b8178-0da0-4a37-b0dd-f8b5e3628eaa/128" }, From 2cb72e1be625c5d94790bb7eca362b68684782ee Mon Sep 17 00:00:00 2001 From: atefehmohseni <57154674+atefehmohseni@users.noreply.github.com> Date: Mon, 18 Nov 2024 21:52:57 -0800 Subject: [PATCH 04/10] Update pr.go --- scm/driver/bitbucket/pr.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/driver/bitbucket/pr.go b/scm/driver/bitbucket/pr.go index 38610bf5..4d435c19 100644 --- a/scm/driver/bitbucket/pr.go +++ b/scm/driver/bitbucket/pr.go @@ -193,7 +193,7 @@ func convertPullRequest(from *pr) *scm.PullRequest { Sha: from.Destination.Commit.Hash, }, Author: scm.User{ - Login: from.Author.UUID, + Login: from.Author.AccountID, Name: from.Author.DisplayName, Avatar: from.Author.Links.Avatar.Href, }, From 8f57b646812524037782314137052815b86aeb00 Mon Sep 17 00:00:00 2001 From: atefehmohseni <57154674+atefehmohseni@users.noreply.github.com> Date: Mon, 18 Nov 2024 21:55:43 -0800 Subject: [PATCH 05/10] Update pr.json.golden --- scm/driver/bitbucket/testdata/pr.json.golden | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/driver/bitbucket/testdata/pr.json.golden b/scm/driver/bitbucket/testdata/pr.json.golden index eb0f2c04..541b7b4c 100644 --- a/scm/driver/bitbucket/testdata/pr.json.golden +++ b/scm/driver/bitbucket/testdata/pr.json.golden @@ -22,7 +22,7 @@ "Name": "Lachlan-Vass/ios-date-picker-component-duplicate-marc-1579222909688" }, "Author": { - "Login": "ef9d9075-f870-417f-b424-83adbc8efa54", + "Login": "5c7c7b1a0b79db7c3e33eca2", "Name": "Lachlan Vass", "Avatar": "https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net/5c7c7b1a0b79db7c3e33eca2/6b6b8178-0da0-4a37-b0dd-f8b5e3628eaa/128" }, From 44d28c751c4e838ee99b0a5a7be7a289334742f9 Mon Sep 17 00:00:00 2001 From: atefehmohseni <57154674+atefehmohseni@users.noreply.github.com> Date: Mon, 18 Nov 2024 21:56:34 -0800 Subject: [PATCH 06/10] Update prs.json.golden --- scm/driver/bitbucket/testdata/prs.json.golden | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/driver/bitbucket/testdata/prs.json.golden b/scm/driver/bitbucket/testdata/prs.json.golden index 99a5905f..993b68be 100644 --- a/scm/driver/bitbucket/testdata/prs.json.golden +++ b/scm/driver/bitbucket/testdata/prs.json.golden @@ -23,7 +23,7 @@ "Name": "Lachlan-Vass/ios-date-picker-component-duplicate-marc-1579222909688" }, "Author": { - "Login": "ef9d9075-f870-417f-b424-83adbc8efa54", + "Login": "5c7c7b1a0b79db7c3e33eca2", "Name": "Lachlan Vass", "Avatar": "https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net/5c7c7b1a0b79db7c3e33eca2/6b6b8178-0da0-4a37-b0dd-f8b5e3628eaa/128" }, From a394f0d2cd7ba0bc4cad45d2c7277f974e2a08a5 Mon Sep 17 00:00:00 2001 From: atefehmohseni <57154674+atefehmohseni@users.noreply.github.com> Date: Tue, 19 Nov 2024 07:53:40 -0800 Subject: [PATCH 07/10] Update pr.go --- scm/driver/bitbucket/pr.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/driver/bitbucket/pr.go b/scm/driver/bitbucket/pr.go index 4d435c19..54f0b8b1 100644 --- a/scm/driver/bitbucket/pr.go +++ b/scm/driver/bitbucket/pr.go @@ -193,7 +193,7 @@ func convertPullRequest(from *pr) *scm.PullRequest { Sha: from.Destination.Commit.Hash, }, Author: scm.User{ - Login: from.Author.AccountID, + ID: from.Author.AccountID, Name: from.Author.DisplayName, Avatar: from.Author.Links.Avatar.Href, }, From de8ab9207236ee5ef0f3fbd46029b7ecf2008741 Mon Sep 17 00:00:00 2001 From: atefehmohseni <57154674+atefehmohseni@users.noreply.github.com> Date: Tue, 19 Nov 2024 07:54:44 -0800 Subject: [PATCH 08/10] Update pr.json.golden --- scm/driver/bitbucket/testdata/pr.json.golden | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/driver/bitbucket/testdata/pr.json.golden b/scm/driver/bitbucket/testdata/pr.json.golden index 541b7b4c..1ed8a643 100644 --- a/scm/driver/bitbucket/testdata/pr.json.golden +++ b/scm/driver/bitbucket/testdata/pr.json.golden @@ -22,7 +22,7 @@ "Name": "Lachlan-Vass/ios-date-picker-component-duplicate-marc-1579222909688" }, "Author": { - "Login": "5c7c7b1a0b79db7c3e33eca2", + "ID": "5c7c7b1a0b79db7c3e33eca2", "Name": "Lachlan Vass", "Avatar": "https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net/5c7c7b1a0b79db7c3e33eca2/6b6b8178-0da0-4a37-b0dd-f8b5e3628eaa/128" }, From 587bff37744f17d407e77508d38831260289aee0 Mon Sep 17 00:00:00 2001 From: atefehmohseni <57154674+atefehmohseni@users.noreply.github.com> Date: Tue, 19 Nov 2024 07:54:56 -0800 Subject: [PATCH 09/10] Update prs.json.golden --- scm/driver/bitbucket/testdata/prs.json.golden | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/driver/bitbucket/testdata/prs.json.golden b/scm/driver/bitbucket/testdata/prs.json.golden index 993b68be..90a24604 100644 --- a/scm/driver/bitbucket/testdata/prs.json.golden +++ b/scm/driver/bitbucket/testdata/prs.json.golden @@ -23,7 +23,7 @@ "Name": "Lachlan-Vass/ios-date-picker-component-duplicate-marc-1579222909688" }, "Author": { - "Login": "5c7c7b1a0b79db7c3e33eca2", + "ID": "5c7c7b1a0b79db7c3e33eca2", "Name": "Lachlan Vass", "Avatar": "https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net/5c7c7b1a0b79db7c3e33eca2/6b6b8178-0da0-4a37-b0dd-f8b5e3628eaa/128" }, From df651244d043b16a27f42fa401e127c4697b1dd6 Mon Sep 17 00:00:00 2001 From: atefehmohseni <57154674+atefehmohseni@users.noreply.github.com> Date: Tue, 19 Nov 2024 12:24:12 -0800 Subject: [PATCH 10/10] gofmt --- scm/driver/bitbucket/pr.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/driver/bitbucket/pr.go b/scm/driver/bitbucket/pr.go index 54f0b8b1..c0282f71 100644 --- a/scm/driver/bitbucket/pr.go +++ b/scm/driver/bitbucket/pr.go @@ -193,7 +193,7 @@ func convertPullRequest(from *pr) *scm.PullRequest { Sha: from.Destination.Commit.Hash, }, Author: scm.User{ - ID: from.Author.AccountID, + ID: from.Author.AccountID, Name: from.Author.DisplayName, Avatar: from.Author.Links.Avatar.Href, },