Merge pull request #1429 from anyproto/fix-objectstore-get-relation

Objectstore: fix GetRelationByKey: add space ID
anyproto · Jul 30, 2024 · 1ded717 · 1ded717
2 parents 000f61a + 97317b2
commit 1ded717
Show file tree

Hide file tree

Showing 9 changed files with 159 additions and 100 deletions.
diff --git a/core/block/source/service.go b/core/block/source/service.go
@@ -40,6 +40,7 @@ type accountService interface {
 
 type Space interface {
 	Id() string
+	IsPersonal() bool
 	TreeBuilder() objecttreebuilder.TreeBuilder
 	GetRelationIdByKey(ctx context.Context, key domain.RelationKey) (id string, err error)
 	GetTypeIdByKey(ctx context.Context, key domain.TypeKey) (id string, err error)

diff --git a/core/block/source/source.go b/core/block/source/source.go
@@ -171,7 +171,7 @@ type fileObjectMigrator interface {
 }
 
 type RelationGetter interface {
-	GetRelationByKey(key string) (*model.Relation, error)
+	GetRelationByKey(spaceId string, key string) (*model.Relation, error)
 }
 
 type source struct {

diff --git a/core/block/source/sub_object_links_migration.go b/core/block/source/sub_object_links_migration.go
@@ -91,7 +91,12 @@ func (m *subObjectsAndProfileLinksMigration) replaceLinksInDetails(s *state.Stat
 	}
 }
 
+// Migrate works only in personal space
 func (m *subObjectsAndProfileLinksMigration) Migrate(s *state.State) {
+	if !m.space.IsPersonal() {
+		return
+	}
+
 	uk, err := domain.NewUniqueKey(smartblock.SmartBlockTypeProfilePage, "")
 	if err != nil {
 		log.Errorf("migration: failed to create unique key for profile: %s", err)
@@ -187,7 +192,7 @@ func (m *subObjectsAndProfileLinksMigration) migrateFilter(filter *model.BlockCo
 		log.With("relationKey", filter.RelationKey).Warnf("empty filter value")
 		return nil
 	}
-	relation, err := m.objectStore.GetRelationByKey(filter.RelationKey)
+	relation, err := m.objectStore.GetRelationByKey(m.space.Id(), filter.RelationKey)
 	if err != nil {
 		log.Warnf("migration: failed to get relation by key %s: %s", filter.RelationKey, err)
 	}

diff --git a/core/subscription/dep.go b/core/subscription/dep.go
@@ -122,12 +122,12 @@ func (ds *dependencyService) isRelationObject(key string) bool {
 	if isObj, ok := ds.isRelationObjMap[key]; ok {
 		return isObj
 	}
-	rel, err := ds.s.objectStore.GetRelationByKey(key)
+	relFormat, err := ds.s.objectStore.GetRelationFormatByKey(key)
 	if err != nil {
 		log.Errorf("can't get relation %s: %v", key, err)
 		return false
 	}
-	isObj := rel.Format == model.RelationFormat_object || rel.Format == model.RelationFormat_file || rel.Format == model.RelationFormat_tag || rel.Format == model.RelationFormat_status
+	isObj := relFormat == model.RelationFormat_object || relFormat == model.RelationFormat_file || relFormat == model.RelationFormat_tag || relFormat == model.RelationFormat_status
 	ds.isRelationObjMap[key] = isObj
 	return isObj
 }

diff --git a/core/subscription/service_test.go b/core/subscription/service_test.go
@@ -32,14 +32,8 @@ func TestService_Search(t *testing.T) {
 			},
 			nil,
 		)
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyName.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyName.String(),
-			Format: model.RelationFormat_shorttext,
-		}, nil).AnyTimes()
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyAuthor.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyAuthor.String(),
-			Format: model.RelationFormat_object,
-		}, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyName.String()).Return(model.RelationFormat_shorttext, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyAuthor.String()).Return(model.RelationFormat_object, nil).AnyTimes()
 
 		fx.store.EXPECT().QueryByID([]string{"author1"}).Return([]database.Record{
 			{Details: &types.Struct{Fields: map[string]*types.Value{
@@ -135,14 +129,8 @@ func TestService_Search(t *testing.T) {
 			},
 			nil,
 		)
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyName.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyName.String(),
-			Format: model.RelationFormat_shorttext,
-		}, nil).AnyTimes()
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyAuthor.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyAuthor.String(),
-			Format: model.RelationFormat_object,
-		}, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyName.String()).Return(model.RelationFormat_shorttext, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyAuthor.String()).Return(model.RelationFormat_object, nil).AnyTimes()
 
 		fx.store.EXPECT().QueryByID([]string{"force1", "force2"}).Return([]database.Record{
 			{Details: &types.Struct{Fields: map[string]*types.Value{
@@ -194,10 +182,7 @@ func TestService_Search(t *testing.T) {
 			},
 			nil,
 		)
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyName.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyName.String(),
-			Format: model.RelationFormat_shorttext,
-		}, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyName.String()).Return(model.RelationFormat_shorttext, nil).AnyTimes()
 
 		resp, err := fx.Search(SubscribeRequest{
 			SubId: "test",
@@ -261,10 +246,7 @@ func TestService_Search(t *testing.T) {
 			},
 			nil,
 		)
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyName.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyName.String(),
-			Format: model.RelationFormat_shorttext,
-		}, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyName.String()).Return(model.RelationFormat_shorttext, nil).AnyTimes()
 
 		resp, err := fx.Search(SubscribeRequest{
 			SubId: "test",
@@ -359,14 +341,8 @@ func TestService_Search(t *testing.T) {
 			}}},
 		}, nil)
 
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyName.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyName.String(),
-			Format: model.RelationFormat_shorttext,
-		}, nil).AnyTimes()
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyId.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyId.String(),
-			Format: model.RelationFormat_shorttext,
-		}, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyName.String()).Return(model.RelationFormat_shorttext, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyId.String()).Return(model.RelationFormat_shorttext, nil).AnyTimes()
 
 		var resp, err = fx.Search(SubscribeRequest{
 			SubId:        subscriptionID,
@@ -409,14 +385,8 @@ func TestService_Search(t *testing.T) {
 			}}},
 		}, nil)
 
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyName.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyName.String(),
-			Format: model.RelationFormat_shorttext,
-		}, nil).AnyTimes()
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyId.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyId.String(),
-			Format: model.RelationFormat_shorttext,
-		}, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyName.String()).Return(model.RelationFormat_shorttext, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyId.String()).Return(model.RelationFormat_shorttext, nil).AnyTimes()
 
 		var resp, err = fx.Search(SubscribeRequest{
 			SubId:        subscriptionID,
@@ -466,14 +436,8 @@ func TestService_Search(t *testing.T) {
 			}}},
 		}, nil)
 
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyName.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyName.String(),
-			Format: model.RelationFormat_shorttext,
-		}, nil).AnyTimes()
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyId.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyId.String(),
-			Format: model.RelationFormat_shorttext,
-		}, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyName.String()).Return(model.RelationFormat_shorttext, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyId.String()).Return(model.RelationFormat_shorttext, nil).AnyTimes()
 
 		var resp, err = fx.Search(SubscribeRequest{
 			SubId:        subscriptionID,
@@ -508,15 +472,9 @@ func TestService_Search(t *testing.T) {
 			}}},
 		}, nil)
 
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyName.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyName.String(),
-			Format: model.RelationFormat_shorttext,
-		}, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyName.String()).Return(model.RelationFormat_shorttext, nil).AnyTimes()
 
-		fx.store.EXPECT().GetRelationByKey(testRelationKey).Return(&model.Relation{
-			Key:    testRelationKey,
-			Format: model.RelationFormat_object,
-		}, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(testRelationKey).Return(model.RelationFormat_object, nil).AnyTimes()
 
 		s := fx.Service.(*service)
 		s.ds = newDependencyService(s)
@@ -563,15 +521,9 @@ func TestService_Search(t *testing.T) {
 			}}},
 		}, nil)
 
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyName.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyName.String(),
-			Format: model.RelationFormat_shorttext,
-		}, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyName.String()).Return(model.RelationFormat_shorttext, nil).AnyTimes()
 
-		fx.store.EXPECT().GetRelationByKey(testRelationKey).Return(&model.Relation{
-			Key:    testRelationKey,
-			Format: model.RelationFormat_object,
-		}, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(testRelationKey).Return(model.RelationFormat_object, nil).AnyTimes()
 
 		s := fx.Service.(*service)
 		s.ds = newDependencyService(s)
@@ -618,14 +570,8 @@ func TestService_Search(t *testing.T) {
 			}}},
 		}, nil)
 
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyName.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyName.String(),
-			Format: model.RelationFormat_shorttext,
-		}, nil).AnyTimes()
-		fx.store.EXPECT().GetRelationByKey(bundle.RelationKeyId.String()).Return(&model.Relation{
-			Key:    bundle.RelationKeyId.String(),
-			Format: model.RelationFormat_shorttext,
-		}, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyName.String()).Return(model.RelationFormat_shorttext, nil).AnyTimes()
+		fx.store.EXPECT().GetRelationFormatByKey(bundle.RelationKeyId.String()).Return(model.RelationFormat_shorttext, nil).AnyTimes()
 
 		var resp, err = fx.Search(SubscribeRequest{
 			SubId:        subscriptionID,
@@ -1066,7 +1012,7 @@ func xTestNestedSubscription(t *testing.T) {
 
 func testCreateSubscriptionWithNestedFilter(t *testing.T) *fixtureRealStore {
 	fx := newFixtureWithRealObjectStore(t)
-	// fx.store.EXPECT().GetRelationByKey(mock.Anything).Return(&model.Relation{}, nil)
+	// fx.store.EXPECT().GetRelationFormatByKey(mock.Anything).Return(&model.Relation{}, nil)
 	resp, err := fx.Search(SubscribeRequest{
 		SubId: "test",
 		Filters: []*model.BlockContentDataviewFilter{

diff --git a/pkg/lib/localstore/objectstore/mock_objectstore/mock_ObjectStore.go b/pkg/lib/localstore/objectstore/mock_objectstore/mock_ObjectStore.go
diff --git a/pkg/lib/localstore/objectstore/objects.go b/pkg/lib/localstore/objectstore/objects.go
@@ -154,7 +154,8 @@ type ObjectStore interface {
 	FetchRelationByLinks(spaceId string, links pbtypes.RelationLinks) (relations relationutils.Relations, err error)
 	ListAllRelations(spaceId string) (relations relationutils.Relations, err error)
 	GetRelationByID(id string) (relation *model.Relation, err error)
-	GetRelationByKey(key string) (*model.Relation, error)
+	GetRelationByKey(spaceId string, key string) (*model.Relation, error)
+	GetRelationFormatByKey(key string) (model.RelationFormat, error)
 
 	GetObjectType(url string) (*model.ObjectType, error)
 	BatchProcessFullTextQueue(ctx context.Context, limit int, processIds func(processIds []string) error) error