From 3f6febb91e11f49da617fa71ac8bac8a8d705635 Mon Sep 17 00:00:00 2001 From: abeizn <101256042+abeizn@users.noreply.github.com> Date: Wed, 6 Jul 2022 15:51:06 +0800 Subject: [PATCH] feat: update gilab user to account (#2432) * feat: create tables * fix: remove OrgId field * refactor: rename users to accounts * feat: team feature update users to account on tool layer step2:github * feat: team feature update users to account on tool layer step2:github * feat: team feature update users to account on tool layer step2:github * feat: update gilab user to account * feat: update gilab user to account * feat: update gilab user to account * feat: update gilab user to account Co-authored-by: zhangliang --- plugins/gitlab/e2e/snapshot_tables/issues.csv | 32 +++++++-------- plugins/gitlab/e2e/snapshot_tables/notes.csv | 40 +++++++++---------- .../snapshot_tables/pull_request_comments.csv | 8 ++-- .../e2e/snapshot_tables/pull_requests.csv | 36 ++++++++--------- plugins/gitlab/impl/impl.go | 6 +-- .../models/migrationscripts/archived/user.go | 4 +- .../models/migrationscripts/init_schema.go | 5 ++- plugins/gitlab/models/user.go | 4 +- ...user_collector.go => account_collector.go} | 8 ++-- ...user_convertor.go => account_convertor.go} | 29 +++++++------- ...user_extractor.go => account_extractor.go} | 14 +++---- plugins/gitlab/tasks/commit_convertor.go | 2 +- plugins/gitlab/tasks/commit_extractor.go | 24 +++++------ plugins/gitlab/tasks/issue_convertor.go | 6 +-- plugins/gitlab/tasks/mr_comment_convertor.go | 4 +- plugins/gitlab/tasks/mr_convertor.go | 5 ++- plugins/gitlab/tasks/note_convertor.go | 4 +- 17 files changed, 116 insertions(+), 115 deletions(-) rename plugins/gitlab/tasks/{user_collector.go => account_collector.go} (92%) rename plugins/gitlab/tasks/{user_convertor.go => account_convertor.go} (75%) rename plugins/gitlab/tasks/{user_extractor.go => account_extractor.go} (86%) diff --git a/plugins/gitlab/e2e/snapshot_tables/issues.csv b/plugins/gitlab/e2e/snapshot_tables/issues.csv index c82facd7fe5..bb2fbb726c6 100644 --- a/plugins/gitlab/e2e/snapshot_tables/issues.csv +++ b/plugins/gitlab/e2e/snapshot_tables/issues.csv @@ -55,36 +55,36 @@ The `source-paths` config has been renamed to `model-paths`. Please update your The `data-paths` config has been renamed to `seed-paths`. Please update your `dbt_project.yml` configuration to reflect this change. 22:42:59 Encountered an error: -Found duplicate project ""dbt_utils"". This occurs when a dependency has the same project name as some other dependency.",,,TODO,,0,,2022-04-19T00:16:22.360+00:00,2022-04-19T00:16:22.360+00:00,0,,,0,0,0,gitlab:GitlabUser:1:11386488,gitlab:GitlabUser:1:0,,,,,gerardoparticle +Found duplicate project ""dbt_utils"". This occurs when a dependency has the same project name as some other dependency.",,,TODO,,0,,2022-04-19T00:16:22.360+00:00,2022-04-19T00:16:22.360+00:00,0,,,0,0,0,gitlab:GitlabAccount:1:11386488,gitlab:GitlabAccount:1:0,,,,,gerardoparticle gitlab:GitlabIssue:1:108497826,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,16,,,16,Release new snowplow spend package,"I've been contacted by Doug Beatty from dbt labs regarding the open PR on out GitHub repo [here](https://github.com/gitlabhq/snowflake_spend/pull/2) This is a synched repo to the GitLab version [here](https://gitlab.com/gitlab-data/snowflake_spend/-/blob/master/packages.yml) where the change has already been made. -I think the issue is that the tag wasn't applied to release this as a version. Release instructions [here](https://gitlab.com/gitlab-data/snowflake_spend/-/tree/master/#how-this-package-gets-released-for-maintainers-only).",,,DONE,,0,2022-06-16T16:23:09.759+00:00,2022-05-13T08:54:58.859+00:00,2022-06-16T16:23:09.779+00:00,49408,,,0,0,0,gitlab:GitlabUser:1:9386100,gitlab:GitlabUser:1:9386100,chrissharp,,,,chrissharp -gitlab:GitlabIssue:1:22097949,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,1,,,1,Add documentation to snowflake spend package,,,,DONE,,0,2019-06-28T14:32:05.376+00:00,2019-06-20T15:04:58.946+00:00,2019-06-28T14:32:05.434+00:00,11487,,,0,0,0,gitlab:GitlabUser:1:2295562,gitlab:GitlabUser:1:2295562,emilie,,,,emilie -gitlab:GitlabIssue:1:23413488,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,2,,,2,Handle multiple prices and date ranges,https://gitlab.com/gitlab-data/analytics/issues/2098,,,DONE,,0,2019-08-04T22:24:40.978+00:00,2019-08-01T21:36:28.766+00:00,2019-08-04T22:24:41.244+00:00,4368,,,0,0,0,gitlab:GitlabUser:1:1942272,gitlab:GitlabUser:1:0,,,,,tayloramurphy -gitlab:GitlabIssue:1:23577209,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,3,,,3,Expand package,I wonder how much more we can do with this https://www.tableau.com/about/blog/2019/5/monitor-understand-snowflake-account-usage,,,TODO,,0,,2019-08-07T13:52:40.231+00:00,2020-04-08T20:53:43.146+00:00,0,,,0,0,0,gitlab:GitlabUser:1:2295562,gitlab:GitlabUser:1:0,,,,,emilie -gitlab:GitlabIssue:1:23812433,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,4,,,4,Config is not generic enough,Not everybody is going to have role reporter or schema analytics,,,DONE,,0,2019-08-26T15:37:49.678+00:00,2019-08-15T15:54:17.378+00:00,2019-08-26T15:37:49.718+00:00,15823,,,0,0,0,gitlab:GitlabUser:1:1942272,gitlab:GitlabUser:1:0,,,,,tayloramurphy +I think the issue is that the tag wasn't applied to release this as a version. Release instructions [here](https://gitlab.com/gitlab-data/snowflake_spend/-/tree/master/#how-this-package-gets-released-for-maintainers-only).",,,DONE,,0,2022-06-16T16:23:09.759+00:00,2022-05-13T08:54:58.859+00:00,2022-06-16T16:23:09.779+00:00,49408,,,0,0,0,gitlab:GitlabAccount:1:9386100,gitlab:GitlabAccount:1:9386100,chrissharp,,,,chrissharp +gitlab:GitlabIssue:1:22097949,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,1,,,1,Add documentation to snowflake spend package,,,,DONE,,0,2019-06-28T14:32:05.376+00:00,2019-06-20T15:04:58.946+00:00,2019-06-28T14:32:05.434+00:00,11487,,,0,0,0,gitlab:GitlabAccount:1:2295562,gitlab:GitlabAccount:1:2295562,emilie,,,,emilie +gitlab:GitlabIssue:1:23413488,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,2,,,2,Handle multiple prices and date ranges,https://gitlab.com/gitlab-data/analytics/issues/2098,,,DONE,,0,2019-08-04T22:24:40.978+00:00,2019-08-01T21:36:28.766+00:00,2019-08-04T22:24:41.244+00:00,4368,,,0,0,0,gitlab:GitlabAccount:1:1942272,gitlab:GitlabAccount:1:0,,,,,tayloramurphy +gitlab:GitlabIssue:1:23577209,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,3,,,3,Expand package,I wonder how much more we can do with this https://www.tableau.com/about/blog/2019/5/monitor-understand-snowflake-account-usage,,,TODO,,0,,2019-08-07T13:52:40.231+00:00,2020-04-08T20:53:43.146+00:00,0,,,0,0,0,gitlab:GitlabAccount:1:2295562,gitlab:GitlabAccount:1:0,,,,,emilie +gitlab:GitlabIssue:1:23812433,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,4,,,4,Config is not generic enough,Not everybody is going to have role reporter or schema analytics,,,DONE,,0,2019-08-26T15:37:49.678+00:00,2019-08-15T15:54:17.378+00:00,2019-08-26T15:37:49.718+00:00,15823,,,0,0,0,gitlab:GitlabAccount:1:1942272,gitlab:GitlabAccount:1:0,,,,,tayloramurphy gitlab:GitlabIssue:1:23816268,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,5,,,5,Update README to include steps to resolve a potential dbt-utils conflict,"Depending on the main project configuration for packages, adding snowflake_spend may return an error about duplicate dbt-utils projects. -I'll update the README to include details and how to resolve it.",,,DONE,,0,2019-08-26T14:15:27.808+00:00,2019-08-15T19:11:30.169+00:00,2019-08-26T14:15:32.854+00:00,15543,,,0,0,0,gitlab:GitlabUser:1:3871284,gitlab:GitlabUser:1:0,,,,,martinguindon -gitlab:GitlabIssue:1:24172103,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,6,,,6,Document release process,,,,DONE,,0,2020-04-08T20:52:10.973+00:00,2019-08-26T15:46:58.045+00:00,2020-04-08T20:52:11.010+00:00,325745,,,0,0,0,gitlab:GitlabUser:1:2295562,gitlab:GitlabUser:1:5212782,m_walker,,,,emilie -gitlab:GitlabIssue:1:32460839,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,7,,,7,Add sources and cleanup structure,,,,DONE,,0,2020-04-07T12:51:53.273+00:00,2020-03-25T21:56:57.084+00:00,2020-04-07T12:51:53.563+00:00,18174,,,0,0,0,gitlab:GitlabUser:1:1942272,gitlab:GitlabUser:1:2295562,emilie,,,,tayloramurphy -gitlab:GitlabIssue:1:32667832,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,8,,,8,Add reviewer roulette to the package,https://gitlab.com/gitlab-org/gitlab/-/tree/master/danger/roulette,,,DONE,,0,2020-07-24T20:32:07.650+00:00,2020-03-31T08:33:30.240+00:00,2020-07-24T20:32:07.689+00:00,166318,,,0,0,0,gitlab:GitlabUser:1:2295562,gitlab:GitlabUser:1:0,,,,,emilie -gitlab:GitlabIssue:1:33004486,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,9,,,9,Make sure I can run locally the models,,,,DONE,,0,2020-07-24T20:31:52.819+00:00,2020-04-07T16:50:58.253+00:00,2020-07-24T20:31:52.872+00:00,155740,,,0,0,0,gitlab:GitlabUser:1:4189780,gitlab:GitlabUser:1:4189780,mpeychet_,,,,mpeychet_ +I'll update the README to include details and how to resolve it.",,,DONE,,0,2019-08-26T14:15:27.808+00:00,2019-08-15T19:11:30.169+00:00,2019-08-26T14:15:32.854+00:00,15543,,,0,0,0,gitlab:GitlabAccount:1:3871284,gitlab:GitlabAccount:1:0,,,,,martinguindon +gitlab:GitlabIssue:1:24172103,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,6,,,6,Document release process,,,,DONE,,0,2020-04-08T20:52:10.973+00:00,2019-08-26T15:46:58.045+00:00,2020-04-08T20:52:11.010+00:00,325745,,,0,0,0,gitlab:GitlabAccount:1:2295562,gitlab:GitlabAccount:1:5212782,m_walker,,,,emilie +gitlab:GitlabIssue:1:32460839,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,7,,,7,Add sources and cleanup structure,,,,DONE,,0,2020-04-07T12:51:53.273+00:00,2020-03-25T21:56:57.084+00:00,2020-04-07T12:51:53.563+00:00,18174,,,0,0,0,gitlab:GitlabAccount:1:1942272,gitlab:GitlabAccount:1:2295562,emilie,,,,tayloramurphy +gitlab:GitlabIssue:1:32667832,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,8,,,8,Add reviewer roulette to the package,https://gitlab.com/gitlab-org/gitlab/-/tree/master/danger/roulette,,,DONE,,0,2020-07-24T20:32:07.650+00:00,2020-03-31T08:33:30.240+00:00,2020-07-24T20:32:07.689+00:00,166318,,,0,0,0,gitlab:GitlabAccount:1:2295562,gitlab:GitlabAccount:1:0,,,,,emilie +gitlab:GitlabIssue:1:33004486,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,9,,,9,Make sure I can run locally the models,,,,DONE,,0,2020-07-24T20:31:52.819+00:00,2020-04-07T16:50:58.253+00:00,2020-07-24T20:31:52.872+00:00,155740,,,0,0,0,gitlab:GitlabAccount:1:4189780,gitlab:GitlabAccount:1:4189780,mpeychet_,,,,mpeychet_ gitlab:GitlabIssue:1:47175437,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,10,,,10,Create alert for missing phone number and emergency contact in BambooHR,"Hi team, per this [issue](https://gitlab.com/gitlab-com/people-group/total-rewards/-/issues/140#note_362993437), can you please help us in creating an alert for missing phone numbers and emergency contacts. Regarding phone number, we only require 1 of the 3 fields filled out (Work Home, Home Phone, Mobile Phone). Is there a way to create an alert for this **only** if all 3 fields are missing info? -Thanks!",,,DONE,,0,2020-07-08T19:05:30.953+00:00,2020-06-17T23:52:31.133+00:00,2020-07-08T19:05:31.101+00:00,29952,,,0,0,0,gitlab:GitlabUser:1:4582589,gitlab:GitlabUser:1:0,,,,,julie.samson +Thanks!",,,DONE,,0,2020-07-08T19:05:30.953+00:00,2020-06-17T23:52:31.133+00:00,2020-07-08T19:05:31.101+00:00,29952,,,0,0,0,gitlab:GitlabAccount:1:4582589,gitlab:GitlabAccount:1:0,,,,,julie.samson gitlab:GitlabIssue:1:59444322,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,11,,,11,Upgrade package for dbt 0.17,"Check: * dbt_project.yml new version -* packages",,,DONE,,0,2020-07-24T21:13:37.403+00:00,2020-07-15T16:49:44.079+00:00,2020-07-24T21:13:37.533+00:00,13223,,,0,0,0,gitlab:GitlabUser:1:1942272,gitlab:GitlabUser:1:0,,,,,tayloramurphy -gitlab:GitlabIssue:1:69025114,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,12,,,12,Mirror to GitHub,,,,DONE,,0,2020-09-22T22:08:20.103+00:00,2020-07-27T14:19:40.700+00:00,2020-09-22T22:08:20.280+00:00,82548,,,0,0,0,gitlab:GitlabUser:1:1942272,gitlab:GitlabUser:1:0,,,,,tayloramurphy +* packages",,,DONE,,0,2020-07-24T21:13:37.403+00:00,2020-07-15T16:49:44.079+00:00,2020-07-24T21:13:37.533+00:00,13223,,,0,0,0,gitlab:GitlabAccount:1:1942272,gitlab:GitlabAccount:1:0,,,,,tayloramurphy +gitlab:GitlabIssue:1:69025114,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,12,,,12,Mirror to GitHub,,,,DONE,,0,2020-09-22T22:08:20.103+00:00,2020-07-27T14:19:40.700+00:00,2020-09-22T22:08:20.280+00:00,82548,,,0,0,0,gitlab:GitlabAccount:1:1942272,gitlab:GitlabAccount:1:0,,,,,tayloramurphy gitlab:GitlabIssue:1:89051403,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,13,,,13,The mirror at https://github.com/gitlabhq/snowflake_spend is managed with an expired personal access token,"Taylor Murphy indicated that the mirror from this repo to github may have been setup on his personal access token. This mirror exists so it will show up on hub.getdbt.com . We need somebody else to manage the mirror to github.com since Taylor's access is expired. -cc @gitlab-data/engineers",,,TODO,,0,,2021-06-21T19:30:40.087+00:00,2021-10-08T14:26:35.650+00:00,0,,,0,0,0,gitlab:GitlabUser:1:5212782,gitlab:GitlabUser:1:0,,,,,m_walker +cc @gitlab-data/engineers",,,TODO,,0,,2021-06-21T19:30:40.087+00:00,2021-10-08T14:26:35.650+00:00,0,,,0,0,0,gitlab:GitlabAccount:1:5212782,gitlab:GitlabAccount:1:0,,,,,m_walker gitlab:GitlabIssue:1:91069461,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,14,,,14,packages.yml refers to a deprecated version of dbt_utils,"## Context fishtown-analytics/* packages have been renamed dbt-labs/* @@ -108,4 +108,4 @@ packages: revision: v1.2.0 - package: dbt-labs/dbt_external_tables version: 0.7.0 -```",,,TODO,,0,,2021-07-29T07:58:08.871+00:00,2022-05-02T20:24:23.772+00:00,0,,,0,0,0,gitlab:GitlabUser:1:6214107,gitlab:GitlabUser:1:0,,,,,loicchesneau +```",,,TODO,,0,,2021-07-29T07:58:08.871+00:00,2022-05-02T20:24:23.772+00:00,0,,,0,0,0,gitlab:GitlabAccount:1:6214107,gitlab:GitlabAccount:1:0,,,,,loicchesneau diff --git a/plugins/gitlab/e2e/snapshot_tables/notes.csv b/plugins/gitlab/e2e/snapshot_tables/notes.csv index 8fbf3257ab8..1c39e586d59 100644 --- a/plugins/gitlab/e2e/snapshot_tables/notes.csv +++ b/plugins/gitlab/e2e/snapshot_tables/notes.csv @@ -1,44 +1,44 @@ id,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark,pr_id,type,author,body,resolvable,is_system,created_date -gitlab:GitlabMrNote:1:186327072,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,1,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabUser:1:2295562,assigned to @emilie,0,1,2019-06-28T05:40:22.415+00:00 -gitlab:GitlabMrNote:1:186327158,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,2,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabUser:1:2295562,"added 1 commit +gitlab:GitlabMrNote:1:186327072,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,1,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabAccount:1:2295562,assigned to @emilie,0,1,2019-06-28T05:40:22.415+00:00 +gitlab:GitlabMrNote:1:186327158,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,2,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabAccount:1:2295562,"added 1 commit [Compare with previous version](/gitlab-data/snowflake_spend/merge_requests/1/diffs?diff_id=46674001&start_sha=8891924597600f608459fa9d981145d89add1161)",0,1,2019-06-28T05:40:58.739+00:00 -gitlab:GitlabMrNote:1:186434804,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,3,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabUser:1:2295562,"added 1 commit +gitlab:GitlabMrNote:1:186434804,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,3,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabAccount:1:2295562,"added 1 commit [Compare with previous version](/gitlab-data/snowflake_spend/merge_requests/1/diffs?diff_id=46703580&start_sha=abbe0ab2c7bb1dc2cfaa3ef3062f378fb908ba71)",0,1,2019-06-28T10:43:27.426+00:00 -gitlab:GitlabMrNote:1:186436608,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,4,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabUser:1:2295562,"added 1 commit +gitlab:GitlabMrNote:1:186436608,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,4,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabAccount:1:2295562,"added 1 commit [Compare with previous version](/gitlab-data/snowflake_spend/merge_requests/1/diffs?diff_id=46704153&start_sha=e01d4f03811cd0da9949848731236e0aa261cf54)",0,1,2019-06-28T10:49:01.184+00:00 -gitlab:GitlabMrNote:1:186438503,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,5,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabUser:1:2295562,"added 1 commit +gitlab:GitlabMrNote:1:186438503,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,5,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabAccount:1:2295562,"added 1 commit [Compare with previous version](/gitlab-data/snowflake_spend/merge_requests/1/diffs?diff_id=46705058&start_sha=3f04e0a61d0c4d2dd736a6bcaa3a06826269a533)",0,1,2019-06-28T10:54:45.674+00:00 -gitlab:GitlabMrNote:1:186438743,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,6,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabUser:1:2295562,unmarked as a **Work In Progress**,0,1,2019-06-28T10:55:26.170+00:00 -gitlab:GitlabMrNote:1:186439132,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,7,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabUser:1:2295562,"@tayloramurphy Once this is merged, let's make this a release version?",0,0,2019-06-28T10:56:46.646+00:00 -gitlab:GitlabMrNote:1:186439136,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,8,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabUser:1:2295562,assigned to @tayloramurphy and unassigned @emilie,0,1,2019-06-28T10:56:47.115+00:00 -gitlab:GitlabMrNote:1:186441803,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,9,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabUser:1:2295562,"added 1 commit +gitlab:GitlabMrNote:1:186438743,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,6,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabAccount:1:2295562,unmarked as a **Work In Progress**,0,1,2019-06-28T10:55:26.170+00:00 +gitlab:GitlabMrNote:1:186439132,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,7,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabAccount:1:2295562,"@tayloramurphy Once this is merged, let's make this a release version?",0,0,2019-06-28T10:56:46.646+00:00 +gitlab:GitlabMrNote:1:186439136,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,8,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabAccount:1:2295562,assigned to @tayloramurphy and unassigned @emilie,0,1,2019-06-28T10:56:47.115+00:00 +gitlab:GitlabMrNote:1:186441803,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,9,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabAccount:1:2295562,"added 1 commit [Compare with previous version](/gitlab-data/snowflake_spend/merge_requests/1/diffs?diff_id=46705949&start_sha=382084b42697577d3a6adf71ce73d4b5ddd22977)",0,1,2019-06-28T11:04:01.697+00:00 -gitlab:GitlabMrNote:1:186537187,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,10,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabUser:1:1942272,mentioned in commit da1d6dea48f5972ffc683da6cff30934e7d6c52c,0,1,2019-06-28T14:32:06.002+00:00 -gitlab:GitlabMrNote:1:186537191,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,11,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabUser:1:1942272,merged,0,1,2019-06-28T14:32:06.279+00:00 -gitlab:GitlabMrNote:1:208061122,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,12,,gitlab:GitlabMergeRequest:1:35064956,MergeRequest,gitlab:GitlabUser:1:2295562,@mg12 This looks good to me. Want me to merge?,0,0,2019-08-26T12:14:39.003+00:00 -gitlab:GitlabMrNote:1:208092969,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,13,,gitlab:GitlabMergeRequest:1:35064956,MergeRequest,gitlab:GitlabUser:1:3871284,@emilie Let's do it!,0,0,2019-08-26T13:17:51.707+00:00 -gitlab:GitlabMrNote:1:208121492,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,14,,gitlab:GitlabMergeRequest:1:35064956,MergeRequest,gitlab:GitlabUser:1:2295562,assigned to @emilie,0,1,2019-08-26T14:14:59.344+00:00 -gitlab:GitlabMrNote:1:208121682,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,15,,gitlab:GitlabMergeRequest:1:35064956,MergeRequest,gitlab:GitlabUser:1:2295562,merged,0,1,2019-08-26T14:15:27.936+00:00 -gitlab:GitlabMrNote:1:208121722,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,16,,gitlab:GitlabMergeRequest:1:35064956,MergeRequest,gitlab:GitlabUser:1:2295562,mentioned in commit d678bea9d47b42eb13512d1c9d6a592d80b432d4,0,1,2019-08-26T14:15:33.136+00:00 -gitlab:GitlabMrNote:1:208121781,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,17,,gitlab:GitlabMergeRequest:1:35064956,MergeRequest,gitlab:GitlabUser:1:2295562,Merged! Thanks for your contribution @mg12!,0,0,2019-08-26T14:15:40.464+00:00 -gitlab:GitlabMrNote:1:208185588,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,18,,gitlab:GitlabMergeRequest:1:35841926,MergeRequest,gitlab:GitlabUser:1:2295562,restored source branch `4-config-is-not-generic-enough`,0,1,2019-08-26T15:33:21.878+00:00 -gitlab:GitlabMrNote:1:208185663,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,19,,gitlab:GitlabMergeRequest:1:35841926,MergeRequest,gitlab:GitlabUser:1:2295562,assigned to @emilie,0,1,2019-08-26T15:33:34.019+00:00 -gitlab:GitlabMrNote:1:208186075,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,20,,gitlab:GitlabMergeRequest:1:35841926,MergeRequest,gitlab:GitlabUser:1:2295562,"added 1 commit +gitlab:GitlabMrNote:1:186537187,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,10,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabAccount:1:1942272,mentioned in commit da1d6dea48f5972ffc683da6cff30934e7d6c52c,0,1,2019-06-28T14:32:06.002+00:00 +gitlab:GitlabMrNote:1:186537191,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,11,,gitlab:GitlabMergeRequest:1:32348491,MergeRequest,gitlab:GitlabAccount:1:1942272,merged,0,1,2019-06-28T14:32:06.279+00:00 +gitlab:GitlabMrNote:1:208061122,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,12,,gitlab:GitlabMergeRequest:1:35064956,MergeRequest,gitlab:GitlabAccount:1:2295562,@mg12 This looks good to me. Want me to merge?,0,0,2019-08-26T12:14:39.003+00:00 +gitlab:GitlabMrNote:1:208092969,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,13,,gitlab:GitlabMergeRequest:1:35064956,MergeRequest,gitlab:GitlabAccount:1:3871284,@emilie Let's do it!,0,0,2019-08-26T13:17:51.707+00:00 +gitlab:GitlabMrNote:1:208121492,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,14,,gitlab:GitlabMergeRequest:1:35064956,MergeRequest,gitlab:GitlabAccount:1:2295562,assigned to @emilie,0,1,2019-08-26T14:14:59.344+00:00 +gitlab:GitlabMrNote:1:208121682,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,15,,gitlab:GitlabMergeRequest:1:35064956,MergeRequest,gitlab:GitlabAccount:1:2295562,merged,0,1,2019-08-26T14:15:27.936+00:00 +gitlab:GitlabMrNote:1:208121722,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,16,,gitlab:GitlabMergeRequest:1:35064956,MergeRequest,gitlab:GitlabAccount:1:2295562,mentioned in commit d678bea9d47b42eb13512d1c9d6a592d80b432d4,0,1,2019-08-26T14:15:33.136+00:00 +gitlab:GitlabMrNote:1:208121781,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,17,,gitlab:GitlabMergeRequest:1:35064956,MergeRequest,gitlab:GitlabAccount:1:2295562,Merged! Thanks for your contribution @mg12!,0,0,2019-08-26T14:15:40.464+00:00 +gitlab:GitlabMrNote:1:208185588,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,18,,gitlab:GitlabMergeRequest:1:35841926,MergeRequest,gitlab:GitlabAccount:1:2295562,restored source branch `4-config-is-not-generic-enough`,0,1,2019-08-26T15:33:21.878+00:00 +gitlab:GitlabMrNote:1:208185663,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,19,,gitlab:GitlabMergeRequest:1:35841926,MergeRequest,gitlab:GitlabAccount:1:2295562,assigned to @emilie,0,1,2019-08-26T15:33:34.019+00:00 +gitlab:GitlabMrNote:1:208186075,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,20,,gitlab:GitlabMergeRequest:1:35841926,MergeRequest,gitlab:GitlabAccount:1:2295562,"added 1 commit diff --git a/plugins/gitlab/e2e/snapshot_tables/pull_request_comments.csv b/plugins/gitlab/e2e/snapshot_tables/pull_request_comments.csv index ff809a0b73f..0970b3f43d1 100644 --- a/plugins/gitlab/e2e/snapshot_tables/pull_request_comments.csv +++ b/plugins/gitlab/e2e/snapshot_tables/pull_request_comments.csv @@ -1,5 +1,5 @@ id,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark,pull_request_id,body,user_id,created_date,commit_sha,position -gitlab:GitlabMrComment:1:186439132,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,7,,gitlab:GitlabMergeRequest:1:32348491,"@tayloramurphy Once this is merged, let's make this a release version?",gitlab:GitlabUser:1:2295562,2019-06-28T10:56:46.646+00:00,,0 -gitlab:GitlabMrComment:1:208061122,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,12,,gitlab:GitlabMergeRequest:1:35064956,@mg12 This looks good to me. Want me to merge?,gitlab:GitlabUser:1:2295562,2019-08-26T12:14:39.003+00:00,,0 -gitlab:GitlabMrComment:1:208092969,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,13,,gitlab:GitlabMergeRequest:1:35064956,@emilie Let's do it!,gitlab:GitlabUser:1:3871284,2019-08-26T13:17:51.707+00:00,,0 -gitlab:GitlabMrComment:1:208121781,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,17,,gitlab:GitlabMergeRequest:1:35064956,Merged! Thanks for your contribution @mg12!,gitlab:GitlabUser:1:2295562,2019-08-26T14:15:40.464+00:00,,0 +gitlab:GitlabMrComment:1:186439132,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,7,,gitlab:GitlabMergeRequest:1:32348491,"@tayloramurphy Once this is merged, let's make this a release version?",gitlab:GitlabAccount:1:2295562,2019-06-28T10:56:46.646+00:00,,0 +gitlab:GitlabMrComment:1:208061122,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,12,,gitlab:GitlabMergeRequest:1:35064956,@mg12 This looks good to me. Want me to merge?,gitlab:GitlabAccount:1:2295562,2019-08-26T12:14:39.003+00:00,,0 +gitlab:GitlabMrComment:1:208092969,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,13,,gitlab:GitlabMergeRequest:1:35064956,@emilie Let's do it!,gitlab:GitlabAccount:1:3871284,2019-08-26T13:17:51.707+00:00,,0 +gitlab:GitlabMrComment:1:208121781,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,17,,gitlab:GitlabMergeRequest:1:35064956,Merged! Thanks for your contribution @mg12!,gitlab:GitlabAccount:1:2295562,2019-08-26T14:15:40.464+00:00,,0 diff --git a/plugins/gitlab/e2e/snapshot_tables/pull_requests.csv b/plugins/gitlab/e2e/snapshot_tables/pull_requests.csv index f787b47a3dc..0fb733187a3 100644 --- a/plugins/gitlab/e2e/snapshot_tables/pull_requests.csv +++ b/plugins/gitlab/e2e/snapshot_tables/pull_requests.csv @@ -1,25 +1,25 @@ id,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark,base_repo_id,head_repo_id,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,16,,gitlab:GitlabProject:1:28584714,gitlab:GitlabProject:1:12345678,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:GitlabUser: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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,17,,gitlab:GitlabProject:1:0,gitlab:GitlabProject:1:12345678,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:GitlabUser: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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,18,,gitlab:GitlabProject:1:29298577,gitlab:GitlabProject:1:12345678,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:GitlabUser:1:9635687,,18,2021-09-01T21:15:30.334+00:00,,,,,,master,master,, +gitlab:GitlabMergeRequest:1:110817220,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,16,,gitlab:GitlabProject:1:28584714,gitlab:GitlabProject:1:12345678,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,17,,gitlab:GitlabProject:1:0,gitlab:GitlabProject:1:12345678,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,18,,gitlab:GitlabProject:1:29298577,gitlab:GitlabProject:1:12345678,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,19,,gitlab:GitlabProject:1:32935405,gitlab:GitlabProject:1:12345678,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:GitlabUser:1:10663622,,19,2022-01-18T19:59:30.723+00:00,,,,,,updates_for_dbt_1.0,master,, -gitlab:GitlabMergeRequest:1:145012495,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,20,,gitlab:GitlabProject:1:34491818,gitlab:GitlabProject:1:12345678,closed,Draft: Update dbt_project.yml,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/20,PedramNavid,gitlab:GitlabUser: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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,21,,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:GitlabUser:1:5618371,,21,2022-06-03T09:24:53.707+00:00,,,,,,updates_for_dbt_1_1,master,, -gitlab:GitlabMergeRequest:1:32348491,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,1,,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:GitlabUser: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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,3,,gitlab:GitlabProject:1:13835497,gitlab:GitlabProject:1:12345678,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:GitlabUser: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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,4,,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:GitlabUser: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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,5,,gitlab:GitlabProject:1:15706315,gitlab:GitlabProject:1:12345678,merged,Issue 3 Base model,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/5,nehiljain,gitlab:GitlabUser: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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,6,,gitlab:GitlabProject:1:15706063,gitlab:GitlabProject:1:12345678,merged,Update schema.yml typo in docs,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/6,nehiljain,gitlab:GitlabUser: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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,8,,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:GitlabUser: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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,9,,gitlab:GitlabProject:1:15706315,gitlab:GitlabProject:1:12345678,opened,Issue 3: Transformed model for query performance,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/9,nehiljain,gitlab:GitlabUser:1:783199,,9,2020-04-08T20:09:08.130+00:00,,,,,,issue_3,master,, -gitlab:GitlabMergeRequest:1:58311001,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,10,,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:GitlabUser: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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,11,,gitlab:GitlabProject:1:19569570,gitlab:GitlabProject:1:12345678,opened,Clustering metering models,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/11,jainnehil,gitlab:GitlabUser:1:842680,,11,2020-06-24T12:34:04.792+00:00,,,,,,clustering-metering,master,, +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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,20,,gitlab:GitlabProject:1:34491818,gitlab:GitlabProject:1:12345678,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,21,,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,1,,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,3,,gitlab:GitlabProject:1:13835497,gitlab:GitlabProject:1:12345678,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,4,,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,5,,gitlab:GitlabProject:1:15706315,gitlab:GitlabProject:1:12345678,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,6,,gitlab:GitlabProject:1:15706063,gitlab:GitlabProject:1:12345678,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,8,,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,9,,gitlab:GitlabProject:1:15706315,gitlab:GitlabProject:1:12345678,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,10,,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,11,,gitlab:GitlabProject:1:19569570,gitlab:GitlabProject:1:12345678,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,12,,gitlab:GitlabProject:1:12345678,gitlab:GitlabProject:1:12345678,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:GitlabUser: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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,13,,gitlab:GitlabProject:1:15706315,gitlab:GitlabProject:1:12345678,closed,Include more snowflake qrt columns,,https://gitlab.com/gitlab-data/snowflake_spend/-/merge_requests/13,aianus,gitlab:GitlabUser: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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,14,,gitlab:GitlabProject:1:24539973,gitlab:GitlabProject:1:12345678,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:GitlabUser:1:2061802,,14,2021-02-19T20:12:14.302+00:00,2021-02-19T20:13:05.969+00:00,,,,21840a7eadb58babe8aeae2960da851a3ed00ddc,ThomasLaPiana-master-patch-93997,master,, +* 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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,13,,gitlab:GitlabProject:1:15706315,gitlab:GitlabProject:1:12345678,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,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_requests,14,,gitlab:GitlabProject:1:24539973,gitlab:GitlabProject:1:12345678,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,,,,21840a7eadb58babe8aeae2960da851a3ed00ddc,ThomasLaPiana-master-patch-93997,master,, diff --git a/plugins/gitlab/impl/impl.go b/plugins/gitlab/impl/impl.go index 5029d999358..1550131ddde 100644 --- a/plugins/gitlab/impl/impl.go +++ b/plugins/gitlab/impl/impl.go @@ -68,9 +68,9 @@ func (plugin Gitlab) SubTaskMetas() []core.SubTaskMeta { tasks.CollectApiPipelinesMeta, tasks.ExtractApiPipelinesMeta, tasks.EnrichMergeRequestsMeta, - tasks.CollectUserMeta, - tasks.ExtractUserMeta, - tasks.ConvertUsersMeta, + tasks.CollectAccountMeta, + tasks.ExtractAccountMeta, + tasks.ConvertAccountMeta, tasks.ConvertProjectMeta, tasks.ConvertApiMergeRequestsMeta, tasks.ConvertApiNotesMeta, diff --git a/plugins/gitlab/models/migrationscripts/archived/user.go b/plugins/gitlab/models/migrationscripts/archived/user.go index 4e4465c2a2e..bd74342153d 100644 --- a/plugins/gitlab/models/migrationscripts/archived/user.go +++ b/plugins/gitlab/models/migrationscripts/archived/user.go @@ -19,7 +19,7 @@ package archived import "github.com/apache/incubator-devlake/models/migrationscripts/archived" -type GitlabUser struct { +type GitlabAccount struct { ConnectionId uint64 `gorm:"primaryKey"` GitlabId int `gorm:"primaryKey"` Username string `gorm:"type:varchar(255)"` @@ -33,6 +33,6 @@ type GitlabUser struct { archived.NoPKModel } -func (GitlabUser) TableName() string { +func (GitlabAccount) TableName() string { return "_tool_gitlab_accounts" } diff --git a/plugins/gitlab/models/migrationscripts/init_schema.go b/plugins/gitlab/models/migrationscripts/init_schema.go index 237d3857053..1d39e0779b1 100644 --- a/plugins/gitlab/models/migrationscripts/init_schema.go +++ b/plugins/gitlab/models/migrationscripts/init_schema.go @@ -19,6 +19,7 @@ package migrationscripts import ( "context" + "github.com/apache/incubator-devlake/config" "github.com/apache/incubator-devlake/plugins/core" "github.com/apache/incubator-devlake/plugins/gitlab/models/migrationscripts/archived" @@ -40,7 +41,7 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error { &archived.GitlabMrNote{}, &archived.GitlabMrCommit{}, &archived.GitlabMrComment{}, - &archived.GitlabUser{}, + &archived.GitlabAccount{}, &archived.GitlabConnection{}, &archived.GitlabIssue{}, &archived.GitlabIssueLabel{}, @@ -74,7 +75,7 @@ func (*InitSchemas) Up(ctx context.Context, db *gorm.DB) error { &archived.GitlabMrNote{}, &archived.GitlabMrCommit{}, &archived.GitlabMrComment{}, - &archived.GitlabUser{}, + &archived.GitlabAccount{}, &archived.GitlabConnection{}, &archived.GitlabIssue{}, &archived.GitlabIssueLabel{}, diff --git a/plugins/gitlab/models/user.go b/plugins/gitlab/models/user.go index 3d1586cce56..9890a9955a8 100644 --- a/plugins/gitlab/models/user.go +++ b/plugins/gitlab/models/user.go @@ -21,7 +21,7 @@ import ( "github.com/apache/incubator-devlake/models/common" ) -type GitlabUser struct { +type GitlabAccount struct { ConnectionId uint64 `gorm:"primaryKey"` GitlabId int `gorm:"primaryKey" json:"id"` Username string `gorm:"type:varchar(255)"` @@ -35,6 +35,6 @@ type GitlabUser struct { common.NoPKModel } -func (GitlabUser) TableName() string { +func (GitlabAccount) TableName() string { return "_tool_gitlab_accounts" } diff --git a/plugins/gitlab/tasks/user_collector.go b/plugins/gitlab/tasks/account_collector.go similarity index 92% rename from plugins/gitlab/tasks/user_collector.go rename to plugins/gitlab/tasks/account_collector.go index 794625ff294..627ca6e54de 100644 --- a/plugins/gitlab/tasks/user_collector.go +++ b/plugins/gitlab/tasks/account_collector.go @@ -28,14 +28,14 @@ import ( const RAW_USER_TABLE = "gitlab_api_users" -var CollectUserMeta = core.SubTaskMeta{ - Name: "collectUsers", - EntryPoint: CollectUsers, +var CollectAccountMeta = core.SubTaskMeta{ + Name: "collectAccounts", + EntryPoint: CollectAccounts, EnabledByDefault: true, Description: "collect gitlab users", } -func CollectUsers(taskCtx core.SubTaskContext) error { +func CollectAccounts(taskCtx core.SubTaskContext) error { rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_USER_TABLE) logger := taskCtx.GetLogger() logger.Info("collect gitlab users") diff --git a/plugins/gitlab/tasks/user_convertor.go b/plugins/gitlab/tasks/account_convertor.go similarity index 75% rename from plugins/gitlab/tasks/user_convertor.go rename to plugins/gitlab/tasks/account_convertor.go index 66510f3770e..84313b6d582 100644 --- a/plugins/gitlab/tasks/user_convertor.go +++ b/plugins/gitlab/tasks/account_convertor.go @@ -18,40 +18,39 @@ limitations under the License. package tasks import ( - "github.com/apache/incubator-devlake/models/domainlayer/crossdomain" "reflect" - "github.com/apache/incubator-devlake/plugins/core/dal" - "github.com/apache/incubator-devlake/models/domainlayer" + "github.com/apache/incubator-devlake/models/domainlayer/crossdomain" "github.com/apache/incubator-devlake/models/domainlayer/didgen" "github.com/apache/incubator-devlake/plugins/core" + "github.com/apache/incubator-devlake/plugins/core/dal" gitlabModels "github.com/apache/incubator-devlake/plugins/gitlab/models" "github.com/apache/incubator-devlake/plugins/helper" ) -var ConvertUsersMeta = core.SubTaskMeta{ - Name: "convertUsers", - EntryPoint: ConvertUsers, +var ConvertAccountMeta = core.SubTaskMeta{ + Name: "convertAccounts", + EntryPoint: ConvertAccounts, EnabledByDefault: true, Description: "Convert tool layer table gitlab_users into domain layer table users", DomainTypes: []string{core.DOMAIN_TYPE_CROSS}, } -func ConvertUsers(taskCtx core.SubTaskContext) error { +func ConvertAccounts(taskCtx core.SubTaskContext) error { db := taskCtx.GetDal() data := taskCtx.GetData().(*GitlabTaskData) - cursor, err := db.Cursor(dal.From(gitlabModels.GitlabUser{})) + cursor, err := db.Cursor(dal.From(gitlabModels.GitlabAccount{})) if err != nil { return err } defer cursor.Close() - userIdGen := didgen.NewDomainIdGenerator(&gitlabModels.GitlabUser{}) + accountIdGen := didgen.NewDomainIdGenerator(&gitlabModels.GitlabAccount{}) converter, err := helper.NewDataConverter(helper.DataConverterArgs{ - InputRowType: reflect.TypeOf(gitlabModels.GitlabUser{}), + InputRowType: reflect.TypeOf(gitlabModels.GitlabAccount{}), Input: cursor, RawDataSubTaskArgs: helper.RawDataSubTaskArgs{ Ctx: taskCtx, @@ -62,12 +61,12 @@ func ConvertUsers(taskCtx core.SubTaskContext) error { Table: RAW_COMMIT_TABLE, }, Convert: func(inputRow interface{}) ([]interface{}, error) { - gitlabUser := inputRow.(*gitlabModels.GitlabUser) + GitlabAccount := inputRow.(*gitlabModels.GitlabAccount) domainUser := &crossdomain.Account{ - DomainEntity: domainlayer.DomainEntity{Id: userIdGen.Generate(data.Options.ConnectionId, gitlabUser.GitlabId)}, - UserName: gitlabUser.Name, - Email: gitlabUser.Email, - AvatarUrl: gitlabUser.AvatarUrl, + DomainEntity: domainlayer.DomainEntity{Id: accountIdGen.Generate(data.Options.ConnectionId, GitlabAccount.GitlabId)}, + UserName: GitlabAccount.Name, + Email: GitlabAccount.Email, + AvatarUrl: GitlabAccount.AvatarUrl, } return []interface{}{ diff --git a/plugins/gitlab/tasks/user_extractor.go b/plugins/gitlab/tasks/account_extractor.go similarity index 86% rename from plugins/gitlab/tasks/user_extractor.go rename to plugins/gitlab/tasks/account_extractor.go index d3bf38a4285..07f1aa79773 100644 --- a/plugins/gitlab/tasks/user_extractor.go +++ b/plugins/gitlab/tasks/account_extractor.go @@ -25,27 +25,27 @@ import ( "github.com/apache/incubator-devlake/plugins/helper" ) -var ExtractUserMeta = core.SubTaskMeta{ - Name: "extractUsers", - EntryPoint: ExtractUsers, +var ExtractAccountMeta = core.SubTaskMeta{ + Name: "extractAccounts", + EntryPoint: ExtractAccounts, EnabledByDefault: true, Description: "Extract raw workspace data into tool layer table _tool_gitlab_accounts", } -func ExtractUsers(taskCtx core.SubTaskContext) error { +func ExtractAccounts(taskCtx core.SubTaskContext) error { rawDataSubTaskArgs, data := CreateRawDataSubTaskArgs(taskCtx, RAW_USER_TABLE) extractor, err := helper.NewApiExtractor(helper.ApiExtractorArgs{ RawDataSubTaskArgs: *rawDataSubTaskArgs, Extract: func(row *helper.RawData) ([]interface{}, error) { - var userRes models.GitlabUser + var userRes models.GitlabAccount err := json.Unmarshal(row.Data, &userRes) if err != nil { return nil, err } results := make([]interface{}, 0) - GitlabUser := &models.GitlabUser{ + GitlabAccount := &models.GitlabAccount{ ConnectionId: data.Options.ConnectionId, Username: userRes.Username, Name: userRes.Name, @@ -54,7 +54,7 @@ func ExtractUsers(taskCtx core.SubTaskContext) error { AvatarUrl: userRes.AvatarUrl, WebUrl: userRes.WebUrl, } - results = append(results, GitlabUser) + results = append(results, GitlabAccount) return results, nil }, }) diff --git a/plugins/gitlab/tasks/commit_convertor.go b/plugins/gitlab/tasks/commit_convertor.go index 49bd31a6f18..186b273d9cd 100644 --- a/plugins/gitlab/tasks/commit_convertor.go +++ b/plugins/gitlab/tasks/commit_convertor.go @@ -58,7 +58,7 @@ func ConvertApiCommits(taskCtx core.SubTaskContext) error { defer cursor.Close() // TODO: adopt batch indate operation - //userDidGen := didgen.NewDomainIdGenerator(&models.GitlabUser{}) + //userDidGen := didgen.NewDomainIdGenerator(&models.GitlabAccount{}) converter, err := helper.NewDataConverter(helper.DataConverterArgs{ RawDataSubTaskArgs: *rawDataSubTaskArgs, diff --git a/plugins/gitlab/tasks/commit_extractor.go b/plugins/gitlab/tasks/commit_extractor.go index ca39cf766cf..8a8ff982c06 100644 --- a/plugins/gitlab/tasks/commit_extractor.go +++ b/plugins/gitlab/tasks/commit_extractor.go @@ -29,7 +29,7 @@ var ExtractApiCommitsMeta = core.SubTaskMeta{ Name: "extractApiCommits", EntryPoint: ExtractApiCommits, EnabledByDefault: true, - Description: "Extract raw commit data into tool layer table GitlabCommit,GitlabUser and GitlabProjectCommit", + Description: "Extract raw commit data into tool layer table GitlabCommit,GitlabAccount and GitlabProjectCommit", DomainTypes: []string{core.DOMAIN_TYPE_CODE}, } @@ -58,23 +58,23 @@ func ExtractApiCommits(taskCtx core.SubTaskContext) error { gitlabProjectCommit.CommitSha = gitlabCommit.Sha // create gitlab user - gitlabUserAuthor := &models.GitlabUser{} - gitlabUserAuthor.Email = gitlabCommit.AuthorEmail - gitlabUserAuthor.Name = gitlabCommit.AuthorName + GitlabAccountAuthor := &models.GitlabAccount{} + GitlabAccountAuthor.Email = gitlabCommit.AuthorEmail + GitlabAccountAuthor.Name = gitlabCommit.AuthorName gitlabProjectCommit.ConnectionId = data.Options.ConnectionId - gitlabUserAuthor.ConnectionId = data.Options.ConnectionId + GitlabAccountAuthor.ConnectionId = data.Options.ConnectionId results = append(results, gitlabCommit) results = append(results, gitlabProjectCommit) - results = append(results, gitlabUserAuthor) + results = append(results, GitlabAccountAuthor) // For Commiter Email is not same as AuthorEmail - if gitlabCommit.CommitterEmail != gitlabUserAuthor.Email { - gitlabUserCommitter := &models.GitlabUser{} - gitlabUserCommitter.Email = gitlabCommit.CommitterEmail - gitlabUserCommitter.Name = gitlabCommit.CommitterName - gitlabUserCommitter.ConnectionId = data.Options.ConnectionId - results = append(results, gitlabUserCommitter) + if gitlabCommit.CommitterEmail != GitlabAccountAuthor.Email { + GitlabAccountCommitter := &models.GitlabAccount{} + GitlabAccountCommitter.Email = gitlabCommit.CommitterEmail + GitlabAccountCommitter.Name = gitlabCommit.CommitterName + GitlabAccountCommitter.ConnectionId = data.Options.ConnectionId + results = append(results, GitlabAccountCommitter) } return results, nil diff --git a/plugins/gitlab/tasks/issue_convertor.go b/plugins/gitlab/tasks/issue_convertor.go index aabdfcf8c7f..410e04eef47 100644 --- a/plugins/gitlab/tasks/issue_convertor.go +++ b/plugins/gitlab/tasks/issue_convertor.go @@ -57,7 +57,7 @@ func ConvertIssues(taskCtx core.SubTaskContext) error { defer cursor.Close() issueIdGen := didgen.NewDomainIdGenerator(&gitlabModels.GitlabIssue{}) - userIdGen := didgen.NewDomainIdGenerator(&gitlabModels.GitlabUser{}) + accountIdGen := didgen.NewDomainIdGenerator(&gitlabModels.GitlabAccount{}) boardIdGen := didgen.NewDomainIdGenerator(&gitlabModels.GitlabProject{}) converter, err := helper.NewDataConverter(helper.DataConverterArgs{ @@ -83,9 +83,9 @@ func ConvertIssues(taskCtx core.SubTaskContext) error { OriginalStatus: issue.Status, OriginalEstimateMinutes: issue.TimeEstimate, TimeSpentMinutes: issue.TotalTimeSpent, - CreatorId: userIdGen.Generate(data.Options.ConnectionId, issue.CreatorId), + CreatorId: accountIdGen.Generate(data.Options.ConnectionId, issue.CreatorId), CreatorName: issue.CreatorName, - AssigneeId: userIdGen.Generate(data.Options.ConnectionId, issue.AssigneeId), + AssigneeId: accountIdGen.Generate(data.Options.ConnectionId, issue.AssigneeId), AssigneeName: issue.AssigneeName, } diff --git a/plugins/gitlab/tasks/mr_comment_convertor.go b/plugins/gitlab/tasks/mr_comment_convertor.go index f048e20028c..b2c5c97833a 100644 --- a/plugins/gitlab/tasks/mr_comment_convertor.go +++ b/plugins/gitlab/tasks/mr_comment_convertor.go @@ -60,7 +60,7 @@ func ConvertMergeRequestComment(taskCtx core.SubTaskContext) error { domainIdGeneratorComment := didgen.NewDomainIdGenerator(&models.GitlabMrComment{}) prIdGen := didgen.NewDomainIdGenerator(&models.GitlabMergeRequest{}) - userIdGen := didgen.NewDomainIdGenerator(&models.GitlabUser{}) + accountIdGen := didgen.NewDomainIdGenerator(&models.GitlabAccount{}) converter, err := helper.NewDataConverter(helper.DataConverterArgs{ RawDataSubTaskArgs: *rawDataSubTaskArgs, @@ -76,7 +76,7 @@ func ConvertMergeRequestComment(taskCtx core.SubTaskContext) error { }, PullRequestId: prIdGen.Generate(data.Options.ConnectionId, gitlabComments.MergeRequestId), Body: gitlabComments.Body, - UserId: userIdGen.Generate(data.Options.ConnectionId, gitlabComments.AuthorUserId), + UserId: accountIdGen.Generate(data.Options.ConnectionId, gitlabComments.AuthorUserId), CreatedDate: gitlabComments.GitlabCreatedAt, Type: gitlabComments.Type, } diff --git a/plugins/gitlab/tasks/mr_convertor.go b/plugins/gitlab/tasks/mr_convertor.go index a8c3b49b615..deba0c77113 100644 --- a/plugins/gitlab/tasks/mr_convertor.go +++ b/plugins/gitlab/tasks/mr_convertor.go @@ -18,6 +18,8 @@ limitations under the License. package tasks import ( + "reflect" + "github.com/apache/incubator-devlake/models/domainlayer" "github.com/apache/incubator-devlake/models/domainlayer/code" "github.com/apache/incubator-devlake/models/domainlayer/didgen" @@ -25,7 +27,6 @@ import ( "github.com/apache/incubator-devlake/plugins/core/dal" "github.com/apache/incubator-devlake/plugins/gitlab/models" "github.com/apache/incubator-devlake/plugins/helper" - "reflect" ) var ConvertApiMergeRequestsMeta = core.SubTaskMeta{ @@ -52,7 +53,7 @@ func ConvertApiMergeRequests(taskCtx core.SubTaskContext) error { domainMrIdGenerator := didgen.NewDomainIdGenerator(&models.GitlabMergeRequest{}) domainRepoIdGenerator := didgen.NewDomainIdGenerator(&models.GitlabProject{}) - domainUserIdGen := didgen.NewDomainIdGenerator(&models.GitlabUser{}) + domainUserIdGen := didgen.NewDomainIdGenerator(&models.GitlabAccount{}) converter, err := helper.NewDataConverter(helper.DataConverterArgs{ RawDataSubTaskArgs: *rawDataSubTaskArgs, diff --git a/plugins/gitlab/tasks/note_convertor.go b/plugins/gitlab/tasks/note_convertor.go index 6ec9699ca5a..8fd7433183a 100644 --- a/plugins/gitlab/tasks/note_convertor.go +++ b/plugins/gitlab/tasks/note_convertor.go @@ -60,7 +60,7 @@ func ConvertApiNotes(taskCtx core.SubTaskContext) error { domainIdGeneratorNote := didgen.NewDomainIdGenerator(&models.GitlabMrNote{}) prIdGen := didgen.NewDomainIdGenerator(&models.GitlabMergeRequest{}) - userIdGen := didgen.NewDomainIdGenerator(&models.GitlabUser{}) + accountIdGen := didgen.NewDomainIdGenerator(&models.GitlabAccount{}) converter, err := helper.NewDataConverter(helper.DataConverterArgs{ RawDataSubTaskArgs: *rawDataSubTaskArgs, @@ -75,7 +75,7 @@ func ConvertApiNotes(taskCtx core.SubTaskContext) error { }, PrId: prIdGen.Generate(data.Options.ConnectionId, gitlabNotes.MergeRequestId), Type: gitlabNotes.NoteableType, - Author: userIdGen.Generate(data.Options.ConnectionId, gitlabNotes.AuthorUserId), + Author: accountIdGen.Generate(data.Options.ConnectionId, gitlabNotes.AuthorUserId), Body: gitlabNotes.Body, Resolvable: gitlabNotes.Resolvable, IsSystem: gitlabNotes.IsSystem,