Revert "MM-55295: Improve DB performance of some APIs (#25318)" (#25852)

This reverts commit ec88ab4ee9.

server/channels/store/storetest/channel_store.go

@@ -246,10 +246,6 @@ func testChannelStoreSaveDirectChannel(t *testing.T, rctx request.CTX, ss store.
 	require.NoError(t, nErr)
 	require.Len(t, members, 2, "should have saved 2 members")
 
-	userIDs, nErr := ss.Channel().GetAllChannelMemberIdsByChannelId(o1.Id)
-	require.NoError(t, nErr)
-	require.ElementsMatch(t, []string{u1.Id, u2.Id}, userIDs)
-
 	_, nErr = ss.Channel().SaveDirectChannel(rctx, &o1, &m1, &m2)
 	require.Error(t, nErr, "shouldn't be a able to update from save")
 
@@ -286,10 +282,6 @@ func testChannelStoreSaveDirectChannel(t *testing.T, rctx request.CTX, ss store.
 	require.NoError(t, nErr)
 	require.Len(t, members, 1, "should have saved just 1 member")
 
-	userIDs, nErr = ss.Channel().GetAllChannelMemberIdsByChannelId(o1.Id)
-	require.NoError(t, nErr)
-	require.ElementsMatch(t, []string{u1.Id}, userIDs)
-
 	// Manually truncate Channels table until testlib can handle cleanups
 	s.GetMasterX().Exec("TRUNCATE Channels")
 }
@@ -7485,10 +7477,6 @@ func testChannelStoreRemoveAllDeactivatedMembers(t *testing.T, rctx request.CTX,
 	assert.NoError(t, err)
 	assert.Len(t, d1, 3)
 
-	userIDs, nErr := ss.Channel().GetAllChannelMemberIdsByChannelId(c1.Id)
-	require.NoError(t, nErr)
-	require.ElementsMatch(t, []string{u1.Id, u2.Id, u3.Id}, userIDs)
-
 	// Deactivate users 1 & 2.
 	u1.DeleteAt = model.GetMillis()
 	u2.DeleteAt = model.GetMillis()
@@ -7506,10 +7494,6 @@ func testChannelStoreRemoveAllDeactivatedMembers(t *testing.T, rctx request.CTX,
 	assert.Len(t, d2, 1)
 	assert.Equal(t, u3.Id, d2[0].UserId)
 
-	userIDs, nErr = ss.Channel().GetAllChannelMemberIdsByChannelId(c1.Id)
-	require.NoError(t, nErr)
-	require.ElementsMatch(t, []string{u3.Id}, userIDs)
-
 	// Manually truncate Channels table until testlib can handle cleanups
 	s.GetMasterX().Exec("TRUNCATE Channels")
 }

server/channels/store/storetest/mocks/ChannelStore.go

@@ -432,8 +432,8 @@ func (_m *ChannelStore) GetAll(teamID string) ([]*model.Channel, error) {
 	return r0, r1
 }
 
-// GetAllChannelMemberIdsByChannelId provides a mock function with given fields: id
-func (_m *ChannelStore) GetAllChannelMemberIdsByChannelId(id string) ([]string, error) {
+// GetAllChannelMembersById provides a mock function with given fields: id
+func (_m *ChannelStore) GetAllChannelMembersById(id string) ([]string, error) {
 	ret := _m.Called(id)
 
 	var r0 []string
@@ -1314,32 +1314,6 @@ func (_m *ChannelStore) GetMemberForPost(postID string, userID string) (*model.C
 	return r0, r1
 }
 
-// GetMemberOnly provides a mock function with given fields: ctx, channelID, userID
-func (_m *ChannelStore) GetMemberOnly(ctx context.Context, channelID string, userID string) (*model.ChannelMember, error) {
-	ret := _m.Called(ctx, channelID, userID)
-
-	var r0 *model.ChannelMember
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, string, string) (*model.ChannelMember, error)); ok {
-		return rf(ctx, channelID, userID)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, string, string) *model.ChannelMember); ok {
-		r0 = rf(ctx, channelID, userID)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*model.ChannelMember)
-		}
-	}
-
-	if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok {
-		r1 = rf(ctx, channelID, userID)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 // GetMembers provides a mock function with given fields: channelID, offset, limit
 func (_m *ChannelStore) GetMembers(channelID string, offset int, limit int) (model.ChannelMembers, error) {
 	ret := _m.Called(channelID, offset, limit)