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(domain): split MR dedup and state counting out of SummarizeDeliveries (#555)

fx-kurumi5c98f7cd8742
diff --git a/internal/domain/mr.go b/internal/domain/mr.go
index 153e6a1d..1e8b2e74 100644
--- a/internal/domain/mr.go
+++ b/internal/domain/mr.go
@@ -133,18 +133,7 @@ func SummarizeDeliveries(items []AnalyticsDelivery) AnalyticsDeliverySummary {
out.DirectDelivered++
}
}
- merged := false
- for _, mr := range list {
- key := analyticsMRKey(mr)
- if key == "" {
- continue
- }
- if state, ok := mrs[key]; !ok || AnalyticsMRRank(mr.State) > AnalyticsMRRank(state) {
- mrs[key] = mr.State
- }
- merged = merged || mr.State == "merged"
- }
- if merged {
+ if recordDeliveryMRs(mrs, list) {
out.IssuesWithMergedMR++
}
if item.Delivered {
@@ -158,14 +147,7 @@ func SummarizeDeliveries(items []AnalyticsDelivery) AnalyticsDeliverySummary {
}
}
out.TotalMRs = len(mrs)
- for _, state := range mrs {
- switch state {
- case "merged":
- out.MRMerged++
- case "integrated":
- out.MRIntegrated++
- }
- }
+ out.MRMerged, out.MRIntegrated = countDeliveryMRStates(mrs)
if durationN > 0 {
out.AverageDurationMs = durationSum / durationN
}
@@ -177,6 +159,39 @@ func SummarizeDeliveries(items []AnalyticsDelivery) AnalyticsDeliverySummary {
return out
}
+// recordDeliveryMRs folds one issue's MRs into mrs, the deduplicated
+// identity→best-state table, keeping the higher-ranked state for each MR. MRs
+// without a recognizable identity are skipped. It reports whether any
+// recorded MR of this issue is merged.
+func recordDeliveryMRs(mrs map[string]string, list []DeliveryMR) bool {
+ merged := false
+ for _, mr := range list {
+ key := analyticsMRKey(mr)
+ if key == "" {
+ continue
+ }
+ if state, ok := mrs[key]; !ok || AnalyticsMRRank(mr.State) > AnalyticsMRRank(state) {
+ mrs[key] = mr.State
+ }
+ merged = merged || mr.State == "merged"
+ }
+ return merged
+}
+
+// countDeliveryMRStates counts the merged and integrated MRs in the
+// deduplicated identity→state table built by recordDeliveryMRs.
+func countDeliveryMRStates(mrs map[string]string) (merged, integrated int) {
+ for _, state := range mrs {
+ switch state {
+ case "merged":
+ merged++
+ case "integrated":
+ integrated++
+ }
+ }
+ return merged, integrated
+}
+
// gongfengMRKey is the case-insensitive identity of a Gongfeng MR.
func gongfengMRKey(project string, iid int) string {
return strings.ToLower(project) + "#" + strconv.Itoa(iid)
diff --git a/internal/domain/mr_summary_mrs_test.go b/internal/domain/mr_summary_mrs_test.go
new file mode 100644
index 00000000..33afa7f3
--- /dev/null
+++ b/internal/domain/mr_summary_mrs_test.go
@@ -0,0 +1,62 @@
+package domain
+
+import "testing"
+
+func TestRecordDeliveryMRsDedupsAndKeepsBestState(t *testing.T) {
+ t.Parallel()
+ mrs := map[string]string{}
+ opened := DeliveryMR{Project: "team/frontend", IID: 1, URL: GongfengMRURL("team/frontend", 1), State: "opened"}
+ if recordDeliveryMRs(mrs, []DeliveryMR{opened}) {
+ t.Fatal("opened MR must not report merged")
+ }
+ // Same MR through another URL form, now merged: one entry, upgraded state.
+ alias := opened
+ alias.URL = "http://git.example.com/team/frontend/merge_requests/1"
+ alias.State = "merged"
+ if !recordDeliveryMRs(mrs, []DeliveryMR{alias}) {
+ t.Fatal("merged MR must report merged")
+ }
+ if len(mrs) != 1 || mrs["team/frontend#1"] != "merged" {
+ t.Fatalf("mrs=%v, want single merged entry", mrs)
+ }
+ // A lower-ranked state never downgrades the recorded one.
+ integrated := opened
+ integrated.State = "integrated"
+ if recordDeliveryMRs(mrs, []DeliveryMR{integrated}) {
+ t.Fatal("integrated MR must not report merged")
+ }
+ if mrs["team/frontend#1"] != "merged" {
+ t.Fatalf("state downgraded: %v", mrs)
+ }
+}
+
+func TestRecordDeliveryMRsSkipsMRsWithoutIdentity(t *testing.T) {
+ t.Parallel()
+ mrs := map[string]string{}
+ if recordDeliveryMRs(mrs, []DeliveryMR{{State: "merged"}}) {
+ t.Fatal("MR without identity must not count as merged")
+ }
+ if len(mrs) != 0 {
+ t.Fatalf("mrs=%v, want empty", mrs)
+ }
+ if recordDeliveryMRs(mrs, nil) {
+ t.Fatal("empty list must not report merged")
+ }
+}
+
+func TestCountDeliveryMRStates(t *testing.T) {
+ t.Parallel()
+ merged, integrated := countDeliveryMRStates(map[string]string{
+ "a#1": "merged",
+ "b#1": "merged",
+ "c#1": "integrated",
+ "d#1": "opened",
+ "e#1": "",
+ })
+ if merged != 2 || integrated != 1 {
+ t.Fatalf("merged=%d integrated=%d, want 2 and 1", merged, integrated)
+ }
+ if merged, integrated := countDeliveryMRStates(nil); merged != 0 || integrated != 0 {
+ t.Fatalf("nil table: merged=%d integrated=%d", merged, integrated)
+ }
+}