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 693c5944 fix: solution of issue2268 draft
693c5944 is described below

commit 693c59447a9363e8e284252ddaa359978a526bfd
Author: tgp <[email protected]>
AuthorDate: Mon Jun 27 16:22:39 2022 +0800

    fix: solution of issue2268 draft
---
 models/domainlayer/code/pull_request.go            | 15 +++--
 models/domainlayer/code/pull_request_comment.go    |  1 +
 models/migrationscripts/register.go                |  2 +-
 .../updateSchemas20220704.go}                      | 37 +++++++----
 plugins/github/tasks/commit_convertor.go           |  5 +-
 plugins/gitlab/e2e/issues_test.go                  |  3 +
 .../e2e/snapshot_tables/_tool_gitlab_issues.csv    | 34 +++++-----
 .../snapshot_tables/_tool_gitlab_mr_comments.csv   |  8 +--
 .../e2e/snapshot_tables/_tool_gitlab_users.csv     | 17 +----
 plugins/gitlab/e2e/snapshot_tables/commits.csv     | 74 +++++++++++-----------
 plugins/gitlab/e2e/snapshot_tables/issues.csv      | 32 +++++-----
 plugins/gitlab/e2e/snapshot_tables/notes.csv       | 40 ++++++------
 .../e2e/snapshot_tables/pull_request_comments.csv  |  8 +--
 .../gitlab/e2e/snapshot_tables/pull_requests.csv   | 36 +++++------
 plugins/gitlab/e2e/snapshot_tables/users.csv       | 15 +----
 plugins/gitlab/e2e/user_test.go                    |  1 +
 plugins/gitlab/models/issue.go                     |  8 ++-
 .../models/migrationscripts/archived/issue.go      |  8 ++-
 .../models/migrationscripts/archived/mr_comment.go |  3 +-
 .../models/migrationscripts/archived/mr_note.go    | 10 +--
 .../models/migrationscripts/archived/user.go       |  3 +-
 plugins/gitlab/models/mr_comment.go                |  3 +-
 plugins/gitlab/models/mr_note.go                   |  7 +-
 plugins/gitlab/models/user.go                      |  3 +-
 plugins/gitlab/tasks/commit_convertor.go           |  6 +-
 plugins/gitlab/tasks/issue_convertor.go            |  9 +--
 plugins/gitlab/tasks/issue_extractor.go            | 25 +++++---
 plugins/gitlab/tasks/mr_comment_convertor.go       |  3 +-
 plugins/gitlab/tasks/mr_convertor.go               |  7 +-
 plugins/gitlab/tasks/mr_note_extractor.go          |  7 +-
 plugins/gitlab/tasks/note_convertor.go             |  2 +-
 plugins/gitlab/tasks/user_convertor.go             |  2 +-
 32 files changed, 225 insertions(+), 209 deletions(-)

diff --git a/models/domainlayer/code/pull_request.go 
b/models/domainlayer/code/pull_request.go
index 7196036b..e17e6970 100644
--- a/models/domainlayer/code/pull_request.go
+++ b/models/domainlayer/code/pull_request.go
@@ -25,13 +25,14 @@ import (
 
 type PullRequest struct {
        domainlayer.DomainEntity
-       BaseRepoId     string `gorm:"index"`
-       HeadRepoId     string `gorm:"index"`
-       Status         string `gorm:"type:varchar(100);comment:open/closed or 
other"`
-       Title          string
-       Description    string
-       Url            string `gorm:"type:varchar(255)"`
-       AuthorName     string `gorm:"type:varchar(100)"`
+       BaseRepoId  string `gorm:"index"`
+       HeadRepoId  string `gorm:"index"`
+       Status      string `gorm:"type:varchar(100);comment:open/closed or 
other"`
+       Title       string
+       Description string
+       Url         string `gorm:"type:varchar(255)"`
+       AuthorName  string `gorm:"type:varchar(100)"`
+       //User             domainUser.User `gorm:"foreignKey:AuthorId"`
        AuthorId       string `gorm:"type:varchar(100)"`
        ParentPrId     string `gorm:"index;type:varchar(100)"`
        PullRequestKey int
diff --git a/models/domainlayer/code/pull_request_comment.go 
b/models/domainlayer/code/pull_request_comment.go
index ba00ecb0..74b1cabe 100644
--- a/models/domainlayer/code/pull_request_comment.go
+++ b/models/domainlayer/code/pull_request_comment.go
@@ -30,6 +30,7 @@ type PullRequestComment struct {
        CreatedDate   time.Time
        CommitSha     string `gorm:"type:varchar(255)"`
        Position      int
+       Type          string `gorm:"type:varchar(255)"`
 }
 
 func (PullRequestComment) TableName() string {
diff --git a/models/migrationscripts/register.go 
b/models/migrationscripts/register.go
index 93c607bc..851ee575 100644
--- a/models/migrationscripts/register.go
+++ b/models/migrationscripts/register.go
@@ -29,6 +29,6 @@ func All() []migration.Script {
                new(updateSchemas20220602), new(updateSchemas20220612), 
new(updateSchemas20220613),
                new(updateSchemas20220614), new(updateSchemas2022061402), 
new(updateSchemas20220616),
                new(blueprintNormalMode),
-               new(UpdateSchemas20220630),
+               new(UpdateSchemas20220630), new(UpdateSchemas20220704),
        }
 }
diff --git a/models/domainlayer/code/pull_request_comment.go 
b/models/migrationscripts/updateSchemas20220704.go
similarity index 58%
copy from models/domainlayer/code/pull_request_comment.go
copy to models/migrationscripts/updateSchemas20220704.go
index ba00ecb0..258ecd32 100644
--- a/models/domainlayer/code/pull_request_comment.go
+++ b/models/migrationscripts/updateSchemas20220704.go
@@ -15,23 +15,36 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 */
 
-package code
+package migrationscripts
 
 import (
-       "github.com/apache/incubator-devlake/models/domainlayer"
-       "time"
+       "context"
+       "gorm.io/gorm"
 )
 
-type PullRequestComment struct {
-       domainlayer.DomainEntity
-       PullRequestId string `gorm:"index"`
-       Body          string
-       UserId        string `gorm:"type:varchar(255)"`
-       CreatedDate   time.Time
-       CommitSha     string `gorm:"type:varchar(255)"`
-       Position      int
+type PullRequestComment0704 struct {
+       Type string `gorm:"type:varchar(255)"`
 }
 
-func (PullRequestComment) TableName() string {
+func (PullRequestComment0704) TableName() string {
        return "pull_request_comments"
 }
+
+type UpdateSchemas20220704 struct {
+}
+
+func (u *UpdateSchemas20220704) Up(ctx context.Context, db *gorm.DB) error {
+       err := db.Migrator().AddColumn(&PullRequestComment0704{}, "type")
+       if err != nil {
+               return err
+       }
+       return nil
+}
+
+func (*UpdateSchemas20220704) Version() uint64 {
+       return 20220704110137
+}
+
+func (*UpdateSchemas20220704) Name() string {
+       return "add type to pr_comment"
+}
diff --git a/plugins/github/tasks/commit_convertor.go 
b/plugins/github/tasks/commit_convertor.go
index 55df93c7..e7a9b063 100644
--- a/plugins/github/tasks/commit_convertor.go
+++ b/plugins/github/tasks/commit_convertor.go
@@ -57,7 +57,6 @@ func ConvertCommits(taskCtx core.SubTaskContext) error {
 
        repoDidGen := didgen.NewDomainIdGenerator(&githubModels.GithubRepo{})
        domainRepoId := repoDidGen.Generate(data.Options.ConnectionId, repoId)
-       userDidGen := didgen.NewDomainIdGenerator(&githubModels.GithubUser{})
 
        converter, err := helper.NewDataConverter(helper.DataConverterArgs{
                RawDataSubTaskArgs: helper.RawDataSubTaskArgs{
@@ -79,14 +78,14 @@ func ConvertCommits(taskCtx core.SubTaskContext) error {
                                Message:        githubCommit.Message,
                                Additions:      githubCommit.Additions,
                                Deletions:      githubCommit.Deletions,
-                               AuthorId:       
userDidGen.Generate(data.Options.ConnectionId, githubCommit.AuthorId),
+                               AuthorId:       githubCommit.AuthorEmail,
                                AuthorName:     githubCommit.AuthorName,
                                AuthorEmail:    githubCommit.AuthorEmail,
                                AuthoredDate:   githubCommit.AuthoredDate,
                                CommitterName:  githubCommit.CommitterName,
                                CommitterEmail: githubCommit.CommitterEmail,
                                CommittedDate:  githubCommit.CommittedDate,
-                               CommitterId:    
userDidGen.Generate(data.Options.ConnectionId, githubCommit.CommitterId),
+                               CommitterId:    githubCommit.CommitterEmail,
                        }
                        repoCommit := &code.RepoCommit{
                                RepoId:    domainRepoId,
diff --git a/plugins/gitlab/e2e/issues_test.go 
b/plugins/gitlab/e2e/issues_test.go
index 1b64b728..13be2605 100644
--- a/plugins/gitlab/e2e/issues_test.go
+++ b/plugins/gitlab/e2e/issues_test.go
@@ -45,6 +45,7 @@ func TestGitlabIssueDataFlow(t *testing.T) {
 
        // verify extraction
        dataflowTester.FlushTabler(&models.GitlabIssue{})
+       dataflowTester.FlushTabler(&models.GitlabAuthor{})
        dataflowTester.FlushTabler(&models.GitlabIssueLabel{})
        dataflowTester.Subtask(tasks.ExtractApiIssuesMeta, taskData)
        dataflowTester.VerifyTable(
@@ -63,6 +64,8 @@ func TestGitlabIssueDataFlow(t *testing.T) {
                        "status",
                        "assignee_id",
                        "assignee_name",
+                       "creator_id",
+                       "creator_name",
                        "lead_time_minutes",
                        "url",
                        "closed_at",
diff --git a/plugins/gitlab/e2e/snapshot_tables/_tool_gitlab_issues.csv 
b/plugins/gitlab/e2e/snapshot_tables/_tool_gitlab_issues.csv
index 5d498654..11859c8e 100644
--- a/plugins/gitlab/e2e/snapshot_tables/_tool_gitlab_issues.csv
+++ b/plugins/gitlab/e2e/snapshot_tables/_tool_gitlab_issues.csv
@@ -1,28 +1,28 @@
-connection_id,gitlab_id,project_id,number,state,title,body,priority,type,status,assignee_id,assignee_name,lead_time_minutes,url,closed_at,gitlab_created_at,gitlab_updated_at,severity,component,time_estimate,total_time_spent,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
-1,22097949,12345678,1,closed,Add documentation to snowflake spend 
package,,,,,2295562,emilie,11487,,2019-06-28T14:32:05.376+00:00,2019-06-20T15:04:58.946+00:00,2019-06-28T14:32:05.434+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,1,
-1,23413488,12345678,2,closed,Handle multiple prices and date 
ranges,https://gitlab.com/gitlab-data/analytics/issues/2098,,,,0,,4368,,2019-08-04T22:24:40.978+00:00,2019-08-01T21:36:28.766+00:00,2019-08-04T22:24:41.244+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,2,
-1,23577209,12345678,3,opened,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,,,,0,,0,,,2019-08-07T13:52:40.231+00:00,2020-04-08T20:53:43.146+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,3,
-1,23812433,12345678,4,closed,Config is not generic enough,Not everybody is 
going to have role reporter or schema 
analytics,,,,0,,15823,,2019-08-26T15:37:49.678+00:00,2019-08-15T15:54:17.378+00:00,2019-08-26T15:37:49.718+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,4,
+connection_id,gitlab_id,project_id,number,state,title,body,priority,type,status,assignee_id,assignee_name,creator_id,creator_name,lead_time_minutes,url,closed_at,gitlab_created_at,gitlab_updated_at,severity,component,time_estimate,total_time_spent,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+1,22097949,12345678,1,closed,Add documentation to snowflake spend 
package,,,,,2295562,emilie,2295562,emilie,11487,,2019-06-28T14:32:05.376+00:00,2019-06-20T15:04:58.946+00:00,2019-06-28T14:32:05.434+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,1,
+1,23413488,12345678,2,closed,Handle multiple prices and date 
ranges,https://gitlab.com/gitlab-data/analytics/issues/2098,,,,0,,1942272,tayloramurphy,4368,,2019-08-04T22:24:40.978+00:00,2019-08-01T21:36:28.766+00:00,2019-08-04T22:24:41.244+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,2,
+1,23577209,12345678,3,opened,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,,,,0,,2295562,emilie,0,,,2019-08-07T13:52:40.231+00:00,2020-04-08T20:53:43.146+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,3,
+1,23812433,12345678,4,closed,Config is not generic enough,Not everybody is 
going to have role reporter or schema 
analytics,,,,0,,1942272,tayloramurphy,15823,,2019-08-26T15:37:49.678+00:00,2019-08-15T15:54:17.378+00:00,2019-08-26T15:37:49.718+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,4,
 1,23816268,12345678,5,closed,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.",,,,0,,15543,,2019-08-26T14:15:27.808+00:00,2019-08-15T19:11:30.169+00:00,2019-08-26T14:15:32.854+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,5,
-1,24172103,12345678,6,closed,Document release 
process,,,,,5212782,m_walker,325745,,2020-04-08T20:52:10.973+00:00,2019-08-26T15:46:58.045+00:00,2020-04-08T20:52:11.010+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,6,
-1,32460839,12345678,7,closed,Add sources and cleanup 
structure,,,,,2295562,emilie,18174,,2020-04-07T12:51:53.273+00:00,2020-03-25T21:56:57.084+00:00,2020-04-07T12:51:53.563+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,7,
-1,32667832,12345678,8,closed,Add reviewer roulette to the 
package,https://gitlab.com/gitlab-org/gitlab/-/tree/master/danger/roulette,,,,0,,166318,,2020-07-24T20:32:07.650+00:00,2020-03-31T08:33:30.240+00:00,2020-07-24T20:32:07.689+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,8,
-1,33004486,12345678,9,closed,Make sure I can run locally the 
models,,,,,4189780,mpeychet_,155740,,2020-07-24T20:31:52.819+00:00,2020-04-07T16:50:58.253+00:00,2020-07-24T20:31:52.872+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,9,
+I'll update the README to include details and how to resolve 
it.",,,,0,,3871284,martinguindon,15543,,2019-08-26T14:15:27.808+00:00,2019-08-15T19:11:30.169+00:00,2019-08-26T14:15:32.854+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,5,
+1,24172103,12345678,6,closed,Document release 
process,,,,,5212782,m_walker,2295562,emilie,325745,,2020-04-08T20:52:10.973+00:00,2019-08-26T15:46:58.045+00:00,2020-04-08T20:52:11.010+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,6,
+1,32460839,12345678,7,closed,Add sources and cleanup 
structure,,,,,2295562,emilie,1942272,tayloramurphy,18174,,2020-04-07T12:51:53.273+00:00,2020-03-25T21:56:57.084+00:00,2020-04-07T12:51:53.563+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,7,
+1,32667832,12345678,8,closed,Add reviewer roulette to the 
package,https://gitlab.com/gitlab-org/gitlab/-/tree/master/danger/roulette,,,,0,,2295562,emilie,166318,,2020-07-24T20:32:07.650+00:00,2020-03-31T08:33:30.240+00:00,2020-07-24T20:32:07.689+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,8,
+1,33004486,12345678,9,closed,Make sure I can run locally the 
models,,,,,4189780,mpeychet_,4189780,mpeychet_,155740,,2020-07-24T20:31:52.819+00:00,2020-04-07T16:50:58.253+00:00,2020-07-24T20:31:52.872+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,9,
 1,47175437,12345678,10,closed,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!",,,,0,,29952,,2020-07-08T19:05:30.953+00:00,2020-06-17T23:52:31.133+00:00,2020-07-08T19:05:31.101+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,10,
+Thanks!",,,,0,,4582589,julie.samson,29952,,2020-07-08T19:05:30.953+00:00,2020-06-17T23:52:31.133+00:00,2020-07-08T19:05:31.101+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,10,
 1,59444322,12345678,11,closed,Upgrade package for dbt 0.17,"Check:
 
 * dbt_project.yml new version
-* 
packages",,,,0,,13223,,2020-07-24T21:13:37.403+00:00,2020-07-15T16:49:44.079+00:00,2020-07-24T21:13:37.533+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,11,
-1,69025114,12345678,12,closed,Mirror to 
GitHub,,,,,0,,82548,,2020-09-22T22:08:20.103+00:00,2020-07-27T14:19:40.700+00:00,2020-09-22T22:08:20.280+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,12,
+* 
packages",,,,0,,1942272,tayloramurphy,13223,,2020-07-24T21:13:37.403+00:00,2020-07-15T16:49:44.079+00:00,2020-07-24T21:13:37.533+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,11,
+1,69025114,12345678,12,closed,Mirror to 
GitHub,,,,,0,,1942272,tayloramurphy,82548,,2020-09-22T22:08:20.103+00:00,2020-07-27T14:19:40.700+00:00,2020-09-22T22:08:20.280+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,12,
 1,89051403,12345678,13,opened,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",,,,0,,0,,,2021-06-21T19:30:40.087+00:00,2021-10-08T14:26:35.650+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,13,
+cc 
@gitlab-data/engineers",,,,0,,5212782,m_walker,0,,,2021-06-21T19:30:40.087+00:00,2021-10-08T14:26:35.650+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,13,
 1,91069461,12345678,14,opened,packages.yml refers to a deprecated version of 
dbt_utils,"## Context 
 
 fishtown-analytics/* packages have been renamed dbt-labs/*
@@ -46,7 +46,7 @@ packages:
     revision: v1.2.0
   - package: dbt-labs/dbt_external_tables
     version: 0.7.0
-```",,,,0,,0,,,2021-07-29T07:58:08.871+00:00,2022-05-02T20:24:23.772+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,14,
+```",,,,0,,6214107,loicchesneau,0,,,2021-07-29T07:58:08.871+00:00,2022-05-02T20:24:23.772+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,14,
 1,106802088,12345678,15,opened,Getting issues and warning upgrading the new 
dbt version 1.0.4,"## Context
 Upgrade DBT version 1.0.4 
 
@@ -103,9 +103,9 @@ 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.",,,,0,,0,,,2022-04-19T00:16:22.360+00:00,2022-04-19T00:16:22.360+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,15,
+Found duplicate project ""dbt_utils"". This occurs when a dependency has the 
same project name as some other 
dependency.",,,,0,,11386488,gerardoparticle,0,,,2022-04-19T00:16:22.360+00:00,2022-04-19T00:16:22.360+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,15,
 1,108497826,12345678,16,closed,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).",,,,9386100,chrissharp,49408,,2022-06-16T16:23:09.759+00:00,2022-05-13T08:54:58.859+00:00,2022-06-16T16:23:09.779+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,16,
+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).",,,,9386100,chrissharp,9386100,chrissharp,49408,,2022-06-16T16:23:09.759+00:00,2022-05-13T08:54:58.859+00:00,2022-06-16T16:23:09.779+00:00,,,0,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_issues,16,
diff --git a/plugins/gitlab/e2e/snapshot_tables/_tool_gitlab_mr_comments.csv 
b/plugins/gitlab/e2e/snapshot_tables/_tool_gitlab_mr_comments.csv
index ad2b38cb..89ca62c1 100644
--- a/plugins/gitlab/e2e/snapshot_tables/_tool_gitlab_mr_comments.csv
+++ b/plugins/gitlab/e2e/snapshot_tables/_tool_gitlab_mr_comments.csv
@@ -1,5 +1,5 @@
 
connection_id,gitlab_id,merge_request_id,merge_request_iid,body,author_username,author_user_id,gitlab_created_at,resolvable,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
-1,186439132,32348491,1,"@tayloramurphy Once this is merged, let's make this a 
release 
version?",emilie,0,2019-06-28T10:56:46.646+00:00,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,7,
-1,208061122,35064956,3,@mg12 This looks good to me. Want me to 
merge?,emilie,0,2019-08-26T12:14:39.003+00:00,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,12,
-1,208092969,35064956,3,@emilie Let's do 
it!,martinguindon,0,2019-08-26T13:17:51.707+00:00,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,13,
-1,208121781,35064956,3,Merged! Thanks for your contribution 
@mg12!,emilie,0,2019-08-26T14:15:40.464+00:00,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,17,
+1,186439132,32348491,1,"@tayloramurphy Once this is merged, let's make this a 
release 
version?",emilie,2295562,2019-06-28T10:56:46.646+00:00,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,7,
+1,208061122,35064956,3,@mg12 This looks good to me. Want me to 
merge?,emilie,2295562,2019-08-26T12:14:39.003+00:00,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,12,
+1,208092969,35064956,3,@emilie Let's do 
it!,martinguindon,3871284,2019-08-26T13:17:51.707+00:00,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,13,
+1,208121781,35064956,3,Merged! Thanks for your contribution 
@mg12!,emilie,2295562,2019-08-26T14:15:40.464+00:00,0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_notes,17,
diff --git a/plugins/gitlab/e2e/snapshot_tables/_tool_gitlab_users.csv 
b/plugins/gitlab/e2e/snapshot_tables/_tool_gitlab_users.csv
index 207a5e1f..ec9fc9ee 100644
--- a/plugins/gitlab/e2e/snapshot_tables/_tool_gitlab_users.csv
+++ b/plugins/gitlab/e2e/snapshot_tables/_tool_gitlab_users.csv
@@ -1,15 +1,2 @@
-connection_id,username,email,name,state,membership_state,avatar_url,web_url,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
-1,abc1,,abc1,active,active,https://gitlab.com/uploads/-/system/user/avatar/2436773/avatar.png,https://gitlab.com/abc1,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,2,
-1,abc10,,abc9,active,active,https://gitlab.com/uploads/-/system/user/avatar/7411593/avatar.png,https://gitlab.com/abc10,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,11,
-1,abc11,,abc10,active,active,https://gitlab.com/uploads/-/system/user/avatar/1678508/avatar.png,https://gitlab.com/abc11,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,12,
-1,abc12,,abc11,active,active,https://gitlab.com/uploads/-/system/user/avatar/7598851/avatar.png,https://gitlab.com/abc12,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,13,
-1,abc13,,abc12,active,active,https://secure.gravatar.com/avatar/df1654ce1e2a49ea9f84986b863bf1d1?s=80&d=identicon,https://gitlab.com/abc13,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,14,
-1,abc14,,abc13,active,active,https://secure.gravatar.com/avatar/d1d69b6c79d3ef5f1c92022969a15485?s=80&d=identicon,https://gitlab.com/abc14,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,15,
-1,abc2,,abc2 
Yin,active,active,https://secure.gravatar.com/avatar/69667c2c63ce892e11b9ac098e3abc4f?s=80&d=identicon,https://gitlab.com/abc2,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,3,
-1,abc3,,abc3,active,active,https://secure.gravatar.com/avatar/ce5efe9b3acceecd4f3266fad757e6c3?s=80&d=identicon,https://gitlab.com/abc3,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,4,
-1,abc4,,abc4,active,active,https://secure.gravatar.com/avatar/85998e06af031ec6071c64976018bcb2?s=80&d=identicon,https://gitlab.com/abc4,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,5,
-1,abc5,,abc5,active,active,https://gitlab.com/uploads/-/system/user/avatar/4403812/avatar.png,https://gitlab.com/abc5,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,6,
-1,abc6,,abc6,active,active,https://gitlab.com/uploads/-/system/user/avatar/1533989/avatar.png,https://gitlab.com/abc6,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,7,
-1,abc7,,abc7,active,active,https://gitlab.com/uploads/-/system/user/avatar/7175839/avatar.png,https://gitlab.com/abc7,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,8,
-1,abc8,,abc2,active,active,https://gitlab.com/uploads/-/system/user/avatar/3466461/avatar.png,https://gitlab.com/abc8,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,9,
-1,abc9,,abc8,active,active,https://secure.gravatar.com/avatar/ad6525d38db5c025f249a5971f339e4b?s=80&d=identicon,https://gitlab.com/abc9,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,10,
+connection_id,gitlab_id,username,email,name,state,membership_state,avatar_url,web_url,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark
+1,0,abc14,,abc13,active,active,https://secure.gravatar.com/avatar/d1d69b6c79d3ef5f1c92022969a15485?s=80&d=identicon,https://gitlab.com/abc14,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,15,
diff --git a/plugins/gitlab/e2e/snapshot_tables/commits.csv 
b/plugins/gitlab/e2e/snapshot_tables/commits.csv
index ab76d481..82caf97f 100644
--- a/plugins/gitlab/e2e/snapshot_tables/commits.csv
+++ b/plugins/gitlab/e2e/snapshot_tables/commits.csv
@@ -1,65 +1,65 @@
 
sha,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark,additions,deletions,dev_eq,message,author_name,author_email,authored_date,author_id,committer_name,committer_email,committed_date,committer_id
 
05976c113b02fb71d5c43682bd2f9d96a3454efa,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,34,,0,0,0,"tab
 refcatoring
-",Nehil 
Jain,[email protected],2020-03-24T18:14:03.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain,Nehil 
Jain,[email protected],2020-03-24T18:14:03.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain
+",Nehil 
Jain,[email protected],2020-03-24T18:14:03.000+00:00,[email protected],Nehil
 Jain,[email protected],2020-03-24T18:14:03.000+00:00,[email protected]
 
083864201849f6707a34d24e61c43638696f95a6,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,6,,0,0,0,"Update
 README to include steps to resolve a potential dbt-utils conflict
-",Martin 
Guindon,[email protected],2019-08-15T19:32:19.000+00:00,gitlab:GitlabUser:1:Martin
 Guindon,Martin 
Guindon,[email protected],2019-08-15T19:32:19.000+00:00,gitlab:GitlabUser:1:Martin
 Guindon
+",Martin 
Guindon,[email protected],2019-08-15T19:32:19.000+00:00,[email protected],Martin
 
Guindon,[email protected],2019-08-15T19:32:19.000+00:00,[email protected]
 
08973065d33c6fd2fb1f592b7a1e0fbe2ee72edd,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,11,,0,0,0,"add
 usage day
-",Taylor A. 
Murphy,[email protected],2019-08-02T18:35:08.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy,Taylor A. 
Murphy,[email protected],2019-08-02T18:35:08.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy
+",Taylor A. 
Murphy,[email protected],2019-08-02T18:35:08.000+00:00,[email protected],Taylor
 A. Murphy,[email protected],2019-08-02T18:35:08.000+00:00,[email protected]
 
0a4574d52b5964c37bfcb2952f6c6a8a9c6d5bcf,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,7,,0,0,0,"fix
 name
-",Taylor A. 
Murphy,[email protected],2019-08-02T19:00:50.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy,Taylor A. 
Murphy,[email protected],2019-08-02T19:00:50.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy
-0dbb8bfdbbf7373656fa3eb036bdcbb25ae162da,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,26,,0,0,0,Apply
 suggestion to 
models/base/snowflake_query_history.sql,Nehil,[email protected],2020-03-24T22:39:40.000+00:00,gitlab:GitlabUser:1:Nehil,Nehil,[email protected],2020-03-24T22:39:40.000+00:00,gitlab:GitlabUser:1:Nehil
+",Taylor A. 
Murphy,[email protected],2019-08-02T19:00:50.000+00:00,[email protected],Taylor
 A. Murphy,[email protected],2019-08-02T19:00:50.000+00:00,[email protected]
+0dbb8bfdbbf7373656fa3eb036bdcbb25ae162da,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,26,,0,0,0,Apply
 suggestion to 
models/base/snowflake_query_history.sql,Nehil,[email protected],2020-03-24T22:39:40.000+00:00,[email protected],Nehil,[email protected],2020-03-24T22:39:40.000+00:00,[email protected]
 
1cba71b355d2bd4e1350602cfb9b98cce5a5cb4d,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,8,,0,0,0,"update
 documentation
-",Taylor A. 
Murphy,[email protected],2019-08-02T18:53:44.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy,Taylor A. 
Murphy,[email protected],2019-08-02T18:53:44.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy
+",Taylor A. 
Murphy,[email protected],2019-08-02T18:53:44.000+00:00,[email protected],Taylor
 A. Murphy,[email protected],2019-08-02T18:53:44.000+00:00,[email protected]
 
1f16955d45cec904c8968bb27689d91a71e9a2f2,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,12,,0,0,0,"change
 cte address
-",Taylor A. 
Murphy,[email protected],2019-08-02T17:28:44.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy,Taylor A. 
Murphy,[email protected],2019-08-02T17:28:44.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy
-211795deaaaaddb23b797261cdcd148e6083d5b2,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,21,,0,0,0,Update
 
snowflake_query_history.sql,Nehil,[email protected],2020-03-24T22:44:07.000+00:00,gitlab:GitlabUser:1:Nehil,Nehil,[email protected],2020-03-24T22:44:07.000+00:00,gitlab:GitlabUser:1:Nehil
+",Taylor A. 
Murphy,[email protected],2019-08-02T17:28:44.000+00:00,[email protected],Taylor
 A. Murphy,[email protected],2019-08-02T17:28:44.000+00:00,[email protected]
+211795deaaaaddb23b797261cdcd148e6083d5b2,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,21,,0,0,0,Update
 
snowflake_query_history.sql,Nehil,[email protected],2020-03-24T22:44:07.000+00:00,[email protected],Nehil,[email protected],2020-03-24T22:44:07.000+00:00,[email protected]
 
25f2b34099a3e1867fcf73a54e50f78f3c8d8f75,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,9,,0,0,0,"add
 documentation
-",Taylor A. 
Murphy,[email protected],2019-08-02T18:47:28.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy,Taylor A. 
Murphy,[email protected],2019-08-02T18:47:28.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy
+",Taylor A. 
Murphy,[email protected],2019-08-02T18:47:28.000+00:00,[email protected],Taylor
 A. Murphy,[email protected],2019-08-02T18:47:28.000+00:00,[email protected]
 
382084b42697577d3a6adf71ce73d4b5ddd22977,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,2,,0,0,0,"add
 info on dashboard
-",emilie,[email protected],2019-06-28T10:54:26.000+00:00,gitlab:GitlabUser:1:emilie,emilie,[email protected],2019-06-28T10:54:26.000+00:00,gitlab:GitlabUser:1:emilie
+",emilie,[email protected],2019-06-28T10:54:26.000+00:00,[email protected],emilie,[email protected],2019-06-28T10:54:26.000+00:00,[email protected]
 
3f04e0a61d0c4d2dd736a6bcaa3a06826269a533,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,3,,0,0,0,"finish
 top level readme
-",emilie,[email protected],2019-06-28T10:48:49.000+00:00,gitlab:GitlabUser:1:emilie,emilie,[email protected],2019-06-28T10:48:49.000+00:00,gitlab:GitlabUser:1:emilie
-45bed79fcdc6ba3444245f55660f839db50d79c8,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,33,,0,0,0,Update
 
.gitignore,Nehil,[email protected],2020-03-24T18:15:29.000+00:00,gitlab:GitlabUser:1:Nehil,Nehil,[email protected],2020-03-24T18:15:29.000+00:00,gitlab:GitlabUser:1:Nehil
+",emilie,[email protected],2019-06-28T10:48:49.000+00:00,[email protected],emilie,[email protected],2019-06-28T10:48:49.000+00:00,[email protected]
+45bed79fcdc6ba3444245f55660f839db50d79c8,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,33,,0,0,0,Update
 
.gitignore,Nehil,[email protected],2020-03-24T18:15:29.000+00:00,[email protected],Nehil,[email protected],2020-03-24T18:15:29.000+00:00,[email protected]
 
48295660f8bd0c0a024849d4407830face57d4bc,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,37,,0,0,0,"add
 docs and sources
-",emilie,[email protected],2020-04-05T14:39:43.000+00:00,gitlab:GitlabUser:1:emilie,emilie,[email protected],2020-04-05T14:39:43.000+00:00,gitlab:GitlabUser:1:emilie
+",emilie,[email protected],2020-04-05T14:39:43.000+00:00,[email protected],emilie,[email protected],2020-04-05T14:39:43.000+00:00,[email protected]
 
4f0d2f7b1a47d21b01a68e59c12d6f8885ab230e,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,24,,0,0,0,"mr
 comments
-",Nehil 
Jain,[email protected],2020-03-24T22:40:36.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain,Nehil 
Jain,[email protected],2020-03-24T22:40:36.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain
-553f7613b178301da4075202afe91ebda5d97ab5,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,16,,0,0,0,Update
 schema.yml typo for 
docs,Nehil,[email protected],2020-03-25T19:01:57.000+00:00,gitlab:GitlabUser:1:Nehil,Nehil,[email protected],2020-03-25T19:01:57.000+00:00,gitlab:GitlabUser:1:Nehil
+",Nehil 
Jain,[email protected],2020-03-24T22:40:36.000+00:00,[email protected],Nehil
 Jain,[email protected],2020-03-24T22:40:36.000+00:00,[email protected]
+553f7613b178301da4075202afe91ebda5d97ab5,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,16,,0,0,0,Update
 schema.yml typo for 
docs,Nehil,[email protected],2020-03-25T19:01:57.000+00:00,[email protected],Nehil,[email protected],2020-03-25T19:01:57.000+00:00,[email protected]
 
5a141ad0c28960b02c40e6c476d8df3cc76f58c4,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,31,,0,0,0,"schema
 yml, untested
-",Nehil 
Jain,[email protected],2020-03-24T21:18:16.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain,Nehil 
Jain,[email protected],2020-03-24T21:18:16.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain
+",Nehil 
Jain,[email protected],2020-03-24T21:18:16.000+00:00,[email protected],Nehil
 
Jain,[email protected],2020-03-24T21:18:16.000+00:00,[email protected]
 
5b6a2be437e0c66ba6276030a61a10583c3f83fa,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,22,,0,0,0,"merging
 online changes
-",Nehil 
Jain,[email protected],2020-03-24T22:42:54.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain,Nehil 
Jain,[email protected],2020-03-24T22:42:54.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain
-5d6c369200c633b06d85c9375f61fef297761ef1,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,19,,0,0,0,Apply
 suggestion to models/base/snowflake_query_history.sql,"Taylor A Murphy, 
PhD",[email protected],2020-03-25T13:22:42.000+00:00,"gitlab:GitlabUser:1:Taylor
 A Murphy, PhD","Taylor A Murphy, 
PhD",[email protected],2020-03-25T13:22:42.000+00:00,"gitlab:GitlabUser:1:Taylor
 A Murphy, PhD"
-645a724b558a7fa3885fa233d06f68f833d893fc,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,27,,0,0,0,Apply
 suggestion to 
models/base/snowflake_query_history.sql,Nehil,[email protected],2020-03-24T22:39:36.000+00:00,gitlab:GitlabUser:1:Nehil,Nehil,[email protected],2020-03-24T22:39:36.000+00:00,gitlab:GitlabUser:1:Nehil
-64abdcdd9ee9c821f56faf93c5bb0ebc57f575e4,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,28,,0,0,0,Apply
 suggestion to 
models/base/snowflake_query_history.sql,Nehil,[email protected],2020-03-24T22:39:31.000+00:00,gitlab:GitlabUser:1:Nehil,Nehil,[email protected],2020-03-24T22:39:31.000+00:00,gitlab:GitlabUser:1:Nehil
+",Nehil 
Jain,[email protected],2020-03-24T22:42:54.000+00:00,[email protected],Nehil
 Jain,[email protected],2020-03-24T22:42:54.000+00:00,[email protected]
+5d6c369200c633b06d85c9375f61fef297761ef1,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,19,,0,0,0,Apply
 suggestion to models/base/snowflake_query_history.sql,"Taylor A Murphy, 
PhD",[email protected],2020-03-25T13:22:42.000+00:00,[email protected],"Taylor
 A Murphy, 
PhD",[email protected],2020-03-25T13:22:42.000+00:00,[email protected]
+645a724b558a7fa3885fa233d06f68f833d893fc,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,27,,0,0,0,Apply
 suggestion to 
models/base/snowflake_query_history.sql,Nehil,[email protected],2020-03-24T22:39:36.000+00:00,[email protected],Nehil,[email protected],2020-03-24T22:39:36.000+00:00,[email protected]
+64abdcdd9ee9c821f56faf93c5bb0ebc57f575e4,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,28,,0,0,0,Apply
 suggestion to 
models/base/snowflake_query_history.sql,Nehil,[email protected],2020-03-24T22:39:31.000+00:00,[email protected],Nehil,[email protected],2020-03-24T22:39:31.000+00:00,[email protected]
 
6ebf519f25328e49a004f5a574c8b69ba7420be1,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,15,,0,0,0,"add
 contract rate and dbt-utils
-",Taylor A. 
Murphy,[email protected],2019-08-02T17:18:15.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy,Taylor A. 
Murphy,[email protected],2019-08-02T17:18:15.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy
-81b12c995b2fc12e20fd05113cf36dbd57b6e7b0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,20,,0,0,0,Apply
 suggestion to models/base/snowflake_query_history.sql,"Taylor A Murphy, 
PhD",[email protected],2020-03-25T13:21:04.000+00:00,"gitlab:GitlabUser:1:Taylor
 A Murphy, PhD","Taylor A Murphy, 
PhD",[email protected],2020-03-25T13:21:04.000+00:00,"gitlab:GitlabUser:1:Taylor
 A Murphy, PhD"
+",Taylor A. 
Murphy,[email protected],2019-08-02T17:18:15.000+00:00,[email protected],Taylor
 A. Murphy,[email protected],2019-08-02T17:18:15.000+00:00,[email protected]
+81b12c995b2fc12e20fd05113cf36dbd57b6e7b0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,20,,0,0,0,Apply
 suggestion to models/base/snowflake_query_history.sql,"Taylor A Murphy, 
PhD",[email protected],2020-03-25T13:21:04.000+00:00,[email protected],"Taylor
 A Murphy, 
PhD",[email protected],2020-03-25T13:21:04.000+00:00,[email protected]
 
846deac12a1263e4631ced45abbc5e157b23c1be,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,30,,0,0,0,"testing
-",Nehil 
Jain,[email protected],2020-03-24T21:27:46.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain,Nehil 
Jain,[email protected],2020-03-24T21:27:46.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain
+",Nehil 
Jain,[email protected],2020-03-24T21:27:46.000+00:00,[email protected],Nehil
 Jain,[email protected],2020-03-24T21:27:46.000+00:00,[email protected]
 
8a40765e605966842b05b5d8cdf2dd6890556d09,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,14,,0,0,0,"change
 dbt-util version
-",Taylor A. 
Murphy,[email protected],2019-08-02T17:22:09.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy,Taylor A. 
Murphy,[email protected],2019-08-02T17:22:09.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy
+",Taylor A. 
Murphy,[email protected],2019-08-02T17:22:09.000+00:00,[email protected],Taylor
 A. Murphy,[email protected],2019-08-02T17:22:09.000+00:00,[email protected]
 
8a96911c5350f7575215f02f0242f7e27ad3d1f4,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,10,,0,0,0,"add
 documentation
-",Taylor A. 
Murphy,[email protected],2019-08-02T18:46:42.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy,Taylor A. 
Murphy,[email protected],2019-08-02T18:46:42.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy
+",Taylor A. 
Murphy,[email protected],2019-08-02T18:46:42.000+00:00,[email protected],Taylor
 A. Murphy,[email protected],2019-08-02T18:46:42.000+00:00,[email protected]
 
91e5666bdfe90e5ada3e65aaa9240b2b0b1a072f,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,17,,0,0,0,"remove
 config
-",emilie,[email protected],2019-08-26T15:34:33.000+00:00,gitlab:GitlabUser:1:emilie,emilie,[email protected],2019-08-26T15:34:33.000+00:00,gitlab:GitlabUser:1:emilie
+",emilie,[email protected],2019-08-26T15:34:33.000+00:00,[email protected],emilie,[email protected],2019-08-26T15:34:33.000+00:00,[email protected]
 
93d13cf14a470995ec35186292bf165e1152dc2a,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,32,,0,0,0,"comments
 on sql
-",Nehil 
Jain,[email protected],2020-03-24T18:55:11.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain,Nehil 
Jain,[email protected],2020-03-24T18:55:11.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain
+",Nehil 
Jain,[email protected],2020-03-24T18:55:11.000+00:00,[email protected],Nehil
 
Jain,[email protected],2020-03-24T18:55:11.000+00:00,[email protected]
 
9a80506e158547d87e7ad2902c0196deff5b5c07,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,35,,0,0,0,"base
 mmodel for query performance
-",Nehil 
Jain,[email protected],2020-03-24T12:52:28.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain,Nehil 
Jain,[email protected],2020-03-24T12:52:28.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain
+",Nehil 
Jain,[email protected],2020-03-24T12:52:28.000+00:00,[email protected],Nehil
 Jain,[email protected],2020-03-24T12:52:28.000+00:00,[email protected]
 
9e5ec04b0a8273b73936ea150275919b0602c260,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,13,,0,0,0,"change
 names
-",Taylor A. 
Murphy,[email protected],2019-08-02T17:24:35.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy,Taylor A. 
Murphy,[email protected],2019-08-02T17:24:35.000+00:00,gitlab:GitlabUser:1:Taylor
 A. Murphy
-9ef8183140bae8c39a440d9c7eb47f3bc7dcab75,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,18,,0,0,0,Apply
 suggestion to models/base/snowflake_query_history.sql,"Taylor A Murphy, 
PhD",[email protected],2020-03-25T13:22:47.000+00:00,"gitlab:GitlabUser:1:Taylor
 A Murphy, PhD","Taylor A Murphy, 
PhD",[email protected],2020-03-25T13:22:47.000+00:00,"gitlab:GitlabUser:1:Taylor
 A Murphy, PhD"
+",Taylor A. 
Murphy,[email protected],2019-08-02T17:24:35.000+00:00,[email protected],Taylor
 A. Murphy,[email protected],2019-08-02T17:24:35.000+00:00,[email protected]
+9ef8183140bae8c39a440d9c7eb47f3bc7dcab75,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,18,,0,0,0,Apply
 suggestion to models/base/snowflake_query_history.sql,"Taylor A Murphy, 
PhD",[email protected],2020-03-25T13:22:47.000+00:00,[email protected],"Taylor
 A Murphy, 
PhD",[email protected],2020-03-25T13:22:47.000+00:00,[email protected]
 
a09f2d4ae88e78d7424fba1ae6d0c036b677271d,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,36,,0,0,0,"update
 readme
-",emilie,[email protected],2020-04-05T14:43:47.000+00:00,gitlab:GitlabUser:1:emilie,emilie,[email protected],2020-04-05T14:43:47.000+00:00,gitlab:GitlabUser:1:emilie
+",emilie,[email protected],2020-04-05T14:43:47.000+00:00,[email protected],emilie,[email protected],2020-04-05T14:43:47.000+00:00,[email protected]
 
abbe0ab2c7bb1dc2cfaa3ef3062f378fb908ba71,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,5,,0,0,0,"add
 first bit
-",emilie,[email protected],2019-06-28T05:40:36.000+00:00,gitlab:GitlabUser:1:emilie,emilie,[email protected],2019-06-28T05:40:36.000+00:00,gitlab:GitlabUser:1:emilie
+",emilie,[email protected],2019-06-28T05:40:36.000+00:00,[email protected],emilie,[email protected],2019-06-28T05:40:36.000+00:00,[email protected]
 
ad25fcda15e310a7eb34b3e38ff9b962b54f0e03,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,1,,0,0,0,"add
 more info to readme
-",emilie,[email protected],2019-06-28T11:03:52.000+00:00,gitlab:GitlabUser:1:emilie,emilie,[email protected],2019-06-28T11:03:52.000+00:00,gitlab:GitlabUser:1:emilie
+",emilie,[email protected],2019-06-28T11:03:52.000+00:00,[email protected],emilie,[email protected],2019-06-28T11:03:52.000+00:00,[email protected]
 
bb6dfec8dcdacb5b6b37dbd8eb1aa6f9e8c06138,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,23,,0,0,0,"merging
 online changes
-",Nehil 
Jain,[email protected],2020-03-24T22:41:35.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain,Nehil 
Jain,[email protected],2020-03-24T22:41:35.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain
+",Nehil 
Jain,[email protected],2020-03-24T22:41:35.000+00:00,[email protected],Nehil
 Jain,[email protected],2020-03-24T22:41:35.000+00:00,[email protected]
 
c4d406c077af582837d3611a46eded70151f93fb,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,29,,0,0,0,"tested
 schema and the model
-",Nehil 
Jain,[email protected],2020-03-24T22:37:23.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain,Nehil 
Jain,[email protected],2020-03-24T22:37:23.000+00:00,gitlab:GitlabUser:1:Nehil
 Jain
+",Nehil 
Jain,[email protected],2020-03-24T22:37:23.000+00:00,[email protected],Nehil
 Jain,[email protected],2020-03-24T22:37:23.000+00:00,[email protected]
 
e01d4f03811cd0da9949848731236e0aa261cf54,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,4,,0,0,0,"move
 analyses
-",emilie,[email protected],2019-06-28T10:43:17.000+00:00,gitlab:GitlabUser:1:emilie,emilie,[email protected],2019-06-28T10:43:17.000+00:00,gitlab:GitlabUser:1:emilie
-e24fecacb1a2c85f904bef57ffd5598ca2df023c,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,25,,0,0,0,Apply
 suggestion to 
models/base/snowflake_query_history.sql,Nehil,[email protected],2020-03-24T22:39:42.000+00:00,gitlab:GitlabUser:1:Nehil,Nehil,[email protected],2020-03-24T22:39:42.000+00:00,gitlab:GitlabUser:1:Nehil
+",emilie,[email protected],2019-06-28T10:43:17.000+00:00,[email protected],emilie,[email protected],2019-06-28T10:43:17.000+00:00,[email protected]
+e24fecacb1a2c85f904bef57ffd5598ca2df023c,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_merge_request_commits,25,,0,0,0,Apply
 suggestion to 
models/base/snowflake_query_history.sql,Nehil,[email protected],2020-03-24T22:39:42.000+00:00,[email protected],Nehil,[email protected],2020-03-24T22:39:42.000+00:00,[email protected]
diff --git a/plugins/gitlab/e2e/snapshot_tables/issues.csv 
b/plugins/gitlab/e2e/snapshot_tables/issues.csv
index f08448e0..c82facd7 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:gerardoparticle,,,,,,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:GitlabUser:1:11386488,gitlab:GitlabUser: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:chrissharp,,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:emilie,,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:tayloramurphy,,,,,,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:emilie,,,,,,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:tayloramurphy,,,,,,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: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
 
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:martinguindon,,,,,,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:emilie,,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:tayloramurphy,,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:emilie,,,,,,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:mpeychet_,,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: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_
 
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:julie.samson,,,,,,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:GitlabUser:1:4582589,gitlab:GitlabUser: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:tayloramurphy,,,,,,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:tayloramurphy,,,,,,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: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
 
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:m_walker,,,,,,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:GitlabUser:1:5212782,gitlab:GitlabUser: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:loicchesneau,,,,,,loicchesneau
+```",,,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
diff --git a/plugins/gitlab/e2e/snapshot_tables/notes.csv 
b/plugins/gitlab/e2e/snapshot_tables/notes.csv
index 5767f845..8fbf3257 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:emilie,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:emilie,"added
 1 commit
+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
 
 <ul><li>abbe0ab2 - add first bit</li></ul>
 
 [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:emilie,"added
 1 commit
+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
 
 <ul><li>e01d4f03 - move analyses</li></ul>
 
 [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:emilie,"added
 1 commit
+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
 
 <ul><li>3f04e0a6 - finish top level readme</li></ul>
 
 [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:emilie,"added
 1 commit
+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
 
 <ul><li>382084b4 - add info on dashboard</li></ul>
 
 [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:emilie,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:emilie,"@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:emilie,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:emilie,"added
 1 commit
+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
 
 <ul><li>ad25fcda - add more info to readme</li></ul>
 
 [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:tayloramurphy,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:tayloramurphy,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:emilie,@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:martinguindon,@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:emilie,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:emilie,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:emilie,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:emilie,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:emilie,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:emilie,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:emilie,"added
 1 commit
+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
 
 <ul><li>91e5666b - remove config</li></ul>
 
diff --git a/plugins/gitlab/e2e/snapshot_tables/pull_request_comments.csv 
b/plugins/gitlab/e2e/snapshot_tables/pull_request_comments.csv
index 91aef9d0..ff809a0b 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:emilie,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:emilie,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:martinguindon,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:emilie,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: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
diff --git a/plugins/gitlab/e2e/snapshot_tables/pull_requests.csv 
b/plugins/gitlab/e2e/snapshot_tables/pull_requests.csv
index f8826019..f787b47a 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,,,16,2021-08-03T15:02:54.955+00:00,2021-08-12T06:12:54.329+00:00,,,,6f45b467c478df1c67d19cf6d4cbb8e05a71
 [...]
-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,,,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,,,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:GitlabUser:1:9439881,,16,2021-08-03T15:02:54.955+00:00,2021-08-12T06:12:54.329+00:00,,,,6f45b467c
 [...]
+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,,,,
 [...]
 
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,,,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,,,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,,,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,,,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,,,3,2019-08-15T19:34:32.706+00:00,2019-08-26T14:15:27.922+00:00,,,,d678bea9d47b42eb13512d1c9d6a592d80b432d4,5-update-readme-to-include-steps-
 [...]
-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,,,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,,,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,,,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,,,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,,,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,,,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,,,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: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-snow
 [...]
+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-upda
 [...]
+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,,
 
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,,,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,,,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,,,14,2021-02-19T20:12:14.302+00:00,2021-02-19T
 [...]
+* 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:
 [...]
diff --git a/plugins/gitlab/e2e/snapshot_tables/users.csv 
b/plugins/gitlab/e2e/snapshot_tables/users.csv
index 4e26babd..ccea67c6 100644
--- a/plugins/gitlab/e2e/snapshot_tables/users.csv
+++ b/plugins/gitlab/e2e/snapshot_tables/users.csv
@@ -1,15 +1,2 @@
 
id,_raw_data_params,_raw_data_table,_raw_data_id,_raw_data_remark,name,email,avatar_url,timezone
-gitlab:GitlabUser:1:abc1,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,2,,abc1,,https://gitlab.com/uploads/-/system/user/avatar/2436773/avatar.png,
-gitlab:GitlabUser:1:abc10,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,11,,abc9,,https://gitlab.com/uploads/-/system/user/avatar/7411593/avatar.png,
-gitlab:GitlabUser:1:abc11,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,12,,abc10,,https://gitlab.com/uploads/-/system/user/avatar/1678508/avatar.png,
-gitlab:GitlabUser:1:abc12,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,13,,abc11,,https://gitlab.com/uploads/-/system/user/avatar/7598851/avatar.png,
-gitlab:GitlabUser:1:abc13,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,14,,abc12,,https://secure.gravatar.com/avatar/df1654ce1e2a49ea9f84986b863bf1d1?s=80&d=identicon,
-gitlab:GitlabUser:1:abc14,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,15,,abc13,,https://secure.gravatar.com/avatar/d1d69b6c79d3ef5f1c92022969a15485?s=80&d=identicon,
-gitlab:GitlabUser:1:abc2,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,3,,abc2
 
Yin,,https://secure.gravatar.com/avatar/69667c2c63ce892e11b9ac098e3abc4f?s=80&d=identicon,
-gitlab:GitlabUser:1:abc3,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,4,,abc3,,https://secure.gravatar.com/avatar/ce5efe9b3acceecd4f3266fad757e6c3?s=80&d=identicon,
-gitlab:GitlabUser:1:abc4,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,5,,abc4,,https://secure.gravatar.com/avatar/85998e06af031ec6071c64976018bcb2?s=80&d=identicon,
-gitlab:GitlabUser:1:abc5,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,6,,abc5,,https://gitlab.com/uploads/-/system/user/avatar/4403812/avatar.png,
-gitlab:GitlabUser:1:abc6,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,7,,abc6,,https://gitlab.com/uploads/-/system/user/avatar/1533989/avatar.png,
-gitlab:GitlabUser:1:abc7,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,8,,abc7,,https://gitlab.com/uploads/-/system/user/avatar/7175839/avatar.png,
-gitlab:GitlabUser:1:abc8,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,9,,abc2,,https://gitlab.com/uploads/-/system/user/avatar/3466461/avatar.png,
-gitlab:GitlabUser:1:abc9,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,10,,abc8,,https://secure.gravatar.com/avatar/ad6525d38db5c025f249a5971f339e4b?s=80&d=identicon,
+gitlab:GitlabUser:1:0,"{""ConnectionId"":1,""ProjectId"":12345678}",_raw_gitlab_api_users,15,,abc13,,https://secure.gravatar.com/avatar/d1d69b6c79d3ef5f1c92022969a15485?s=80&d=identicon,
diff --git a/plugins/gitlab/e2e/user_test.go b/plugins/gitlab/e2e/user_test.go
index 3fdd9bd6..eb2df5a3 100644
--- a/plugins/gitlab/e2e/user_test.go
+++ b/plugins/gitlab/e2e/user_test.go
@@ -52,6 +52,7 @@ func TestGitlabUserDataFlow(t *testing.T) {
                fmt.Sprintf("./snapshot_tables/%s.csv", 
models.GitlabUser{}.TableName()),
                []string{
                        "connection_id",
+                       "gitlab_id",
                        "username",
                        "email",
                        "name",
diff --git a/plugins/gitlab/models/issue.go b/plugins/gitlab/models/issue.go
index 18ed85a7..cba859aa 100644
--- a/plugins/gitlab/models/issue.go
+++ b/plugins/gitlab/models/issue.go
@@ -34,7 +34,7 @@ type GitlabIssue struct {
        Priority        string `gorm:"type:varchar(255)"`
        Type            string `gorm:"type:varchar(100)"`
        Status          string `gorm:"type:varchar(255)"`
-       CreatorId       string `gorm:"type:varchar(255)"`
+       CreatorId       int
        CreatorName     string `gorm:"type:varchar(255)"`
        AssigneeId      int
        AssigneeName    string `gorm:"type:varchar(255)"`
@@ -56,7 +56,8 @@ func (GitlabIssue) TableName() string {
 
 type GitlabAuthor struct {
        ConnectionId    uint64 `gorm:"primaryKey"`
-       Username        string `gorm:"primaryKey;type:varchar(255)"`
+       GitlabId        int    `gorm:"primaryKey" json:"id"`
+       Username        string `gorm:"type:varchar(255)"`
        Email           string `gorm:"type:varchar(255)"`
        Name            string `gorm:"type:varchar(255)"`
        State           string `gorm:"type:varchar(255)"`
@@ -73,7 +74,8 @@ func (GitlabAuthor) TableName() string {
 
 type GitlabAssignee struct {
        ConnectionId    uint64 `gorm:"primaryKey"`
-       Username        string `gorm:"primaryKey;type:varchar(255)"`
+       GitlabId        int    `gorm:"primaryKey" json:"id"`
+       Username        string `gorm:"type:varchar(255)"`
        Email           string `gorm:"type:varchar(255)"`
        Name            string `gorm:"type:varchar(255)"`
        State           string `gorm:"type:varchar(255)"`
diff --git a/plugins/gitlab/models/migrationscripts/archived/issue.go 
b/plugins/gitlab/models/migrationscripts/archived/issue.go
index 04076db4..6800ab86 100644
--- a/plugins/gitlab/models/migrationscripts/archived/issue.go
+++ b/plugins/gitlab/models/migrationscripts/archived/issue.go
@@ -34,7 +34,7 @@ type GitlabIssue struct {
        Priority        string `gorm:"type:varchar(255)"`
        Type            string `gorm:"type:varchar(100)"`
        Status          string `gorm:"type:varchar(255)"`
-       CreatorId       string `gorm:"type:varchar(255)"`
+       CreatorId       int
        CreatorName     string `gorm:"type:varchar(255)"`
        AssigneeId      int
        AssigneeName    string `gorm:"type:varchar(255)"`
@@ -56,7 +56,8 @@ func (GitlabIssue) TableName() string {
 
 type GitlabAuthor struct {
        ConnectionId    uint64 `gorm:"primaryKey"`
-       Username        string `gorm:"primaryKey;type:varchar(255)"`
+       GitlabId        int    `gorm:"primaryKey" json:"id"`
+       Username        string `gorm:"type:varchar(255)"`
        Email           string `gorm:"type:varchar(255)"`
        Name            string `gorm:"type:varchar(255)"`
        State           string `gorm:"type:varchar(255)"`
@@ -73,7 +74,8 @@ func (GitlabAuthor) TableName() string {
 
 type GitlabAssignee struct {
        ConnectionId    uint64 `gorm:"primaryKey"`
-       Username        string `gorm:"primaryKey;type:varchar(255)"`
+       GitlabId        int    `gorm:"primaryKey" json:"id"`
+       Username        string `gorm:"type:varchar(255)"`
        Email           string `gorm:"type:varchar(255)"`
        Name            string `gorm:"type:varchar(255)"`
        State           string `gorm:"type:varchar(255)"`
diff --git a/plugins/gitlab/models/migrationscripts/archived/mr_comment.go 
b/plugins/gitlab/models/migrationscripts/archived/mr_comment.go
index e7c690de..2010986d 100644
--- a/plugins/gitlab/models/migrationscripts/archived/mr_comment.go
+++ b/plugins/gitlab/models/migrationscripts/archived/mr_comment.go
@@ -32,7 +32,8 @@ type GitlabMrComment struct {
        AuthorUsername  string `gorm:"type:varchar(255)"`
        AuthorUserId    int
        GitlabCreatedAt time.Time
-       Resolvable      bool `gorm:"comment:Is or is not review comment"`
+       Resolvable      bool   `gorm:"comment:Is or is not review comment"`
+       Type            string `gorm:"comment:if type=null, it is normal 
comment,if type=diffNote,it is diff comment"`
        archived.NoPKModel
 }
 
diff --git a/plugins/gitlab/models/migrationscripts/archived/mr_note.go 
b/plugins/gitlab/models/migrationscripts/archived/mr_note.go
index c3dc1c84..5c9790e3 100644
--- a/plugins/gitlab/models/migrationscripts/archived/mr_note.go
+++ b/plugins/gitlab/models/migrationscripts/archived/mr_note.go
@@ -18,8 +18,9 @@ limitations under the License.
 package archived
 
 import (
-       "github.com/apache/incubator-devlake/models/migrationscripts/archived"
        "time"
+
+       "github.com/apache/incubator-devlake/models/migrationscripts/archived"
 )
 
 type GitlabMrNote struct {
@@ -29,13 +30,14 @@ type GitlabMrNote struct {
        MergeRequestId  int    `gorm:"index"`
        MergeRequestIid int    `gorm:"comment:Used in API requests ex. 
/api/merge_requests/<THIS_IID>"`
        NoteableType    string `gorm:"type:varchar(100)"`
+       AuthorUserId    int
        AuthorUsername  string `gorm:"type:varchar(255)"`
        Body            string
        GitlabCreatedAt time.Time
        Confidential    bool
-       Resolvable      bool `gorm:"comment:Is or is not review comment"`
-       IsSystem        bool `gorm:"comment:Is or is not auto-generated vs. 
human generated"`
-
+       Resolvable      bool   `gorm:"comment:Is or is not review comment"`
+       IsSystem        bool   `gorm:"comment:Is or is not auto-generated vs. 
human generated"`
+       Type            string `gorm:"comment:if type=null, it is normal 
comment,if type=diffNote,it is diff comment"`
        archived.NoPKModel
 }
 
diff --git a/plugins/gitlab/models/migrationscripts/archived/user.go 
b/plugins/gitlab/models/migrationscripts/archived/user.go
index d98e70b4..24aec731 100644
--- a/plugins/gitlab/models/migrationscripts/archived/user.go
+++ b/plugins/gitlab/models/migrationscripts/archived/user.go
@@ -21,7 +21,8 @@ import 
"github.com/apache/incubator-devlake/models/migrationscripts/archived"
 
 type GitlabUser struct {
        ConnectionId    uint64 `gorm:"primaryKey"`
-       Username        string `gorm:"primaryKey;type:varchar(255)"`
+       GitlabId        int    `gorm:"primaryKey"`
+       Username        string `gorm:"type:varchar(255)"`
        Email           string `gorm:"type:varchar(255)"`
        Name            string `gorm:"type:varchar(255)"`
        State           string `gorm:"type:varchar(255)"`
diff --git a/plugins/gitlab/models/mr_comment.go 
b/plugins/gitlab/models/mr_comment.go
index 2cc6e272..79c62380 100644
--- a/plugins/gitlab/models/mr_comment.go
+++ b/plugins/gitlab/models/mr_comment.go
@@ -32,7 +32,8 @@ type GitlabMrComment struct {
        AuthorUsername  string `gorm:"type:varchar(255)"`
        AuthorUserId    int
        GitlabCreatedAt time.Time
-       Resolvable      bool `gorm:"comment:Is or is not review comment"`
+       Resolvable      bool   `gorm:"comment:Is or is not review comment"`
+       Type            string `gorm:"comment:if type=null, it is normal 
comment,if type=diffNote,it is diff comment"`
        common.NoPKModel
 }
 
diff --git a/plugins/gitlab/models/mr_note.go b/plugins/gitlab/models/mr_note.go
index e82031cc..747aa5f1 100644
--- a/plugins/gitlab/models/mr_note.go
+++ b/plugins/gitlab/models/mr_note.go
@@ -30,13 +30,14 @@ type GitlabMrNote struct {
        MergeRequestId  int    `gorm:"index"`
        MergeRequestIid int    `gorm:"comment:Used in API requests ex. 
/api/merge_requests/<THIS_IID>"`
        NoteableType    string `gorm:"type:varchar(100)"`
+       AuthorUserId    int
        AuthorUsername  string `gorm:"type:varchar(255)"`
        Body            string
        GitlabCreatedAt time.Time
        Confidential    bool
-       Resolvable      bool `gorm:"comment:Is or is not review comment"`
-       IsSystem        bool `gorm:"comment:Is or is not auto-generated vs. 
human generated"`
-
+       Resolvable      bool   `gorm:"comment:Is or is not review comment"`
+       IsSystem        bool   `gorm:"comment:Is or is not auto-generated vs. 
human generated"`
+       Type            string `gorm:"comment:if type=null, it is normal 
comment,if type=diffNote,it is diff comment"`
        common.NoPKModel
 }
 
diff --git a/plugins/gitlab/models/user.go b/plugins/gitlab/models/user.go
index 1a6fbc00..01ad5547 100644
--- a/plugins/gitlab/models/user.go
+++ b/plugins/gitlab/models/user.go
@@ -23,7 +23,8 @@ import (
 
 type GitlabUser struct {
        ConnectionId    uint64 `gorm:"primaryKey"`
-       Username        string `gorm:"primaryKey;type:varchar(255)"`
+       GitlabId        int    `gorm:"primaryKey" json:"id"`
+       Username        string `gorm:"type:varchar(255)"`
        Email           string `gorm:"type:varchar(255)"`
        Name            string `gorm:"type:varchar(255)"`
        State           string `gorm:"type:varchar(255)"`
diff --git a/plugins/gitlab/tasks/commit_convertor.go 
b/plugins/gitlab/tasks/commit_convertor.go
index f77e65a5..49bd31a6 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.GitlabUser{})
 
        converter, err := helper.NewDataConverter(helper.DataConverterArgs{
                RawDataSubTaskArgs: *rawDataSubTaskArgs,
@@ -74,14 +74,14 @@ func ConvertApiCommits(taskCtx core.SubTaskContext) error {
                        commit.Message = gitlabCommit.Message
                        commit.Additions = gitlabCommit.Additions
                        commit.Deletions = gitlabCommit.Deletions
-                       commit.AuthorId = 
userDidGen.Generate(data.Options.ConnectionId, gitlabCommit.AuthorName)
+                       commit.AuthorId = gitlabCommit.AuthorEmail
                        commit.AuthorName = gitlabCommit.AuthorName
                        commit.AuthorEmail = gitlabCommit.AuthorEmail
                        commit.AuthoredDate = gitlabCommit.AuthoredDate
                        commit.CommitterName = gitlabCommit.CommitterName
                        commit.CommitterEmail = gitlabCommit.CommitterEmail
                        commit.CommittedDate = gitlabCommit.CommittedDate
-                       commit.CommitterId = 
userDidGen.Generate(data.Options.ConnectionId, gitlabCommit.AuthorName)
+                       commit.CommitterId = gitlabCommit.CommitterEmail
 
                        // convert repo / commits relationship
                        repoCommit := &code.RepoCommit{
diff --git a/plugins/gitlab/tasks/issue_convertor.go 
b/plugins/gitlab/tasks/issue_convertor.go
index e0e8d3dd..aabdfcf8 100644
--- a/plugins/gitlab/tasks/issue_convertor.go
+++ b/plugins/gitlab/tasks/issue_convertor.go
@@ -29,7 +29,6 @@ import (
        "github.com/apache/incubator-devlake/models/domainlayer"
        "github.com/apache/incubator-devlake/models/domainlayer/didgen"
        "github.com/apache/incubator-devlake/models/domainlayer/ticket"
-       "github.com/apache/incubator-devlake/plugins/gitlab/models"
        gitlabModels "github.com/apache/incubator-devlake/plugins/gitlab/models"
 )
 
@@ -58,8 +57,8 @@ func ConvertIssues(taskCtx core.SubTaskContext) error {
        defer cursor.Close()
 
        issueIdGen := didgen.NewDomainIdGenerator(&gitlabModels.GitlabIssue{})
+       userIdGen := didgen.NewDomainIdGenerator(&gitlabModels.GitlabUser{})
        boardIdGen := didgen.NewDomainIdGenerator(&gitlabModels.GitlabProject{})
-       userIdGen := didgen.NewDomainIdGenerator(&models.GitlabUser{})
 
        converter, err := helper.NewDataConverter(helper.DataConverterArgs{
                RawDataSubTaskArgs: *rawDataSubTaskArgs,
@@ -74,7 +73,6 @@ func ConvertIssues(taskCtx core.SubTaskContext) error {
                                Description:             issue.Body,
                                Priority:                issue.Priority,
                                Type:                    issue.Type,
-                               AssigneeName:            issue.AssigneeName,
                                LeadTimeMinutes:         issue.LeadTimeMinutes,
                                Url:                     issue.Url,
                                CreatedDate:             &issue.GitlabCreatedAt,
@@ -85,8 +83,10 @@ func ConvertIssues(taskCtx core.SubTaskContext) error {
                                OriginalStatus:          issue.Status,
                                OriginalEstimateMinutes: issue.TimeEstimate,
                                TimeSpentMinutes:        issue.TotalTimeSpent,
-                               CreatorId:               
userIdGen.Generate(data.Options.ConnectionId, issue.CreatorName),
+                               CreatorId:               
userIdGen.Generate(data.Options.ConnectionId, issue.CreatorId),
                                CreatorName:             issue.CreatorName,
+                               AssigneeId:              
userIdGen.Generate(data.Options.ConnectionId, issue.AssigneeId),
+                               AssigneeName:            issue.AssigneeName,
                        }
 
                        if issue.State == "opened" {
@@ -94,6 +94,7 @@ func ConvertIssues(taskCtx core.SubTaskContext) error {
                        } else {
                                domainIssue.Status = ticket.DONE
                        }
+
                        boardIssue := &ticket.BoardIssue{
                                BoardId: 
boardIdGen.Generate(data.Options.ConnectionId, projectId),
                                IssueId: domainIssue.Id,
diff --git a/plugins/gitlab/tasks/issue_extractor.go 
b/plugins/gitlab/tasks/issue_extractor.go
index 31be638a..f4d35488 100644
--- a/plugins/gitlab/tasks/issue_extractor.go
+++ b/plugins/gitlab/tasks/issue_extractor.go
@@ -22,7 +22,6 @@ import (
        "fmt"
        "regexp"
        "runtime/debug"
-       "strconv"
 
        "github.com/apache/incubator-devlake/models/domainlayer/ticket"
 
@@ -53,13 +52,13 @@ type IssuesResponse struct {
                CreatedAt   helper.Iso8601Time
                UpdatedAt   helper.Iso8601Time
        }
-       Author struct {
+       Author *struct {
                State     string
                WebUrl    string `json:"web_url"`
                AvatarUrl string `json:"avatar_url"`
                Username  string
-               Id        int
-               Name      string
+               Id        int    `json:"id"`
+               Name      string `json:"name"`
        }
        Description string
        State       string
@@ -251,13 +250,14 @@ func ExtractApiIssues(taskCtx core.SubTaskContext) error {
 
                        }
                        gitlabIssue.ConnectionId = data.Options.ConnectionId
-
-                       gitlabAuthor, err := convertGitlabAuthor(body, 
data.Options.ConnectionId)
-                       if err != nil {
-                               return nil, err
+                       if body.Author != nil {
+                               gitlabAuthor, err := convertGitlabAuthor(body, 
data.Options.ConnectionId)
+                               if err != nil {
+                                       return nil, err
+                               }
+                               results = append(results, gitlabAuthor)
                        }
                        results = append(results, gitlabIssue)
-                       results = append(results, gitlabAuthor)
 
                        for _, v := range body.Assignees {
                                GitlabAssignee := &models.GitlabAssignee{
@@ -296,7 +296,7 @@ func convertGitlabIssue(issue *IssuesResponse, projectId 
int) (*models.GitlabIss
                GitlabUpdatedAt: issue.GitlabUpdatedAt.ToTime(),
                TimeEstimate:    issue.TimeStats.TimeEstimate,
                TotalTimeSpent:  issue.TimeStats.TotalTimeSpent,
-               CreatorId:       strconv.Itoa(issue.Author.Id),
+               CreatorId:       issue.Author.Id,
                CreatorName:     issue.Author.Username,
        }
 
@@ -304,7 +304,11 @@ func convertGitlabIssue(issue *IssuesResponse, projectId 
int) (*models.GitlabIss
                gitlabIssue.AssigneeId = issue.Assignee.Id
                gitlabIssue.AssigneeName = issue.Assignee.Username
        }
+       if issue.Author != nil {
+               gitlabIssue.CreatorId = issue.Author.Id
+               gitlabIssue.CreatorName = issue.Author.Username
 
+       }
        if issue.GitlabClosedAt != nil {
                gitlabIssue.LeadTimeMinutes = 
uint(issue.GitlabClosedAt.ToTime().Sub(issue.GitlabCreatedAt.ToTime()).Minutes())
        }
@@ -315,6 +319,7 @@ func convertGitlabIssue(issue *IssuesResponse, projectId 
int) (*models.GitlabIss
 func convertGitlabAuthor(issue *IssuesResponse, connectionId uint64) 
(*models.GitlabAuthor, error) {
        gitlabAuthor := &models.GitlabAuthor{
                ConnectionId: connectionId,
+               GitlabId:     issue.Author.Id,
                Username:     issue.Author.Username,
                Name:         issue.Author.Name,
                State:        issue.Author.State,
diff --git a/plugins/gitlab/tasks/mr_comment_convertor.go 
b/plugins/gitlab/tasks/mr_comment_convertor.go
index 4d786f26..f048e200 100644
--- a/plugins/gitlab/tasks/mr_comment_convertor.go
+++ b/plugins/gitlab/tasks/mr_comment_convertor.go
@@ -76,8 +76,9 @@ func ConvertMergeRequestComment(taskCtx core.SubTaskContext) 
error {
                                },
                                PullRequestId: 
prIdGen.Generate(data.Options.ConnectionId, gitlabComments.MergeRequestId),
                                Body:          gitlabComments.Body,
-                               UserId:        
userIdGen.Generate(data.Options.ConnectionId, gitlabComments.AuthorUsername),
+                               UserId:        
userIdGen.Generate(data.Options.ConnectionId, gitlabComments.AuthorUserId),
                                CreatedDate:   gitlabComments.GitlabCreatedAt,
+                               Type:          gitlabComments.Type,
                        }
                        return []interface{}{
                                domainComment,
diff --git a/plugins/gitlab/tasks/mr_convertor.go 
b/plugins/gitlab/tasks/mr_convertor.go
index 1c56db64..a8c3b49b 100644
--- a/plugins/gitlab/tasks/mr_convertor.go
+++ b/plugins/gitlab/tasks/mr_convertor.go
@@ -18,15 +18,14 @@ limitations under the License.
 package tasks
 
 import (
-       "github.com/apache/incubator-devlake/plugins/core/dal"
-       "reflect"
-
        "github.com/apache/incubator-devlake/models/domainlayer"
        "github.com/apache/incubator-devlake/models/domainlayer/code"
        "github.com/apache/incubator-devlake/models/domainlayer/didgen"
        "github.com/apache/incubator-devlake/plugins/core"
+       "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{
@@ -53,6 +52,7 @@ func ConvertApiMergeRequests(taskCtx core.SubTaskContext) 
error {
 
        domainMrIdGenerator := 
didgen.NewDomainIdGenerator(&models.GitlabMergeRequest{})
        domainRepoIdGenerator := 
didgen.NewDomainIdGenerator(&models.GitlabProject{})
+       domainUserIdGen := didgen.NewDomainIdGenerator(&models.GitlabUser{})
 
        converter, err := helper.NewDataConverter(helper.DataConverterArgs{
                RawDataSubTaskArgs: *rawDataSubTaskArgs,
@@ -75,6 +75,7 @@ func ConvertApiMergeRequests(taskCtx core.SubTaskContext) 
error {
                                Type:           gitlabMr.Type,
                                Url:            gitlabMr.WebUrl,
                                AuthorName:     gitlabMr.AuthorUsername,
+                               AuthorId:       
domainUserIdGen.Generate(data.Options.ConnectionId, gitlabMr.AuthorUserId),
                                CreatedDate:    gitlabMr.GitlabCreatedAt,
                                MergedDate:     gitlabMr.MergedAt,
                                ClosedDate:     gitlabMr.ClosedAt,
diff --git a/plugins/gitlab/tasks/mr_note_extractor.go 
b/plugins/gitlab/tasks/mr_note_extractor.go
index 68a03f2d..10fd71af 100644
--- a/plugins/gitlab/tasks/mr_note_extractor.go
+++ b/plugins/gitlab/tasks/mr_note_extractor.go
@@ -19,7 +19,6 @@ package tasks
 
 import (
        "encoding/json"
-
        "github.com/apache/incubator-devlake/plugins/core"
        "github.com/apache/incubator-devlake/plugins/gitlab/models"
        "github.com/apache/incubator-devlake/plugins/helper"
@@ -36,8 +35,10 @@ type MergeRequestNote struct {
        Resolvable      bool `json:"resolvable"`
        System          bool `json:"system"`
        Author          struct {
+               Id       int    `json:"id"`
                Username string `json:"username"`
        }
+       Type string `json:"type"`
 }
 
 var ExtractApiMrNotesMeta = core.SubTaskMeta{
@@ -72,9 +73,11 @@ func ExtractApiMergeRequestsNotes(taskCtx 
core.SubTaskContext) error {
                                        MergeRequestId:  
toolMrNote.MergeRequestId,
                                        MergeRequestIid: 
toolMrNote.MergeRequestIid,
                                        Body:            toolMrNote.Body,
+                                       AuthorUserId:    
toolMrNote.AuthorUserId,
                                        AuthorUsername:  
toolMrNote.AuthorUsername,
                                        GitlabCreatedAt: 
toolMrNote.GitlabCreatedAt,
                                        Resolvable:      toolMrNote.Resolvable,
+                                       Type:            toolMrNote.Type,
                                        ConnectionId:    
data.Options.ConnectionId,
                                }
                                results = append(results, toolMrComment)
@@ -96,6 +99,7 @@ func ExtractApiMergeRequestsNotes(taskCtx 
core.SubTaskContext) error {
 func convertMergeRequestNote(mrNote *MergeRequestNote) (*models.GitlabMrNote, 
error) {
        GitlabMrNote := &models.GitlabMrNote{
                GitlabId:        mrNote.GitlabId,
+               AuthorUserId:    mrNote.Author.Id,
                MergeRequestId:  mrNote.MergeRequestId,
                MergeRequestIid: mrNote.MergeRequestIid,
                NoteableType:    mrNote.NoteableType,
@@ -105,6 +109,7 @@ func convertMergeRequestNote(mrNote *MergeRequestNote) 
(*models.GitlabMrNote, er
                Confidential:    mrNote.Confidential,
                Resolvable:      mrNote.Resolvable,
                IsSystem:        mrNote.System,
+               Type:            mrNote.Type,
        }
        return GitlabMrNote, nil
 }
diff --git a/plugins/gitlab/tasks/note_convertor.go 
b/plugins/gitlab/tasks/note_convertor.go
index 6c3a5bd4..6ec9699c 100644
--- a/plugins/gitlab/tasks/note_convertor.go
+++ b/plugins/gitlab/tasks/note_convertor.go
@@ -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.AuthorUsername),
+                               Author:      
userIdGen.Generate(data.Options.ConnectionId, gitlabNotes.AuthorUserId),
                                Body:        gitlabNotes.Body,
                                Resolvable:  gitlabNotes.Resolvable,
                                IsSystem:    gitlabNotes.IsSystem,
diff --git a/plugins/gitlab/tasks/user_convertor.go 
b/plugins/gitlab/tasks/user_convertor.go
index 68423934..2b73f1dc 100644
--- a/plugins/gitlab/tasks/user_convertor.go
+++ b/plugins/gitlab/tasks/user_convertor.go
@@ -64,7 +64,7 @@ func ConvertUsers(taskCtx core.SubTaskContext) error {
                Convert: func(inputRow interface{}) ([]interface{}, error) {
                        gitlabUser := inputRow.(*gitlabModels.GitlabUser)
                        domainUser := &user.User{
-                               DomainEntity: domainlayer.DomainEntity{Id: 
userIdGen.Generate(data.Options.ConnectionId, gitlabUser.Username)},
+                               DomainEntity: domainlayer.DomainEntity{Id: 
userIdGen.Generate(data.Options.ConnectionId, gitlabUser.GitlabId)},
                                Name:         gitlabUser.Name,
                                Email:        gitlabUser.Email,
                                AvatarUrl:    gitlabUser.AvatarUrl,

Reply via email to