remove fields from other layers

src/internal/m365/collection/groups/backup.go

@@ -63,7 +63,7 @@ func CreateCollections(
 	// chanPager := handler.NewChannelsPager(qp.ProtectedResource.ID())
 
 	//  enumerating channels
-	pager := handler.NewChannelsPager(qp.ProtectedResource.ID(), []string{})
+	pager := handler.NewChannelsPager(qp.ProtectedResource.ID())
 
 	// Loop through all pages returned by Graph API.
 	for {
@@ -179,13 +179,11 @@ func populateCollections(
 		// }
 
 		// ictx = clues.Add(ictx, "previous_path", prevPath)
-		// TODO: Neha check this
-		var fields []string
 		// TODO: the handler should provide this implementation.
 		// TODO: if we doing this messages are items for us.
 		items, err := collectItems(
 			ctx,
-			bh.NewMessagePager(qp.ProtectedResource.ID(), ptr.Val(c.GetId()), fields))
+			bh.NewMessagePager(qp.ProtectedResource.ID(), ptr.Val(c.GetId())))
 		if err != nil {
 			el.AddRecoverable(ctx, clues.Stack(err))
 			continue

src/internal/m365/collection/groups/groups_handler.go

@@ -3,10 +3,11 @@ package groups
 import (
 	"context"
 
-	"github.com/alcionai/corso/src/pkg/selectors"
-	"github.com/alcionai/corso/src/pkg/services/m365/api"
 	"github.com/microsoft/kiota-abstractions-go/serialization"
 	"github.com/microsoftgraph/msgraph-sdk-go/models"
+
+	"github.com/alcionai/corso/src/pkg/selectors"
+	"github.com/alcionai/corso/src/pkg/services/m365/api"
 )
 
 var _ BackupHandler = &groupBackupHandler{}
@@ -14,40 +15,40 @@ var _ BackupHandler = &groupBackupHandler{}
 type groupBackupHandler struct {
 	ac      api.Channels
 	groupID string
-	scope   selectors.GroupsScope
 }
 
 func NewGroupBackupHandler(groupID string, ac api.Channels, scope selectors.GroupsScope) groupBackupHandler {
 	return groupBackupHandler{
 		ac:      ac,
 		groupID: groupID,
-		scope:   scope,
 	}
 }
 
-func (gHandler groupBackupHandler) GetChannelByID(ctx context.Context, teamID, channelID string) (models.Channelable, error) {
+func (gHandler groupBackupHandler) GetChannelByID(
+	ctx context.Context,
+	teamID, channelID string,
+) (models.Channelable, error) {
 	return gHandler.ac.Client.Channels().GetChannel(ctx, teamID, channelID)
 }
 
 func (gHandler groupBackupHandler) NewChannelsPager(
 	teamID string,
-	fields []string,
 ) api.ChannelDeltaEnumerator {
-	return gHandler.ac.NewChannelPager(teamID, fields)
+	return gHandler.ac.NewChannelPager(teamID)
 }
 
 func (gHandler groupBackupHandler) GetMessageByID(
 	ctx context.Context,
 	teamID, channelID, itemID string,
 ) (models.ChatMessageable, error) {
-	return gHandler.ac.GetMessageByID(ctx, teamID, channelID, itemID)
+	chatMessage, _, err := gHandler.ac.GetMessage(ctx, teamID, channelID, itemID)
+	return chatMessage, err
 }
 
 func (gHandler groupBackupHandler) NewMessagePager(
 	teamID, channelID string,
-	fields []string,
 ) api.ChannelMessageDeltaEnumerator {
-	return gHandler.ac.NewMessagePager(teamID, channelID, fields)
+	return gHandler.ac.NewMessagePager(teamID, channelID)
 }
 
 func (gHandler groupBackupHandler) GetMessageReplies(

src/internal/m365/collection/groups/handlers.go

@@ -16,7 +16,6 @@ type BackupHandler interface {
 	) (models.Channelable, error)
 	NewChannelsPager(
 		teamID string,
-		fields []string,
 	) api.ChannelDeltaEnumerator
 
 	GetMessageByID(
@@ -25,7 +24,6 @@ type BackupHandler interface {
 	) (models.ChatMessageable, error)
 	NewMessagePager(
 		teamID, channelID string,
-		fields []string,
 	) api.ChannelMessageDeltaEnumerator
 
 	GetMessageReplies(

src/pkg/services/m365/api/channels.go

@@ -107,7 +107,7 @@ func (c Channels) GetChannelByName(
 func (c Channels) GetMessage(
 	ctx context.Context,
 	teamID, channelID, itemID string,
-) (serialization.Parsable, *details.GroupsInfo, error) {
+) (models.ChatMessageable, *details.GroupsInfo, error) {
 	var size int64
 
 	message, err := c.Stable.
@@ -126,27 +126,6 @@ func (c Channels) GetMessage(
 	return message, ChannelMessageInfo(message, size), nil
 }
 
-// GetMessage retrieves a ChannelMessage item.
-func (c Channels) GetMessageByID(
-	ctx context.Context,
-	teamID, channelID, itemID string,
-) (models.ChatMessageable, error) {
-	message, err := c.Stable.
-		Client().
-		Teams().
-		ByTeamId(teamID).
-		Channels().
-		ByChannelId(channelID).
-		Messages().
-		ByChatMessageId(itemID).
-		Get(ctx, nil)
-	if err != nil {
-		return nil, graph.Stack(ctx, err)
-	}
-
-	return message, nil
-}
-
 // ---------------------------------------------------------------------------
 // replies
 // ---------------------------------------------------------------------------

src/pkg/services/m365/api/channels_pager.go

@@ -32,17 +32,10 @@ type MessagePageCtrl struct {
 func (c Channels) NewMessagePager(
 	teamID,
 	channelID string,
-	fields []string,
 ) *MessagePageCtrl {
-	requestConfig := &teams.ItemChannelsItemMessagesDeltaRequestBuilderGetRequestConfiguration{
-		QueryParameters: &teams.ItemChannelsItemMessagesDeltaRequestBuilderGetQueryParameters{
-			Select: fields,
-		},
-	}
-
 	res := &MessagePageCtrl{
 		gs:      c.Stable,
-		options: requestConfig,
+		options: nil,
 		builder: c.Stable.
 			Client().
 			Teams().
@@ -100,17 +93,10 @@ type channelPageCtrl struct {
 
 func (c Channels) NewChannelPager(
 	teamID string,
-	fields []string,
 ) *channelPageCtrl {
-	requestConfig := &teams.ItemChannelsRequestBuilderGetRequestConfiguration{
-		QueryParameters: &teams.ItemChannelsRequestBuilderGetQueryParameters{
-			Select: fields,
-		},
-	}
-
 	res := &channelPageCtrl{
 		gs:      c.Stable,
-		options: requestConfig,
+		options: nil,
 		builder: c.Stable.
 			Client().
 			Teams().