From f21ef8ccb5e697c2ba8e5abb6977da8ed84e3003 Mon Sep 17 00:00:00 2001
From: ryanfkeepers <ryanfkeepers@gmail.com>
Date: Fri, 8 Dec 2023 10:43:30 -0700
Subject: [PATCH] fix up code after rebase

---
 src/internal/m365/collection/groups/backup_test.go          | 3 +++
 src/internal/m365/collection/groups/channel_handler.go      | 2 ++
 src/internal/m365/collection/groups/collection_test.go      | 2 ++
 src/internal/m365/collection/groups/conversation_handler.go | 2 ++
 src/internal/m365/collection/groups/handlers.go             | 1 +
 5 files changed, 10 insertions(+)

diff --git a/src/internal/m365/collection/groups/backup_test.go b/src/internal/m365/collection/groups/backup_test.go
index b71d3a9e9..d4fadd91a 100644
--- a/src/internal/m365/collection/groups/backup_test.go
+++ b/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,
diff --git a/src/internal/m365/collection/groups/channel_handler.go b/src/internal/m365/collection/groups/channel_handler.go
index 2e14eb651..804263081 100644
--- a/src/internal/m365/collection/groups/channel_handler.go
+++ b/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,
diff --git a/src/internal/m365/collection/groups/collection_test.go b/src/internal/m365/collection/groups/collection_test.go
index f4ece9bd5..34d2f2751 100644
--- a/src/internal/m365/collection/groups/collection_test.go
+++ b/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
 }
diff --git a/src/internal/m365/collection/groups/conversation_handler.go b/src/internal/m365/collection/groups/conversation_handler.go
index b7fd53760..115a22f12 100644
--- a/src/internal/m365/collection/groups/conversation_handler.go
+++ b/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,
diff --git a/src/internal/m365/collection/groups/handlers.go b/src/internal/m365/collection/groups/handlers.go
index 3673c2736..dfb224d56 100644
--- a/src/internal/m365/collection/groups/handlers.go
+++ b/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