Merge branch 'main' into production

Author: codex

internal/api/types.go

@@ -5,6 +5,15 @@ import (
 	"github.com/gastownhall/wasteland/internal/sdk"
 )
 
+func allowsPendingSubmissionState(status string) bool {
+	switch status {
+	case "open", "claimed", "in_review":
+		return true
+	default:
+		return false
+	}
+}
+
 // --- Response types ---
 
 // PendingItemJSON is a summary of a pending upstream PR for browse list hover cards.
@@ -370,6 +379,9 @@ func toDetailResponse(d *sdk.DetailResult, mode string) *DetailResponse {
 	}
 
 	itemJSON := toWantedItemJSON(d.Item)
+	if itemJSON != nil && !allowsPendingSubmissionState(itemJSON.Status) {
+		upstreamPRs = nil
+	}
 	// If there are competing upstream submissions, overlay claimed_by to
 	// reflect the full set of candidates (main claimer + upstream PRs).
 	if itemJSON != nil && len(upstreamPRs) > 0 {

internal/api/types_test.go

@@ -0,0 +1,62 @@
+package api
+
+import (
+	"testing"
+
+	"github.com/gastownhall/wasteland/internal/commons"
+	"github.com/gastownhall/wasteland/internal/sdk"
+)
+
+func TestToDetailResponse_SuppressesTerminalUpstreamSubmissions(t *testing.T) {
+	resp := toDetailResponse(&sdk.DetailResult{
+		Item: &commons.WantedItem{
+			ID:        "w-1",
+			Title:     "Done task",
+			Status:    "completed",
+			ClaimedBy: "winner",
+		},
+		UpstreamPRs: []sdk.PendingItem{{
+			RigHandle: "charlie",
+			Status:    "in_review",
+			ClaimedBy: "charlie",
+			PRURL:     "https://example.com/pr/1",
+		}},
+	}, "pr")
+
+	if resp == nil {
+		t.Fatal("expected response")
+	}
+	if len(resp.UpstreamPRs) != 0 {
+		t.Fatalf("upstream PRs = %+v, want none for completed item", resp.UpstreamPRs)
+	}
+	if resp.Item == nil || resp.Item.ClaimedBy != "winner" {
+		t.Fatalf("item = %+v, want completed winner preserved", resp.Item)
+	}
+}
+
+func TestToDetailResponse_PreservesActiveUpstreamSubmissions(t *testing.T) {
+	resp := toDetailResponse(&sdk.DetailResult{
+		Item: &commons.WantedItem{
+			ID:        "w-1",
+			Title:     "Open task",
+			Status:    "open",
+			ClaimedBy: "alice",
+		},
+		UpstreamPRs: []sdk.PendingItem{{
+			RigHandle: "charlie",
+			Status:    "in_review",
+			ClaimedBy: "charlie",
+			PRURL:     "https://example.com/pr/1",
+		}},
+	}, "pr")
+
+	if resp == nil {
+		t.Fatal("expected response")
+	}
+	if len(resp.UpstreamPRs) != 1 {
+		t.Fatalf("upstream PRs = %+v, want 1 active submission", resp.UpstreamPRs)
+	}
+	if resp.Item == nil || resp.Item.ClaimedBy != "Multiple (pending)" {
+		t.Fatalf("item = %+v, want pending overlay for active item", resp.Item)
+	}
+}

internal/hosted/authservice_resolver.go

@@ -259,6 +259,7 @@ func (wr *AuthServiceWorkspaceResolver) buildClient(
 
 	db := backend.NewRemoteDBWithClient(proxyClient, upOrg, upDB, wl.ForkOrg, wl.ForkDB, mode)
 	provider := remote.NewDoltHubProviderWithClient(proxyClient)
+	pendingCache := wr.getOrCreatePendingCache(session.ConnectionID, provider, upOrg, upDB)
 
 	branchURL := func(branch string) string {
 		return fmt.Sprintf("https://www.dolthub.com/repositories/%s/%s/data/%s",
@@ -322,9 +323,9 @@ func (wr *AuthServiceWorkspaceResolver) buildClient(
 			}
 			return provider.ClosePR(upOrg, upDB, prID)
 		},
-		ListPendingItems: wr.getOrCreatePendingCache(session.ConnectionID, provider, upOrg, upDB).Get,
+		ListPendingItems: pendingCache.Get,
 		ListPendingItemsContext: func(ctx context.Context) (map[string][]sdk.PendingItem, error) {
-			return wr.getOrCreatePendingCache(session.ConnectionID, provider, upOrg, upDB).GetContext(ctx)
+			return pendingCache.GetContext(ctx)
 		},
 		BranchURL: branchURL,
 		Signing:   wl.Signing,

internal/hosted/authservice_resolver_test.go

@@ -1,10 +1,20 @@
 package hosted
 
 import (
+	"context"
+	"net/http"
 	"testing"
 	"time"
+
+	"github.com/gastownhall/wasteland/internal/dolthubauth"
 )
 
+type roundTripFunc func(*http.Request) (*http.Response, error)
+
+func (fn roundTripFunc) RoundTrip(req *http.Request) (*http.Response, error) {
+	return fn(req)
+}
+
 func TestAuthServiceWorkspaceResolver_InvalidateConnectionClearsPendingCaches(t *testing.T) {
 	resolver := NewAuthServiceWorkspaceResolver(nil, NewSessionStore())
 	cache1 := newPendingUpstreamCache(nil, "hop", "wl-commons", time.Hour)
@@ -24,3 +34,37 @@ func TestAuthServiceWorkspaceResolver_InvalidateConnectionClearsPendingCaches(t
 		t.Fatal("expected unrelated pending cache to remain")
 	}
 }
+
+func TestAuthServiceWorkspaceResolver_BuildClientWarmsPendingCache(t *testing.T) {
+	resolver := NewAuthServiceWorkspaceResolver(nil, NewSessionStore())
+	session := &UserSession{
+		SubjectID:    "subject-1",
+		ConnectionID: "conn-1",
+	}
+	conn := &dolthubauth.ConnectionResponse{
+		ConnectionID: "conn-1",
+		SubjectID:    "subject-1",
+		RigHandle:    "alice",
+	}
+	wl := dolthubauth.WastelandConfig{
+		Upstream: "hop/wl-commons",
+		ForkOrg:  "alice",
+		ForkDB:   "wl-commons",
+		Mode:     "pr",
+	}
+
+	client := &http.Client{Transport: roundTripFunc(func(*http.Request) (*http.Response, error) {
+		return nil, context.Canceled
+	})}
+
+	if _, err := resolver.buildClient(session, conn, client, wl); err != nil {
+		t.Fatalf("buildClient() error = %v", err)
+	}
+
+	key := "conn-1:hop/wl-commons"
+	cache, ok := resolver.pendingCache[key]
+	if !ok {
+		t.Fatalf("expected pending cache %q to be created during build", key)
+	}
+	cache.Stop()
+}