Migrate Channel.GetMemberForPost to Sync by default (#11244)

* Migrate Channel.GetMemberForPost to Sync by default

* fix indentation

app/authorization.go

@@ -66,9 +66,7 @@ func (a *App) SessionHasPermissionToChannel(session model.Session, channelId str
 }
 
 func (a *App) SessionHasPermissionToChannelByPost(session model.Session, postId string, permission *model.Permission) bool {
-	var channelMember *model.ChannelMember
+	if channelMember, err := a.Srv.Store.Channel().GetMemberForPost(postId, session.UserId); err == nil {
-	if result := <-a.Srv.Store.Channel().GetMemberForPost(postId, session.UserId); result.Err == nil {
-		channelMember = result.Data.(*model.ChannelMember)
 
 		if a.RolesGrantPermission(channelMember.GetRoles(), permission.Id) {
 			return true
@@ -165,10 +163,7 @@ func (a *App) HasPermissionToChannel(askingUserId string, channelId string, perm
 }
 
 func (a *App) HasPermissionToChannelByPost(askingUserId string, postId string, permission *model.Permission) bool {
-	var channelMember *model.ChannelMember
+	if channelMember, err := a.Srv.Store.Channel().GetMemberForPost(postId, askingUserId); err == nil {
-	if result := <-a.Srv.Store.Channel().GetMemberForPost(postId, askingUserId); result.Err == nil {
-		channelMember = result.Data.(*model.ChannelMember)
-
 		if a.RolesGrantPermission(channelMember.GetRoles(), permission.Id) {
 			return true
 		}

store/sqlstore/channel_store.go

@@ -1464,11 +1464,9 @@ func (s SqlChannelStore) IsUserInChannelUseCache(userId string, channelId string
 	return false
 }
 
-func (s SqlChannelStore) GetMemberForPost(postId string, userId string) store.StoreChannel {
+func (s SqlChannelStore) GetMemberForPost(postId string, userId string) (*model.ChannelMember, *model.AppError) {
-	return store.Do(func(result *store.StoreResult) {
 	var dbMember channelMemberWithSchemeRoles
-		if err := s.GetReplica().SelectOne(&dbMember,
+	query := `
-			`
 		SELECT
 			ChannelMembers.*,
 			TeamScheme.DefaultChannelGuestRole TeamSchemeDefaultGuestRole,
@@ -1491,12 +1489,12 @@ func (s SqlChannelStore) GetMemberForPost(postId string, userId string) store.St
 			Schemes TeamScheme ON Teams.SchemeId = TeamScheme.Id
 		WHERE
 			ChannelMembers.UserId = :UserId
-				AND Posts.Id = :PostId`, map[string]interface{}{"UserId": userId, "PostId": postId}); err != nil {
+		AND 
-			result.Err = model.NewAppError("SqlChannelStore.GetMemberForPost", "store.sql_channel.get_member_for_post.app_error", nil, "postId="+postId+", err="+err.Error(), http.StatusInternalServerError)
+			Posts.Id = :PostId`
-			return
+	if err := s.GetReplica().SelectOne(&dbMember, query, map[string]interface{}{"UserId": userId, "PostId": postId}); err != nil {
+		return nil, model.NewAppError("SqlChannelStore.GetMemberForPost", "store.sql_channel.get_member_for_post.app_error", nil, "postId="+postId+", err="+err.Error(), http.StatusInternalServerError)
 	}
-		result.Data = dbMember.ToModel()
+	return dbMember.ToModel(), nil
-	})
 }
 
 func (s SqlChannelStore) GetAllChannelMembersForUser(userId string, allowFromCache bool, includeDeleted bool) store.StoreChannel {

store/store.go

@@ -167,7 +167,7 @@ type ChannelStore interface {
 	IsUserInChannelUseCache(userId string, channelId string) bool
 	GetAllChannelMembersNotifyPropsForChannel(channelId string, allowFromCache bool) (map[string]model.StringMap, *model.AppError)
 	InvalidateCacheForChannelMembersNotifyProps(channelId string)
-	GetMemberForPost(postId string, userId string) StoreChannel
+	GetMemberForPost(postId string, userId string) (*model.ChannelMember, *model.AppError)
 	InvalidateMemberCount(channelId string)
 	GetMemberCountFromCache(channelId string) int64
 	GetMemberCount(channelId string, allowFromCache bool) StoreChannel

store/storetest/channel_store.go

@@ -1865,13 +1865,13 @@ func testChannelStoreGetMemberForPost(t *testing.T, ss store.Store) {
 	})
 	require.Nil(t, err)
 
-	if r1 := <-ss.Channel().GetMemberForPost(p1.Id, m1.UserId); r1.Err != nil {
+	if r1, err := ss.Channel().GetMemberForPost(p1.Id, m1.UserId); err != nil {
-		t.Fatal(r1.Err)
+		t.Fatal(err)
-	} else if r1.Data.(*model.ChannelMember).ToJson() != m1.ToJson() {
+	} else if r1.ToJson() != m1.ToJson() {
 		t.Fatal("invalid returned channel member")
 	}
 
-	if r2 := <-ss.Channel().GetMemberForPost(p1.Id, model.NewId()); r2.Err == nil {
+	if _, err := ss.Channel().GetMemberForPost(p1.Id, model.NewId()); err == nil {
 		t.Fatal("shouldn't have returned a member")
 	}
 }

store/storetest/mocks/ChannelStore.go

@@ -705,19 +705,28 @@ func (_m *ChannelStore) GetMemberCountFromCache(channelId string) int64 {
 }
 
 // GetMemberForPost provides a mock function with given fields: postId, userId
-func (_m *ChannelStore) GetMemberForPost(postId string, userId string) store.StoreChannel {
+func (_m *ChannelStore) GetMemberForPost(postId string, userId string) (*model.ChannelMember, *model.AppError) {
 	ret := _m.Called(postId, userId)
 
-	var r0 store.StoreChannel
+	var r0 *model.ChannelMember
-	if rf, ok := ret.Get(0).(func(string, string) store.StoreChannel); ok {
+	if rf, ok := ret.Get(0).(func(string, string) *model.ChannelMember); ok {
 		r0 = rf(postId, userId)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(store.StoreChannel)
+			r0 = ret.Get(0).(*model.ChannelMember)
 		}
 	}
 
-	return r0
+	var r1 *model.AppError
+	if rf, ok := ret.Get(1).(func(string, string) *model.AppError); ok {
+		r1 = rf(postId, userId)
+	} else {
+		if ret.Get(1) != nil {
+			r1 = ret.Get(1).(*model.AppError)
+		}
+	}
+
+	return r0, r1
 }
 
 // GetMembers provides a mock function with given fields: channelId, offset, limit