refactor: simplify service interface to use tags/rels for all node properties

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-03-31 23:10:56 +02:00
parent 4404518f50
commit cb16bda200
5 changed files with 151 additions and 147 deletions

View File

@@ -7,6 +7,7 @@ import (
"maps"
"regexp"
"slices"
"strings"
"time"
)
@@ -25,6 +26,43 @@ func mentions(t string) []string {
return slices.Collect(maps.Keys(seen))
}
// --- Validation ---
var (
validTypes = map[string]bool{"issue": true, "note": true, "user": true, "namespace": true}
validStatuses = map[string]bool{"open": true, "done": true}
validPrios = map[string]bool{"high": true, "medium": true, "low": true}
)
func validateTags(tags []string) error {
for _, t := range tags {
if v, ok := strings.CutPrefix(t, "_type::"); ok {
if !validTypes[v] {
return fmt.Errorf("invalid type %q: must be one of issue, note, user, namespace", v)
}
} else if v, ok := strings.CutPrefix(t, "_status::"); ok {
if !validStatuses[v] {
return fmt.Errorf("invalid status %q: must be one of open, done", v)
}
} else if v, ok := strings.CutPrefix(t, "_prio::"); ok {
if !validPrios[v] {
return fmt.Errorf("invalid priority %q: must be one of high, medium, low", v)
}
}
}
return nil
}
// tagValue returns the value of the first tag with the given prefix, or "".
func tagValue(tags []string, prefix string) string {
for _, t := range tags {
if v, ok := strings.CutPrefix(t, prefix); ok {
return v
}
}
return ""
}
// --- Query ---
func (s *nodeServiceImpl) GetByID(id string) (*models.Node, error) {
@@ -32,86 +70,51 @@ func (s *nodeServiceImpl) GetByID(id string) (*models.Node, error) {
}
func (s *nodeServiceImpl) List(filter ListFilter) ([]*models.Node, error) {
// Build tag prefixes from both semantic fields and raw tags.
tagPrefixes := append([]string{}, filter.Tags...)
if filter.Status != "" {
tagPrefixes = append(tagPrefixes, "_status::"+filter.Status)
}
if filter.Priority != "" {
tagPrefixes = append(tagPrefixes, "_prio::"+filter.Priority)
}
if filter.Type != "" {
tagPrefixes = append(tagPrefixes, "_type::"+filter.Type)
}
// Build rel filters, resolving names to node IDs (read-only, no auto-creation).
type relEntry struct {
relType models.RelType
name string
}
namedRels := []relEntry{
{models.RelAssignee, filter.Assignee},
{models.RelInNamespace, filter.Namespace},
{models.RelMentions, filter.Mention},
}
var relFilters []*models.Rel
for _, e := range namedRels {
if e.name == "" {
continue
}
id, ok := s.lookupRelTarget(e.relType, e.name)
if !ok {
return nil, nil // named target doesn't exist; no nodes can match
}
relFilters = append(relFilters, &models.Rel{Type: e.relType, Target: id})
}
for _, ri := range filter.Rels {
id, ok := s.lookupRelTarget(ri.Type, ri.Target)
if !ok {
return nil, nil
return nil, nil // named target doesn't exist; no nodes can match
}
relFilters = append(relFilters, &models.Rel{Type: ri.Type, Target: id})
}
return s.store.FindNodes(tagPrefixes, relFilters)
return s.store.FindNodes(filter.Tags, relFilters)
}
// --- Lifecycle ---
func (s *nodeServiceImpl) Add(input AddInput) (*models.Node, error) {
// Copy tags so we can extend without mutating the input.
tags := make([]string, len(input.Tags))
copy(tags, input.Tags)
// Apply defaults.
nodeType := input.Type
nodeType := tagValue(tags, "_type::")
if nodeType == "" {
nodeType = "issue"
tags = append(tags, "_type::issue")
}
status := input.Status
if status == "" && nodeType == "issue" {
status = "open"
if nodeType == "issue" && tagValue(tags, "_status::") == "" {
tags = append(tags, "_status::open")
}
// Build initial tag set from semantic fields.
tags := []string{"_type::" + nodeType}
if status != "" {
tags = append(tags, "_status::"+status)
// Validate special tags.
if err := validateTags(tags); err != nil {
return nil, err
}
if input.Priority != "" {
tags = append(tags, "_prio::"+input.Priority)
}
tags = append(tags, input.Tags...)
// Build initial relation map from semantic fields.
// Build initial relation map from rels input.
rels := make(map[models.RelType][]string)
if input.Namespace != "" {
rels[models.RelInNamespace] = []string{input.Namespace}
} else {
rels[models.RelInNamespace] = []string{s.userID} // default: creator's namespace
}
if input.Assignee != "" {
rels[models.RelAssignee] = []string{input.Assignee}
}
hasNamespace := false
for _, ri := range input.Rels {
if ri.Type == models.RelInNamespace {
hasNamespace = true
}
rels[ri.Type] = append(rels[ri.Type], ri.Target)
}
if !hasNamespace {
rels[models.RelInNamespace] = []string{s.userID}
}
id, err := s.store.GenerateID()
if err != nil {
@@ -176,12 +179,20 @@ func (s *nodeServiceImpl) Add(input AddInput) (*models.Node, error) {
func (s *nodeServiceImpl) Update(id string, input UpdateInput) (*models.Node, error) {
// Enforce blocking constraint before allowing status=done.
if input.Status != nil && *input.Status == "done" {
if err := s.checkBlockers(id); err != nil {
return nil, err
for _, t := range input.AddTags {
if t == "_status::done" {
if err := s.checkBlockers(id); err != nil {
return nil, err
}
break
}
}
// Validate tags being added.
if err := validateTags(input.AddTags); err != nil {
return nil, err
}
err := s.store.Transaction(func(st store.Store) error {
current, err := st.GetNode(id)
if err != nil {
@@ -211,15 +222,6 @@ func (s *nodeServiceImpl) Update(id string, input UpdateInput) (*models.Node, er
for _, t := range current.Tags() {
tmp.AddTag(t)
}
if input.Type != nil {
tmp.AddTag("_type::" + *input.Type)
}
if input.Status != nil {
tmp.AddTag("_status::" + *input.Status)
}
if input.Priority != nil {
tmp.AddTag("_prio::" + *input.Priority)
}
for _, t := range input.AddTags {
tmp.AddTag(t)
}
@@ -251,18 +253,8 @@ func (s *nodeServiceImpl) Update(id string, input UpdateInput) (*models.Node, er
}
}
// Build relation additions, including structured fields.
var addRels []RelInput
if input.Namespace != nil {
addRels = append(addRels, RelInput{Type: models.RelInNamespace, Target: *input.Namespace})
}
if input.Assignee != nil {
addRels = append(addRels, RelInput{Type: models.RelAssignee, Target: *input.Assignee})
}
addRels = append(addRels, input.AddRels...)
currentRels := current.Relations()
for _, ri := range addRels {
for _, ri := range input.AddRels {
resolved, err := s.resolveRelTarget(st, ri)
if err != nil {
return err
@@ -485,4 +477,3 @@ func (s *nodeServiceImpl) ensureNamespace(st store.Store, name string) (string,
}
return id, nil
}