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 2249af0b1 refactor: rename jenkins `job.jobFullname` to `fullName` 
(#6203)
2249af0b1 is described below

commit 2249af0b19e6ad014b5ec346f985927c6191514c
Author: Klesh Wong <[email protected]>
AuthorDate: Mon Oct 9 16:55:25 2023 +0800

    refactor: rename jenkins `job.jobFullname` to `fullName` (#6203)
    
    * refactor: rename jobFullName to fullName for jenkins
    
    * fix: flatten scope output
---
 backend/core/models/common/base.go                 | 12 +++++-----
 backend/plugins/bamboo/models/plan.go              |  2 +-
 backend/plugins/bitbucket/models/repo.go           | 20 ++++++++---------
 backend/plugins/circleci/models/project.go         |  2 +-
 backend/plugins/gitee/models/repo.go               |  2 +-
 backend/plugins/jenkins/models/job.go              | 20 ++++++++---------
 backend/plugins/jira/models/board.go               | 12 +++++-----
 backend/plugins/pagerduty/models/service.go        |  8 +++----
 .../plugins/sonarqube/models/sonarqube_project.go  |  2 +-
 backend/plugins/tapd/models/workspace.go           | 26 +++++++++++-----------
 backend/plugins/trello/models/board.go             |  2 +-
 backend/plugins/zentao/models/project.go           |  5 +++--
 12 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/backend/core/models/common/base.go 
b/backend/core/models/common/base.go
index b7dffd55b..43c6675a8 100644
--- a/backend/core/models/common/base.go
+++ b/backend/core/models/common/base.go
@@ -49,12 +49,12 @@ type Updater struct {
 // embedded fields for tool layer tables
 type RawDataOrigin struct {
        // can be used for flushing outdated records from table
-       RawDataParams string 
`gorm:"column:_raw_data_params;type:varchar(255);index" json:"_raw_data_params"`
-       RawDataTable  string `gorm:"column:_raw_data_table;type:varchar(255)" 
json:"_raw_data_table"`
+       RawDataParams string 
`gorm:"column:_raw_data_params;type:varchar(255);index" json:"_raw_data_params" 
mapstructure:"rawDataParams"`
+       RawDataTable  string `gorm:"column:_raw_data_table;type:varchar(255)" 
json:"_raw_data_table" mapstructure:"rawDataTable"`
        // can be used for debugging
-       RawDataId uint64 `gorm:"column:_raw_data_id" json:"_raw_data_id"`
+       RawDataId uint64 `gorm:"column:_raw_data_id" json:"_raw_data_id" 
mapstructure:"rawDataId"`
        // we can store record index into this field, which is helpful for 
debugging
-       RawDataRemark string `gorm:"column:_raw_data_remark" 
json:"_raw_data_remark"`
+       RawDataRemark string `gorm:"column:_raw_data_remark" 
json:"_raw_data_remark" mapstructure:"rawDataRemark"`
 }
 
 type GetRawDataOrigin interface {
@@ -68,7 +68,7 @@ func (c *RawDataOrigin) GetRawDataOrigin() *RawDataOrigin {
 type NoPKModel struct {
        CreatedAt     time.Time `json:"createdAt" mapstructure:"createdAt"`
        UpdatedAt     time.Time `json:"updatedAt" mapstructure:"updatedAt"`
-       RawDataOrigin `swaggerignore:"true"`
+       RawDataOrigin `swaggerignore:"true" mapstructure:",squash"`
 }
 
 func NewNoPKModel() NoPKModel {
@@ -80,7 +80,7 @@ func NewNoPKModel() NoPKModel {
 }
 
 type Scope struct {
-       NoPKModel
+       NoPKModel     `mapstructure:",squash"`
        ConnectionId  uint64 `json:"connectionId" gorm:"primaryKey" 
validate:"required" mapstructure:"connectionId,omitempty"`
        ScopeConfigId uint64 `json:"scopeConfigId,omitempty" 
mapstructure:"scopeConfigId,omitempty"`
 }
diff --git a/backend/plugins/bamboo/models/plan.go 
b/backend/plugins/bamboo/models/plan.go
index d547109fc..a3653279f 100644
--- a/backend/plugins/bamboo/models/plan.go
+++ b/backend/plugins/bamboo/models/plan.go
@@ -26,7 +26,7 @@ var _ plugin.ToolLayerScope = (*BambooPlan)(nil)
 var _ plugin.ApiScope = (*ApiBambooPlan)(nil)
 
 type BambooPlan struct {
-       common.Scope
+       common.Scope              `mapstructure:",squash"`
        PlanKey                   string  `json:"planKey" 
mapstructure:"planKey" gorm:"primaryKey"`
        Name                      string  `json:"name" mapstructure:"name"`
        Expand                    string  `json:"expand" mapstructure:"expand"`
diff --git a/backend/plugins/bitbucket/models/repo.go 
b/backend/plugins/bitbucket/models/repo.go
index 7d88afbea..be68dee91 100644
--- a/backend/plugins/bitbucket/models/repo.go
+++ b/backend/plugins/bitbucket/models/repo.go
@@ -29,16 +29,16 @@ var _ plugin.ApiGroup = (*GroupResponse)(nil)
 var _ plugin.ApiScope = (*BitbucketApiRepo)(nil)
 
 type BitbucketRepo struct {
-       common.Scope
-       BitbucketId string     `json:"bitbucketId" 
gorm:"primaryKey;type:varchar(255)" validate:"required" 
mapstructure:"bitbucketId"`
-       Name        string     `json:"name" gorm:"type:varchar(255)" 
mapstructure:"name,omitempty"`
-       HTMLUrl     string     `json:"HTMLUrl" gorm:"type:varchar(255)" 
mapstructure:"HTMLUrl,omitempty"`
-       Description string     `json:"description" 
mapstructure:"description,omitempty"`
-       Owner       string     `json:"owner" mapstructure:"owner,omitempty"`
-       Language    string     `json:"language" gorm:"type:varchar(255)" 
mapstructure:"language,omitempty"`
-       CloneUrl    string     `json:"cloneUrl" gorm:"type:varchar(255)" 
mapstructure:"cloneUrl,omitempty"`
-       CreatedDate *time.Time `json:"createdDate" mapstructure:"-"`
-       UpdatedDate *time.Time `json:"updatedDate" mapstructure:"-"`
+       common.Scope `mapstructure:",squash"`
+       BitbucketId  string     `json:"bitbucketId" 
gorm:"primaryKey;type:varchar(255)" validate:"required" 
mapstructure:"bitbucketId"`
+       Name         string     `json:"name" gorm:"type:varchar(255)" 
mapstructure:"name,omitempty"`
+       HTMLUrl      string     `json:"HTMLUrl" gorm:"type:varchar(255)" 
mapstructure:"HTMLUrl,omitempty"`
+       Description  string     `json:"description" 
mapstructure:"description,omitempty"`
+       Owner        string     `json:"owner" mapstructure:"owner,omitempty"`
+       Language     string     `json:"language" gorm:"type:varchar(255)" 
mapstructure:"language,omitempty"`
+       CloneUrl     string     `json:"cloneUrl" gorm:"type:varchar(255)" 
mapstructure:"cloneUrl,omitempty"`
+       CreatedDate  *time.Time `json:"createdDate" mapstructure:"-"`
+       UpdatedDate  *time.Time `json:"updatedDate" mapstructure:"-"`
 }
 
 func (BitbucketRepo) TableName() string {
diff --git a/backend/plugins/circleci/models/project.go 
b/backend/plugins/circleci/models/project.go
index ee18c004f..453fed1fc 100644
--- a/backend/plugins/circleci/models/project.go
+++ b/backend/plugins/circleci/models/project.go
@@ -23,7 +23,7 @@ import (
 )
 
 type CircleciProject struct {
-       common.Scope
+       common.Scope   `mapstructure:",squash"`
        Id             string `gorm:"primaryKey;type:varchar(100)" json:"id" 
mapstructure:"id"`
        Slug           string `gorm:"type:varchar(255)" json:"slug" 
mapstructure:"slug"`
        Name           string `gorm:"type:varchar(255)" json:"name" 
mapstructure:"name"`
diff --git a/backend/plugins/gitee/models/repo.go 
b/backend/plugins/gitee/models/repo.go
index e1f93b2f9..1229567ae 100644
--- a/backend/plugins/gitee/models/repo.go
+++ b/backend/plugins/gitee/models/repo.go
@@ -29,7 +29,7 @@ import (
 var _ plugin.ToolLayerScope = (*GiteeRepo)(nil)
 
 type GiteeRepo struct {
-       common.Scope
+       common.Scope  `mapstructure:",squash"`
        GiteeId       int    `gorm:"primaryKey"`
        Name          string `gorm:"type:varchar(255)"`
        HTMLUrl       string `gorm:"type:varchar(255)"`
diff --git a/backend/plugins/jenkins/models/job.go 
b/backend/plugins/jenkins/models/job.go
index e448dc34a..e4b5b84a6 100644
--- a/backend/plugins/jenkins/models/job.go
+++ b/backend/plugins/jenkins/models/job.go
@@ -26,16 +26,16 @@ var _ plugin.ToolLayerScope = (*JenkinsJob)(nil)
 
 // JenkinsJob db entity for jenkins job
 type JenkinsJob struct {
-       common.Scope
-       FullName    string `gorm:"primaryKey;type:varchar(255)" 
mapstructure:"jobFullName" validate:"required" json:"jobFullName"` // 
"path1/path2/job name"
-       Name        string `gorm:"index;type:varchar(255)" mapstructure:"name" 
json:"name"`                                        // scope name now is same 
to `jobFullName`
-       Path        string `gorm:"index;type:varchar(511)" 
mapstructure:"-,omitempty" json:"-"`                                    // 
"job/path1/job/path2"
-       Class       string `gorm:"type:varchar(255)" 
mapstructure:"class,omitempty" json:"class"`
-       Color       string `gorm:"type:varchar(255)" 
mapstructure:"color,omitempty" json:"color"`
-       Base        string `gorm:"type:varchar(255)" 
mapstructure:"base,omitempty" json:"base"`
-       Url         string `mapstructure:"url,omitempty" json:"url"`
-       Description string `mapstructure:"description,omitempty" 
json:"description"`
-       PrimaryView string `gorm:"type:varchar(255)" 
mapstructure:"primaryView,omitempty" json:"primaryView"`
+       common.Scope `mapstructure:",squash"`
+       FullName     string `gorm:"primaryKey;type:varchar(255)" 
mapstructure:"fullName" validate:"required" json:"fullName"` // 
"path1/path2/job name"
+       Name         string `gorm:"index;type:varchar(255)" mapstructure:"name" 
json:"name"`                                  // scope name now is same to 
`jobFullName`
+       Path         string `gorm:"index;type:varchar(511)" 
mapstructure:"-,omitempty" json:"-"`                              // 
"job/path1/job/path2"
+       Class        string `gorm:"type:varchar(255)" 
mapstructure:"class,omitempty" json:"class"`
+       Color        string `gorm:"type:varchar(255)" 
mapstructure:"color,omitempty" json:"color"`
+       Base         string `gorm:"type:varchar(255)" 
mapstructure:"base,omitempty" json:"base"`
+       Url          string `mapstructure:"url,omitempty" json:"url"`
+       Description  string `mapstructure:"description,omitempty" 
json:"description"`
+       PrimaryView  string `gorm:"type:varchar(255)" 
mapstructure:"primaryView,omitempty" json:"primaryView"`
 }
 
 func (JenkinsJob) TableName() string {
diff --git a/backend/plugins/jira/models/board.go 
b/backend/plugins/jira/models/board.go
index e0e3d15f1..ad4ed2b0d 100644
--- a/backend/plugins/jira/models/board.go
+++ b/backend/plugins/jira/models/board.go
@@ -27,12 +27,12 @@ import (
 var _ plugin.ToolLayerScope = (*JiraBoard)(nil)
 
 type JiraBoard struct {
-       common.Scope
-       BoardId   uint64 `json:"boardId" mapstructure:"boardId" 
validate:"required" gorm:"primaryKey"`
-       ProjectId uint   `json:"projectId" mapstructure:"projectId"`
-       Name      string `json:"name" mapstructure:"name" 
gorm:"type:varchar(255)"`
-       Self      string `json:"self" mapstructure:"self" 
gorm:"type:varchar(255)"`
-       Type      string `json:"type" mapstructure:"type" 
gorm:"type:varchar(100)"`
+       common.Scope `mapstructure:",squash"`
+       BoardId      uint64 `json:"boardId" mapstructure:"boardId" 
validate:"required" gorm:"primaryKey"`
+       ProjectId    uint   `json:"projectId" mapstructure:"projectId"`
+       Name         string `json:"name" mapstructure:"name" 
gorm:"type:varchar(255)"`
+       Self         string `json:"self" mapstructure:"self" 
gorm:"type:varchar(255)"`
+       Type         string `json:"type" mapstructure:"type" 
gorm:"type:varchar(100)"`
 }
 
 func (b JiraBoard) ScopeId() string {
diff --git a/backend/plugins/pagerduty/models/service.go 
b/backend/plugins/pagerduty/models/service.go
index 365aec200..d3b860b45 100644
--- a/backend/plugins/pagerduty/models/service.go
+++ b/backend/plugins/pagerduty/models/service.go
@@ -28,10 +28,10 @@ type PagerDutyParams struct {
 }
 
 type Service struct {
-       common.Scope
-       Id   string `json:"id" mapstructure:"id" 
gorm:"primaryKey;autoIncrement:false" `
-       Url  string `json:"url" mapstructure:"url"`
-       Name string `json:"name" mapstructure:"name"`
+       common.Scope `mapstructure:",squash"`
+       Id           string `json:"id" mapstructure:"id" 
gorm:"primaryKey;autoIncrement:false" `
+       Url          string `json:"url" mapstructure:"url"`
+       Name         string `json:"name" mapstructure:"name"`
 }
 
 func (s Service) ScopeId() string {
diff --git a/backend/plugins/sonarqube/models/sonarqube_project.go 
b/backend/plugins/sonarqube/models/sonarqube_project.go
index c4bc92dbc..b40f6c197 100644
--- a/backend/plugins/sonarqube/models/sonarqube_project.go
+++ b/backend/plugins/sonarqube/models/sonarqube_project.go
@@ -26,7 +26,7 @@ var _ plugin.ToolLayerScope = (*SonarqubeProject)(nil)
 var _ plugin.ApiScope = (*SonarqubeApiProject)(nil)
 
 type SonarqubeProject struct {
-       common.Scope
+       common.Scope     `mapstructure:",squash"`
        ProjectKey       string              `json:"projectKey" 
validate:"required" gorm:"type:varchar(255);primaryKey" 
mapstructure:"projectKey"`
        Name             string              `json:"name" 
gorm:"type:varchar(255)" mapstructure:"name"`
        Qualifier        string              `json:"qualifier" 
gorm:"type:varchar(255)" mapstructure:"qualifier"`
diff --git a/backend/plugins/tapd/models/workspace.go 
b/backend/plugins/tapd/models/workspace.go
index 1fd8f26c2..62b4df32a 100644
--- a/backend/plugins/tapd/models/workspace.go
+++ b/backend/plugins/tapd/models/workspace.go
@@ -41,19 +41,19 @@ type WorkspaceResponse struct {
 }
 
 type TapdWorkspace struct {
-       common.Scope
-       Id          uint64          `gorm:"primaryKey;type:BIGINT" 
mapstructure:"id" json:"id"`
-       Name        string          `gorm:"type:varchar(255)" 
mapstructure:"name" json:"name"`
-       PrettyName  string          `gorm:"type:varchar(255)" 
mapstructure:"pretty_name" json:"pretty_name"`
-       Category    string          `gorm:"type:varchar(255)" 
mapstructure:"category" json:"category"`
-       Status      string          `gorm:"type:varchar(255)" 
mapstructure:"status" json:"status"`
-       Description string          `mapstructure:"description" 
json:"description"`
-       BeginDate   *common.CSTTime `mapstructure:"begin_date" 
json:"begin_date"`
-       EndDate     *common.CSTTime `mapstructure:"end_date" json:"end_date"`
-       ExternalOn  string          `gorm:"type:varchar(255)" 
mapstructure:"external_on" json:"external_on"`
-       ParentId    uint64          `gorm:"type:BIGINT" 
mapstructure:"parent_id,string" json:"parent_id"`
-       Creator     string          `gorm:"type:varchar(255)" 
mapstructure:"creator" json:"creator"`
-       Created     *common.CSTTime `mapstructure:"created" json:"created"`
+       common.Scope `mapstructure:",squash"`
+       Id           uint64          `gorm:"primaryKey;type:BIGINT" 
mapstructure:"id" json:"id"`
+       Name         string          `gorm:"type:varchar(255)" 
mapstructure:"name" json:"name"`
+       PrettyName   string          `gorm:"type:varchar(255)" 
mapstructure:"pretty_name" json:"pretty_name"`
+       Category     string          `gorm:"type:varchar(255)" 
mapstructure:"category" json:"category"`
+       Status       string          `gorm:"type:varchar(255)" 
mapstructure:"status" json:"status"`
+       Description  string          `mapstructure:"description" 
json:"description"`
+       BeginDate    *common.CSTTime `mapstructure:"begin_date" 
json:"begin_date"`
+       EndDate      *common.CSTTime `mapstructure:"end_date" json:"end_date"`
+       ExternalOn   string          `gorm:"type:varchar(255)" 
mapstructure:"external_on" json:"external_on"`
+       ParentId     uint64          `gorm:"type:BIGINT" 
mapstructure:"parent_id,string" json:"parent_id"`
+       Creator      string          `gorm:"type:varchar(255)" 
mapstructure:"creator" json:"creator"`
+       Created      *common.CSTTime `mapstructure:"created" json:"created"`
 }
 
 func (TapdWorkspace) TableName() string {
diff --git a/backend/plugins/trello/models/board.go 
b/backend/plugins/trello/models/board.go
index 815746c12..426836c01 100644
--- a/backend/plugins/trello/models/board.go
+++ b/backend/plugins/trello/models/board.go
@@ -25,7 +25,7 @@ import (
 var _ plugin.ToolLayerScope = (*TrelloBoard)(nil)
 
 type TrelloBoard struct {
-       common.Scope
+       common.Scope `mapstructure:",squash"`
        ConnectionId uint64 `json:"connectionId" mapstructure:"connectionId" 
gorm:"primaryKey"`
        BoardId      string `json:"boardId" mapstructure:"boardId" 
gorm:"type:varchar(255)"`
        Name         string `json:"name" mapstructure:"name" 
gorm:"type:varchar(255)"`
diff --git a/backend/plugins/zentao/models/project.go 
b/backend/plugins/zentao/models/project.go
index 64dfed0b3..bc44d1b15 100644
--- a/backend/plugins/zentao/models/project.go
+++ b/backend/plugins/zentao/models/project.go
@@ -21,9 +21,10 @@ import (
        "database/sql/driver"
        "encoding/json"
        "fmt"
-       "github.com/spf13/cast"
        "strconv"
 
+       "github.com/spf13/cast"
+
        "github.com/apache/incubator-devlake/core/models/common"
        "github.com/apache/incubator-devlake/core/plugin"
 )
@@ -111,7 +112,7 @@ func (by *OperatedBy) String() string {
 }
 
 type ZentaoProject struct {
-       common.Scope
+       common.Scope  `mapstructure:",squash"`
        Id            int64               `json:"id" mapstructure:"id" 
gorm:"primaryKey;type:BIGINT  NOT NULL;autoIncrement:false"`
        Project       int64               `json:"project" 
mapstructure:"project"`
        Model         string              `json:"model" mapstructure:"model"`

Reply via email to