feat(query): add grouped summary logging for query results

Implement QueryLogSummary interface to provide category-based summaries in query logs. Adds methods to multiple models (ConfigAnalysis, ConfigAccessSummary, ConfigChangeRow, RelatedConfig) and creates groupedSummary function to display counts by category (e.g. "CodeDeployment: 5, BackupCompleted: 3"). Also improves error handling in config tree resolution and adds embedded postgres cleanup hook.

Author: moshloop

models/config.go

@@ -974,6 +974,10 @@ func (a ConfigAnalysis) PK() string {
 	return a.ID.String()
 }
 
+func (a ConfigAnalysis) QueryLogSummary() string {
+	return string(a.AnalysisType) + "/" + a.Analyzer
+}
+
 func (a ConfigAnalysis) TableName() string {
 	return "config_analysis"
 }

models/config_access.go

@@ -237,6 +237,10 @@ type ConfigAccessSummary struct {
 	LastReviewedBy  *uuid.UUID `json:"last_reviewed_by,omitempty"`
 }
 
+func (e ConfigAccessSummary) QueryLogSummary() string {
+	return e.ConfigType
+}
+
 func (e ConfigAccessSummary) TableName() string {
 	return "config_access_summary"
 }

query/catalog_search.go

@@ -174,9 +174,13 @@ func (b *BaseCatalogSearch) String() string {
 	}
 	if b.From != "" {
 		s += fmt.Sprintf("from=%s ", b.From)
+	} else if b.FromTime != nil {
+		s += fmt.Sprintf("from=%s ", b.FromTime.Format("2006-01-02"))
 	}
 	if b.To != "" {
 		s += fmt.Sprintf("to=%s ", b.To)
+	} else if b.ToTime != nil {
+		s += fmt.Sprintf("to=%s ", b.ToTime.Format("2006-01-02"))
 	}
 	if b.Recursive != "" {
 		s += fmt.Sprintf("recursive=%s ", b.Recursive)

query/config_changes.go

@@ -149,6 +149,10 @@ type ConfigChangeRow struct {
 	InsertedAt        *time.Time          `gorm:"column:inserted_at" json:"inserted_at,omitempty"`
 }
 
+func (r ConfigChangeRow) QueryLogSummary() string {
+	return r.ChangeType
+}
+
 type CatalogChangesSearchResponse struct {
 	Summary map[string]int    `json:"summary,omitempty"`
 	Total   int64             `json:"total,omitempty"`
@@ -164,7 +168,6 @@ func (t *CatalogChangesSearchResponse) Summarize() {
 
 func formSeverityQuery(severity string) string {
 	if strings.HasPrefix(severity, "!") {
-		// For `Not` queries, we don't need to make any changes.
 		return severity
 	}
 
@@ -177,13 +180,19 @@ func formSeverityQuery(severity string) string {
 	}
 
 	var applicable []string
+	found := false
 	for _, s := range severities {
 		applicable = append(applicable, string(s))
 		if string(s) == severity {
+			found = true
 			break
 		}
 	}
 
+	if !found {
+		return "__invalid__"
+	}
+
 	return strings.Join(applicable, ",")
 }
 

query/config_relations.go

@@ -12,7 +12,7 @@ import (
 )
 
 func (r RelatedConfig) QueryLogSummary() string {
-	return r.Type + "/" + r.Name
+	return r.Type
 }
 
 type RelatedConfig struct {

query/config_tree.go

@@ -1,6 +1,7 @@
 package query
 
 import (
+	"fmt"
 	"strings"
 
 	"github.com/flanksource/duty/context"
@@ -22,6 +23,25 @@ type ConfigTreeOptions struct {
 	Outgoing  RelationType
 }
 
+func (n *ConfigTreeNode) OutgoingIDs() []uuid.UUID {
+	var ids []uuid.UUID
+	n.collectOutgoing(&ids, make(map[uuid.UUID]bool))
+	return ids
+}
+
+func (n *ConfigTreeNode) collectOutgoing(ids *[]uuid.UUID, seen map[uuid.UUID]bool) {
+	if seen[n.ID] {
+		return
+	}
+	seen[n.ID] = true
+	if n.EdgeType != "parent" {
+		*ids = append(*ids, n.ID)
+	}
+	for _, c := range n.Children {
+		c.collectOutgoing(ids, seen)
+	}
+}
+
 func ConfigTree(ctx context.Context, configID uuid.UUID, opts ConfigTreeOptions) (*ConfigTreeNode, error) {
 	config, err := GetCachedConfig(ctx, configID.String())
 	if err != nil {
@@ -31,7 +51,10 @@ func ConfigTree(ctx context.Context, configID uuid.UUID, opts ConfigTreeOptions)
 		return nil, nil
 	}
 
-	parents := resolveParentsFromPath(ctx, config)
+	parents, err := resolveParentsFromPath(ctx, config)
+	if err != nil {
+		return nil, err
+	}
 
 	childIDs, err := ExpandConfigChildren(ctx, []uuid.UUID{config.ID})
 	if err != nil {
@@ -54,7 +77,7 @@ func ConfigTree(ctx context.Context, configID uuid.UUID, opts ConfigTreeOptions)
 	if opts.Incoming != "" {
 		relType = opts.Incoming
 	}
-	outType := Hard
+	outType := Both
 	if opts.Outgoing != "" {
 		outType = opts.Outgoing
 	}
@@ -72,9 +95,9 @@ func ConfigTree(ctx context.Context, configID uuid.UUID, opts ConfigTreeOptions)
 	return buildConfigTree(config, parents, children, related), nil
 }
 
-func resolveParentsFromPath(ctx context.Context, config *models.ConfigItem) []models.ConfigItem {
+func resolveParentsFromPath(ctx context.Context, config *models.ConfigItem) ([]models.ConfigItem, error) {
 	if config.Path == "" {
-		return nil
+		return nil, nil
 	}
 	segments := strings.Split(config.Path, ".")
 	var parentIDs []uuid.UUID
@@ -86,11 +109,14 @@ func resolveParentsFromPath(ctx context.Context, config *models.ConfigItem) []mo
 		parentIDs = append(parentIDs, id)
 	}
 	if len(parentIDs) == 0 {
-		return nil
+		return nil, nil
 	}
 	items, err := GetConfigsByIDs(ctx, parentIDs)
-	if err != nil || len(items) == 0 {
-		return nil
+	if err != nil {
+		return nil, fmt.Errorf("resolving parents from path: %w", err)
+	}
+	if len(items) == 0 {
+		return nil, nil
 	}
 	byID := make(map[uuid.UUID]models.ConfigItem, len(items))
 	for _, ci := range items {
@@ -102,7 +128,7 @@ func resolveParentsFromPath(ctx context.Context, config *models.ConfigItem) []mo
 			parents = append(parents, ci)
 		}
 	}
-	return parents
+	return parents, nil
 }
 
 func ExpandConfigChildren(ctx context.Context, ids []uuid.UUID) ([]uuid.UUID, error) {

query/query_logger.go

@@ -40,8 +40,12 @@ func (q QueryLogger) Start(entity string) *QueryTimer {
 }
 
 func (t *QueryTimer) Arg(key string, value any) *QueryTimer {
+	s := fmt.Sprintf("%v", value)
+	if len(s) > 80 {
+		s = s[:77] + "..."
+	}
 	t.label = t.label.AddText(fmt.Sprintf(" %s=", key), "text-gray-500").
-		AddText(fmt.Sprintf("%v", value))
+		AddText(s)
 	return t
 }
 
@@ -101,6 +105,11 @@ func summaryText(v any, count int) string {
 		return ""
 	}
 
+	// Try grouped summary first (e.g. "CodeDeployment: 5, BackupCompleted: 3")
+	if grouped := groupedSummary(rv); grouped != "" {
+		return " [" + grouped + "]"
+	}
+
 	const maxInline = 2
 	shown := count
 	if shown > maxInline {
@@ -117,3 +126,27 @@ func summaryText(v any, count int) string {
 	}
 	return " [" + summary + "]"
 }
+
+func groupedSummary(rv reflect.Value) string {
+	if rv.Len() == 0 {
+		return ""
+	}
+	first := rv.Index(0).Interface()
+	if _, ok := first.(QueryLogSummary); !ok {
+		return ""
+	}
+	counts := make(map[string]int)
+	var order []string
+	for i := 0; i < rv.Len(); i++ {
+		s := rv.Index(i).Interface().(QueryLogSummary).QueryLogSummary()
+		if counts[s] == 0 {
+			order = append(order, s)
+		}
+		counts[s]++
+	}
+	var parts []string
+	for _, key := range order {
+		parts = append(parts, fmt.Sprintf("%s: %d", key, counts[key]))
+	}
+	return strings.Join(parts, ", ")
+}

tests/setup/template.go

@@ -234,6 +234,11 @@ func ensurePostgres(port int) (string, error) {
 		if err := postgresServer.Start(); err != nil {
 			return "", err
 		}
+		shutdown.AddHookWithPriority("stop embedded postgres", shutdown.PriorityCritical, func() {
+			if err := postgresServer.Stop(); err != nil {
+				logger.Errorf("failed to stop embedded postgres: %v", err)
+			}
+		})
 		logger.Infof("Started postgres on port %d", port)
 	}