Migrates Channel.GetAllDirectChannelsForExportAfter to sync by default (#11272)

store/sqlstore/channel_store.go

@@ -2487,67 +2487,63 @@ func (s SqlChannelStore) GetChannelMembersForExport(userId string, teamId string
 	return members, nil
 }
 
-func (s SqlChannelStore) GetAllDirectChannelsForExportAfter(limit int, afterId string) store.StoreChannel {
-	return store.Do(func(result *store.StoreResult) {
-		var directChannelsForExport []*model.DirectChannelForExport
-		query := s.getQueryBuilder().
-			Select("Channels.*").
-			From("Channels").
-			Where(sq.And{
-				sq.Gt{"Channels.Id": afterId},
-				sq.Eq{"Channels.DeleteAt": int(0)},
-				sq.Eq{"Channels.Type": []string{"D", "G"}},
-			}).
-			OrderBy("Channels.Id").
-			Limit(uint64(limit))
+func (s SqlChannelStore) GetAllDirectChannelsForExportAfter(limit int, afterId string) ([]*model.DirectChannelForExport, *model.AppError) {
+	var directChannelsForExport []*model.DirectChannelForExport
+	query := s.getQueryBuilder().
+		Select("Channels.*").
+		From("Channels").
+		Where(sq.And{
+			sq.Gt{"Channels.Id": afterId},
+			sq.Eq{"Channels.DeleteAt": int(0)},
+			sq.Eq{"Channels.Type": []string{"D", "G"}},
+		}).
+		OrderBy("Channels.Id").
+		Limit(uint64(limit))
 
-		queryString, args, err := query.ToSql()
-		if err != nil {
-			result.Err = model.NewAppError("SqlChannelStore.GetAllDirectChannelsForExportAfter", "store.sql_channel.get_all_direct.app_error", nil, err.Error(), http.StatusInternalServerError)
-			return
-		}
+	queryString, args, err := query.ToSql()
+	if err != nil {
+		return nil, model.NewAppError("SqlChannelStore.GetAllDirectChannelsForExportAfter", "store.sql_channel.get_all_direct.app_error", nil, err.Error(), http.StatusInternalServerError)
+	}
 
-		if _, err = s.GetReplica().Select(&directChannelsForExport, queryString, args...); err != nil {
-			result.Err = model.NewAppError("SqlChannelStore.GetAllDirectChannelsForExportAfter", "store.sql_channel.get_all_direct.app_error", nil, err.Error(), http.StatusInternalServerError)
-			return
-		}
+	if _, err = s.GetReplica().Select(&directChannelsForExport, queryString, args...); err != nil {
+		return nil, model.NewAppError("SqlChannelStore.GetAllDirectChannelsForExportAfter", "store.sql_channel.get_all_direct.app_error", nil, err.Error(), http.StatusInternalServerError)
+	}
 
-		var channelIds []string
-		for _, channel := range directChannelsForExport {
-			channelIds = append(channelIds, channel.Id)
-		}
-		query = s.getQueryBuilder().
-			Select("u.Username as Username, ChannelId, UserId, cm.Roles as Roles, LastViewedAt, MsgCount, MentionCount, cm.NotifyProps as NotifyProps, LastUpdateAt, SchemeUser, SchemeAdmin, (SchemeGuest IS NOT NULL AND SchemeGuest) as SchemeGuest").
-			From("ChannelMembers cm").
-			Join("Users u ON ( u.Id = cm.UserId )").
-			Where(sq.And{
-				sq.Eq{"cm.ChannelId": channelIds},
-				sq.Eq{"u.DeleteAt": int(0)},
-			})
+	var channelIds []string
+	for _, channel := range directChannelsForExport {
+		channelIds = append(channelIds, channel.Id)
+	}
+	query = s.getQueryBuilder().
+		Select("u.Username as Username, ChannelId, UserId, cm.Roles as Roles, LastViewedAt, MsgCount, MentionCount, cm.NotifyProps as NotifyProps, LastUpdateAt, SchemeUser, SchemeAdmin, (SchemeGuest IS NOT NULL AND SchemeGuest) as SchemeGuest").
+		From("ChannelMembers cm").
+		Join("Users u ON ( u.Id = cm.UserId )").
+		Where(sq.And{
+			sq.Eq{"cm.ChannelId": channelIds},
+			sq.Eq{"u.DeleteAt": int(0)},
+		})
 
-		queryString, args, err = query.ToSql()
-		if err != nil {
-			result.Err = model.NewAppError("SqlChannelStore.GetAllDirectChannelsForExportAfter", "store.sql_channel.get_all_direct.app_error", nil, err.Error(), http.StatusInternalServerError)
-			return
-		}
+	queryString, args, err = query.ToSql()
+	if err != nil {
+		return nil, model.NewAppError("SqlChannelStore.GetAllDirectChannelsForExportAfter", "store.sql_channel.get_all_direct.app_error", nil, err.Error(), http.StatusInternalServerError)
+	}
 
-		var channelMembers []*model.ChannelMemberForExport
-		if _, err := s.GetReplica().Select(&channelMembers, queryString, args...); err != nil {
-			result.Err = model.NewAppError("SqlChannelStore.GetAllDirectChannelsForExportAfter", "store.sql_channel.get_all_direct.app_error", nil, err.Error(), http.StatusInternalServerError)
-		}
+	var channelMembers []*model.ChannelMemberForExport
+	if _, err := s.GetReplica().Select(&channelMembers, queryString, args...); err != nil {
+		return nil, model.NewAppError("SqlChannelStore.GetAllDirectChannelsForExportAfter", "store.sql_channel.get_all_direct.app_error", nil, err.Error(), http.StatusInternalServerError)
+	}
 
-		// Populate each channel with its members
-		dmChannelsMap := make(map[string]*model.DirectChannelForExport)
-		for _, channel := range directChannelsForExport {
-			channel.Members = &[]string{}
-			dmChannelsMap[channel.Id] = channel
-		}
-		for _, member := range channelMembers {
-			members := dmChannelsMap[member.ChannelId].Members
-			*members = append(*members, member.Username)
-		}
-		result.Data = directChannelsForExport
-	})
+	// Populate each channel with its members
+	dmChannelsMap := make(map[string]*model.DirectChannelForExport)
+	for _, channel := range directChannelsForExport {
+		channel.Members = &[]string{}
+		dmChannelsMap[channel.Id] = channel
+	}
+	for _, member := range channelMembers {
+		members := dmChannelsMap[member.ChannelId].Members
+		*members = append(*members, member.Username)
+	}
+
+	return directChannelsForExport, nil
 }
 
 func (s SqlChannelStore) GetChannelsBatchForIndexing(startTime, endTime int64, limit int) ([]*model.Channel, *model.AppError) {