luisgulo/focalboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Include migration for content order on unique id migration (#1965)

Browse source 
* Include migration for content order on unique id migration

* Adding test case for other workspace

* making lines shorter
This commit is contained in:
Jesús Espino 2021-12-10 15:33:41 +01:00 committed by GitHub
parent 3450eb6d4f
commit 7952d6b018
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
server/services/store/sqlstore/blocks.go
View file

@ -599,5 +599,24 @@ func (s *SQLStore) replaceBlockID(db sq.BaseRunner, currentID, newID, workspaceI
return errParentID
}
// update parent contentOrder
updateContentOrder := baseQuery.Update("")
if s.dbType == postgresDBType {
updateContentOrder = updateContentOrder.
Set("fields", sq.Expr("REPLACE(fields::text, ?, ?)::json", currentID, newID)).
Where(sq.Like{"fields->>'contentOrder'": "%" + currentID + "%"}).
Where(sq.Eq{"type": model.TypeCard})
} else {
updateContentOrder = updateContentOrder.
Set("fields", sq.Expr("REPLACE(fields, ?, ?)", currentID, newID)).
Where(sq.Like{"fields": "%" + currentID + "%"}).
Where(sq.Eq{"type": model.TypeCard})
}
if errParentID := runUpdateForBlocksAndHistory(updateContentOrder); errParentID != nil {
s.logger.Error(`replaceBlockID ERROR`, mlog.Err(errParentID))
return errParentID
}
return nil
}

20
server/services/store/sqlstore/data_migrations_test.go
View file

@ -79,19 +79,27 @@ func TestReplaceBlockID(t *testing.T) {
block3 := model.Block{ID: "block-id-3", RootID: "block-id-1"}
block4 := model.Block{ID: "block-id-4", RootID: "block-id-2"}
block5 := model.Block{ID: "block-id-5", RootID: "block-id-1", ParentID: "block-id-1"}
block8 := model.Block{
ID: "block-id-8", RootID: "root-id-2", Type: model.TypeCard,
Fields: map[string]interface{}{"contentOrder": []string{"block-id-1", "block-id-2"}},
}
// blocks from workspace2. They're identical to blocks 1 and 2,
// but they shouldn't change
block6 := model.Block{ID: "block-id-1", RootID: "root-id-1"}
block7 := model.Block{ID: "block-id-2", RootID: "root-id-2", ParentID: "block-id-1"}
block9 := model.Block{
ID: "block-id-8", RootID: "root-id-2", Type: model.TypeCard,
Fields: map[string]interface{}{"contentOrder": []string{"block-id-1", "block-id-2"}},
}
for _, block := range []model.Block{block1, block2, block3, block4, block5} {
for _, block := range []model.Block{block1, block2, block3, block4, block5, block8} {
err := sqlStore.InsertBlock(container1, &block, "user-id")
require.NoError(t, err)
time.Sleep(100 * time.Millisecond)
}
for _, block := range []model.Block{block6, block7} {
for _, block := range []model.Block{block6, block7, block9} {
err := sqlStore.InsertBlock(container2, &block, "user-id")
require.NoError(t, err)
time.Sleep(100 * time.Millisecond)
@ -114,15 +122,23 @@ func TestReplaceBlockID(t *testing.T) {
require.NoError(t, err)
newBlock7, err := sqlStore.GetBlock(container2, block7.ID)
require.NoError(t, err)
newBlock8, err := sqlStore.GetBlock(container1, block8.ID)
require.NoError(t, err)
newBlock9, err := sqlStore.GetBlock(container2, block9.ID)
require.NoError(t, err)
require.Equal(t, newID, newBlock1.ID)
require.Equal(t, newID, newBlock2.ParentID)
require.Equal(t, newID, newBlock3.RootID)
require.Equal(t, newID, newBlock5.RootID)
require.Equal(t, newID, newBlock5.ParentID)
require.Equal(t, newBlock8.Fields["contentOrder"].([]interface{})[0], newID)
require.Equal(t, newBlock8.Fields["contentOrder"].([]interface{})[1], "block-id-2")
require.Equal(t, currentID, newBlock6.ID)
require.Equal(t, currentID, newBlock7.ParentID)
require.Equal(t, newBlock9.Fields["contentOrder"].([]interface{})[0], "block-id-1")
require.Equal(t, newBlock9.Fields["contentOrder"].([]interface{})[1], "block-id-2")
}
//nolint:gosec