test(handlers): add BroadcastHandler coverage — 14 test cases

Covers: truncate, validation, authz, DB errors, success paths,
and graceful degradation on log insert failures.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

workspace-server/internal/handlers/workspace_broadcast_test.go

@@ -1,277 +1,425 @@
 package handlers
 
-// workspace_broadcast_test.go — coverage for workspace_broadcast.go.
-//
-// Covered handlers:
-//   - BroadcastHandler.Broadcast  POST /workspaces/:id/broadcast
-//   - broadcastTruncate            pure function
-//
-// DB reads are mocked via sqlmock. The *events.Broadcaster is injected
-// as the real no-op test broadcaster so BroadcastOnly() is safe in tests.
-
 import (
+	"bytes"
 	"context"
-	"encoding/json"
+	"database/sql"
 	"net/http"
 	"net/http/httptest"
-	"strings"
 	"testing"
 
 	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
+	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
+	"github.com/Molecule-AI/molecule-monorepo/platform/internal/ws"
 	"github.com/gin-gonic/gin"
-	"github.com/stretchr/testify/require"
 )
 
-// ─── broadcastTruncate ─────────────────────────────────────────────────────────
-
-func TestBroadcastTruncate_LenBelowMax_ReturnsFullString(t *testing.T) {
-	result := broadcastTruncate("hello", 10)
-	require.Equal(t, "hello", result)
-}
-
-func TestBroadcastTruncate_LenEqualMax_ReturnsFullString(t *testing.T) {
-	result := broadcastTruncate("hello", 5)
-	require.Equal(t, "hello", result)
-}
-
-func TestBroadcastTruncate_LenAboveMax_TruncatesWithEllipsis(t *testing.T) {
-	result := broadcastTruncate("hello world", 5)
-	require.Equal(t, "hello…", result)
-}
-
-func TestBroadcastTruncate_EmptyString_ReturnsEmpty(t *testing.T) {
-	result := broadcastTruncate("", 5)
-	require.Equal(t, "", result)
-}
-
-func TestBroadcastTruncate_Unicode_TruncatesAtRuneBoundary(t *testing.T) {
-	// "日本語" is 3 runes; truncating at max=2 should give 2 runes + ellipsis.
-	result := broadcastTruncate("日本語abcdef", 2)
-	require.Equal(t, "日本…", result)
-}
-
-// ─── Broadcast handler ────────────────────────────────────────────────────────
-
-// Valid UUIDs used throughout the test suite.
-const (
-	testSenderID      = "00000000-0000-0000-0000-000000000001"
-	testRecipient1   = "00000000-0000-0000-0000-000000000002"
-	testRecipient2    = "00000000-0000-0000-0000-000000000003"
-)
-
-func setupBroadcastCtx(t *testing.T, body string) (*BroadcastHandler, sqlmock.Sqlmock, *httptest.ResponseRecorder, *gin.Context) {
+// setupBroadcastDB uses QueryMatcherEqual so SQL strings with quoted literals
+// (e.g. status != 'removed') are compared verbatim, not as regex.
+func setupBroadcastDB(t *testing.T) sqlmock.Sqlmock {
 	t.Helper()
-	mockDB, mock, err := sqlmock.New()
-	require.NoError(t, err)
+	mockDB, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherEqual))
+	if err != nil {
+		t.Fatalf("failed to create sqlmock: %v", err)
+	}
 	prevDB := db.DB
 	db.DB = mockDB
 	t.Cleanup(func() { db.DB = prevDB; mockDB.Close() })
+	return mock
+}
 
-	gin.SetMode(gin.TestMode)
+// validUUID is a properly formatted test UUID.
+const broadcastTestUUID = "bbbbbbbb-0001-0001-0001-000000000001"
+
+// buildBroadcastCtx creates a gin.Context wired for POST /workspaces/:id/broadcast.
+func buildBroadcastCtx(id, body string) (*gin.Context, *httptest.ResponseRecorder) {
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
-	c.Params = gin.Params{{Key: "id", Value: testSenderID}}
-	c.Request = httptest.NewRequest("POST", "/workspaces/"+testSenderID+"/broadcast", strings.NewReader(body))
-	c.Request.Header.Set("Content-Type", "application/json")
-
-	h := NewBroadcastHandler(newTestBroadcaster())
-	return h, mock, w, c
+	req := httptest.NewRequest(http.MethodPost, "/workspaces/"+id+"/broadcast", bytes.NewBufferString(body))
+	req.Header.Set("Content-Type", "application/json")
+	c.Request = req.WithContext(context.Background())
+	c.Params = gin.Params{{Key: "id", Value: id}}
+	return c, w
 }
 
-func TestBroadcast_InvalidWorkspaceID_Returns400(t *testing.T) {
-	gin.SetMode(gin.TestMode)
-	w := httptest.NewRecorder()
-	c, _ := gin.CreateTestContext(w)
-	c.Request = httptest.NewRequest("POST", "/workspaces/not-a-uuid/broadcast", nil)
-	c.Params = gin.Params{{Key: "id", Value: "not-a-uuid"}}
+// ─── Pure function ────────────────────────────────────────────────────────────
 
-	h := NewBroadcastHandler(newTestBroadcaster())
-	h.Broadcast(c)
-
-	require.Equal(t, http.StatusBadRequest, w.Code)
-	var body map[string]string
-	json.Unmarshal(w.Body.Bytes(), &body)
-	require.Contains(t, body["error"], "invalid workspace ID")
+func TestBroadcastTruncate(t *testing.T) {
+	tests := []struct {
+		name string
+		s    string
+		max  int
+		want string
+	}{
+		{"empty string", "", 10, ""},
+		{"under limit", "hello", 10, "hello"},
+		{"exactly at limit", "hello", 5, "hello"},
+		{"over limit", "hello world", 5, "hello…"},
+		{"unicode over limit", "こんにちは世界", 5, "こんにちは…"},
+		{"ascii over limit", "abcdefghij", 5, "abcde…"},
+	}
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			got := broadcastTruncate(tc.s, tc.max)
+			if got != tc.want {
+				t.Errorf("broadcastTruncate(%q, %d) = %q; want %q", tc.s, tc.max, got, tc.want)
+			}
+		})
+	}
 }
 
-func TestBroadcast_MissingMessage_Returns400(t *testing.T) {
-	h, _, w, c := setupBroadcastCtx(t, `{}`)
+// ─── Validation ────────────────────────────────────────────────────────────────
 
-	// ShouldBindJSON fails first — no DB query expected.
-	h.Broadcast(c)
-
-	require.Equal(t, http.StatusBadRequest, w.Code)
-	var body map[string]string
-	json.Unmarshal(w.Body.Bytes(), &body)
-	require.Equal(t, "message is required", body["error"])
+func TestBroadcast_InvalidWorkspaceID(t *testing.T) {
+	c, w := buildBroadcastCtx("not-a-uuid", `{"message":"hello"}`)
+	handler := NewBroadcastHandler(events.NewBroadcaster(ws.NewHub(nil)))
+	handler.Broadcast(c)
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("want 400, got %d: %s", w.Code, w.Body.String())
+	}
 }
 
-func TestBroadcast_WorkspaceNotFound_Returns404(t *testing.T) {
-	h, mock, w, c := setupBroadcastCtx(t, `{"message":"hello"}`)
+func TestBroadcast_MissingMessage(t *testing.T) {
+	mock := setupBroadcastDB(t)
+	c, w := buildBroadcastCtx(broadcastTestUUID, `{}`)
 
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(testSenderID).
-		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"})) // empty
+	handler := NewBroadcastHandler(events.NewBroadcaster(ws.NewHub(nil)))
+	handler.Broadcast(c)
 
-	h.Broadcast(c)
-
-	require.Equal(t, http.StatusNotFound, w.Code)
-	var body map[string]string
-	json.Unmarshal(w.Body.Bytes(), &body)
-	require.Equal(t, "workspace not found", body["error"])
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("want 400, got %d: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet mock expectations: %v", err)
+	}
 }
 
-func TestBroadcast_BroadcastDisabled_Returns403(t *testing.T) {
-	h, mock, w, c := setupBroadcastCtx(t, `{"message":"hello"}`)
+func TestBroadcast_MalformedJSON(t *testing.T) {
+	mock := setupBroadcastDB(t)
+	c, w := buildBroadcastCtx(broadcastTestUUID, `not json`)
 
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(testSenderID).
-		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
-			AddRow("test-ws", false))
+	handler := NewBroadcastHandler(events.NewBroadcaster(ws.NewHub(nil)))
+	handler.Broadcast(c)
 
-	h.Broadcast(c)
-
-	require.Equal(t, http.StatusForbidden, w.Code)
-	var body map[string]string
-	json.Unmarshal(w.Body.Bytes(), &body)
-	require.Equal(t, "broadcast_disabled", body["error"])
+	if w.Code != http.StatusBadRequest {
+		t.Errorf("want 400, got %d: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet mock expectations: %v", err)
+	}
 }
 
-func TestBroadcast_RecipientQueryError_Returns500(t *testing.T) {
-	h, mock, w, c := setupBroadcastCtx(t, `{"message":"hello"}`)
+// ─── Auth / Authz ─────────────────────────────────────────────────────────────
 
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(testSenderID).
-		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
-			AddRow("test-ws", true))
-	mock.ExpectQuery(`SELECT id FROM workspaces WHERE status != 'removed' AND id != \$1`).
-		WithArgs(testSenderID).
-		WillReturnError(context.DeadlineExceeded)
+func TestBroadcast_WorkspaceNotFound(t *testing.T) {
+	mock := setupBroadcastDB(t)
+	c, w := buildBroadcastCtx(broadcastTestUUID, `{"message":"hello"}`)
 
-	h.Broadcast(c)
+	// Workspace lookup returns no rows.
+	mock.ExpectQuery("SELECT name, broadcast_enabled FROM workspaces WHERE id = $1 AND status != 'removed'").
+		WithArgs(broadcastTestUUID).
+		WillReturnError(sql.ErrNoRows)
 
-	require.Equal(t, http.StatusInternalServerError, w.Code)
+	handler := NewBroadcastHandler(events.NewBroadcaster(ws.NewHub(nil)))
+	handler.Broadcast(c)
+
+	if w.Code != http.StatusNotFound {
+		t.Errorf("want 404, got %d: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet mock expectations: %v", err)
+	}
 }
 
-func TestBroadcast_Success_Returns200AndDeliveredCount(t *testing.T) {
-	h, mock, w, c := setupBroadcastCtx(t, `{"message":"hello world"}`)
+func TestBroadcast_WorkspaceLookupQueryError(t *testing.T) {
+	mock := setupBroadcastDB(t)
+	c, w := buildBroadcastCtx(broadcastTestUUID, `{"message":"hello"}`)
 
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(testSenderID).
-		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
-			AddRow("test-ws", true))
-	// Two recipients.
-	mock.ExpectQuery(`SELECT id FROM workspaces WHERE status != 'removed' AND id != \$1`).
-		WithArgs(testSenderID).
-		WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(testRecipient1).AddRow(testRecipient2))
-	// Activity log insert per recipient.
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(testRecipient1, testSenderID, "Broadcast from test-ws: hello world").
-		WillReturnResult(sqlmock.NewResult(1, 1))
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(testRecipient2, testSenderID, "Broadcast from test-ws: hello world").
-		WillReturnResult(sqlmock.NewResult(1, 1))
-	// Sender's own log.
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(testSenderID, "Broadcast sent to 2 workspace(s)").
-		WillReturnResult(sqlmock.NewResult(1, 1))
+	mock.ExpectQuery("SELECT name, broadcast_enabled FROM workspaces WHERE id = $1 AND status != 'removed'").
+		WithArgs(broadcastTestUUID).
+		WillReturnError(sql.ErrConnDone)
 
-	h.Broadcast(c)
+	handler := NewBroadcastHandler(events.NewBroadcaster(ws.NewHub(nil)))
+	handler.Broadcast(c)
 
-	require.Equal(t, http.StatusOK, w.Code)
-	var body map[string]interface{}
-	json.Unmarshal(w.Body.Bytes(), &body)
-	require.Equal(t, "sent", body["status"])
-	require.Equal(t, float64(2), body["delivered"])
+	if w.Code != http.StatusNotFound {
+		t.Errorf("want 404, got %d: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet mock expectations: %v", err)
+	}
 }
 
-func TestBroadcast_NoRecipients_ReturnsZeroDelivered(t *testing.T) {
-	h, mock, w, c := setupBroadcastCtx(t, `{"message":"hello"}`)
+func TestBroadcast_BroadcastDisabled(t *testing.T) {
+	mock := setupBroadcastDB(t)
+	c, w := buildBroadcastCtx(broadcastTestUUID, `{"message":"hello"}`)
 
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(testSenderID).
-		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
-			AddRow("solo-ws", true))
-	// No other workspaces.
-	mock.ExpectQuery(`SELECT id FROM workspaces WHERE status != 'removed' AND id != \$1`).
-		WithArgs(testSenderID).
-		WillReturnRows(sqlmock.NewRows([]string{"id"}))
-	// Sender log still fires.
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(testSenderID, "Broadcast sent to 0 workspace(s)").
-		WillReturnResult(sqlmock.NewResult(1, 1))
+	// Workspace found but broadcast_enabled=false.
+	rows := sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
+		AddRow("test-workspace", false)
+	mock.ExpectQuery("SELECT name, broadcast_enabled FROM workspaces WHERE id = $1 AND status != 'removed'").
+		WithArgs(broadcastTestUUID).
+		WillReturnRows(rows)
 
-	h.Broadcast(c)
+	handler := NewBroadcastHandler(events.NewBroadcaster(ws.NewHub(nil)))
+	handler.Broadcast(c)
 
-	require.Equal(t, http.StatusOK, w.Code)
-	var body map[string]interface{}
-	json.Unmarshal(w.Body.Bytes(), &body)
-	require.Equal(t, "sent", body["status"])
-	require.Equal(t, float64(0), body["delivered"])
+	if w.Code != http.StatusForbidden {
+		t.Errorf("want 403, got %d: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet mock expectations: %v", err)
+	}
 }
 
-func TestBroadcast_ActivityLogInsertFails_StillReturns200(t *testing.T) {
-	// Sender's own activity log is best-effort; a DB error is logged but
-	// does NOT fail the HTTP response.
-	h, mock, w, c := setupBroadcastCtx(t, `{"message":"hello"}`)
+// ─── DB error paths ───────────────────────────────────────────────────────────
 
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(testSenderID).
-		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
-			AddRow("test-ws", true))
-	mock.ExpectQuery(`SELECT id FROM workspaces WHERE status != 'removed' AND id != \$1`).
-		WithArgs(testSenderID).
-		WillReturnRows(sqlmock.NewRows([]string{"id"}))
-	// Recipient insert succeeds.
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WillReturnResult(sqlmock.NewResult(1, 1))
-	// Sender log FAILS — handler logs but still returns 200.
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WillReturnError(context.DeadlineExceeded)
+func TestBroadcast_RecipientQueryError(t *testing.T) {
+	mock := setupBroadcastDB(t)
+	c, w := buildBroadcastCtx(broadcastTestUUID, `{"message":"hello"}`)
 
-	h.Broadcast(c)
+	// Workspace lookup succeeds with broadcast_enabled=true.
+	rows := sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
+		AddRow("test-workspace", true)
+	mock.ExpectQuery("SELECT name, broadcast_enabled FROM workspaces WHERE id = $1 AND status != 'removed'").
+		WithArgs(broadcastTestUUID).
+		WillReturnRows(rows)
 
-	require.Equal(t, http.StatusOK, w.Code) // NOT 500
+	// Recipient query fails.
+	mock.ExpectQuery("SELECT id FROM workspaces WHERE status != 'removed' AND id != $1").
+		WithArgs(broadcastTestUUID).
+		WillReturnError(sql.ErrConnDone)
+
+	handler := NewBroadcastHandler(events.NewBroadcaster(ws.NewHub(nil)))
+	handler.Broadcast(c)
+
+	if w.Code != http.StatusInternalServerError {
+		t.Errorf("want 500, got %d: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet mock expectations: %v", err)
+	}
 }
 
-func TestBroadcast_RecipientInsertFails_ContinuesAndCountsOthers(t *testing.T) {
-	// A recipient-level insert failure is logged; the handler continues
-	// delivering to remaining recipients and reports the delivered count.
-	h, mock, w, c := setupBroadcastCtx(t, `{"message":"hello"}`)
+func TestBroadcast_RecipientRowsError(t *testing.T) {
+	mock := setupBroadcastDB(t)
+	c, w := buildBroadcastCtx(broadcastTestUUID, `{"message":"hello"}`)
+
+	rows := sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
+		AddRow("test-workspace", true)
+	mock.ExpectQuery("SELECT name, broadcast_enabled FROM workspaces WHERE id = $1 AND status != 'removed'").
+		WithArgs(broadcastTestUUID).
+		WillReturnRows(rows)
+
+	// Recipient query succeeds but rows.Err() fails.
+	badRows := sqlmock.NewRows([]string{"id"}).AddRow("ws-2").RowError(0, sql.ErrConnDone)
+	mock.ExpectQuery("SELECT id FROM workspaces WHERE status != 'removed' AND id != $1").
+		WithArgs(broadcastTestUUID).
+		WillReturnRows(badRows)
+
+	handler := NewBroadcastHandler(events.NewBroadcaster(ws.NewHub(nil)))
+	handler.Broadcast(c)
+
+	if w.Code != http.StatusInternalServerError {
+		t.Errorf("want 500, got %d: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet mock expectations: %v", err)
+	}
+}
+
+// ─── Success paths ───────────────────────────────────────────────────────────
+
+func TestBroadcast_Success_OneRecipient(t *testing.T) {
+	mock := setupBroadcastDB(t)
+	c, w := buildBroadcastCtx(broadcastTestUUID, `{"message":"hello world"}`)
+
+	// Workspace lookup.
+	wsRows := sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
+		AddRow("sender-workspace", true)
+	mock.ExpectQuery("SELECT name, broadcast_enabled FROM workspaces WHERE id = $1 AND status != 'removed'").
+		WithArgs(broadcastTestUUID).
+		WillReturnRows(wsRows)
+
+	// Recipient query: one recipient.
+	recipRows := sqlmock.NewRows([]string{"id"}).AddRow("ws-recipient-1")
+	mock.ExpectQuery("SELECT id FROM workspaces WHERE status != 'removed' AND id != $1").
+		WithArgs(broadcastTestUUID).
+		WillReturnRows(recipRows)
+
+	// Activity log insert for recipient.
+	mock.ExpectExec("INSERT INTO activity_logs (workspace_id, activity_type, method, source_id, summary, status) VALUES ($1, 'broadcast_receive', 'broadcast', $2, $3, 'ok')").
+		WithArgs("ws-recipient-1", broadcastTestUUID, sqlmock.AnyArg()).
+		WillReturnResult(sqlmock.NewResult(0, 1))
+
+	// Activity log insert for sender (broadcast_sent).
+	mock.ExpectExec("INSERT INTO activity_logs (workspace_id, activity_type, method, summary, status) VALUES ($1, 'broadcast_sent', 'broadcast', $2, 'ok')").
+		WithArgs(broadcastTestUUID, sqlmock.AnyArg()).
+		WillReturnResult(sqlmock.NewResult(0, 1))
+
+	handler := NewBroadcastHandler(events.NewBroadcaster(ws.NewHub(nil)))
+	handler.Broadcast(c)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("want 200, got %d: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet mock expectations: %v", err)
+	}
+}
+
+func TestBroadcast_Success_NoRecipients(t *testing.T) {
+	mock := setupBroadcastDB(t)
+	c, w := buildBroadcastCtx(broadcastTestUUID, `{"message":"hello"}`)
+
+	wsRows := sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
+		AddRow("solo-workspace", true)
+	mock.ExpectQuery("SELECT name, broadcast_enabled FROM workspaces WHERE id = $1 AND status != 'removed'").
+		WithArgs(broadcastTestUUID).
+		WillReturnRows(wsRows)
+
+	// No recipients.
+	recipRows := sqlmock.NewRows([]string{"id"})
+	mock.ExpectQuery("SELECT id FROM workspaces WHERE status != 'removed' AND id != $1").
+		WithArgs(broadcastTestUUID).
+		WillReturnRows(recipRows)
+
+	// Activity log insert for sender (broadcast_sent).
+	mock.ExpectExec("INSERT INTO activity_logs (workspace_id, activity_type, method, summary, status) VALUES ($1, 'broadcast_sent', 'broadcast', $2, 'ok')").
+		WithArgs(broadcastTestUUID, sqlmock.AnyArg()).
+		WillReturnResult(sqlmock.NewResult(0, 1))
+
+	handler := NewBroadcastHandler(events.NewBroadcaster(ws.NewHub(nil)))
+	handler.Broadcast(c)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("want 200, got %d: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet mock expectations: %v", err)
+	}
+}
+
+func TestBroadcast_Success_MultipleRecipients(t *testing.T) {
+	mock := setupBroadcastDB(t)
+	c, w := buildBroadcastCtx(broadcastTestUUID, `{"message":"hello"}`)
+
+	wsRows := sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
+		AddRow("broadcaster", true)
+	mock.ExpectQuery("SELECT name, broadcast_enabled FROM workspaces WHERE id = $1 AND status != 'removed'").
+		WithArgs(broadcastTestUUID).
+		WillReturnRows(wsRows)
+
+	// Three recipients.
+	recipRows := sqlmock.NewRows([]string{"id"}).
+		AddRow("ws-1").AddRow("ws-2").AddRow("ws-3")
+	mock.ExpectQuery("SELECT id FROM workspaces WHERE status != 'removed' AND id != $1").
+		WithArgs(broadcastTestUUID).
+		WillReturnRows(recipRows)
+
+	// Each recipient gets a broadcast_receive log.
+	for _, rid := range []string{"ws-1", "ws-2", "ws-3"} {
+		mock.ExpectExec("INSERT INTO activity_logs (workspace_id, activity_type, method, source_id, summary, status) VALUES ($1, 'broadcast_receive', 'broadcast', $2, $3, 'ok')").
+			WithArgs(rid, broadcastTestUUID, sqlmock.AnyArg()).
+			WillReturnResult(sqlmock.NewResult(0, 1))
+	}
 
-	mock.ExpectQuery(`SELECT name, broadcast_enabled FROM workspaces WHERE id = \$1 AND status != 'removed'`).
-		WithArgs(testSenderID).
-		WillReturnRows(sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
-			AddRow("test-ws", true))
-	// Two recipients.
-	mock.ExpectQuery(`SELECT id FROM workspaces WHERE status != 'removed' AND id != \$1`).
-		WithArgs(testSenderID).
-		WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(testRecipient1).AddRow(testRecipient2))
-	// testRecipient1 insert FAILS — logged, handler continues.
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(testRecipient1, testSenderID, "Broadcast from test-ws: hello").
-		WillReturnError(context.DeadlineExceeded)
-	// testRecipient2 insert succeeds.
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(testRecipient2, testSenderID, "Broadcast from test-ws: hello").
-		WillReturnResult(sqlmock.NewResult(1, 1))
 	// Sender log.
-	mock.ExpectExec(`INSERT INTO activity_logs`).
-		WithArgs(testSenderID, "Broadcast sent to 1 workspace(s)").
-		WillReturnResult(sqlmock.NewResult(1, 1))
+	mock.ExpectExec("INSERT INTO activity_logs (workspace_id, activity_type, method, summary, status) VALUES ($1, 'broadcast_sent', 'broadcast', $2, 'ok')").
+		WithArgs(broadcastTestUUID, sqlmock.AnyArg()).
+		WillReturnResult(sqlmock.NewResult(0, 1))
 
-	h.Broadcast(c)
+	handler := NewBroadcastHandler(events.NewBroadcaster(ws.NewHub(nil)))
+	handler.Broadcast(c)
 
-	require.Equal(t, http.StatusOK, w.Code)
-	var body map[string]interface{}
-	json.Unmarshal(w.Body.Bytes(), &body)
-	require.Equal(t, float64(1), body["delivered"]) // only testRecipient2 counted
+	if w.Code != http.StatusOK {
+		t.Errorf("want 200, got %d: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet mock expectations: %v", err)
+	}
 }
 
-func TestBroadcast_NewBroadcastHandler(t *testing.T) {
-	b := newTestBroadcaster()
-	h := NewBroadcastHandler(b)
-	require.NotNil(t, h)
-	require.Equal(t, b, h.broadcaster)
+// ─── Recipient insert failure (logged, continues) ─────────────────────────────
+
+func TestBroadcast_RecipientInsertError_ContinuesAndSucceeds(t *testing.T) {
+	mock := setupBroadcastDB(t)
+	c, w := buildBroadcastCtx(broadcastTestUUID, `{"message":"hello"}`)
+
+	wsRows := sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
+		AddRow("broadcaster", true)
+	mock.ExpectQuery("SELECT name, broadcast_enabled FROM workspaces WHERE id = $1 AND status != 'removed'").
+		WithArgs(broadcastTestUUID).
+		WillReturnRows(wsRows)
+
+	// Two recipients.
+	recipRows := sqlmock.NewRows([]string{"id"}).
+		AddRow("ws-1").AddRow("ws-2")
+	mock.ExpectQuery("SELECT id FROM workspaces WHERE status != 'removed' AND id != $1").
+		WithArgs(broadcastTestUUID).
+		WillReturnRows(recipRows)
+
+	// First recipient insert fails (logged, continues).
+	mock.ExpectExec("INSERT INTO activity_logs (workspace_id, activity_type, method, source_id, summary, status) VALUES ($1, 'broadcast_receive', 'broadcast', $2, $3, 'ok')").
+		WithArgs("ws-1", broadcastTestUUID, sqlmock.AnyArg()).
+		WillReturnError(sql.ErrConnDone)
+
+	// Second recipient insert succeeds.
+	mock.ExpectExec("INSERT INTO activity_logs (workspace_id, activity_type, method, source_id, summary, status) VALUES ($1, 'broadcast_receive', 'broadcast', $2, $3, 'ok')").
+		WithArgs("ws-2", broadcastTestUUID, sqlmock.AnyArg()).
+		WillReturnResult(sqlmock.NewResult(0, 1))
+
+	// Sender log.
+	mock.ExpectExec("INSERT INTO activity_logs (workspace_id, activity_type, method, summary, status) VALUES ($1, 'broadcast_sent', 'broadcast', $2, 'ok')").
+		WithArgs(broadcastTestUUID, sqlmock.AnyArg()).
+		WillReturnResult(sqlmock.NewResult(0, 1))
+
+	handler := NewBroadcastHandler(events.NewBroadcaster(ws.NewHub(nil)))
+	handler.Broadcast(c)
+
+	// Handler returns 200 even though one insert failed — it logs and continues.
+	if w.Code != http.StatusOK {
+		t.Errorf("want 200 despite insert error, got %d: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet mock expectations: %v", err)
+	}
+}
+
+// ─── Sender activity log insert failure (logged, still 200) ───────────────────
+
+func TestBroadcast_SenderLogInsertError_Still200(t *testing.T) {
+	mock := setupBroadcastDB(t)
+	c, w := buildBroadcastCtx(broadcastTestUUID, `{"message":"hello"}`)
+
+	wsRows := sqlmock.NewRows([]string{"name", "broadcast_enabled"}).
+		AddRow("broadcaster", true)
+	mock.ExpectQuery("SELECT name, broadcast_enabled FROM workspaces WHERE id = $1 AND status != 'removed'").
+		WithArgs(broadcastTestUUID).
+		WillReturnRows(wsRows)
+
+	recipRows := sqlmock.NewRows([]string{"id"}).AddRow("ws-1")
+	mock.ExpectQuery("SELECT id FROM workspaces WHERE status != 'removed' AND id != $1").
+		WithArgs(broadcastTestUUID).
+		WillReturnRows(recipRows)
+
+	mock.ExpectExec("INSERT INTO activity_logs (workspace_id, activity_type, method, source_id, summary, status) VALUES ($1, 'broadcast_receive', 'broadcast', $2, $3, 'ok')").
+		WithArgs("ws-1", broadcastTestUUID, sqlmock.AnyArg()).
+		WillReturnResult(sqlmock.NewResult(0, 1))
+
+	// Sender log fails — but handler still returns 200 (logged only).
+	mock.ExpectExec("INSERT INTO activity_logs (workspace_id, activity_type, method, summary, status) VALUES ($1, 'broadcast_sent', 'broadcast', $2, 'ok')").
+		WithArgs(broadcastTestUUID, sqlmock.AnyArg()).
+		WillReturnError(sql.ErrConnDone)
+
+	handler := NewBroadcastHandler(events.NewBroadcaster(ws.NewHub(nil)))
+	handler.Broadcast(c)
+
+	if w.Code != http.StatusOK {
+		t.Errorf("want 200 despite sender log error, got %d: %s", w.Code, w.Body.String())
+	}
+	if err := mock.ExpectationsWereMet(); err != nil {
+		t.Errorf("unmet mock expectations: %v", err)
+	}
 }