Merge pull request #1428 from anyproto/go-3770-deleted-type-on-initia…

…l-empty-space-homepage GO-3770: Hot fix for type import
anyproto · Jul 29, 2024 · d8599a6 · d8599a6
2 parents 55c13f9 + 716fb18
commit d8599a6
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/core/block/import/common/objectid/derivedobject.go b/core/block/import/common/objectid/derivedobject.go
@@ -50,7 +50,7 @@ func (d *derivedObject) GetIDAndPayload(ctx context.Context, spaceID string, sn
 	}
 
 	var key string
-	if d.isDeletedObject(uniqueKey.Marshal()) {
+	if d.isDeletedObject(spaceID, uniqueKey.Marshal()) {
 		key = bson.NewObjectId().Hex()
 		uniqueKey, err = domain.NewUniqueKey(sn.SbType, key)
 		if err != nil {
@@ -74,9 +74,14 @@ func (d *derivedObject) GetInternalKey(sbType sb.SmartBlockType) string {
 	return d.internalKey
 }
 
-func (d *derivedObject) isDeletedObject(uniqueKey string) bool {
+func (d *derivedObject) isDeletedObject(spaceId string, uniqueKey string) bool {
 	ids, _, err := d.objectStore.QueryObjectIDs(database.Query{
 		Filters: []*model.BlockContentDataviewFilter{
+			{
+				Condition:   model.BlockContentDataviewFilter_Equal,
+				RelationKey: bundle.RelationKeySpaceId.String(),
+				Value:       pbtypes.String(spaceId),
+			},
 			{
 				Condition:   model.BlockContentDataviewFilter_Equal,
 				RelationKey: bundle.RelationKeyUniqueKey.String(),