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 7bb73a96d fix(sonarqube): modify columns order (#4348)
7bb73a96d is described below
commit 7bb73a96da41bd96deb857718ffe732fb5f40f44
Author: Warren Chen <[email protected]>
AuthorDate: Wed Feb 8 09:49:33 2023 +0800
fix(sonarqube): modify columns order (#4348)
---
.../migrationscripts/archived/sonarqube_file_metrics.go | 14 +++++++-------
.../models/migrationscripts/archived/sonarqube_hotspot.go | 2 +-
.../models/migrationscripts/archived/sonarqube_issue.go | 2 +-
backend/plugins/sonarqube/models/sonarqube_file_metrics.go | 14 +++++++-------
backend/plugins/sonarqube/models/sonarqube_hotspot.go | 8 ++++----
backend/plugins/sonarqube/models/sonarqube_issue.go | 4 ++--
6 files changed, 22 insertions(+), 22 deletions(-)
diff --git
a/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_file_metrics.go
b/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_file_metrics.go
index 9c2b3f0fd..ef9209018 100644
---
a/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_file_metrics.go
+++
b/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_file_metrics.go
@@ -28,21 +28,21 @@ type SonarqubeFileMetrics struct {
FilePath string `json:"file_path"`
FileLanguage string `json:"file_language"`
BatchID string `json:"batch_id"`
+ CodeSmells int `json:"code_smells"`
SqaleIndex string `json:"sqale_index"`
SqaleRating string `json:"sqale_rating"`
- ReliabilityRating string `json:"reliability_rating"`
- SecurityRating string `json:"security_rating"`
- SecurityReviewRating string `json:"security_review_rating"`
- Ncloc int `json:"ncloc"`
- DuplicatedBlocks int `json:"duplicated_blocks"`
- DuplicatedLinesDensity float64 `json:"duplicated_lines_density"`
- CodeSmells int `json:"code_smells"`
Bugs int `json:"bugs"`
+ ReliabilityRating string `json:"reliability_rating"`
Vulnerabilities int `json:"vulnerabilities"`
+ SecurityRating string `json:"security_rating"`
SecurityHotspots int `json:"security_hotspots"`
SecurityHotspotsReviewed float64 `json:"security_hotspots_reviewed"`
+ SecurityReviewRating string `json:"security_review_rating"`
+ Ncloc int `json:"ncloc"`
Coverage float64 `json:"coverage"`
LinesToCover int `json:"lines_to_cover"`
+ DuplicatedLinesDensity float64 `json:"duplicated_lines_density"`
+ DuplicatedBlocks int `json:"duplicated_blocks"`
archived.NoPKModel
}
diff --git
a/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_hotspot.go
b/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_hotspot.go
index a94aeac94..db42c28d7 100644
---
a/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_hotspot.go
+++
b/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_hotspot.go
@@ -24,7 +24,7 @@ import (
type SonarqubeHotspot struct {
ConnectionId uint64 `gorm:"primaryKey"`
- Key string `json:"key" gorm:"primaryKey"`
+ IssueKey string `json:"key" gorm:"primaryKey"`
BatchId string `json:"batchId"
gorm:"type:varchar(100)"` // from collection time
Component string `json:"component"
gorm:"index"`
Project string `json:"project" gorm:"index"`
diff --git
a/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_issue.go
b/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_issue.go
index 0beef00aa..287a393ed 100644
---
a/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_issue.go
+++
b/backend/plugins/sonarqube/models/migrationscripts/archived/sonarqube_issue.go
@@ -24,8 +24,8 @@ import (
type SonarqubeIssue struct {
ConnectionId uint64 `gorm:"primaryKey"`
- Key string `json:"key" gorm:"primaryKey"`
BatchId string `json:"batchId" gorm:"type:varchar(100)"`
// from collection time
+ Key string `json:"key" gorm:"primaryKey"`
Rule string `json:"rule"`
Severity string `json:"severity"`
Component string `json:"component"`
diff --git a/backend/plugins/sonarqube/models/sonarqube_file_metrics.go
b/backend/plugins/sonarqube/models/sonarqube_file_metrics.go
index 0864d1266..d32b1fcc5 100644
--- a/backend/plugins/sonarqube/models/sonarqube_file_metrics.go
+++ b/backend/plugins/sonarqube/models/sonarqube_file_metrics.go
@@ -28,21 +28,21 @@ type SonarqubeFileMetrics struct {
FilePath string `json:"file_path"`
FileLanguage string `json:"file_language"`
BatchID string `json:"batch_id"`
+ CodeSmells int `json:"code_smells"`
SqaleIndex string `json:"sqale_index"`
SqaleRating string `json:"sqale_rating"`
- ReliabilityRating string `json:"reliability_rating"`
- SecurityRating string `json:"security_rating"`
- SecurityReviewRating string `json:"security_review_rating"`
- Ncloc int `json:"ncloc"`
- DuplicatedBlocks int `json:"duplicated_blocks"`
- DuplicatedLinesDensity float64 `json:"duplicated_lines_density"`
- CodeSmells int `json:"code_smells"`
Bugs int `json:"bugs"`
+ ReliabilityRating string `json:"reliability_rating"`
Vulnerabilities int `json:"vulnerabilities"`
+ SecurityRating string `json:"security_rating"`
SecurityHotspots int `json:"security_hotspots"`
SecurityHotspotsReviewed float64 `json:"security_hotspots_reviewed"`
+ SecurityReviewRating string `json:"security_review_rating"`
+ Ncloc int `json:"ncloc"`
Coverage float64 `json:"coverage"`
LinesToCover int `json:"lines_to_cover"`
+ DuplicatedLinesDensity float64 `json:"duplicated_lines_density"`
+ DuplicatedBlocks int `json:"duplicated_blocks"`
common.NoPKModel
}
diff --git a/backend/plugins/sonarqube/models/sonarqube_hotspot.go
b/backend/plugins/sonarqube/models/sonarqube_hotspot.go
index ed99ce892..e048b01cc 100644
--- a/backend/plugins/sonarqube/models/sonarqube_hotspot.go
+++ b/backend/plugins/sonarqube/models/sonarqube_hotspot.go
@@ -23,12 +23,11 @@ import (
)
type SonarqubeHotspot struct {
- common.NoPKModel
ConnectionId uint64 `gorm:"primaryKey"`
- Key string `json:"key" gorm:"primaryKey"`
+ IssueKey string `json:"key" gorm:"primaryKey"`
BatchId string `json:"batchId"
gorm:"type:varchar(100)"` // from collection time
- Component string `json:"component"`
- Project string `json:"project" gorm:"index"`
// projects.key
+ Component string `json:"component"
gorm:"index"`
+ Project string `json:"project" gorm:"index"`
SecurityCategory string `json:"securityCategory"`
VulnerabilityProbability string
`json:"vulnerabilityProbability"`
Status string `json:"status"`
@@ -39,6 +38,7 @@ type SonarqubeHotspot struct {
CreationDate *api.Iso8601Time `json:"creationDate"`
UpdateDate *api.Iso8601Time `json:"updateDate"`
RuleKey string `json:"ruleKey"`
+ common.NoPKModel
}
func (SonarqubeHotspot) TableName() string {
diff --git a/backend/plugins/sonarqube/models/sonarqube_issue.go
b/backend/plugins/sonarqube/models/sonarqube_issue.go
index 67027625b..d5de96cd3 100644
--- a/backend/plugins/sonarqube/models/sonarqube_issue.go
+++ b/backend/plugins/sonarqube/models/sonarqube_issue.go
@@ -23,10 +23,9 @@ import (
)
type SonarqubeIssue struct {
- common.NoPKModel
ConnectionId uint64 `gorm:"primaryKey"`
- Key string `json:"key" gorm:"primaryKey"`
BatchId string `json:"batchId" gorm:"type:varchar(100)"`
// from collection time
+ Key string `json:"key" gorm:"primaryKey"`
Rule string `json:"rule"`
Severity string `json:"severity"`
Component string `json:"component"`
@@ -47,6 +46,7 @@ type SonarqubeIssue struct {
EndOffset int `json:"endOffset"`
CreationDate *api.Iso8601Time `json:"creationDate"`
UpdateDate *api.Iso8601Time `json:"updateDate"`
+ common.NoPKModel
}
func (SonarqubeIssue) TableName() string {
