refactor(thread-unread): project room type directly; add roomclient + multi-site tests (CodeRabbit)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BocBvJn2N9YYMmciA5EWJX

Author: claude

room-service/store_mongo.go

@@ -1777,12 +1777,24 @@ func (s *MongoStore) GetThreadRoomInfos(ctx context.Context, threadRoomIDs []str
 
 	typeByRoom := make(map[string]model.RoomType, len(roomIDs))
 	if len(roomIDs) > 0 {
-		rooms, err := s.ListRoomsByIDs(ctx, roomIDs)
+		roomCursor, err := s.rooms.Find(ctx,
+			bson.M{"_id": bson.M{"$in": roomIDs}},
+			options.Find().SetProjection(bson.M{"_id": 1, "type": 1}),
+		)
 		if err != nil {
-			return nil, fmt.Errorf("list rooms by ids: %w", err)
+			return nil, fmt.Errorf("list room types: %w", err)
 		}
-		for i := range rooms {
-			typeByRoom[rooms[i].ID] = rooms[i].Type
+		defer roomCursor.Close(ctx)
+
+		var roomTypes []struct {
+			ID   string         `bson:"_id"`
+			Type model.RoomType `bson:"type"`
+		}
+		if err := roomCursor.All(ctx, &roomTypes); err != nil {
+			return nil, fmt.Errorf("list room types: %w", err)
+		}
+		for i := range roomTypes {
+			typeByRoom[roomTypes[i].ID] = roomTypes[i].Type
 		}
 	}
 

user-service/roomclient/client_integration_test.go

@@ -155,6 +155,36 @@ func TestGetThreadRoomInfoBatch_Integration(t *testing.T) {
 		require.True(t, errors.As(err, &e))
 		assert.Equal(t, errcode.CodeBadRequest, e.Code)
 	})
+
+	t.Run("no responder — returns error wrapping thread-room-info rpc", func(t *testing.T) {
+		nc := dial(t)
+		// Intentionally no subscriber: nc.Request must fail with "no responders".
+
+		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+		defer cancel()
+
+		_, err := New(nc, "site-a").GetThreadRoomInfoBatch(ctx, "site-a", []string{"tr1"})
+		require.Error(t, err)
+		assert.Contains(t, err.Error(), "thread-room-info rpc")
+	})
+
+	t.Run("cross-site siteID routing — uses siteID param not c.siteID", func(t *testing.T) {
+		nc := dial(t)
+
+		// Responder on "site-b" subject proves the method routes on siteID param, not c.siteID.
+		sub, err := nc.Subscribe(subject.ThreadRoomInfoBatch("site-b"), func(m otelnats.Msg) {
+			out, _ := json.Marshal(model.ThreadRoomInfoBatchResponse{
+				Threads: []model.ThreadRoomInfo{{ThreadRoomID: "tr2", Found: true, LastMsgAt: 99, RoomType: model.RoomTypeChannel}},
+			})
+			_ = m.Msg.Respond(out)
+		})
+		require.NoError(t, err)
+		t.Cleanup(func() { _ = sub.Unsubscribe() })
+
+		got, err := New(nc, "site-a").GetThreadRoomInfoBatch(context.Background(), "site-b", []string{"tr2"})
+		require.NoError(t, err)
+		require.Len(t, got, 1)
+	})
 }
 
 func TestCreateDMRoom_Integration(t *testing.T) {

user-service/service/threadunread_test.go

@@ -65,6 +65,29 @@ func TestGetThreadUnread_SiteFailureDegrades(t *testing.T) {
 	assert.Equal(t, []string{"site-b"}, resp.UnavailableSites)
 }
 
+func TestGetThreadUnread_MultiSiteMixedSuccessAndFailure(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	ts := mocks.NewMockThreadSubscriptionRepository(ctrl)
+	rc := mocks.NewMockRoomClient(ctrl)
+
+	ts.EXPECT().ListByAccount(gomock.Any(), "alice").Return([]model.ThreadSubRef{
+		{ThreadRoomID: "trA", SiteID: "site-a", LastSeenAt: ptrTime(100)},
+		{ThreadRoomID: "trC", SiteID: "site-c", LastSeenAt: nil},
+	}, nil)
+	rc.EXPECT().GetThreadRoomInfoBatch(gomock.Any(), "site-a", []string{"trA"}).
+		Return([]model.ThreadRoomInfo{{ThreadRoomID: "trA", Found: true, LastMsgAt: 200, RoomType: model.RoomTypeChannel}}, nil)
+	rc.EXPECT().GetThreadRoomInfoBatch(gomock.Any(), "site-c", []string{"trC"}).
+		Return(nil, errors.New("site-c unreachable"))
+
+	svc := newThreadUnreadService(t, ts, rc)
+	resp, err := svc.GetThreadUnread(ctx("alice", "site-a"), model.ThreadUnreadRequest{})
+	require.NoError(t, err)
+	assert.True(t, resp.Unread)
+	require.NotNil(t, resp.LastMessageAt)
+	assert.Equal(t, int64(200), *resp.LastMessageAt)
+	assert.Equal(t, []string{"site-c"}, resp.UnavailableSites)
+}
+
 func TestGetThreadUnread_NoSubs(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	ts := mocks.NewMockThreadSubscriptionRepository(ctrl)