This is an automated email from the ASF dual-hosted git repository. narro pushed a commit to branch fix-ci in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit 1fe9248c42f48563a1e0bcff838990eeec5782d5 Author: narro wizard <[email protected]> AuthorDate: Fri May 30 06:03:37 2025 +0000 chore: fix lint error --- backend/go.mod | 1 + backend/go.sum | 5 +++ .../migrationscripts/20250320_modify_file_meta.go | 4 +- .../q_dev/models/migrationscripts/register.go | 3 +- backend/plugins/q_dev/models/user_metrics.go | 49 +++++++++++----------- backend/plugins/q_dev/q_dev.go | 2 +- backend/plugins/q_dev/tasks/s3_client.go | 4 +- backend/plugins/q_dev/tasks/task_data.go | 2 +- 8 files changed, 39 insertions(+), 31 deletions(-) diff --git a/backend/go.mod b/backend/go.mod index 871cba963..1b0d2d174 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -80,6 +80,7 @@ require ( github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect diff --git a/backend/go.sum b/backend/go.sum index a6e2f17ba..761f0153d 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -54,6 +54,7 @@ github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hC github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/aws/aws-sdk-go v1.55.6 h1:cSg4pvZ3m8dgYcgqB97MrcdjUmZ1BeMYKUxMMB89IPk= github.com/aws/aws-sdk-go v1.55.6/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= @@ -334,6 +335,10 @@ github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/ github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= diff --git a/backend/plugins/q_dev/models/migrationscripts/20250320_modify_file_meta.go b/backend/plugins/q_dev/models/migrationscripts/20250320_modify_file_meta.go index a847d041e..d9d704273 100644 --- a/backend/plugins/q_dev/models/migrationscripts/20250320_modify_file_meta.go +++ b/backend/plugins/q_dev/models/migrationscripts/20250320_modify_file_meta.go @@ -30,14 +30,14 @@ func (*modifyFileMetaTable) Name() string { func (*modifyFileMetaTable) Up(basicRes context.BasicRes) errors.Error { db := basicRes.GetDal() - + // 修改 processed_time 列允许为 NULL sql := "ALTER TABLE _tool_q_dev_s3_file_meta MODIFY processed_time DATETIME NULL" err := db.Exec(sql) if err != nil { return errors.Default.Wrap(err, "failed to modify processed_time column") } - + return nil } diff --git a/backend/plugins/q_dev/models/migrationscripts/register.go b/backend/plugins/q_dev/models/migrationscripts/register.go index 885bdf2fc..b874a19a4 100644 --- a/backend/plugins/q_dev/models/migrationscripts/register.go +++ b/backend/plugins/q_dev/models/migrationscripts/register.go @@ -25,5 +25,6 @@ import ( func All() []plugin.MigrationScript { return []plugin.MigrationScript{ new(initTables), + new(modifyFileMetaTable), } -} \ No newline at end of file +} diff --git a/backend/plugins/q_dev/models/user_metrics.go b/backend/plugins/q_dev/models/user_metrics.go index baebc3ead..60ef224f4 100644 --- a/backend/plugins/q_dev/models/user_metrics.go +++ b/backend/plugins/q_dev/models/user_metrics.go @@ -18,26 +18,27 @@ limitations under the License. package models import ( - "github.com/apache/incubator-devlake/core/models/common" "time" + + "github.com/apache/incubator-devlake/core/models/common" ) // QDevUserMetrics 存储按用户聚合的指标数据 type QDevUserMetrics struct { common.NoPKModel - ConnectionId uint64 `gorm:"primaryKey"` - UserId string `gorm:"primaryKey"` - FirstDate time.Time - LastDate time.Time - TotalDays int - + ConnectionId uint64 `gorm:"primaryKey"` + UserId string `gorm:"primaryKey"` + FirstDate time.Time + LastDate time.Time + TotalDays int + // 聚合指标 - TotalCodeReview_FindingsCount int - TotalCodeReview_SucceededEventCount int - TotalInlineChat_AcceptanceEventCount int - TotalInlineChat_AcceptedLineAdditions int - TotalInlineChat_AcceptedLineDeletions int - TotalInlineChat_DismissalEventCount int + TotalCodeReview_FindingsCount int + TotalCodeReview_SucceededEventCount int + TotalInlineChat_AcceptanceEventCount int + TotalInlineChat_AcceptedLineAdditions int + TotalInlineChat_AcceptedLineDeletions int + TotalInlineChat_DismissalEventCount int TotalInlineChat_DismissedLineAdditions int TotalInlineChat_DismissedLineDeletions int TotalInlineChat_RejectedLineAdditions int @@ -47,20 +48,20 @@ type QDevUserMetrics struct { TotalInline_AICodeLines int TotalInline_AcceptanceCount int TotalInline_SuggestionsCount int - + // 平均指标 - AvgCodeReview_FindingsCount float64 - AvgCodeReview_SucceededEventCount float64 - AvgInlineChat_AcceptanceEventCount float64 - AvgInlineChat_TotalEventCount float64 - AvgInline_AICodeLines float64 - AvgInline_AcceptanceCount float64 - AvgInline_SuggestionsCount float64 - + AvgCodeReview_FindingsCount float64 + AvgCodeReview_SucceededEventCount float64 + AvgInlineChat_AcceptanceEventCount float64 + AvgInlineChat_TotalEventCount float64 + AvgInline_AICodeLines float64 + AvgInline_AcceptanceCount float64 + AvgInline_SuggestionsCount float64 + // 接受率指标 - AcceptanceRate float64 + AcceptanceRate float64 } func (QDevUserMetrics) TableName() string { return "_tool_q_dev_user_metrics" -} \ No newline at end of file +} diff --git a/backend/plugins/q_dev/q_dev.go b/backend/plugins/q_dev/q_dev.go index 2cb9a7eea..1c01f20a7 100644 --- a/backend/plugins/q_dev/q_dev.go +++ b/backend/plugins/q_dev/q_dev.go @@ -40,4 +40,4 @@ func main() { }, *timeAfter) } runner.RunCmd(cmd) -} \ No newline at end of file +} diff --git a/backend/plugins/q_dev/tasks/s3_client.go b/backend/plugins/q_dev/tasks/s3_client.go index 679b99f11..a45b5022a 100644 --- a/backend/plugins/q_dev/tasks/s3_client.go +++ b/backend/plugins/q_dev/tasks/s3_client.go @@ -39,9 +39,9 @@ func NewQDevS3Client(taskCtx plugin.TaskContext, connection *models.QDevConnecti // 创建S3服务客户端 s3Client := s3.New(sess) - + return &QDevS3Client{ S3: s3Client, Bucket: connection.Bucket, }, nil -} \ No newline at end of file +} diff --git a/backend/plugins/q_dev/tasks/task_data.go b/backend/plugins/q_dev/tasks/task_data.go index ce94a70ea..240811668 100644 --- a/backend/plugins/q_dev/tasks/task_data.go +++ b/backend/plugins/q_dev/tasks/task_data.go @@ -42,4 +42,4 @@ type QDevS3Client struct { func (client *QDevS3Client) Close() { // S3客户端不需要特别关闭操作 -} \ No newline at end of file +}
