You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by kl...@apache.org on 2023/12/15 09:06:06 UTC
(incubator-devlake) 01/01: refactor: move scopeConfig.name to the base model
This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch kw-5519-dshelper-sonarqube
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit e287e257e02a42cf6473babf9fc42e415c285218
Author: Klesh Wong <zh...@merico.dev>
AuthorDate: Fri Dec 15 16:59:16 2023 +0800
refactor: move scopeConfig.name to the base model
---
backend/core/models/common/base.go | 5 +++--
backend/plugins/bamboo/api/blueprint_V200_test.go | 2 +-
backend/plugins/bamboo/models/scope_config.go | 2 --
backend/plugins/bitbucket/api/blueprint_V200_test.go | 2 +-
backend/plugins/bitbucket/models/scope_config.go | 2 --
backend/plugins/circleci/models/scope_config.go | 2 --
backend/plugins/github/models/scope_config.go | 1 -
backend/plugins/gitlab/models/scope_config.go | 2 --
backend/plugins/jenkins/models/scope_config.go | 2 --
backend/plugins/jira/models/scope_config.go | 2 --
backend/plugins/tapd/models/scope_config.go | 2 --
backend/plugins/trello/models/scope_config.go | 2 --
backend/plugins/zentao/models/scope_config.go | 2 --
13 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/backend/core/models/common/base.go b/backend/core/models/common/base.go
index a505f74e7..6f3678f8c 100644
--- a/backend/core/models/common/base.go
+++ b/backend/core/models/common/base.go
@@ -18,8 +18,9 @@ limitations under the License.
package common
import (
- "github.com/apache/incubator-devlake/core/dal"
"time"
+
+ "github.com/apache/incubator-devlake/core/dal"
)
const (
@@ -99,7 +100,7 @@ type ScopeConfig struct {
Model
Entities []string `gorm:"type:json;serializer:json" json:"entities" mapstructure:"entities"`
ConnectionId uint64 `json:"connectionId" gorm:"index" validate:"required" mapstructure:"connectionId,omitempty"`
- //Name string `mapstructure:"name" json:"name" gorm:"type:varchar(255)" validate:"required"`
+ Name string `mapstructure:"name" json:"name" gorm:"type:varchar(255);uniqueIndex" validate:"required"`
}
func (s ScopeConfig) ScopeConfigConnectionId() uint64 {
diff --git a/backend/plugins/bamboo/api/blueprint_V200_test.go b/backend/plugins/bamboo/api/blueprint_V200_test.go
index da8baeba8..e2155fb08 100644
--- a/backend/plugins/bamboo/api/blueprint_V200_test.go
+++ b/backend/plugins/bamboo/api/blueprint_V200_test.go
@@ -70,8 +70,8 @@ func TestMakeDataSourcePipelinePlanV200(t *testing.T) {
ID: testScopeConfigId,
},
Entities: []string{plugin.DOMAIN_TYPE_CICD},
+ Name: testScopeConfigName,
},
- Name: testScopeConfigName,
}
var testBambooConnection = &models.BambooConnection{
diff --git a/backend/plugins/bamboo/models/scope_config.go b/backend/plugins/bamboo/models/scope_config.go
index abbb008fb..587ba991e 100644
--- a/backend/plugins/bamboo/models/scope_config.go
+++ b/backend/plugins/bamboo/models/scope_config.go
@@ -23,8 +23,6 @@ import (
type BambooScopeConfig struct {
common.ScopeConfig `mapstructure:",squash" json:",inline" gorm:"embedded"`
- ConnectionId uint64 `mapstructure:"connectionId" json:"connectionId"`
- Name string `gorm:"type:varchar(255);index:idx_name_gitlab,unique" validate:"required" mapstructure:"name" json:"name"`
RepoMap map[string][]int `json:"repoMap" gorm:"type:json;serializer:json"` // should be {realRepoName: [bamboo_repoId, ...]}
DeploymentPattern string `mapstructure:"deploymentPattern,omitempty" json:"deploymentPattern" gorm:"type:varchar(255)"`
ProductionPattern string `mapstructure:"productionPattern,omitempty" json:"productionPattern" gorm:"type:varchar(255)"`
diff --git a/backend/plugins/bitbucket/api/blueprint_V200_test.go b/backend/plugins/bitbucket/api/blueprint_V200_test.go
index 650c63f59..92306e69e 100644
--- a/backend/plugins/bitbucket/api/blueprint_V200_test.go
+++ b/backend/plugins/bitbucket/api/blueprint_V200_test.go
@@ -149,8 +149,8 @@ func mockBasicRes(t *testing.T) {
Model: common.Model{
ID: 1,
},
+ Name: "Bitbucket scope config",
},
- Name: "Bitbucket scope config",
IssueStatusTodo: "new,open,wantfix",
Refdiff: map[string]interface{}{
"tagsPattern": "pattern",
diff --git a/backend/plugins/bitbucket/models/scope_config.go b/backend/plugins/bitbucket/models/scope_config.go
index 846ed7bb4..207485a10 100644
--- a/backend/plugins/bitbucket/models/scope_config.go
+++ b/backend/plugins/bitbucket/models/scope_config.go
@@ -24,8 +24,6 @@ import (
type BitbucketScopeConfig struct {
common.ScopeConfig `mapstructure:",squash" json:",inline" gorm:"embedded"`
- ConnectionId uint64 `mapstructure:"connectionId" json:"connectionId"`
- Name string `mapstructure:"name" json:"name" gorm:"type:varchar(255);index:idx_name_github,unique" validate:"required"`
DeploymentPattern string `mapstructure:"deploymentPattern,omitempty" json:"deploymentPattern" gorm:"type:varchar(255)"`
ProductionPattern string `mapstructure:"productionPattern,omitempty" json:"productionPattern" gorm:"type:varchar(255)"`
Refdiff datatypes.JSONMap `mapstructure:"refdiff,omitempty" json:"refdiff" swaggertype:"object" format:"json"`
diff --git a/backend/plugins/circleci/models/scope_config.go b/backend/plugins/circleci/models/scope_config.go
index bad26995c..8d6a433bd 100644
--- a/backend/plugins/circleci/models/scope_config.go
+++ b/backend/plugins/circleci/models/scope_config.go
@@ -23,8 +23,6 @@ import (
type CircleciScopeConfig struct {
common.ScopeConfig `mapstructure:",squash" json:",inline" gorm:"embedded"`
- ConnectionId uint64 `mapstructure:"connectionId" json:"connectionId"`
- Name string `gorm:"type:varchar(255);index:idx_name_jenkins,unique" validate:"required" mapstructure:"name" json:"name"`
DeploymentPattern string `gorm:"type:varchar(255)" mapstructure:"deploymentPattern,omitempty" json:"deploymentPattern"`
ProductionPattern string `gorm:"type:varchar(255)" mapstructure:"productionPattern,omitempty" json:"productionPattern"`
}
diff --git a/backend/plugins/github/models/scope_config.go b/backend/plugins/github/models/scope_config.go
index 16e1ad875..60b298d36 100644
--- a/backend/plugins/github/models/scope_config.go
+++ b/backend/plugins/github/models/scope_config.go
@@ -27,7 +27,6 @@ var _ plugin.ToolLayerScopeConfig = (*GithubScopeConfig)(nil)
type GithubScopeConfig struct {
common.ScopeConfig `mapstructure:",squash" json:",inline" gorm:"embedded"`
- Name string `mapstructure:"name" json:"name" gorm:"type:varchar(255);index:idx_name_github,unique" validate:"required"`
PrType string `mapstructure:"prType,omitempty" json:"prType" gorm:"type:varchar(255)"`
PrComponent string `mapstructure:"prComponent,omitempty" json:"prComponent" gorm:"type:varchar(255)"`
PrBodyClosePattern string `mapstructure:"prBodyClosePattern,omitempty" json:"prBodyClosePattern" gorm:"type:varchar(255)"`
diff --git a/backend/plugins/gitlab/models/scope_config.go b/backend/plugins/gitlab/models/scope_config.go
index d74d2b9a4..78cfd7f2d 100644
--- a/backend/plugins/gitlab/models/scope_config.go
+++ b/backend/plugins/gitlab/models/scope_config.go
@@ -24,8 +24,6 @@ import (
type GitlabScopeConfig struct {
common.ScopeConfig `mapstructure:",squash" json:",inline" gorm:"embedded"`
- ConnectionId uint64 `mapstructure:"connectionId" json:"connectionId"`
- Name string `gorm:"type:varchar(255);index:idx_name_gitlab,unique" validate:"required" mapstructure:"name" json:"name"`
PrType string `mapstructure:"prType" json:"prType"`
PrComponent string `mapstructure:"prComponent" json:"prComponent"`
PrBodyClosePattern string `mapstructure:"prBodyClosePattern" json:"prBodyClosePattern"`
diff --git a/backend/plugins/jenkins/models/scope_config.go b/backend/plugins/jenkins/models/scope_config.go
index 03e6c20b1..1eb889ca4 100644
--- a/backend/plugins/jenkins/models/scope_config.go
+++ b/backend/plugins/jenkins/models/scope_config.go
@@ -23,8 +23,6 @@ import (
type JenkinsScopeConfig struct {
common.ScopeConfig `mapstructure:",squash" json:",inline" gorm:"embedded"`
- ConnectionId uint64 `mapstructure:"connectionId" json:"connectionId"`
- Name string `gorm:"type:varchar(255);index:idx_name_jenkins,unique" validate:"required" mapstructure:"name" json:"name"`
DeploymentPattern string `gorm:"type:varchar(255)" mapstructure:"deploymentPattern,omitempty" json:"deploymentPattern"`
ProductionPattern string `gorm:"type:varchar(255)" mapstructure:"productionPattern,omitempty" json:"productionPattern"`
}
diff --git a/backend/plugins/jira/models/scope_config.go b/backend/plugins/jira/models/scope_config.go
index a8143bee8..bb267a0f6 100644
--- a/backend/plugins/jira/models/scope_config.go
+++ b/backend/plugins/jira/models/scope_config.go
@@ -42,8 +42,6 @@ type CommitUrlPattern struct {
type JiraScopeConfig struct {
common.ScopeConfig `mapstructure:",squash" json:",inline" gorm:"embedded"`
- ConnectionId uint64 `mapstructure:"connectionId" json:"connectionId"`
- Name string `mapstructure:"name" json:"name" gorm:"type:varchar(255);index:idx_name_jira,unique" validate:"required"`
EpicKeyField string `mapstructure:"epicKeyField,omitempty" json:"epicKeyField" gorm:"type:varchar(255)"`
StoryPointField string `mapstructure:"storyPointField,omitempty" json:"storyPointField" gorm:"type:varchar(255)"`
RemotelinkCommitShaPattern string `mapstructure:"remotelinkCommitShaPattern,omitempty" json:"remotelinkCommitShaPattern" gorm:"type:varchar(255)"`
diff --git a/backend/plugins/tapd/models/scope_config.go b/backend/plugins/tapd/models/scope_config.go
index 8f1b9027b..0ef82fc20 100644
--- a/backend/plugins/tapd/models/scope_config.go
+++ b/backend/plugins/tapd/models/scope_config.go
@@ -23,8 +23,6 @@ import (
type TapdScopeConfig struct {
common.ScopeConfig `mapstructure:",squash" json:",inline" gorm:"embedded"`
- ConnectionId uint64 `mapstructure:"connectionId" json:"connectionId"`
- Name string `gorm:"type:varchar(255);index:idx_name_tapd,unique" validate:"required" mapstructure:"name" json:"name"`
TypeMappings map[string]string `mapstructure:"typeMappings,omitempty" json:"typeMappings" gorm:"serializer:json"`
StatusMappings map[string]string `mapstructure:"statusMappings,omitempty" json:"statusMappings" gorm:"serializer:json"`
}
diff --git a/backend/plugins/trello/models/scope_config.go b/backend/plugins/trello/models/scope_config.go
index 51b94ef1f..a7c30d603 100644
--- a/backend/plugins/trello/models/scope_config.go
+++ b/backend/plugins/trello/models/scope_config.go
@@ -23,8 +23,6 @@ import (
type TrelloScopeConfig struct {
common.ScopeConfig `mapstructure:",squash" json:",inline" gorm:"embedded"`
- ConnectionId uint64 `mapstructure:"connectionId" json:"connectionId"`
- Name string `mapstructure:"name" json:"name" gorm:"type:varchar(255);index:idx_name_trello,unique" validate:"required"`
}
func (TrelloScopeConfig) TableName() string {
diff --git a/backend/plugins/zentao/models/scope_config.go b/backend/plugins/zentao/models/scope_config.go
index 71cd2937e..1c0222c28 100644
--- a/backend/plugins/zentao/models/scope_config.go
+++ b/backend/plugins/zentao/models/scope_config.go
@@ -23,8 +23,6 @@ import (
type ZentaoScopeConfig struct {
common.ScopeConfig `mapstructure:",squash" json:",inline" gorm:"embedded"`
- ConnectionId uint64 `mapstructure:"connectionId" json:"connectionId"`
- Name string `gorm:"type:varchar(255);index:idx_name_tapd,unique" validate:"required" mapstructure:"name" json:"name"`
TypeMappings map[string]string `mapstructure:"typeMappings,omitempty" json:"typeMappings" gorm:"serializer:json"`
BugStatusMappings map[string]string `mapstructure:"bugStatusMappings,omitempty" json:"bugStatusMappings" gorm:"serializer:json"`
StoryStatusMappings map[string]string `mapstructure:"storyStatusMappings,omitempty" json:"storyStatusMappings" gorm:"serializer:json"`