Skip to content

Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.

refactor(knowledge): extract cleanProjectSources and resolveSettingsToken from UpdateSettings (#515) (#516)

fx-kurumi8a8fcd238383
diff --git a/internal/knowledge/service.go b/internal/knowledge/service.go
index f3a00f37..24983685 100644
--- a/internal/knowledge/service.go
+++ b/internal/knowledge/service.go
@@ -83,21 +83,9 @@ func (s *Service) UpdateSettings(input SettingsInput, actor string) (domain.Know
}
next := domain.KnowledgeSettings{
Enabled: input.Enabled, URL: rawURL, WriteEnabled: input.WriteEnabled,
- DefaultSources: cleanSources(input.DefaultSources), UpdatedBy: actor,
- }
- if input.ProjectSources != nil {
- next.ProjectSources = map[string][]string{}
- for project, list := range input.ProjectSources {
- if project = strings.TrimSpace(project); project != "" {
- next.ProjectSources[project] = cleanSources(list)
- }
- }
- }
- switch token := strings.TrimSpace(input.Token); {
- case token != "":
- next.Token = stripBearer(token)
- case !input.ClearToken:
- next.Token = current.Token
+ Token: resolveSettingsToken(input, current.Token),
+ DefaultSources: cleanSources(input.DefaultSources),
+ ProjectSources: cleanProjectSources(input.ProjectSources), UpdatedBy: actor,
}
if next.Enabled && (next.URL == "" || next.Token == "") {
return current, apperr.New(apperr.Invalid, "启用前需要填写知识库地址和 Token")
@@ -108,6 +96,33 @@ func (s *Service) UpdateSettings(input SettingsInput, actor string) (domain.Know
return s.store.KnowledgeSettings(), nil
}
+// cleanProjectSources normalizes the per-project source lists, dropping
+// blank project keys. A nil map stays nil so "no overrides" is preserved.
+func cleanProjectSources(in map[string][]string) map[string][]string {
+ if in == nil {
+ return nil
+ }
+ out := map[string][]string{}
+ for project, list := range in {
+ if project = strings.TrimSpace(project); project != "" {
+ out[project] = cleanSources(list)
+ }
+ }
+ return out
+}
+
+// resolveSettingsToken picks the token to save: a new token (without its
+// Bearer prefix), else the current one unless the input asks to clear it.
+func resolveSettingsToken(input SettingsInput, current string) string {
+ switch token := strings.TrimSpace(input.Token); {
+ case token != "":
+ return stripBearer(token)
+ case !input.ClearToken:
+ return current
+ }
+ return ""
+}
+
type CheckResult struct {
OK bool `json:"ok"`
Error string `json:"error,omitempty"`
diff --git a/internal/knowledge/update_settings_helpers_test.go b/internal/knowledge/update_settings_helpers_test.go
new file mode 100644
index 00000000..77c416a0
--- /dev/null
+++ b/internal/knowledge/update_settings_helpers_test.go
@@ -0,0 +1,43 @@
+package knowledge
+
+import (
+ "reflect"
+ "testing"
+)
+
+func TestCleanProjectSources(t *testing.T) {
+ if got := cleanProjectSources(nil); got != nil {
+ t.Fatalf("cleanProjectSources(nil) = %#v, want nil", got)
+ }
+ if got := cleanProjectSources(map[string][]string{}); got == nil || len(got) != 0 {
+ t.Fatalf("cleanProjectSources(empty) = %#v, want empty non-nil map", got)
+ }
+ got := cleanProjectSources(map[string][]string{
+ " p1 ": {" a ", "a", ""},
+ " ": {"x"},
+ "p2": nil,
+ })
+ want := map[string][]string{"p1": {"a"}, "p2": {}}
+ if !reflect.DeepEqual(got, want) {
+ t.Fatalf("cleanProjectSources = %#v, want %#v", got, want)
+ }
+}
+
+func TestResolveSettingsToken(t *testing.T) {
+ cases := []struct {
+ name string
+ input SettingsInput
+ want string
+ }{
+ {"new token", SettingsInput{Token: " new "}, "new"},
+ {"new bearer token", SettingsInput{Token: "Bearer new"}, "new"},
+ {"new token wins over clear", SettingsInput{Token: "new", ClearToken: true}, "new"},
+ {"blank keeps current", SettingsInput{Token: " "}, "old"},
+ {"clear drops current", SettingsInput{ClearToken: true}, ""},
+ }
+ for _, tc := range cases {
+ if got := resolveSettingsToken(tc.input, "old"); got != tc.want {
+ t.Errorf("%s: resolveSettingsToken = %q, want %q", tc.name, got, tc.want)
+ }
+ }
+}