benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update state builder to fix root change

Browse Source
This commit is contained in:
mcrakhman 2023-03-10 16:33:13 +01:00 committed by Mikhail Iudin
parent 3f17e594ec
commit 831ac5150a
No known key found for this signature in database
GPG Key ID: FAAAA8BAABDFF1C0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commonspace/settings/settingsstate/statebuilder.go
View File

@ -48,7 +48,7 @@ func (s *stateBuilder) Build(tr objecttree.ObjectTree, oldState *State) (state *
func (s *stateBuilder) processChange(change *objecttree.Change, rootId string, state *State) *State { func (s *stateBuilder) processChange(change *objecttree.Change, rootId string, state *State) *State {
// ignoring root change which has empty model or startId change // ignoring root change which has empty model or startId change
if change.Model == nil || state.LastIteratedId == change.Id { if len(change.PreviousIds) == 0 || state.LastIteratedId == change.Id {
return state return state
} }

2
commonspace/settings/settingsstate/statebuilder_test.go
View File

@ -42,6 +42,7 @@ func TestStateBuilder_ProcessChange(t *testing.T) {
t.Run("changeId is equal to rootId", func(t *testing.T) { t.Run("changeId is equal to rootId", func(t *testing.T) {
ch := &objecttree.Change{} ch := &objecttree.Change{}
ch.PreviousIds = []string{"someId"}
ch.Model = &spacesyncproto.SettingsData{ ch.Model = &spacesyncproto.SettingsData{
Snapshot: &spacesyncproto.SpaceSettingsSnapshot{ Snapshot: &spacesyncproto.SpaceSettingsSnapshot{
DeletedIds: []string{"id1", "id2"}, DeletedIds: []string{"id1", "id2"},
@ -56,6 +57,7 @@ func TestStateBuilder_ProcessChange(t *testing.T) {
t.Run("changeId is not equal to lastIteratedId or rootId", func(t *testing.T) { t.Run("changeId is not equal to lastIteratedId or rootId", func(t *testing.T) {
ch := &objecttree.Change{} ch := &objecttree.Change{}
ch.PreviousIds = []string{"someId"}
ch.Model = &spacesyncproto.SettingsData{ ch.Model = &spacesyncproto.SettingsData{
Content: []*spacesyncproto.SpaceSettingsContent{ Content: []*spacesyncproto.SpaceSettingsContent{
{Value: &spacesyncproto.SpaceSettingsContent_ObjectDelete{ {Value: &spacesyncproto.SpaceSettingsContent_ObjectDelete{