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
62 changes: 61 additions & 1 deletion coderd/apidoc/docs.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 61 additions & 1 deletion coderd/apidoc/swagger.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 49 additions & 6 deletions coderd/database/db2sdk/db2sdk.go
Original file line number Diff line number Diff line change
Expand Up @@ -1918,6 +1918,17 @@ func ChatProject(project database.ChatProject) codersdk.ChatProject {
// When files is non-empty the response includes file metadata;
// pass nil to omit the files field (e.g. list endpoints).
func Chat(c database.Chat, diffStatus *database.ChatDiffStatus, files []database.GetChatFileMetadataByChatIDRow) codersdk.Chat {
return ChatWithDiffStatuses(c, diffStatus, nil, files)
}

// ChatWithDiffStatuses converts a chat with its per-ref diff status
// list. diffStatus is the primary shown in the diff_status field.
func ChatWithDiffStatuses(
c database.Chat,
diffStatus *database.ChatDiffStatus,
diffStatuses []database.ChatDiffStatus,
files []database.GetChatFileMetadataByChatIDRow,
) codersdk.Chat {
mcpServerIDs := c.MCPServerIDs
if mcpServerIDs == nil {
mcpServerIDs = []uuid.UUID{}
Expand Down Expand Up @@ -1999,6 +2010,12 @@ func Chat(c database.Chat, diffStatus *database.ChatDiffStatus, files []database
convertedDiffStatus := ChatDiffStatus(c.ID, diffStatus)
chat.DiffStatus = &convertedDiffStatus
}
if len(diffStatuses) > 0 {
chat.DiffStatuses = make([]codersdk.ChatDiffStatus, 0, len(diffStatuses))
for i := range diffStatuses {
chat.DiffStatuses = append(chat.DiffStatuses, ChatDiffStatus(c.ID, &diffStatuses[i]))
}
}
if len(files) > 0 {
chat.Files = make([]codersdk.ChatFileMetadata, 0, len(files))
for _, row := range files {
Expand Down Expand Up @@ -2186,13 +2203,13 @@ func ChatDebugRunDetail(r database.ChatDebugRun, steps []database.ChatDebugStep)
// is non-nil, children without an entry receive an empty DiffStatus.
func ChildChatRows(
children []database.GetChildChatsByParentIDsRow,
diffStatuses map[uuid.UUID]database.ChatDiffStatus,
diffStatuses map[uuid.UUID][]database.ChatDiffStatus,
) []codersdk.Chat {
result := make([]codersdk.Chat, len(children))
for i, row := range children {
diffStatus, ok := diffStatuses[row.Chat.ID]
statuses, ok := diffStatuses[row.Chat.ID]
if ok {
result[i] = Chat(row.Chat, &diffStatus, nil)
result[i] = ChatWithDiffStatuses(row.Chat, PrimaryChatDiffStatus(statuses), statuses, nil)
} else {
result[i] = Chat(row.Chat, nil, nil)
if diffStatuses != nil {
Expand All @@ -2211,7 +2228,7 @@ func ChildChatRows(
func ChatRowsWithChildren(
roots []database.GetChatsRow,
children []database.GetChildChatsByParentIDsRow,
diffStatuses map[uuid.UUID]database.ChatDiffStatus,
diffStatuses map[uuid.UUID][]database.ChatDiffStatus,
) []codersdk.Chat {
// Group children by parent ID.
childrenByParent := make(map[uuid.UUID][]database.GetChildChatsByParentIDsRow, len(children))
Expand All @@ -2222,9 +2239,9 @@ func ChatRowsWithChildren(

result := make([]codersdk.Chat, len(roots))
for i, row := range roots {
diffStatus, ok := diffStatuses[row.Chat.ID]
statuses, ok := diffStatuses[row.Chat.ID]
if ok {
result[i] = Chat(row.Chat, &diffStatus, nil)
result[i] = ChatWithDiffStatuses(row.Chat, PrimaryChatDiffStatus(statuses), statuses, nil)
} else {
result[i] = Chat(row.Chat, nil, nil)
if diffStatuses != nil {
Expand Down Expand Up @@ -2254,6 +2271,14 @@ func ChatDiffStatus(chatID uuid.UUID, status *database.ChatDiffStatus) codersdk.
}

result.ChatID = status.ChatID
if status.GitRemoteOrigin != "" {
remoteOrigin := status.GitRemoteOrigin
result.RemoteOrigin = &remoteOrigin
Comment thread
DanielleMaywood marked this conversation as resolved.
Resolved
}
if status.GitBranch != "" {
gitBranch := status.GitBranch
result.GitBranch = &gitBranch
}
if status.Url.Valid {
u := strings.TrimSpace(status.Url.String)
if u != "" {
Expand Down Expand Up @@ -2325,6 +2350,24 @@ func ChatDiffStatus(chatID uuid.UUID, status *database.ChatDiffStatus) codersdk.
return result
}

// PrimaryChatDiffStatus returns the row with the most recent git
// report, or nil when statuses is empty. Only a git report sets
// updated_at. Ties go to the lowest origin, then the lowest branch.
func PrimaryChatDiffStatus(statuses []database.ChatDiffStatus) *database.ChatDiffStatus {
if len(statuses) == 0 {
return nil
}

primary := slices.MinFunc(statuses, func(a, b database.ChatDiffStatus) int {
return cmp.Or(
b.UpdatedAt.Compare(a.UpdatedAt),
cmp.Compare(a.GitRemoteOrigin, b.GitRemoteOrigin),
cmp.Compare(a.GitBranch, b.GitBranch),
)
})
return &primary
}

// UserSecret converts a database ListUserSecretsRow (metadata only,
// no value) to an SDK UserSecret.
func UserSecret(secret database.ListUserSecretsRow) codersdk.UserSecret {
Expand Down
25 changes: 24 additions & 1 deletion coderd/database/db2sdk/db2sdk_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -997,6 +997,7 @@ func TestChat_AllFieldsPopulated(t *testing.T) {
diffStatus := &database.ChatDiffStatus{
ChatID: input.ID,
}
diffStatuses := []database.ChatDiffStatus{*diffStatus}

fileRows := []database.GetChatFileMetadataByChatIDRow{
{
Expand All @@ -1009,7 +1010,7 @@ func TestChat_AllFieldsPopulated(t *testing.T) {
},
}

got := db2sdk.Chat(input, diffStatus, fileRows)
got := db2sdk.ChatWithDiffStatuses(input, diffStatus, diffStatuses, fileRows)

require.Equal(t, &lastErrorPayload, got.LastError)

Expand Down Expand Up @@ -1147,6 +1148,28 @@ func TestChat_NilFilesOmitted(t *testing.T) {
require.Empty(t, result.Files)
}

func TestPrimaryChatDiffStatus(t *testing.T) {
t.Parallel()

require.Nil(t, db2sdk.PrimaryChatDiffStatus(nil))

older := dbtime.Now()
newer := older.Add(time.Minute)
// The primary is not first in the list. Equal report times go to
// the lowest origin, then the lowest branch.
statuses := []database.ChatDiffStatus{
{GitRemoteOrigin: "https://github.com/a/r", GitBranch: "first", UpdatedAt: older},
{GitRemoteOrigin: "https://github.com/b/r", GitBranch: "main", UpdatedAt: newer},
{GitRemoteOrigin: "https://github.com/a/r", GitBranch: "z", UpdatedAt: newer},
{GitRemoteOrigin: "https://github.com/a/r", GitBranch: "y", UpdatedAt: newer},
}

primary := db2sdk.PrimaryChatDiffStatus(statuses)
require.NotNil(t, primary)
require.Equal(t, "https://github.com/a/r", primary.GitRemoteOrigin)
require.Equal(t, "y", primary.GitBranch)
}

func TestChat_LastErrorFallback(t *testing.T) {
t.Parallel()

Expand Down
4 changes: 2 additions & 2 deletions coderd/database/queries.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading