fix up code after rebase

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

@@ -39,6 +39,7 @@ import (
 
 var _ backupHandler[models.Channelable, models.ChatMessageable] = &mockBackupHandler{}
 
+//nolint:unused
 type mockBackupHandler struct {
 	channels      []models.Channelable
 	messageIDs    []string
@@ -50,6 +51,7 @@ type mockBackupHandler struct {
 	doNotInclude  bool
 }
 
+//nolint:unused
 func (bh mockBackupHandler) augmentItemInfo(
 	*details.GroupsInfo,
 	models.Channelable,
@@ -123,6 +125,7 @@ func (bh mockBackupHandler) canonicalPath(
 			false)
 }
 
+//nolint:unused
 func (bh mockBackupHandler) getItem(
 	_ context.Context,
 	_ string,

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

@@ -95,6 +95,7 @@ func (bh channelsBackupHandler) PathPrefix(tenantID string) (path.Path, error) {
 		false)
 }
 
+//nolint:unused
 func (bh channelsBackupHandler) getItem(
 	ctx context.Context,
 	groupID string,
@@ -104,6 +105,7 @@ func (bh channelsBackupHandler) getItem(
 	return bh.ac.GetChannelMessage(ctx, groupID, containerIDs[0], messageID)
 }
 
+//nolint:unused
 func (bh channelsBackupHandler) augmentItemInfo(
 	dgi *details.GroupsInfo,
 	c models.Channelable,

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

@@ -144,6 +144,7 @@ type getAndAugmentChannelMessage struct {
 	Err error
 }
 
+//nolint:unused
 func (m getAndAugmentChannelMessage) getItem(
 	_ context.Context,
 	_ string,
@@ -156,6 +157,7 @@ func (m getAndAugmentChannelMessage) getItem(
 	return msg, &details.GroupsInfo{}, m.Err
 }
 
+//nolint:unused
 func (getAndAugmentChannelMessage) augmentItemInfo(*details.GroupsInfo, models.Channelable) {
 	// no-op
 }

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

@@ -113,6 +113,7 @@ func (bh conversationsBackupHandler) PathPrefix(tenantID string) (path.Path, err
 		false)
 }
 
+//nolint:unused
 func (bh conversationsBackupHandler) getItem(
 	ctx context.Context,
 	groupID string,
@@ -128,6 +129,7 @@ func (bh conversationsBackupHandler) getItem(
 		api.CallConfig{})
 }
 
+//nolint:unused
 func (bh conversationsBackupHandler) augmentItemInfo(
 	dgi *details.GroupsInfo,
 	c models.Conversationable,

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

@@ -25,6 +25,7 @@ type backupHandler[C graph.GetIDer, I groupsItemer] interface {
 	getItemer[I]
 	getContainerser[C]
 	getContainerItemIDser
+	getItemAndAugmentInfoer[C, I]
 	includeContainerer[C]
 	canonicalPather
 	canMakeDeltaQuerieser