You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by ab...@apache.org on 2023/05/09 10:37:56 UTC
[incubator-devlake] branch main updated: feat: gitlab adapts original_status and status (#5137)
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 0c5bbcb66 feat: gitlab adapts original_status and status (#5137)
0c5bbcb66 is described below
commit 0c5bbcb66797fb50b110166fefddfdcfd97609e5
Author: abeizn <zi...@merico.dev>
AuthorDate: Tue May 9 18:37:51 2023 +0800
feat: gitlab adapts original_status and status (#5137)
* feat: gitlab adapts original_status and status
* feat: bitbucket adapts original_status and status
* feat: if else to switch
---
backend/plugins/bitbucket/e2e/pr_test.go | 4 +-
.../e2e/snapshot_tables/pull_requests.csv | 116 ++++++++++-----------
backend/plugins/bitbucket/tasks/pr_convertor.go | 13 ++-
.../gitlab/e2e/snapshot_tables/pull_requests.csv | 36 +++----
backend/plugins/gitlab/tasks/mr_convertor.go | 15 ++-
5 files changed, 104 insertions(+), 80 deletions(-)
diff --git a/backend/plugins/bitbucket/e2e/pr_test.go b/backend/plugins/bitbucket/e2e/pr_test.go
index 1fb23e0d4..5c250f0a4 100644
--- a/backend/plugins/bitbucket/e2e/pr_test.go
+++ b/backend/plugins/bitbucket/e2e/pr_test.go
@@ -18,12 +18,13 @@ limitations under the License.
package e2e
import (
+ "testing"
+
"github.com/apache/incubator-devlake/core/models/domainlayer/code"
"github.com/apache/incubator-devlake/helpers/e2ehelper"
"github.com/apache/incubator-devlake/plugins/bitbucket/impl"
"github.com/apache/incubator-devlake/plugins/bitbucket/models"
"github.com/apache/incubator-devlake/plugins/bitbucket/tasks"
- "testing"
)
func TestPrDataFlow(t *testing.T) {
@@ -99,6 +100,7 @@ func TestPrDataFlow(t *testing.T) {
"base_repo_id",
"head_repo_id",
"status",
+ "original_status",
"title",
"description",
"url",
diff --git a/backend/plugins/bitbucket/e2e/snapshot_tables/pull_requests.csv b/backend/plugins/bitbucket/e2e/snapshot_tables/pull_requests.csv
index d3162fb98..0954cb47a 100644
--- a/backend/plugins/bitbucket/e2e/snapshot_tables/pull_requests.csv
+++ b/backend/plugins/bitbucket/e2e/snapshot_tables/pull_requests.csv
@@ -1,6 +1,6 @@
-id,base_repo_id,head_repo_id,status,title,description,url,author_name,author_id,parent_pr_id,pull_request_key,merged_date,closed_date,type,component,merge_commit_sha,head_ref,base_ref,base_commit_sha,head_commit_sha,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:1,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,feat: add pr test,this is a pr test for Bitbucket plugin,https://bitbucket.org/likyh/likyhphp/pull-requests/1,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,1,,,pullrequest,,,test,master,c0e12b61e44b,5e5bccfcc656,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,171,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:10,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test007,"* feat: add git.sh
+id,base_repo_id,head_repo_id,status,original_status,title,description,url,author_name,author_id,parent_pr_id,pull_request_key,merged_date,closed_date,type,component,merge_commit_sha,head_ref,base_ref,base_commit_sha,head_commit_sha,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:1,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,feat: add pr test,this is a pr test for Bitbucket plugin,https://bitbucket.org/likyh/likyhphp/pull-requests/1,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,1,,,pullrequest,,,test,master,c0e12b61e44b,5e5bccfcc656,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,171,
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:10,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test007,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -10,7 +10,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:10,bitbucket:BitbucketRepo:1:lik
* feat: add test007
",https://bitbucket.org/likyh/likyhphp/pull-requests/10,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,10,,,pullrequest,,983edbf06740,test007,master,0bd83caaf9c7,15a1fcb51f0e,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,161,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:11,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test6,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:11,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test6,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -33,7 +33,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:11,bitbucket:BitbucketRepo:1:lik
* feat: add test6
",https://bitbucket.org/likyh/likyhphp/pull-requests/11,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,11,,,pullrequest,,983edbf06740,test6,master,0bd83caaf9c7,bc9a3ddd47ea,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,160,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:12,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test7,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:12,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test7,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -57,7 +57,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:12,bitbucket:BitbucketRepo:1:lik
* feat: add test7
",https://bitbucket.org/likyh/likyhphp/pull-requests/12,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,12,,,pullrequest,,983edbf06740,test7,master,0bd83caaf9c7,dd2cd76d7098,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,159,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:13,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test8,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:13,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test8,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -82,7 +82,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:13,bitbucket:BitbucketRepo:1:lik
* feat: add test8
",https://bitbucket.org/likyh/likyhphp/pull-requests/13,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,13,,,pullrequest,,983edbf06740,test8,master,0bd83caaf9c7,94056215cf46,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,158,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:14,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test10,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:14,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test10,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -109,7 +109,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:14,bitbucket:BitbucketRepo:1:lik
* feat: add test10
",https://bitbucket.org/likyh/likyhphp/pull-requests/14,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,14,,,pullrequest,,983edbf06740,test10,master,0bd83caaf9c7,bc2cf25142e3,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,157,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:15,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test011,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:15,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test011,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -123,7 +123,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:15,bitbucket:BitbucketRepo:1:lik
* feat: add test011
",https://bitbucket.org/likyh/likyhphp/pull-requests/15,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,15,,,pullrequest,,983edbf06740,test011,master,0bd83caaf9c7,5db6b1a9e60c,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,156,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:16,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test12,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:16,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test12,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -152,7 +152,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:16,bitbucket:BitbucketRepo:1:lik
* feat: add test12
",https://bitbucket.org/likyh/likyhphp/pull-requests/16,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,16,,,pullrequest,,983edbf06740,test12,master,0bd83caaf9c7,d1321cb5e4fb,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,170,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:17,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test13,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:17,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test13,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -182,7 +182,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:17,bitbucket:BitbucketRepo:1:lik
* feat: add test13
",https://bitbucket.org/likyh/likyhphp/pull-requests/17,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,17,,,pullrequest,,c0e12b61e44b,test13,master,983edbf06740,3d6d96659c4d,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,151,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:18,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test14,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:18,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test14,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -213,7 +213,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:18,bitbucket:BitbucketRepo:1:lik
* feat: add test14
",https://bitbucket.org/likyh/likyhphp/pull-requests/18,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,18,,,pullrequest,,c0e12b61e44b,test14,master,983edbf06740,8d4896eef3ed,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,150,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:19,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test15,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:19,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test15,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -245,8 +245,8 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:19,bitbucket:BitbucketRepo:1:lik
* feat: add test15
",https://bitbucket.org/likyh/likyhphp/pull-requests/19,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,19,,,pullrequest,,c0e12b61e44b,test15,master,983edbf06740,daa1cfa7ec0c,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,149,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:2,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,feat: add git.sh,help to git commit faster,https://bitbucket.org/likyh/likyhphp/pull-requests/2,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,2,,,pullrequest,,983edbf06740,vowehwo,master,0bd83caaf9c7,d4a6789a3751,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,169,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:20,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test16,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:2,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,feat: add git.sh,help to git commit faster,https://bitbucket.org/likyh/likyhphp/pull-requests/2,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,2,,,pullrequest,,983edbf06740,vowehwo,master,0bd83caaf9c7,d4a6789a3751,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,169,
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:20,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test16,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -279,7 +279,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:20,bitbucket:BitbucketRepo:1:lik
* feat: add test16
",https://bitbucket.org/likyh/likyhphp/pull-requests/20,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,20,,,pullrequest,,c0e12b61e44b,test16,master,983edbf06740,11f6c86580e2,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,148,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:21,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test18,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:21,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test18,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -314,7 +314,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:21,bitbucket:BitbucketRepo:1:lik
* feat: add test18
",https://bitbucket.org/likyh/likyhphp/pull-requests/21,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,21,,,pullrequest,,c0e12b61e44b,test18,master,983edbf06740,0b958bbfed04,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,147,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:22,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test19,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:22,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test19,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -350,7 +350,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:22,bitbucket:BitbucketRepo:1:lik
* feat: add test19
",https://bitbucket.org/likyh/likyhphp/pull-requests/22,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,22,,,pullrequest,,c0e12b61e44b,test19,master,983edbf06740,d1bb3677810e,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,146,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:23,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test20,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:23,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test20,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -387,7 +387,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:23,bitbucket:BitbucketRepo:1:lik
* feat: add test20
",https://bitbucket.org/likyh/likyhphp/pull-requests/23,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,23,,,pullrequest,,c0e12b61e44b,test20,master,983edbf06740,9d16a2368acd,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,145,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:24,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test17,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:24,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test17,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -421,7 +421,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:24,bitbucket:BitbucketRepo:1:lik
* feat: add test17
",https://bitbucket.org/likyh/likyhphp/pull-requests/24,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,24,,,pullrequest,,c0e12b61e44b,test17,master,983edbf06740,2bfd29a17665,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,144,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:25,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,1,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:25,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,1,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -439,7 +439,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:25,bitbucket:BitbucketRepo:1:lik
* feat: add 1
",https://bitbucket.org/likyh/likyhphp/pull-requests/25,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,25,,,pullrequest,,983edbf06740,1,master,0bd83caaf9c7,592612c47ff5,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,155,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:26,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,2,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:26,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,2,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -458,7 +458,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:26,bitbucket:BitbucketRepo:1:lik
* feat: add 2
",https://bitbucket.org/likyh/likyhphp/pull-requests/26,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,26,,,pullrequest,,983edbf06740,2,master,0bd83caaf9c7,05b97cf92b4b,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,154,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:27,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,4,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:27,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,4,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -479,13 +479,13 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:27,bitbucket:BitbucketRepo:1:lik
* feat: add 4
",https://bitbucket.org/likyh/likyhphp/pull-requests/27,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,27,,,pullrequest,,983edbf06740,4,master,0bd83caaf9c7,761fdb9244ef,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,153,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:28,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,mergev1,merge all v1,https://bitbucket.org/likyh/likyhphp/pull-requests/28,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,28,,,pullrequest,,c0e12b61e44b,mergev1,master,983edbf06740,581a89006076,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,152,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:29,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test03,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:28,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,mergev1,merge all v1,https://bitbucket.org/likyh/likyhphp/pull-requests/28,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,28,,,pullrequest,,c0e12b61e44b,mergev1,master,983edbf06740,581a89006076,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,152,
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:29,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test03,"* feat: add test01
* feat: add test02
* feat: add test03
",https://bitbucket.org/likyh/likyhphp/pull-requests/29,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,29,,,pullrequest,,,test03,master,c0e12b61e44b,a3768d182d18,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,132,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:3,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test9,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:3,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test9,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -511,14 +511,14 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:3,bitbucket:BitbucketRepo:1:liky
* feat: add test9
",https://bitbucket.org/likyh/likyhphp/pull-requests/3,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,3,,,pullrequest,,983edbf06740,test9,master,0bd83caaf9c7,6557208f4aa6,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,168,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:30,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test05,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:30,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test05,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
* feat: add test05
",https://bitbucket.org/likyh/likyhphp/pull-requests/30,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,30,,,pullrequest,,,test05,master,c0e12b61e44b,91e7a1db9ae0,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,143,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:31,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test020,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:31,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test020,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -540,7 +540,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:31,bitbucket:BitbucketRepo:1:lik
* feat: add test020
",https://bitbucket.org/likyh/likyhphp/pull-requests/31,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,31,,,pullrequest,,,test020,master,c0e12b61e44b,0342bf5351f8,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,118,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:32,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test022,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:32,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test022,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -564,7 +564,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:32,bitbucket:BitbucketRepo:1:lik
* feat: add test022
",https://bitbucket.org/likyh/likyhphp/pull-requests/32,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,32,,,pullrequest,,,test022,master,c0e12b61e44b,d72c46a722d7,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,142,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:33,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test023,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:33,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test023,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -589,7 +589,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:33,bitbucket:BitbucketRepo:1:lik
* feat: add test023
",https://bitbucket.org/likyh/likyhphp/pull-requests/33,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,33,,,pullrequest,,,test023,master,c0e12b61e44b,0a8011c8c0ac,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,141,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:34,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test024,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:34,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test024,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -615,7 +615,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:34,bitbucket:BitbucketRepo:1:lik
* feat: add test024
",https://bitbucket.org/likyh/likyhphp/pull-requests/34,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,34,,,pullrequest,,,test024,master,c0e12b61e44b,bd7e81a581f1,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,140,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:35,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test025,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:35,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test025,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -642,7 +642,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:35,bitbucket:BitbucketRepo:1:lik
* feat: add test025
",https://bitbucket.org/likyh/likyhphp/pull-requests/35,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,35,,,pullrequest,,,test025,master,c0e12b61e44b,a15cb5876414,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,139,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:36,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test027,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:36,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test027,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -671,7 +671,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:36,bitbucket:BitbucketRepo:1:lik
* feat: add test027
",https://bitbucket.org/likyh/likyhphp/pull-requests/36,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,36,,,pullrequest,,,test027,master,c0e12b61e44b,200665f463ff,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,138,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:37,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test028,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:37,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test028,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -701,7 +701,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:37,bitbucket:BitbucketRepo:1:lik
* feat: add test028
",https://bitbucket.org/likyh/likyhphp/pull-requests/37,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,37,,,pullrequest,,,test028,master,c0e12b61e44b,8a9052ac97f4,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,137,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:38,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test029,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:38,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test029,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -732,7 +732,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:38,bitbucket:BitbucketRepo:1:lik
* feat: add test029
",https://bitbucket.org/likyh/likyhphp/pull-requests/38,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,38,,,pullrequest,,,test029,master,c0e12b61e44b,74bddc0541c6,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,121,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:39,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test030,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:39,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test030,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -764,11 +764,11 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:39,bitbucket:BitbucketRepo:1:lik
* feat: add test030
",https://bitbucket.org/likyh/likyhphp/pull-requests/39,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,39,,,pullrequest,,,test030,master,c0e12b61e44b,f332a9855de1,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,136,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:4,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test001,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:4,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test001,"* feat: add git.sh
* feat: add test001
",https://bitbucket.org/likyh/likyhphp/pull-requests/4,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,4,,,pullrequest,,983edbf06740,test001,master,0bd83caaf9c7,3bd3b34b2397,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,167,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:40,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test016,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:40,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test016,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -786,7 +786,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:40,bitbucket:BitbucketRepo:1:lik
* feat: add test016
",https://bitbucket.org/likyh/likyhphp/pull-requests/40,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,40,,,pullrequest,,,test016,master,c0e12b61e44b,a000a2a9fc11,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,115,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:41,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test018,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:41,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test018,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -806,7 +806,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:41,bitbucket:BitbucketRepo:1:lik
* feat: add test018
",https://bitbucket.org/likyh/likyhphp/pull-requests/41,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,41,,,pullrequest,,,test018,master,c0e12b61e44b,561e4e3ca4cc,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,119,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:42,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test019,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:42,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test019,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -827,7 +827,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:42,bitbucket:BitbucketRepo:1:lik
* feat: add test019
",https://bitbucket.org/likyh/likyhphp/pull-requests/42,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,42,,,pullrequest,,,test019,master,c0e12b61e44b,8597a99eebb3,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,117,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:43,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test015,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:43,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test015,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -844,7 +844,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:43,bitbucket:BitbucketRepo:1:lik
* feat: add test015
",https://bitbucket.org/likyh/likyhphp/pull-requests/43,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,43,,,pullrequest,,,test015,master,c0e12b61e44b,5af2c361263a,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,135,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:44,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test017,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:44,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test017,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -863,14 +863,14 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:44,bitbucket:BitbucketRepo:1:lik
* feat: add test017
",https://bitbucket.org/likyh/likyhphp/pull-requests/44,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,44,,,pullrequest,,,test017,master,c0e12b61e44b,ee87b0380472,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,120,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:45,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,feat: add test01,,https://bitbucket.org/likyh/likyhphp/pull-requests/45,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,45,,,pullrequest,,,test01,master,c0e12b61e44b,63e6acbb60a9,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,134,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:46,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test04,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:45,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,feat: add test01,,https://bitbucket.org/likyh/likyhphp/pull-requests/45,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,45,,,pullrequest,,,test01,master,c0e12b61e44b,63e6acbb60a9,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,134,
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:46,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test04,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
",https://bitbucket.org/likyh/likyhphp/pull-requests/46,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,46,,,pullrequest,,,test04,master,c0e12b61e44b,33419e166d75,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,133,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:47,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test06,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:47,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test06,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -878,7 +878,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:47,bitbucket:BitbucketRepo:1:lik
* feat: add test06
",https://bitbucket.org/likyh/likyhphp/pull-requests/47,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,47,,,pullrequest,,,test06,master,c0e12b61e44b,f8f9ef467e3a,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,131,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:48,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test07,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:48,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test07,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -887,7 +887,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:48,bitbucket:BitbucketRepo:1:lik
* feat: add test07
",https://bitbucket.org/likyh/likyhphp/pull-requests/48,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,48,,,pullrequest,,,test07,master,c0e12b61e44b,c28f34dde568,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,130,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:49,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Test08,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:49,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Test08,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -897,12 +897,12 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:49,bitbucket:BitbucketRepo:1:lik
* feat: add test08
",https://bitbucket.org/likyh/likyhphp/pull-requests/49,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,49,,,pullrequest,,,test08,master,c0e12b61e44b,6b59c8607581,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,129,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:5,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test002,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:5,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test002,"* feat: add git.sh
* feat: add test001
* feat: test002
",https://bitbucket.org/likyh/likyhphp/pull-requests/5,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,5,,,pullrequest,,983edbf06740,test002,master,0bd83caaf9c7,904df6924f1e,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,166,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:50,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Bitbuckettest12,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:50,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Bitbuckettest12,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -937,7 +937,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:50,bitbucket:BitbucketRepo:1:lik
* feat: add bitbuckettest12
",https://bitbucket.org/likyh/likyhphp/pull-requests/50,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,50,,,pullrequest,,,bitbuckettest12,master,c0e12b61e44b,deff6927812f,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,128,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:51,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Bitbuckettest15,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:51,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Bitbuckettest15,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -975,7 +975,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:51,bitbucket:BitbucketRepo:1:lik
* feat: add bitbuckettest15
",https://bitbucket.org/likyh/likyhphp/pull-requests/51,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,51,,,pullrequest,,,bitbuckettest15,master,c0e12b61e44b,5c2c9af70da2,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,122,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:52,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Bitbuckettest16,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:52,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Bitbuckettest16,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -1014,7 +1014,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:52,bitbucket:BitbucketRepo:1:lik
* feat: add bitbuckettest16
",https://bitbucket.org/likyh/likyhphp/pull-requests/52,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,52,,,pullrequest,,,bitbuckettest16,master,c0e12b61e44b,7c91d40ffaa3,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,127,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:53,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Bitbuckettest17,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:53,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Bitbuckettest17,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -1054,7 +1054,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:53,bitbucket:BitbucketRepo:1:lik
* feat: add bitbuckettest17
",https://bitbucket.org/likyh/likyhphp/pull-requests/53,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,53,,,pullrequest,,,bitbuckettest17,master,c0e12b61e44b,765ab2594451,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,125,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:54,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Bitbuckettest19,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:54,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Bitbuckettest19,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -1096,7 +1096,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:54,bitbucket:BitbucketRepo:1:lik
* feat: add bitbuckettest19
",https://bitbucket.org/likyh/likyhphp/pull-requests/54,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,54,,,pullrequest,,,bitbuckettest19,master,c0e12b61e44b,2493b9212fd4,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,116,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:55,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Bitbuckettest13,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:55,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Bitbuckettest13,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -1132,7 +1132,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:55,bitbucket:BitbucketRepo:1:lik
* feat: add bitbuckettest13
",https://bitbucket.org/likyh/likyhphp/pull-requests/55,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,55,,,pullrequest,,,bitbuckettest13,master,c0e12b61e44b,9dd8c98115ca,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,126,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:56,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Bitbuckettest25,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:56,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Bitbuckettest25,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -1180,7 +1180,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:56,bitbucket:BitbucketRepo:1:lik
* feat: add bitbuckettest25
",https://bitbucket.org/likyh/likyhphp/pull-requests/56,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,56,,,pullrequest,,,bitbuckettest25,master,c0e12b61e44b,d69faf8c90c4,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,124,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:57,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,Bitbuckettest22,"* feat: add test01
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:57,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,OPEN,OPEN,Bitbuckettest22,"* feat: add test01
* feat: add test02
* feat: add test03
* feat: add test04
@@ -1225,20 +1225,20 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:57,bitbucket:BitbucketRepo:1:lik
* feat: add bitbuckettest22
",https://bitbucket.org/likyh/likyhphp/pull-requests/57,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,57,,,pullrequest,,,bitbuckettest22,master,c0e12b61e44b,2c23b3babf27,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,123,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:6,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test003,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:6,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test003,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
",https://bitbucket.org/likyh/likyhphp/pull-requests/6,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,6,,,pullrequest,,983edbf06740,test003,master,0bd83caaf9c7,494b97e9d0b2,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,165,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:7,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test004,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:7,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test004,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
* feat: add test004
",https://bitbucket.org/likyh/likyhphp/pull-requests/7,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,7,,,pullrequest,,983edbf06740,test004,master,0bd83caaf9c7,db921ce6537c,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,164,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:8,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test005,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:8,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test005,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
@@ -1246,7 +1246,7 @@ bitbucket:BitbucketPullRequest:1:likyh/likyhphp:8,bitbucket:BitbucketRepo:1:liky
* feat: add test005
",https://bitbucket.org/likyh/likyhphp/pull-requests/8,teoiaoe,bitbucket:BitbucketAccount:1:62abf394192edb006fa0e8cf,,8,,,pullrequest,,983edbf06740,test005,master,0bd83caaf9c7,8a224cc0eaae,"{""ConnectionId"":1,""FullName"":""likyh/likyhphp""}",_raw_bitbucket_api_pull_requests,163,
-bitbucket:BitbucketPullRequest:1:likyh/likyhphp:9,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,Test006,"* feat: add git.sh
+bitbucket:BitbucketPullRequest:1:likyh/likyhphp:9,bitbucket:BitbucketRepo:1:likyh/likyhphp,bitbucket:BitbucketRepo:1:likyh/likyhphp,MERGED,MERGED,Test006,"* feat: add git.sh
* feat: add test001
* feat: test002
* feat: add test003
diff --git a/backend/plugins/bitbucket/tasks/pr_convertor.go b/backend/plugins/bitbucket/tasks/pr_convertor.go
index 82d4ca1eb..b2fc68d56 100644
--- a/backend/plugins/bitbucket/tasks/pr_convertor.go
+++ b/backend/plugins/bitbucket/tasks/pr_convertor.go
@@ -69,7 +69,7 @@ func ConvertPullRequests(taskCtx plugin.SubTaskContext) errors.Error {
},
BaseRepoId: repoIdGen.Generate(data.Options.ConnectionId, pr.BaseRepoId),
HeadRepoId: repoIdGen.Generate(data.Options.ConnectionId, pr.HeadRepoId),
- Status: pr.State,
+ OriginalStatus: pr.State,
Title: pr.Title,
Url: pr.Url,
AuthorId: domainUserIdGen.Generate(data.Options.ConnectionId, pr.AuthorId),
@@ -87,6 +87,17 @@ func ConvertPullRequests(taskCtx plugin.SubTaskContext) errors.Error {
HeadRef: pr.HeadRef,
HeadCommitSha: pr.HeadCommitSha,
}
+ switch pr.State {
+ case "OPEN":
+ domainPr.Status = code.OPEN
+ case "MERGED":
+ domainPr.Status = code.MERGED
+ case "DECLINED":
+ domainPr.Status = code.CLOSED
+ default:
+ domainPr.Status = pr.State
+ }
+
return []interface{}{
domainPr,
}, nil
diff --git a/backend/plugins/gitlab/e2e/snapshot_tables/pull_requests.csv b/backend/plugins/gitlab/e2e/snapshot_tables/pull_requests.csv
index 1b2fcd54f..915f6df2e 100644
--- a/backend/plugins/gitlab/e2e/snapshot_tables/pull_requests.csv
+++ b/backend/plugins/gitlab/e2e/snapshot_tables/pull_requests.csv
@@ -1,25 +1,25 @@
id,base_repo_id,head_repo_id,status,original_status,title,description,url,author_name,author_id,parent_pr_id,pull_request_key,created_date,merged_date,closed_date,type,component,merge_commit_sha,head_ref,base_ref,base_commit_sha,head_commit_sha
-gitlab:GitlabMergeRequest:1:110817220,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:28584714,merged,,Update packages.yml to point to dbt-labs instead of fishtown,With the company name change the old repo is deprecated.,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/16,GJMcClintock,gitlab:GitlabAccount:1:9439881,,16,2021-08-03T15:02:54.955+00:00,2021-08-12T06:12:54.329+00:00,,,,6f45b467c478df1c67d19cf6d4cbb8e05a710662,GJMcClintock-master-patch-24867,master,,
-gitlab:GitlabMergeRequest:1:111383524,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:0,closed,,The package name changed -> https://hub.getdbt.com/dbt-labs/dbt_utils/latest/,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/17,swiffer,gitlab:GitlabAccount:1:156402,,17,2021-08-07T06:50:25.458+00:00,,2021-08-07T06:51:14.933+00:00,,,,swiffer-master-patch-77533,master,,
-gitlab:GitlabMergeRequest:1:114994501,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:29298577,opened,,Add support for Snowpipe usage monitoring,Add models and docs for Snowflake pipes (Snowpipe) usage monitoring based on the views in Snowflake Usage schema,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/18,gary-beautypie,gitlab:GitlabAccount:1:9635687,,18,2021-09-01T21:15:30.334+00:00,,,,,,master,master,,
-gitlab:GitlabMergeRequest:1:135775405,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:32935405,opened,,Updates for dbt 1.0,"This MR sets up the repo for dbt 1.0
+gitlab:GitlabMergeRequest:1:110817220,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:28584714,MERGED,merged,Update packages.yml to point to dbt-labs instead of fishtown,With the company name change the old repo is deprecated.,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/16,GJMcClintock,gitlab:GitlabAccount:1:9439881,,16,2021-08-03T15:02:54.955+00:00,2021-08-12T06:12:54.329+00:00,,,,6f45b467c478df1c67d19cf6d4cbb8e05a710662,GJMcClintock-master-patch-24867,master,,
+gitlab:GitlabMergeRequest:1:111383524,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:0,CLOSED,closed,The package name changed -> https://hub.getdbt.com/dbt-labs/dbt_utils/latest/,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/17,swiffer,gitlab:GitlabAccount:1:156402,,17,2021-08-07T06:50:25.458+00:00,,2021-08-07T06:51:14.933+00:00,,,,swiffer-master-patch-77533,master,,
+gitlab:GitlabMergeRequest:1:114994501,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:29298577,OPEN,opened,Add support for Snowpipe usage monitoring,Add models and docs for Snowflake pipes (Snowpipe) usage monitoring based on the views in Snowflake Usage schema,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/18,gary-beautypie,gitlab:GitlabAccount:1:9635687,,18,2021-09-01T21:15:30.334+00:00,,,,,,master,master,,
+gitlab:GitlabMergeRequest:1:135775405,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:32935405,OPEN,opened,Updates for dbt 1.0,"This MR sets up the repo for dbt 1.0
A few configs were renamed.
Could a new release be made for dbt 1.0?",https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/19,johnj4,gitlab:GitlabAccount:1:10663622,,19,2022-01-18T19:59:30.723+00:00,,,,,,updates_for_dbt_1.0,master,,
-gitlab:GitlabMergeRequest:1:145012495,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:34491818,closed,,Draft: Update dbt_project.yml,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/20,PedramNavid,gitlab:GitlabAccount:1:9722492,,20,2022-03-15T03:07:06.077+00:00,,2022-03-15T03:07:22.665+00:00,,,,PedramNavid-master-patch-20645,master,,
-gitlab:GitlabMergeRequest:1:158698019,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:12345678,opened,,Draft: Corrections for dbt 1,Closes https://gitlab.com/gitlab-data/analytics/-/issues/12941,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/21,paul_armstrong,gitlab:GitlabAccount:1:5618371,,21,2022-06-03T09:24:53.707+00:00,,,,,,updates_for_dbt_1_1,master,,
-gitlab:GitlabMergeRequest:1:32348491,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:12345678,merged,,"Resolve ""Add documentation to snowflake spend package""",Closes #1,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/1,emilie,gitlab:GitlabAccount:1:2295562,,1,2019-06-28T05:21:43.743+00:00,2019-06-28T14:32:06.192+00:00,,,,da1d6dea48f5972ffc683da6cff30934e7d6c52c,1-add-documentation-to-snowflake-spend-package,master,,
-gitlab:GitlabMergeRequest:1:35064956,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:13835497,merged,,Update README to include steps to resolve a potential dbt-utils conflict,Closes #5,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/3,martinguindon,gitlab:GitlabAccount:1:3871284,,3,2019-08-15T19:34:32.706+00:00,2019-08-26T14:15:27.922+00:00,,,,d678bea9d47b42eb13512d1c9d6a592d80b432d4,5-update-readme-to-include-steps-to-resolve-a-potential-dbt-utils-conflict,master,,
-gitlab:GitlabMergeRequest:1:35841926,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:12345678,merged,,"Resolve ""Config is not generic enough""",Closes #4,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/4,emilie,gitlab:GitlabAccount:1:2295562,,4,2019-08-26T15:32:49.557+00:00,2019-08-26T15:37:50.105+00:00,,,,e95b5db25e15a38e21d11cb45cc21bf17d5c407c,4-config-is-not-generic-enough,master,,
-gitlab:GitlabMergeRequest:1:53445063,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:15706315,merged,,Issue 3 Base model,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/5,nehiljain,gitlab:GitlabAccount:1:783199,,5,2020-03-24T12:46:15.891+00:00,2020-03-25T18:36:45.801+00:00,,,,f2ee4cf121a328ce39723506dc18e4661941971a,issue_3,master,,
-gitlab:GitlabMergeRequest:1:53627854,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:15706063,merged,,Update schema.yml typo in docs,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/6,nehiljain,gitlab:GitlabAccount:1:783199,,6,2020-03-25T19:02:16.747+00:00,2020-03-25T19:04:19.844+00:00,,,,12dcc23a45adce0b12f8687438ec3a28274c7c30,patch-1,master,,
-gitlab:GitlabMergeRequest:1:55146687,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:12345678,merged,,"Resolve ""Document release process""",Closes #6,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/8,m_walker,gitlab:GitlabAccount:1:5212782,,8,2020-04-08T20:07:10.223+00:00,2020-04-08T20:52:11.150+00:00,,,,7c8245a3a5eda7f502737940aaf7944d99c58f2e,6-document-release-process,master,,
-gitlab:GitlabMergeRequest:1:55146787,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:15706315,opened,,Issue 3: Transformed model for query performance,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/9,nehiljain,gitlab:GitlabAccount:1:783199,,9,2020-04-08T20:09:08.130+00:00,,,,,,issue_3,master,,
-gitlab:GitlabMergeRequest:1:58311001,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:12345678,merged,,Update version in readme,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/10,emilie,gitlab:GitlabAccount:1:2295562,,10,2020-05-11T17:09:12.265+00:00,2020-05-11T17:09:20.603+00:00,,,,66c0f1de49a0c876b8f93e8e0dce3327e766f59d,emilie-master-patch-23079,master,,
-gitlab:GitlabMergeRequest:1:62519057,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:19569570,opened,,Clustering metering models,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/11,jainnehil,gitlab:GitlabAccount:1:842680,,11,2020-06-24T12:34:04.792+00:00,,,,,,clustering-metering,master,,
-gitlab:GitlabMergeRequest:1:65505080,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:12345678,merged,,"Resolve ""Upgrade package for dbt 0.17""","Closes #11
+gitlab:GitlabMergeRequest:1:145012495,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:34491818,CLOSED,closed,Draft: Update dbt_project.yml,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/20,PedramNavid,gitlab:GitlabAccount:1:9722492,,20,2022-03-15T03:07:06.077+00:00,,2022-03-15T03:07:22.665+00:00,,,,PedramNavid-master-patch-20645,master,,
+gitlab:GitlabMergeRequest:1:158698019,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:12345678,OPEN,opened,Draft: Corrections for dbt 1,Closes https://gitlab.com/gitlab-data/analytics/-/issues/12941,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/21,paul_armstrong,gitlab:GitlabAccount:1:5618371,,21,2022-06-03T09:24:53.707+00:00,,,,,,updates_for_dbt_1_1,master,,
+gitlab:GitlabMergeRequest:1:32348491,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:12345678,MERGED,merged,"Resolve ""Add documentation to snowflake spend package""",Closes #1,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/1,emilie,gitlab:GitlabAccount:1:2295562,,1,2019-06-28T05:21:43.743+00:00,2019-06-28T14:32:06.192+00:00,,,,da1d6dea48f5972ffc683da6cff30934e7d6c52c,1-add-documentation-to-snowflake-spend-package,master,,
+gitlab:GitlabMergeRequest:1:35064956,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:13835497,MERGED,merged,Update README to include steps to resolve a potential dbt-utils conflict,Closes #5,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/3,martinguindon,gitlab:GitlabAccount:1:3871284,,3,2019-08-15T19:34:32.706+00:00,2019-08-26T14:15:27.922+00:00,,,,d678bea9d47b42eb13512d1c9d6a592d80b432d4,5-update-readme-to-include-steps-to-resolve-a-potential-dbt-utils-conflict,master,,
+gitlab:GitlabMergeRequest:1:35841926,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:12345678,MERGED,merged,"Resolve ""Config is not generic enough""",Closes #4,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/4,emilie,gitlab:GitlabAccount:1:2295562,,4,2019-08-26T15:32:49.557+00:00,2019-08-26T15:37:50.105+00:00,,,,e95b5db25e15a38e21d11cb45cc21bf17d5c407c,4-config-is-not-generic-enough,master,,
+gitlab:GitlabMergeRequest:1:53445063,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:15706315,MERGED,merged,Issue 3 Base model,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/5,nehiljain,gitlab:GitlabAccount:1:783199,,5,2020-03-24T12:46:15.891+00:00,2020-03-25T18:36:45.801+00:00,,,,f2ee4cf121a328ce39723506dc18e4661941971a,issue_3,master,,
+gitlab:GitlabMergeRequest:1:53627854,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:15706063,MERGED,merged,Update schema.yml typo in docs,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/6,nehiljain,gitlab:GitlabAccount:1:783199,,6,2020-03-25T19:02:16.747+00:00,2020-03-25T19:04:19.844+00:00,,,,12dcc23a45adce0b12f8687438ec3a28274c7c30,patch-1,master,,
+gitlab:GitlabMergeRequest:1:55146687,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:12345678,MERGED,merged,"Resolve ""Document release process""",Closes #6,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/8,m_walker,gitlab:GitlabAccount:1:5212782,,8,2020-04-08T20:07:10.223+00:00,2020-04-08T20:52:11.150+00:00,,,,7c8245a3a5eda7f502737940aaf7944d99c58f2e,6-document-release-process,master,,
+gitlab:GitlabMergeRequest:1:55146787,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:15706315,OPEN,opened,Issue 3: Transformed model for query performance,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/9,nehiljain,gitlab:GitlabAccount:1:783199,,9,2020-04-08T20:09:08.130+00:00,,,,,,issue_3,master,,
+gitlab:GitlabMergeRequest:1:58311001,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:12345678,MERGED,merged,Update version in readme,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/10,emilie,gitlab:GitlabAccount:1:2295562,,10,2020-05-11T17:09:12.265+00:00,2020-05-11T17:09:20.603+00:00,,,,66c0f1de49a0c876b8f93e8e0dce3327e766f59d,emilie-master-patch-23079,master,,
+gitlab:GitlabMergeRequest:1:62519057,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:19569570,OPEN,opened,Clustering metering models,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/11,jainnehil,gitlab:GitlabAccount:1:842680,,11,2020-06-24T12:34:04.792+00:00,,,,,,clustering-metering,master,,
+gitlab:GitlabMergeRequest:1:65505080,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:12345678,MERGED,merged,"Resolve ""Upgrade package for dbt 0.17""","Closes #11
* Upgrades to 0.17.0 format
* Formatting changes to be in line with GitLab SQL Style Guide",https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/12,tayloramurphy,gitlab:GitlabAccount:1:1942272,,12,2020-07-24T17:47:08.238+00:00,2020-07-24T21:13:35.321+00:00,,,,9bfc136eb90802c2ce59956c34dde01bb3de0d50,11-upgrade-package-for-dbt-0-17,master,,
-gitlab:GitlabMergeRequest:1:68978485,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:15706315,closed,,Include more snowflake qrt columns,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/13,aianus,gitlab:GitlabAccount:1:2478227,,13,2020-08-27T20:17:01.825+00:00,,2020-08-27T20:20:08.150+00:00,,,,include_more_snowflake_qrt_columns,master,,
-gitlab:GitlabMergeRequest:1:89243644,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:24539973,merged,,Update README.md to use the newest version as an example,Update README.md to use the newest version as an example. The old version doesn't work with the current version of dbt,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/14,ThomasLaPiana,gitlab:GitlabAccount:1:2061802,,14,2021-02-19T20:12:14.302+00:00,2021-02-19T20:13:05.969+00:00,,,,21840a7eadb58babe8aeae2960da [...]
+gitlab:GitlabMergeRequest:1:68978485,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:15706315,CLOSED,closed,Include more snowflake qrt columns,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/13,aianus,gitlab:GitlabAccount:1:2478227,,13,2020-08-27T20:17:01.825+00:00,,2020-08-27T20:20:08.150+00:00,,,,include_more_snowflake_qrt_columns,master,,
+gitlab:GitlabMergeRequest:1:89243644,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:24539973,MERGED,merged,Update README.md to use the newest version as an example,Update README.md to use the newest version as an example. The old version doesn't work with the current version of dbt,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/14,ThomasLaPiana,gitlab:GitlabAccount:1:2061802,,14,2021-02-19T20:12:14.302+00:00,2021-02-19T20:13:05.969+00:00,,,,21840a7eadb58babe8aeae [...]
diff --git a/backend/plugins/gitlab/tasks/mr_convertor.go b/backend/plugins/gitlab/tasks/mr_convertor.go
index dc831e297..b0fb831d7 100644
--- a/backend/plugins/gitlab/tasks/mr_convertor.go
+++ b/backend/plugins/gitlab/tasks/mr_convertor.go
@@ -18,6 +18,8 @@ limitations under the License.
package tasks
import (
+ "reflect"
+
"github.com/apache/incubator-devlake/core/dal"
"github.com/apache/incubator-devlake/core/errors"
"github.com/apache/incubator-devlake/core/models/domainlayer"
@@ -26,7 +28,6 @@ import (
"github.com/apache/incubator-devlake/core/plugin"
helper "github.com/apache/incubator-devlake/helpers/pluginhelper/api"
"github.com/apache/incubator-devlake/plugins/gitlab/models"
- "reflect"
)
var ConvertApiMergeRequestsMeta = plugin.SubTaskMeta{
@@ -69,7 +70,7 @@ func ConvertApiMergeRequests(taskCtx plugin.SubTaskContext) errors.Error {
},
HeadRepoId: domainRepoIdGenerator.Generate(data.Options.ConnectionId, gitlabMr.SourceProjectId),
BaseRepoId: domainRepoIdGenerator.Generate(data.Options.ConnectionId, gitlabMr.TargetProjectId),
- Status: gitlabMr.State,
+ OriginalStatus: gitlabMr.State,
PullRequestKey: gitlabMr.Iid,
Title: gitlabMr.Title,
Description: gitlabMr.Description,
@@ -85,6 +86,16 @@ func ConvertApiMergeRequests(taskCtx plugin.SubTaskContext) errors.Error {
BaseRef: gitlabMr.TargetBranch,
Component: gitlabMr.Component,
}
+ switch gitlabMr.State {
+ case "opened":
+ domainPr.Status = code.OPEN
+ case "merged":
+ domainPr.Status = code.MERGED
+ case "closed", "locked":
+ domainPr.Status = code.CLOSED
+ default:
+ domainPr.Status = gitlabMr.State
+ }
return []interface{}{
domainPr,