Skip to content

ACI0106595: Graph mail pull notifications dispatch @removed entries as onCreate/onModify #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
e-marchand wants to merge 1 commit into from
+32 −3
Closed

ACI0106595: Graph mail pull notifications dispatch @removed entries as onCreate/onModify #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 32 additions & 3 deletions Project/Sources/Classes/GraphNotification.4dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,14 +576,41 @@ Function _pollDeltaUsingChangeTypeStreams() : Collection
* enabled change type streams
* @description Polls each delta stream (one per enabled changeType) and merges results.
* Used for mail, where Graph supports `changeType` filtering on delta queries.
* The same item can be reported by several streams: duplicates are removed, and an
* item deleted during this poll is only reported as `"deleted"`.
*/

var $items : Collection:=[]
var $polled : Collection:=[]
var $changeTypes : Collection:=This._computePullChangeTypes()
var $changeType : Text

For each ($changeType; $changeTypes)
$items.combine(This._pollDeltaForChangeType($changeType))
$polled.combine(This._pollDeltaForChangeType($changeType))
End for each

// Collect the IDs deleted during this poll, whatever stream reported them
var $deletedIds : Object:={}
var $item : Object
For each ($item; $polled)
If ($item.changeType="deleted")
$deletedIds[$item.resourceId]:=True
End if
End for each

var $items : Collection:=[]
var $seen : Object:={}
For each ($item; $polled)
// A deleted item must not also be dispatched as created or updated
If (($item.changeType#"deleted") && (Bool($deletedIds[$item.resourceId])))
continue
End if
var $key : Text:=$item.changeType+"|"+$item.resourceId
If (Not(Bool($seen[$key])))
$seen[$key]:=True
If (This._shouldDispatchPullChangeType($item.changeType))
$items.push($item)
End if
End if
End for each

return $items
Expand Down Expand Up @@ -622,7 +649,9 @@ Function _pollDeltaForChangeType($inChangeType : Text) : Collection
If (Length(String($entry.id))>0)
var $item : Object:={}
$item.resourceId:=String($entry.id)
$item.changeType:=$inChangeType
// Graph emits @removed entries on every filtered stream (created and
// updated too) when a message is deleted or moved out of the folder.
$item.changeType:=($entry["@removed"]#Null) ? "deleted" : $inChangeType
$items.push($item)
End if
End for each
Expand Down
Loading