larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test omission

Browse Source
This commit is contained in:
Abhishek Pandey 2023-08-18 13:30:49 +05:30
parent bb2de3b8d6
commit 277e7e1b3e
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/internal/tester/tconfig/config.go
View File

@ -123,7 +123,7 @@ func ReadTestConfig() (map[string]string, error) {
TestCfgUserID, TestCfgUserID,
os.Getenv(EnvCorsoM365TestUserID), os.Getenv(EnvCorsoM365TestUserID),
vpr.GetString(TestCfgUserID), vpr.GetString(TestCfgUserID),
"LynneR@10rqc2.onmicrosoft.com") "PradeepG@10rqc2.onmicrosoft.com")
fallbackTo( fallbackTo(
testEnv, testEnv,
TestCfgSecondaryUserID, TestCfgSecondaryUserID,

2
src/pkg/services/m365/api/mail.go
View File

@ -636,7 +636,7 @@ func UnwrapEmailAddress(contact models.Recipientable) string {
} }
func mailCollisionKeyProps() []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). // MailCollisionKey constructs a key from the messageable's subject, sender, and recipients (to, cc, bcc).

22
src/pkg/services/m365/api/mail_pager.go
View File

@ -11,6 +11,7 @@ import (
"github.com/alcionai/corso/src/internal/common/ptr" "github.com/alcionai/corso/src/internal/common/ptr"
"github.com/alcionai/corso/src/internal/m365/graph" "github.com/alcionai/corso/src/internal/m365/graph"
"github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/fault"
"github.com/alcionai/corso/src/pkg/logger"
"github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/selectors"
) )
@ -241,6 +242,27 @@ func (c Mail) GetItemsInContainerByCollisionKey(
m := map[string]string{} m := map[string]string{}
for _, item := range items { 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()) m[MailCollisionKey(item)] = ptr.Val(item.GetId())
} }