From 8c61f1490352b8f817c8d6dc9b6a86dfaabd6854 Mon Sep 17 00:00:00 2001 From: Abhishek Pandey Date: Tue, 22 Aug 2023 09:00:44 +0530 Subject: [PATCH] Fixes --- src/internal/tester/tconfig/config.go | 2 +- src/pkg/services/m365/api/mail_pager.go | 23 ----------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/src/internal/tester/tconfig/config.go b/src/internal/tester/tconfig/config.go index 1cc1461ce..a900f26f2 100644 --- a/src/internal/tester/tconfig/config.go +++ b/src/internal/tester/tconfig/config.go @@ -123,7 +123,7 @@ func ReadTestConfig() (map[string]string, error) { TestCfgUserID, os.Getenv(EnvCorsoM365TestUserID), vpr.GetString(TestCfgUserID), - "PradeepG@10rqc2.onmicrosoft.com") + "LynneR@10rqc2.onmicrosoft.com") fallbackTo( testEnv, TestCfgSecondaryUserID, diff --git a/src/pkg/services/m365/api/mail_pager.go b/src/pkg/services/m365/api/mail_pager.go index f0982e4cf..ccefe847d 100644 --- a/src/pkg/services/m365/api/mail_pager.go +++ b/src/pkg/services/m365/api/mail_pager.go @@ -11,7 +11,6 @@ import ( "github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/pkg/fault" - "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/selectors" ) @@ -242,33 +241,11 @@ func (c Mail) GetItemsInContainerByCollisionKey( m := map[string]string{} for _, item := range items { - e := item.GetAdditionalData() - tag := e["@odata.etag"] - - logger.Ctx(ctx).Infow( - "item_id", ptr.Val(item.GetId()), - "item_subject", ptr.Val(item.GetSubject()), - "collision_key", MailCollisionKey(item), - "etag", tag) - - // Check if item already exists - // if _, ok := m[MailCollisionKey(item)]; ok { - // // print id & subject for both items - // logger.Ctx(ctx).Infow( - // "item collision", - // "item_id", ptr.Val(item.GetId()), - // "item_subject", ptr.Val(item.GetSubject()), - // "collision_key", MailCollisionKey(item), - // "etag", tag) - // } - // PIM: A privileged directory role was assigned outside of PIM2023-02-17T03:18:05Z2023-02-17T03:18:09Z - logger.Ctx(ctx).Info(MailCollisionKey(item)) m[MailCollisionKey(item)] = ptr.Val(item.GetId()) } return m, nil } - func (c Mail) GetItemIDsInContainer( ctx context.Context, userID, containerID string,