Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/plugins/q_dev/api/connection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,11 @@ func TestConnectionSanitization_PreservesIdentityStore(t *testing.T) {

// Secret should be sanitized
assert.NotEqual(t, "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY", sanitized.SecretAccessKey)

// Identity Store fields should be preserved
assert.Equal(t, "d-1234567890", sanitized.IdentityStoreId)
assert.Equal(t, "us-west-2", sanitized.IdentityStoreRegion)

// Other fields should be preserved
assert.Equal(t, "AKIAIOSFODNN7EXAMPLE", sanitized.AccessKeyId)
assert.Equal(t, "us-east-1", sanitized.Region)
Expand Down
1 change: 1 addition & 0 deletions backend/plugins/q_dev/impl/impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package impl

import (
"fmt"

"github.com/apache/incubator-devlake/core/context"
"github.com/apache/incubator-devlake/core/dal"
"github.com/apache/incubator-devlake/core/errors"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ limitations under the License.
package archived

import (
"github.com/apache/incubator-devlake/core/models/migrationscripts/archived"
"time"

"github.com/apache/incubator-devlake/core/models/migrationscripts/archived"
)

// QDevUserMetrics 存储按用户聚合的指标数据
Expand Down
98 changes: 49 additions & 49 deletions backend/plugins/q_dev/models/user_data_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,67 +20,67 @@ package models
import (
"testing"
"time"

"github.com/stretchr/testify/assert"
)

func TestQDevUserDataAllMetrics(t *testing.T) {
// Create a test user data object with all metrics
userData := &QDevUserData{
ConnectionId: 1,
UserId: "test-user-id",
Date: time.Now(),
DisplayName: "Test User",
UserId: "test-user-id",
Date: time.Now(),
DisplayName: "Test User",

// Set values for existing metrics
CodeReview_FindingsCount: 10,
CodeReview_SucceededEventCount: 11,
InlineChat_AcceptanceEventCount: 12,
InlineChat_AcceptedLineAdditions: 13,
InlineChat_AcceptedLineDeletions: 14,
InlineChat_DismissalEventCount: 15,
CodeReview_FindingsCount: 10,
CodeReview_SucceededEventCount: 11,
InlineChat_AcceptanceEventCount: 12,
InlineChat_AcceptedLineAdditions: 13,
InlineChat_AcceptedLineDeletions: 14,
InlineChat_DismissalEventCount: 15,
InlineChat_DismissedLineAdditions: 16,
InlineChat_DismissedLineDeletions: 17,
InlineChat_RejectedLineAdditions: 18,
InlineChat_RejectedLineDeletions: 19,
InlineChat_RejectionEventCount: 20,
InlineChat_TotalEventCount: 21,
Inline_AICodeLines: 22,
Inline_AcceptanceCount: 23,
Inline_SuggestionsCount: 24,
InlineChat_RejectedLineAdditions: 18,
InlineChat_RejectedLineDeletions: 19,
InlineChat_RejectionEventCount: 20,
InlineChat_TotalEventCount: 21,
Inline_AICodeLines: 22,
Inline_AcceptanceCount: 23,
Inline_SuggestionsCount: 24,

// Set values for new metrics
Chat_AICodeLines: 25,
Chat_MessagesInteracted: 26,
Chat_MessagesSent: 27,
CodeFix_AcceptanceEventCount: 28,
CodeFix_AcceptedLines: 29,
CodeFix_GeneratedLines: 30,
CodeFix_GenerationEventCount: 31,
CodeReview_FailedEventCount: 32,
Dev_AcceptanceEventCount: 33,
Dev_AcceptedLines: 34,
Dev_GeneratedLines: 35,
Dev_GenerationEventCount: 36,
DocGeneration_AcceptedFileUpdates: 37,
Chat_AICodeLines: 25,
Chat_MessagesInteracted: 26,
Chat_MessagesSent: 27,
CodeFix_AcceptanceEventCount: 28,
CodeFix_AcceptedLines: 29,
CodeFix_GeneratedLines: 30,
CodeFix_GenerationEventCount: 31,
CodeReview_FailedEventCount: 32,
Dev_AcceptanceEventCount: 33,
Dev_AcceptedLines: 34,
Dev_GeneratedLines: 35,
Dev_GenerationEventCount: 36,
DocGeneration_AcceptedFileUpdates: 37,
DocGeneration_AcceptedFilesCreations: 38,
DocGeneration_AcceptedLineAdditions: 39,
DocGeneration_AcceptedLineUpdates: 40,
DocGeneration_EventCount: 41,
DocGeneration_RejectedFileCreations: 42,
DocGeneration_RejectedFileUpdates: 43,
DocGeneration_RejectedLineAdditions: 44,
DocGeneration_RejectedLineUpdates: 45,
TestGeneration_AcceptedLines: 46,
TestGeneration_AcceptedTests: 47,
TestGeneration_EventCount: 48,
TestGeneration_GeneratedLines: 49,
TestGeneration_GeneratedTests: 50,
Transformation_EventCount: 51,
Transformation_LinesGenerated: 52,
Transformation_LinesIngested: 53,
DocGeneration_AcceptedLineAdditions: 39,
DocGeneration_AcceptedLineUpdates: 40,
DocGeneration_EventCount: 41,
DocGeneration_RejectedFileCreations: 42,
DocGeneration_RejectedFileUpdates: 43,
DocGeneration_RejectedLineAdditions: 44,
DocGeneration_RejectedLineUpdates: 45,
TestGeneration_AcceptedLines: 46,
TestGeneration_AcceptedTests: 47,
TestGeneration_EventCount: 48,
TestGeneration_GeneratedLines: 49,
TestGeneration_GeneratedTests: 50,
Transformation_EventCount: 51,
Transformation_LinesGenerated: 52,
Transformation_LinesIngested: 53,
}

// Verify that all metrics are accessible
// Existing metrics
assert.Equal(t, 10, userData.CodeReview_FindingsCount)
Expand All @@ -98,7 +98,7 @@ func TestQDevUserDataAllMetrics(t *testing.T) {
assert.Equal(t, 22, userData.Inline_AICodeLines)
assert.Equal(t, 23, userData.Inline_AcceptanceCount)
assert.Equal(t, 24, userData.Inline_SuggestionsCount)

// New metrics
assert.Equal(t, 25, userData.Chat_AICodeLines)
assert.Equal(t, 26, userData.Chat_MessagesInteracted)
Expand Down
21 changes: 12 additions & 9 deletions backend/plugins/q_dev/tasks/s3_data_extractor.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func processCSVData(taskCtx plugin.SubTaskContext, db dal.Dal, reader io.ReadClo

// 读取标头
headers, err := csvReader.Read()
fmt.Printf("headers: %+v\n", headers)
taskCtx.GetLogger().Debug("CSV headers: %+v", headers)
if err != nil {
return errors.Convert(err)
}
Expand All @@ -135,7 +135,7 @@ func processCSVData(taskCtx plugin.SubTaskContext, db dal.Dal, reader io.ReadClo
}

// 创建用户数据对象 (updated to include display name resolution)
userData, err := createUserDataWithDisplayName(headers, record, fileMeta, data.IdentityClient)
userData, err := createUserDataWithDisplayName(taskCtx.GetLogger(), headers, record, fileMeta, data.IdentityClient)
if err != nil {
return errors.Default.Wrap(err, "failed to create user data")
}
Expand All @@ -156,7 +156,9 @@ type UserDisplayNameResolver interface {
}

// 从CSV记录创建用户数据对象 (enhanced with display name resolution)
func createUserDataWithDisplayName(headers []string, record []string, fileMeta *models.QDevS3FileMeta, identityClient UserDisplayNameResolver) (*models.QDevUserData, errors.Error) {
func createUserDataWithDisplayName(logger interface {
Debug(format string, a ...interface{})
}, headers []string, record []string, fileMeta *models.QDevS3FileMeta, identityClient UserDisplayNameResolver) (*models.QDevUserData, errors.Error) {
userData := &models.QDevUserData{
ConnectionId: fileMeta.ConnectionId,
}
Expand All @@ -165,13 +167,12 @@ func createUserDataWithDisplayName(headers []string, record []string, fileMeta *
fieldMap := make(map[string]string)
for i, header := range headers {
if i < len(record) {
// 打印每个header和对应的值,帮助调试
fmt.Printf("Mapping header[%d]: '%s' -> '%s'\n", i, header, record[i])
logger.Debug("Mapping header[%d]: '%s' -> '%s'", i, header, record[i])
fieldMap[header] = record[i]
// 同时添加去除空格的版本
trimmedHeader := strings.TrimSpace(header)
if trimmedHeader != header {
fmt.Printf("Also adding trimmed header: '%s'\n", trimmedHeader)
logger.Debug("Also adding trimmed header: '%s'", trimmedHeader)
fieldMap[trimmedHeader] = record[i]
}
}
Expand All @@ -188,7 +189,7 @@ func createUserDataWithDisplayName(headers []string, record []string, fileMeta *
}

// 设置DisplayName (new functionality)
userData.DisplayName = resolveDisplayName(userData.UserId, identityClient)
userData.DisplayName = resolveDisplayName(logger, userData.UserId, identityClient)

// 设置Date
dateStr, ok := fieldMap["Date"]
Expand Down Expand Up @@ -251,7 +252,9 @@ func createUserDataWithDisplayName(headers []string, record []string, fileMeta *
}

// resolveDisplayName resolves user ID to display name using Identity Client
func resolveDisplayName(userId string, identityClient UserDisplayNameResolver) string {
func resolveDisplayName(logger interface {
Debug(format string, a ...interface{})
}, userId string, identityClient UserDisplayNameResolver) string {
// If no identity client available, use userId as fallback
if identityClient == nil {
return userId
Expand All @@ -261,7 +264,7 @@ func resolveDisplayName(userId string, identityClient UserDisplayNameResolver) s
displayName, err := identityClient.ResolveUserDisplayName(userId)
if err != nil {
// Log error but continue with userId as fallback
fmt.Printf("Failed to resolve display name for user %s: %v\n", userId, err)
logger.Debug("Failed to resolve display name for user %s: %v", userId, err)
return userId
}

Expand Down
Loading
Loading