From 277e7e1b3e842591bc3a549f94cc0dd4adc43d30 Mon Sep 17 00:00:00 2001 From: Abhishek Pandey Date: Fri, 18 Aug 2023 13:30:49 +0530 Subject: [PATCH] Test omission --- src/internal/tester/tconfig/config.go | 2 +- src/pkg/services/m365/api/mail.go | 2 +- src/pkg/services/m365/api/mail_pager.go | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/internal/tester/tconfig/config.go b/src/internal/tester/tconfig/config.go index a900f26f2..1cc1461ce 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), - "LynneR@10rqc2.onmicrosoft.com") + "PradeepG@10rqc2.onmicrosoft.com") fallbackTo( testEnv, TestCfgSecondaryUserID, diff --git a/src/pkg/services/m365/api/mail.go b/src/pkg/services/m365/api/mail.go index f4201ce5b..29785895d 100644 --- a/src/pkg/services/m365/api/mail.go +++ b/src/pkg/services/m365/api/mail.go @@ -636,7 +636,7 @@ func UnwrapEmailAddress(contact models.Recipientable) string { } func mailCollisionKeyProps() []string { - return idAnd("subject", sentDateTime, receivedDateTime) + return idAnd("subject", sentDateTime, receivedDateTime, createdDateTime) } // MailCollisionKey constructs a key from the messageable's subject, sender, and recipients (to, cc, bcc). diff --git a/src/pkg/services/m365/api/mail_pager.go b/src/pkg/services/m365/api/mail_pager.go index 0648a906c..f0982e4cf 100644 --- a/src/pkg/services/m365/api/mail_pager.go +++ b/src/pkg/services/m365/api/mail_pager.go @@ -11,6 +11,7 @@ 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" ) @@ -241,6 +242,27 @@ 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()) }