diff --git a/src/internal/m365/controller.go b/src/internal/m365/controller.go index 4057b2424..536f24f78 100644 --- a/src/internal/m365/controller.go +++ b/src/internal/m365/controller.go @@ -112,7 +112,7 @@ func (ctrl *Controller) setResourceHandler( var rh *resourceGetter switch serviceInOperation { - case path.ExchangeService, path.OneDriveService: + case path.ExchangeService, path.OneDriveService, path.TeamsChatsService: rh = &resourceGetter{ enum: resource.Users, getter: ctrl.AC.Users(), diff --git a/src/internal/m365/service/teamschats/enabled.go b/src/internal/m365/service/teamschats/enabled.go index c97417bda..a4613feab 100644 --- a/src/internal/m365/service/teamschats/enabled.go +++ b/src/internal/m365/service/teamschats/enabled.go @@ -3,7 +3,6 @@ package teamschats import ( "context" - "github.com/alcionai/clues" "github.com/microsoftgraph/msgraph-sdk-go/models" "github.com/alcionai/corso/src/pkg/services/m365/api" @@ -14,5 +13,6 @@ func IsServiceEnabled( gbi api.GetByIDer[models.Userable], resource string, ) (bool, error) { - return true, clues.New("needs implementation") + // TODO(rkeepers): investgate service enablement checks + return true, nil } diff --git a/src/internal/m365/service/teamschats/enabled_test.go b/src/internal/m365/service/teamschats/enabled_test.go index 820591e3a..6c79549aa 100644 --- a/src/internal/m365/service/teamschats/enabled_test.go +++ b/src/internal/m365/service/teamschats/enabled_test.go @@ -49,7 +49,7 @@ func (suite *EnabledUnitSuite) TestIsServiceEnabled() { return mockGU{} }, expect: assert.True, - expectErr: assert.Error, + expectErr: assert.NoError, }, } for _, test := range table { diff --git a/src/pkg/path/service_category_test.go b/src/pkg/path/service_category_test.go index 0a9d64b92..428fd8ca6 100644 --- a/src/pkg/path/service_category_test.go +++ b/src/pkg/path/service_category_test.go @@ -163,9 +163,10 @@ func (suite *ServiceCategoryUnitSuite) TestToServiceType() { } for _, test := range table { suite.Run(test.name, func() { - t := suite.T() - - assert.Equal(t, test.expected, ToServiceType(test.service)) + assert.Equal( + suite.T(), + test.expected.String(), + ToServiceType(test.service).String()) }) } } @@ -189,9 +190,10 @@ func (suite *ServiceCategoryUnitSuite) TestToCategoryType() { } for _, test := range table { suite.Run(test.name, func() { - t := suite.T() - - assert.Equal(t, test.expected, ToCategoryType(test.category)) + assert.Equal( + suite.T(), + test.expected.String(), + ToCategoryType(test.category).String()) }) } } diff --git a/src/pkg/path/service_type.go b/src/pkg/path/service_type.go index 098fb4ffd..5541e670d 100644 --- a/src/pkg/path/service_type.go +++ b/src/pkg/path/service_type.go @@ -36,16 +36,16 @@ const ( ) var strToSvc = map[string]ServiceType{ - ExchangeService.String(): ExchangeService, - ExchangeMetadataService.String(): ExchangeMetadataService, - OneDriveService.String(): OneDriveService, - OneDriveMetadataService.String(): OneDriveMetadataService, - SharePointService.String(): SharePointService, - SharePointMetadataService.String(): SharePointMetadataService, - GroupsService.String(): GroupsService, - GroupsMetadataService.String(): GroupsMetadataService, - TeamsChatsService.String(): TeamsChatsService, - TeamsChatsMetadataService.String(): TeamsChatsMetadataService, + strings.ToLower(ExchangeService.String()): ExchangeService, + strings.ToLower(ExchangeMetadataService.String()): ExchangeMetadataService, + strings.ToLower(OneDriveService.String()): OneDriveService, + strings.ToLower(OneDriveMetadataService.String()): OneDriveMetadataService, + strings.ToLower(SharePointService.String()): SharePointService, + strings.ToLower(SharePointMetadataService.String()): SharePointMetadataService, + strings.ToLower(GroupsService.String()): GroupsService, + strings.ToLower(GroupsMetadataService.String()): GroupsMetadataService, + strings.ToLower(TeamsChatsService.String()): TeamsChatsService, + strings.ToLower(TeamsChatsMetadataService.String()): TeamsChatsMetadataService, } func ToServiceType(service string) ServiceType { diff --git a/src/pkg/selectors/selectors.go b/src/pkg/selectors/selectors.go index 4c49f637b..03654d8d1 100644 --- a/src/pkg/selectors/selectors.go +++ b/src/pkg/selectors/selectors.go @@ -355,6 +355,9 @@ func selectorAsIface[T any](s Selector) (T, error) { case ServiceGroups: a, err = func() (any, error) { return s.ToGroupsRestore() }() t = a.(T) + case ServiceTeamsChats: + a, err = func() (any, error) { return s.ToTeamsChatsRestore() }() + t = a.(T) default: err = clues.Stack(ErrorUnrecognizedService, clues.New(s.Service.String())) }