You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by wa...@apache.org on 2023/03/01 05:00:00 UTC

[incubator-devlake] branch main updated: fix: update sonarqube created_date and updated_date field (#4553)

This is an automated email from the ASF dual-hosted git repository.

warren 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 aa8e6b6e3 fix: update sonarqube created_date and updated_date field (#4553)
aa8e6b6e3 is described below

commit aa8e6b6e32f37f18294996f922c5fa600ba55b4f
Author: abeizn <zi...@merico.dev>
AuthorDate: Wed Mar 1 12:59:53 2023 +0800

    fix: update sonarqube created_date and updated_date field (#4553)
    
    * fix: update sonarqube created_date and updated_date field
    
    * fix: remove useless json
---
 .../core/models/domainlayer/codequality/cq_issues.go | 20 ++++++++++----------
 .../migrationscripts/20230208_add_code_quality.go    |  2 +-
 .../models/migrationscripts/archived/cq_issues.go    | 20 ++++++++++----------
 .../sonarqube/e2e/snapshot_tables/issue_hotspots.csv |  2 +-
 .../plugins/sonarqube/e2e/snapshot_tables/issues.csv |  2 +-
 .../plugins/sonarqube/tasks/hotspots_convertor.go    |  4 ++--
 backend/plugins/sonarqube/tasks/issues_convertor.go  |  4 ++--
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/backend/core/models/domainlayer/codequality/cq_issues.go b/backend/core/models/domainlayer/codequality/cq_issues.go
index dbbbb9e0a..e32bfedb4 100644
--- a/backend/core/models/domainlayer/codequality/cq_issues.go
+++ b/backend/core/models/domainlayer/codequality/cq_issues.go
@@ -37,16 +37,16 @@ type CqIssue struct {
 	Assignee                 string `json:"assignee" gorm:"type:varchar(255)"`
 	Hash                     string `gorm:"type:varchar(100)"`
 	Tags                     string
-	Type                     string           `gorm:"type:varchar(100)"`
-	Scope                    string           `gorm:"type:varchar(255)"`
-	StartLine                int              `json:"startLine"`
-	EndLine                  int              `json:"endLine"`
-	StartOffset              int              `json:"startOffset"`
-	EndOffset                int              `json:"endOffset"`
-	VulnerabilityProbability string           `gorm:"type:varchar(100)"`
-	SecurityCategory         string           `gorm:"type:varchar(100)"`
-	CreationDate             *api.Iso8601Time `json:"creationDate"`
-	UpdateDate               *api.Iso8601Time `json:"updateDate"`
+	Type                     string `gorm:"type:varchar(100)"`
+	Scope                    string `gorm:"type:varchar(255)"`
+	StartLine                int    `json:"startLine"`
+	EndLine                  int    `json:"endLine"`
+	StartOffset              int    `json:"startOffset"`
+	EndOffset                int    `json:"endOffset"`
+	VulnerabilityProbability string `gorm:"type:varchar(100)"`
+	SecurityCategory         string `gorm:"type:varchar(100)"`
+	CreatedDate              *api.Iso8601Time
+	UpdatedDate              *api.Iso8601Time
 }
 
 func (CqIssue) TableName() string {
diff --git a/backend/core/models/migrationscripts/20230208_add_code_quality.go b/backend/core/models/migrationscripts/20230208_add_code_quality.go
index 6bdbc81e1..67b5707e5 100644
--- a/backend/core/models/migrationscripts/20230208_add_code_quality.go
+++ b/backend/core/models/migrationscripts/20230208_add_code_quality.go
@@ -46,7 +46,7 @@ func (u *addCodeQuality) Up(basicRes context.BasicRes) errors.Error {
 }
 
 func (*addCodeQuality) Version() uint64 {
-	return 20230227000081
+	return 20230301000082
 }
 
 func (*addCodeQuality) Name() string {
diff --git a/backend/core/models/migrationscripts/archived/cq_issues.go b/backend/core/models/migrationscripts/archived/cq_issues.go
index b17917211..537a20f46 100644
--- a/backend/core/models/migrationscripts/archived/cq_issues.go
+++ b/backend/core/models/migrationscripts/archived/cq_issues.go
@@ -36,16 +36,16 @@ type CqIssue struct {
 	Assignee                 string `json:"assignee" gorm:"type:varchar(255)"`
 	Hash                     string `gorm:"type:varchar(100)"`
 	Tags                     string
-	Type                     string           `gorm:"type:varchar(100)"`
-	Scope                    string           `gorm:"type:varchar(255)"`
-	StartLine                int              `json:"startLine"`
-	EndLine                  int              `json:"endLine"`
-	StartOffset              int              `json:"startOffset"`
-	EndOffset                int              `json:"endOffset"`
-	VulnerabilityProbability string           `gorm:"type:varchar(100)"`
-	SecurityCategory         string           `gorm:"type:varchar(100)"`
-	CreationDate             *api.Iso8601Time `json:"creationDate"`
-	UpdateDate               *api.Iso8601Time `json:"updateDate"`
+	Type                     string `gorm:"type:varchar(100)"`
+	Scope                    string `gorm:"type:varchar(255)"`
+	StartLine                int    `json:"startLine"`
+	EndLine                  int    `json:"endLine"`
+	StartOffset              int    `json:"startOffset"`
+	EndOffset                int    `json:"endOffset"`
+	VulnerabilityProbability string `gorm:"type:varchar(100)"`
+	SecurityCategory         string `gorm:"type:varchar(100)"`
+	CreatedDate              *api.Iso8601Time
+	UpdatedDate              *api.Iso8601Time
 }
 
 func (CqIssue) TableName() string {
diff --git a/backend/plugins/sonarqube/e2e/snapshot_tables/issue_hotspots.csv b/backend/plugins/sonarqube/e2e/snapshot_tables/issue_hotspots.csv
index 261d166ec..fbb9d62be 100644
--- a/backend/plugins/sonarqube/e2e/snapshot_tables/issue_hotspots.csv
+++ b/backend/plugins/sonarqube/e2e/snapshot_tables/issue_hotspots.csv
@@ -1,4 +1,4 @@
-id,rule,severity,component,project_key,line,status,message,debt,effort,commit_author_email,assignee,hash,tags,type,scope,start_line,end_line,start_offset,end_offset,vulnerability_probability,security_category,creation_date,update_date
+id,rule,severity,component,project_key,line,status,message,debt,effort,commit_author_email,assignee,hash,tags,type,scope,start_line,end_line,start_offset,end_offset,vulnerability_probability,security_category,created_date,updated_date
 sonarqube:SonarqubeHotspot:1:AYUwBajH46XwcL-YZONY,,,f5a50c63-2e8f-4107-9014-853f6f467757:core/src/main/java/com/airbnb/aerosolve/core/models/MlpModel.java,sonarqube:SonarqubeProject:1:f5a50c63-2e8f-4107-9014-853f6f467757,143,TO_REVIEW,Make sure that using this pseudorandom number generator is safe here.,0,0,peng.ye@airbnb.com,,,,HOTSPOTS,,143,0,0,0,MEDIUM,weak-cryptography,2016-02-26T22:41:48.000+00:00,2022-12-20T14:50:30.000+00:00
 sonarqube:SonarqubeHotspot:1:AYUwBajH46XwcL-YZONZ,,,f5a50c63-2e8f-4107-9014-853f6f467757:core/src/main/java/com/airbnb/aerosolve/core/models/MlpModel.java,sonarqube:SonarqubeProject:1:f5a50c63-2e8f-4107-9014-853f6f467757,172,TO_REVIEW,Make sure that using this pseudorandom number generator is safe here.,0,0,peng.ye@airbnb.com,,,,HOTSPOTS,,172,0,0,0,MEDIUM,weak-cryptography,2016-02-26T22:41:48.000+00:00,2022-12-20T14:50:30.000+00:00
 sonarqube:SonarqubeHotspot:1:AYUwBamj46XwcL-YZOPh,,,f5a50c63-2e8f-4107-9014-853f6f467757:core/src/main/java/com/airbnb/aerosolve/core/function/MultiDimensionSpline.java,sonarqube:SonarqubeProject:1:f5a50c63-2e8f-4107-9014-853f6f467757,295,REVIEWED,Make sure that using this pseudorandom number generator is safe here.,0,0,julian.qian@airbnb.com,,,,HOTSPOTS,,295,0,0,0,MEDIUM,weak-cryptography,2016-04-25T19:02:16.000+00:00,2022-12-21T08:30:43.000+00:00
diff --git a/backend/plugins/sonarqube/e2e/snapshot_tables/issues.csv b/backend/plugins/sonarqube/e2e/snapshot_tables/issues.csv
index 6da8c7405..28b72ce93 100644
--- a/backend/plugins/sonarqube/e2e/snapshot_tables/issues.csv
+++ b/backend/plugins/sonarqube/e2e/snapshot_tables/issues.csv
@@ -1,4 +1,4 @@
-id,rule,severity,component,project_key,line,status,message,debt,effort,commit_author_email,assignee,hash,tags,type,scope,start_line,end_line,start_offset,end_offset,vulnerability_probability,security_category,creation_date,update_date
+id,rule,severity,component,project_key,line,status,message,debt,effort,commit_author_email,assignee,hash,tags,type,scope,start_line,end_line,start_offset,end_offset,vulnerability_probability,security_category,created_date,updated_date
 sonarqube:SonarqubeIssue:1:AYUwBbCC46XwcL-YZOTH,java:S5993,MAJOR,f5a50c63-2e8f-4107-9014-853f6f467757:core/src/main/java/com/airbnb/aerosolve/core/util/FeatureDictionary.java,sonarqube:SonarqubeProject:1:f5a50c63-2e8f-4107-9014-853f6f467757,24,OPEN,"Change the visibility of this constructor to ""protected"".",2,2,hector.yee@airbnb.com,,cb21cfee164b0548717edfe840aea8a2,design,CODE_SMELL,MAIN,24,24,2,8,,,2015-05-12T19:22:15.000+00:00,2022-12-20T14:50:30.000+00:00
 sonarqube:SonarqubeIssue:1:AYUwBbGD46XwcL-YZOUu,java:S3824,MAJOR,f5a50c63-2e8f-4107-9014-853f6f467757:core/src/main/java/com/airbnb/aerosolve/core/util/Util.java,sonarqube:SonarqubeProject:1:f5a50c63-2e8f-4107-9014-853f6f467757,171,OPEN,"Replace this ""Map.get()"" and condition with a call to ""Map.computeIfAbsent()"".",10,10,hector.yee@airbnb.com,,136741d9bacea2c123cc5a81be33aa4b,java8,CODE_SMELL,MAIN,171,171,25,49,,,2015-05-12T19:22:15.000+00:00,2022-12-20T14:50:30.000+00:00
 sonarqube:SonarqubeIssue:1:AYUwBbGD46XwcL-YZOUv,java:S3824,MAJOR,f5a50c63-2e8f-4107-9014-853f6f467757:core/src/main/java/com/airbnb/aerosolve/core/util/Util.java,sonarqube:SonarqubeProject:1:f5a50c63-2e8f-4107-9014-853f6f467757,182,OPEN,"Replace this ""Map.get()"" and condition with a call to ""Map.computeIfAbsent()"".",10,10,hector.yee@airbnb.com,,fbe0119b6af3a6db83bfd6fdb9a6833b,java8,CODE_SMELL,MAIN,182,182,33,56,,,2015-05-12T19:22:15.000+00:00,2022-12-20T14:50:30.000+00:00
diff --git a/backend/plugins/sonarqube/tasks/hotspots_convertor.go b/backend/plugins/sonarqube/tasks/hotspots_convertor.go
index 687fe2de3..2016890e4 100644
--- a/backend/plugins/sonarqube/tasks/hotspots_convertor.go
+++ b/backend/plugins/sonarqube/tasks/hotspots_convertor.go
@@ -67,8 +67,8 @@ func ConvertHotspots(taskCtx plugin.SubTaskContext) errors.Error {
 				CommitAuthorEmail:        sonarqubeHotspot.Author,
 				Assignee:                 sonarqubeHotspot.Assignee,
 				Rule:                     sonarqubeHotspot.RuleKey,
-				CreationDate:             sonarqubeHotspot.CreationDate,
-				UpdateDate:               sonarqubeHotspot.UpdateDate,
+				CreatedDate:              sonarqubeHotspot.CreationDate,
+				UpdatedDate:              sonarqubeHotspot.UpdateDate,
 				Type:                     "HOTSPOTS",
 				VulnerabilityProbability: sonarqubeHotspot.VulnerabilityProbability,
 				SecurityCategory:         sonarqubeHotspot.SecurityCategory,
diff --git a/backend/plugins/sonarqube/tasks/issues_convertor.go b/backend/plugins/sonarqube/tasks/issues_convertor.go
index 503b935bd..7d3c9679f 100644
--- a/backend/plugins/sonarqube/tasks/issues_convertor.go
+++ b/backend/plugins/sonarqube/tasks/issues_convertor.go
@@ -76,8 +76,8 @@ func ConvertIssues(taskCtx plugin.SubTaskContext) errors.Error {
 				EndLine:           sonarqubeIssue.EndLine,
 				StartOffset:       sonarqubeIssue.StartOffset,
 				EndOffset:         sonarqubeIssue.EndOffset,
-				CreationDate:      sonarqubeIssue.CreationDate,
-				UpdateDate:        sonarqubeIssue.UpdateDate,
+				CreatedDate:       sonarqubeIssue.CreationDate,
+				UpdatedDate:       sonarqubeIssue.UpdateDate,
 			}
 			return []interface{}{
 				domainIssue,