From 8769b768e7556cb25d1e998c047b3dad5b5d1953 Mon Sep 17 00:00:00 2001 From: Roman Khafizianov Date: Fri, 5 Aug 2022 18:56:13 +0200 Subject: [PATCH] temp: migrate relations in builtinobjects --- core/relation/service.go | 1 + util/builtinobjects/builtinobjects.go | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/core/relation/service.go b/core/relation/service.go index a089ef615..92fcba7c3 100644 --- a/core/relation/service.go +++ b/core/relation/service.go @@ -133,6 +133,7 @@ func (s *service) FetchKey(key string) (relation *Relation, err error) { func (s *service) fetchKey(key string) (relation *Relation, err error) { if b, _ := bundle.GetRelation(bundle.RelationKey(key)); b != nil { + b.Id = addr.BundledRelationURLPrefix + key return &Relation{b}, nil } q := database.Query{ diff --git a/util/builtinobjects/builtinobjects.go b/util/builtinobjects/builtinobjects.go index 0bf9c9ca9..75d7a3800 100644 --- a/util/builtinobjects/builtinobjects.go +++ b/util/builtinobjects/builtinobjects.go @@ -11,6 +11,7 @@ import ( "github.com/anytypeio/go-anytype-middleware/core/block/simple/bookmark" "github.com/anytypeio/go-anytype-middleware/core/block/simple/link" "github.com/anytypeio/go-anytype-middleware/core/block/simple/text" + relation2 "github.com/anytypeio/go-anytype-middleware/core/relation" "github.com/gogo/protobuf/types" "github.com/textileio/go-threads/core/thread" "io" @@ -58,6 +59,8 @@ type builtinObjects struct { l sync.Mutex source source.Service service block.Service + relService relation2.Service + newAccount bool idsMap map[string]string } @@ -66,7 +69,7 @@ func (b *builtinObjects) Init(a *app.App) (err error) { b.source = a.MustComponent(source.CName).(source.Service) b.service = a.MustComponent(block.CName).(block.Service) b.newAccount = a.MustComponent(config.CName).(*config.Config).NewAccount - + b.relService = a.MustComponent(relation2.CName).(relation2.Service) b.cancel = func() {} return } @@ -156,6 +159,11 @@ func (b *builtinObjects) createObject(ctx context.Context, rd io.ReadCloser) (er f["analyticsOriginalId"] = pbtypes.String(oldId) st.Set(simple.New(m)) + rels, err := b.relService.MigrateRelations(st.OldExtraRelations()) + if err != nil { + return err + } + st.AddRelationLinks(rels...) st.RemoveDetail(bundle.RelationKeyCreator.String(), bundle.RelationKeyLastModifiedBy.String()) st.SetLocalDetail(bundle.RelationKeyCreator.String(), pbtypes.String(addr.AnytypeProfileId))