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

Updates to /connector/exchange/attachment.go

Browse Source 
Updates to logic flow for item attachment type. Also imports function not yet merged into main.
This commit is contained in:
Danny Adams 2023-02-02 00:19:14 -05:00
parent cbad4b6070
commit 6f592c144e
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/internal/connector/exchange/attachment.go
View File

@ -46,7 +46,11 @@ func uploadAttachment(
attachment models.Attachmentable, attachment models.Attachmentable,
) error { ) error {
logger.Ctx(ctx).Debugf("uploading attachment with size %d", *attachment.GetSize()) logger.Ctx(ctx).Debugf("uploading attachment with size %d", *attachment.GetSize())
attachmentType := attachmentType(attachment)
var (
err error
attachmentType = attachmentType(attachment)
)
// Reference attachments that are inline() do not need to be recreated. The contents are part of the body. // Reference attachments that are inline() do not need to be recreated. The contents are part of the body.
if attachmentType == models.REFERENCE_ATTACHMENTTYPE && if attachmentType == models.REFERENCE_ATTACHMENTTYPE &&
@ -57,15 +61,23 @@ func uploadAttachment(
// item Attachments to be skipped until the completion of Issue #2353 // item Attachments to be skipped until the completion of Issue #2353
if attachmentType == models.ITEM_ATTACHMENTTYPE { if attachmentType == models.ITEM_ATTACHMENTTYPE {
attachment, err := support.ToItemAttachment(attachment) name := ""
if attachment.GetName() != nil {
name = *attachment.GetName()
}
prev := attachment
attachment, err = support.ToItemAttachment(attachment)
if err != nil { if err != nil {
logger.Ctx(ctx).Infow("item attachment uploads are not supported ", logger.Ctx(ctx).Infow("item attachment uploads are not supported ",
"attachment_name", *attachment.GetName(), // TODO: Update to support PII protection "attachment_name", name, // TODO: Update to support PII protection
"attachment_type", attachmentType, "attachment_type", models.ITEM_ATTACHMENTTYPE,
"attachment_id", *attachment.GetId(), "internal_item_type", getItemAttachmentItemType(prev),
"attachment_id", prev,
) )
fmt.Println("Error returned: " + err.Error()) fmt.Printf("Error returned: %v\n", err)
return nil return nil
} }
@ -108,3 +120,19 @@ func uploadLargeAttachment(ctx context.Context, uploader attachmentUploadable,
return nil return nil
} }
func getItemAttachmentItemType(query models.Attachmentable) string {
empty := ""
attachment, ok := query.(models.ItemAttachmentable)
if !ok {
return empty
}
item := attachment.GetItem()
if item.GetOdataType() == nil {
return empty
}
return *item.GetOdataType()
}