anyproto/anytype-heart
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-heart.git synced 2025-06-09 17:44:59 +09:00
Code Activity

GO-2277 Rename IDs to Ids

Browse source
This commit is contained in:
kirillston 2023-11-02 16:52:23 +01:00
parent 82d3a09cfe
commit 18c7264945
No known key found for this signature in database
GPG key ID: 88218A7F1109754B
10 changed files with 77 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/block/editor/template.go
View file

@ -37,14 +37,14 @@ func (t *Template) CreationStateMigration(ctx *smartblock.InitContext) migration
Version: 1,
Proc: func(s *state.State) {
if t.Type() == coresb.SmartBlockTypeTemplate && (len(t.ObjectTypeKeys()) != 2) {
targetObjectTypeID := pbtypes.GetString(s.Details(), bundle.RelationKeyTargetObjectType.String())
if targetObjectTypeID != "" {
uniqueKey, err := t.objectStore.GetUniqueKeyByID(targetObjectTypeID)
targetObjectTypeId := pbtypes.GetString(s.Details(), bundle.RelationKeyTargetObjectType.String())
if targetObjectTypeId != "" {
uniqueKey, err := t.objectStore.GetUniqueKeyById(targetObjectTypeId)
if err == nil && uniqueKey.SmartblockType() != coresb.SmartBlockTypeObjectType {
err = fmt.Errorf("unique key %s has wrong smartblock type %d", uniqueKey.InternalKey(), uniqueKey.SmartblockType())
}
if err != nil {
log.Errorf("get target object type %s: %s", targetObjectTypeID, err)
log.Errorf("get target object type %s: %s", targetObjectTypeId, err)
}
s.SetObjectTypeKeys([]domain.TypeKey{bundle.TypeKeyTemplate, domain.TypeKey(uniqueKey.InternalKey())})
}

8
core/block/object/objectcreator/creator.go
View file

@ -58,8 +58,8 @@ type CollectionService interface {
}
type TemplateService interface {
StateFromTemplate(templateID, name string) (st *state.State, err error)
TemplateCloneInSpace(space space.Space, id string) (templateID string, err error)
StateFromTemplate(templateId, name string) (st *state.State, err error)
TemplateCloneInSpace(space space.Space, id string) (templateId string, err error)
}
func NewCreator() Service {
@ -82,9 +82,9 @@ func (s *service) Name() (name string) {
return CName
}
func (s *service) createSmartBlockFromTemplate(ctx context.Context, space space.Space, objectTypeKeys []domain.TypeKey, details *types.Struct, templateID string) (id string, newDetails *types.Struct, err error) {
func (s *service) createSmartBlockFromTemplate(ctx context.Context, space space.Space, objectTypeKeys []domain.TypeKey, details *types.Struct, templateId string) (id string, newDetails *types.Struct, err error) {
var createState *state.State
if createState, err = s.templateService.StateFromTemplate(templateID, pbtypes.GetString(details, bundle.RelationKeyName.String())); err != nil {
if createState, err = s.templateService.StateFromTemplate(templateId, pbtypes.GetString(details, bundle.RelationKeyName.String())); err != nil {
return
}
for k, v := range details.GetFields() {

68
core/block/template/service.go
View file

@ -34,18 +34,18 @@ import (
const (
CName = "template"
BlankTemplateID = "blank"
BlankTemplateId = "blank"
)
var log = logging.Logger("template")
type Service interface {
StateFromTemplate(templateID, name string) (st *state.State, err error)
ObjectApplyTemplate(contextID string, templateID string) error
TemplateCreateFromObject(ctx context.Context, id string) (templateID string, err error)
StateFromTemplate(templateId, name string) (st *state.State, err error)
ObjectApplyTemplate(contextId string, templateId string) error
TemplateCreateFromObject(ctx context.Context, id string) (templateId string, err error)
TemplateCloneInSpace(space space.Space, id string) (templateID string, err error)
TemplateClone(spaceID string, id string) (templateID string, err error)
TemplateCloneInSpace(space space.Space, id string) (templateId string, err error)
TemplateClone(spaceId string, id string) (templateId string, err error)
TemplateExportAll(ctx context.Context, path string) (string, error)
@ -80,16 +80,16 @@ func (s *service) Init(a *app.App) error {
}
// StateFromTemplate creates clone of template object state with empty localDetails and updated objectTypes.
// Blank template is created in case template object is deleted or blank/empty templateID is provided
func (s *service) StateFromTemplate(templateID, name string) (st *state.State, err error) {
if templateID == BlankTemplateID || templateID == "" {
// Blank template is created in case template object is deleted or blank/empty templateIв is provided
func (s *service) StateFromTemplate(templateId, name string) (st *state.State, err error) {
if templateId == BlankTemplateId || templateId == "" {
return s.blankTemplateState(), nil
}
if err = getblock.Do(s.picker, templateID, func(b smartblock.SmartBlock) (innerErr error) {
if err = getblock.Do(s.picker, templateId, func(b smartblock.SmartBlock) (innerErr error) {
if lo.Contains(b.ObjectTypeKeys(), bundle.TypeKeyTemplate) {
st, innerErr = s.getNewPageState(b, name)
} else {
return fmt.Errorf("object '%s' is not a template", templateID)
return fmt.Errorf("object '%s' is not a template", templateId)
}
return
}); err != nil {
@ -101,14 +101,14 @@ func (s *service) StateFromTemplate(templateID, name string) (st *state.State, e
return
}
func (s *service) ObjectApplyTemplate(contextID, templateID string) error {
return getblock.Do(s.picker, contextID, func(b smartblock.SmartBlock) error {
func (s *service) ObjectApplyTemplate(contextId, templateId string) error {
return getblock.Do(s.picker, contextId, func(b smartblock.SmartBlock) error {
orig := b.NewState().ParentState()
ts, err := s.StateFromTemplate(templateID, "")
ts, err := s.StateFromTemplate(templateId, "")
if err != nil {
return err
}
ts.SetRootId(contextID)
ts.SetRootId(contextId)
ts.SetParent(orig)
layout, found := orig.Layout()
@ -133,7 +133,7 @@ func (s *service) ObjectApplyTemplate(contextID, templateID string) error {
})
}
func (s *service) TemplateCreateFromObject(ctx context.Context, id string) (templateID string, err error) {
func (s *service) TemplateCreateFromObject(ctx context.Context, id string) (templateId string, err error) {
var (
st *state.State
objectTypeKeys []domain.TypeKey
@ -150,19 +150,19 @@ func (s *service) TemplateCreateFromObject(ctx context.Context, id string) (temp
return
}
spaceID, err := s.resolver.ResolveSpaceID(id)
spaceId, err := s.resolver.ResolveSpaceID(id)
if err != nil {
return "", fmt.Errorf("resolve spaceID: %w", err)
return "", fmt.Errorf("resolve spaceId: %w", err)
}
templateID, _, err = s.creator.CreateSmartBlockFromState(ctx, spaceID, objectTypeKeys, st)
templateId, _, err = s.creator.CreateSmartBlockFromState(ctx, spaceId, objectTypeKeys, st)
if err != nil {
return
}
return
}
func (s *service) TemplateCloneInSpace(space space.Space, id string) (templateID string, err error) {
func (s *service) TemplateCloneInSpace(space space.Space, id string) (templateId string, err error) {
var (
st *state.State
objectTypeKeys []domain.TypeKey
@ -181,30 +181,30 @@ func (s *service) TemplateCloneInSpace(space space.Space, id string) (templateID
st.SetLocalDetails(nil)
st.SetDetailAndBundledRelation(bundle.RelationKeySourceObject, pbtypes.String(id))
targetObjectTypeBundledID := pbtypes.GetString(st.Details(), bundle.RelationKeyTargetObjectType.String())
targetObjectTypeKey, err := bundle.TypeKeyFromUrl(targetObjectTypeBundledID)
targetObjectTypeBundledId := pbtypes.GetString(st.Details(), bundle.RelationKeyTargetObjectType.String())
targetObjectTypeKey, err := bundle.TypeKeyFromUrl(targetObjectTypeBundledId)
if err != nil {
return fmt.Errorf("get target object type key: %w", err)
}
targetObjectTypeID, err := space.GetTypeIdByKey(context.Background(), targetObjectTypeKey)
targetObjectTypeId, err := space.GetTypeIdByKey(context.Background(), targetObjectTypeKey)
if err != nil {
return fmt.Errorf("get target object type id: %w", err)
}
st.SetDetailAndBundledRelation(bundle.RelationKeyTargetObjectType, pbtypes.String(targetObjectTypeID))
st.SetDetailAndBundledRelation(bundle.RelationKeyTargetObjectType, pbtypes.String(targetObjectTypeId))
return nil
}); err != nil {
return
}
templateID, _, err = s.creator.CreateSmartBlockFromStateInSpace(context.Background(), space, objectTypeKeys, st)
templateId, _, err = s.creator.CreateSmartBlockFromStateInSpace(context.Background(), space, objectTypeKeys, st)
if err != nil {
return
}
return
}
func (s *service) TemplateClone(spaceID string, id string) (templateID string, err error) {
func (s *service) TemplateClone(spaceId string, id string) (templateId string, err error) {
var spaceObject space.Space
spaceObject, err = s.spaceService.Get(context.Background(), spaceID)
spaceObject, err = s.spaceService.Get(context.Background(), spaceId)
if err != nil {
return "", fmt.Errorf("get space: %w", err)
}
@ -248,7 +248,7 @@ func (s *service) TemplateExportAll(ctx context.Context, path string) (string, e
}
func (s *service) blankTemplateState() (st *state.State) {
st = state.NewDoc(BlankTemplateID, nil).NewState()
st = state.NewDoc(BlankTemplateId, nil).NewState()
template.InitTemplate(st, template.WithEmpty,
template.WithDefaultFeaturedRelations,
template.WithFeaturedRelations,
@ -281,12 +281,12 @@ func (s *service) getNewPageState(sb smartblock.SmartBlock, name string) (st *st
}
func (s *service) updateTypeKey(st *state.State) (err error) {
objectTypeID := pbtypes.GetString(st.Details(), bundle.RelationKeyTargetObjectType.String())
if objectTypeID != "" {
objectTypeId := pbtypes.GetString(st.Details(), bundle.RelationKeyTargetObjectType.String())
if objectTypeId != "" {
var uniqueKey domain.UniqueKey
uniqueKey, err = s.store.GetUniqueKeyByID(objectTypeID)
uniqueKey, err = s.store.GetUniqueKeyById(objectTypeId)
if err != nil {
err = fmt.Errorf("get target object type %s: %w", objectTypeID, err)
err = fmt.Errorf("get target object type %s: %w", objectTypeId, err)
} else if uniqueKey.SmartblockType() != coresb.SmartBlockTypeObjectType {
err = fmt.Errorf("unique key %s does not belong to object type", uniqueKey.InternalKey())
}
@ -307,11 +307,11 @@ func (s *service) updateTypeKey(st *state.State) (err error) {
func (s *service) templateCreateFromObjectState(sb smartblock.SmartBlock) (*state.State, error) {
st := sb.NewState().Copy()
st.SetLocalDetails(nil)
targetObjectTypeID, err := sb.Space().GetTypeIdByKey(context.Background(), st.ObjectTypeKey())
targetObjectTypeId, err := sb.Space().GetTypeIdByKey(context.Background(), st.ObjectTypeKey())
if err != nil {
return nil, fmt.Errorf("get type id by key: %w", err)
}
st.SetDetail(bundle.RelationKeyTargetObjectType.String(), pbtypes.String(targetObjectTypeID))
st.SetDetail(bundle.RelationKeyTargetObjectType.String(), pbtypes.String(targetObjectTypeId))
st.SetObjectTypeKeys([]domain.TypeKey{bundle.TypeKeyTemplate, st.ObjectTypeKey()})
for _, rel := range sb.Relations(st) {
if rel.DataSource == model.Relation_details && !rel.Hidden {

8
core/block/template/service_test.go
View file

@ -103,7 +103,7 @@ func TestService_StateFromTemplate(t *testing.T) {
// then
assert.NoError(t, err)
assert.Equal(t, st.RootId(), BlankTemplateID)
assert.Equal(t, st.RootId(), BlankTemplateId)
})
t.Run("blank templateId", func(t *testing.T) {
@ -112,11 +112,11 @@ func TestService_StateFromTemplate(t *testing.T) {
s := service{picker: &testPicker{sb: tmpl}}
// when
st, err := s.StateFromTemplate(BlankTemplateID, "")
st, err := s.StateFromTemplate(BlankTemplateId, "")
// then
assert.NoError(t, err)
assert.Equal(t, st.RootId(), BlankTemplateID)
assert.Equal(t, st.RootId(), BlankTemplateId)
})
t.Run("create blank template in case template object is deleted", func(t *testing.T) {
@ -128,7 +128,7 @@ func TestService_StateFromTemplate(t *testing.T) {
// then
assert.NoError(t, err)
assert.Equal(t, st.RootId(), BlankTemplateID)
assert.Equal(t, st.RootId(), BlankTemplateId)
})

2
core/subscription/service.go
View file

@ -529,7 +529,7 @@ func (s *service) filtersFromSource(sources []string) (database.Filter, error) {
if uk, err = domain.UnmarshalUniqueKey(source); err != nil {
// todo: gradually escalate to return error
log.Info("Using object id instead of uniqueKey is deprecated in the Source")
uk, err = s.objectStore.GetUniqueKeyByID(source)
uk, err = s.objectStore.GetUniqueKeyById(source)
if err != nil {
return nil, err
}

20
pkg/lib/localstore/objectstore/mock_objectstore/mock_ObjectStore.go
View file

@ -1185,8 +1185,8 @@ func (_c *MockObjectStore_GetRelationLink_Call) RunAndReturn(run func(string, st
return _c
}
// GetUniqueKeyByID provides a mock function with given fields: id
func (_m *MockObjectStore) GetUniqueKeyByID(id string) (domain.UniqueKey, error) {
// GetUniqueKeyById provides a mock function with given fields: id
func (_m *MockObjectStore) GetUniqueKeyById(id string) (domain.UniqueKey, error) {
ret := _m.Called(id)
var r0 domain.UniqueKey
@ -1211,30 +1211,30 @@ func (_m *MockObjectStore) GetUniqueKeyByID(id string) (domain.UniqueKey, error)
return r0, r1
}
// MockObjectStore_GetUniqueKeyByID_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetUniqueKeyByID'
type MockObjectStore_GetUniqueKeyByID_Call struct {
// MockObjectStore_GetUniqueKeyById_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetUniqueKeyById'
type MockObjectStore_GetUniqueKeyById_Call struct {
*mock.Call
}
// GetUniqueKeyByID is a helper method to define mock.On call
// GetUniqueKeyById is a helper method to define mock.On call
// - id string
func (_e *MockObjectStore_Expecter) GetUniqueKeyByID(id interface{}) *MockObjectStore_GetUniqueKeyByID_Call {
return &MockObjectStore_GetUniqueKeyByID_Call{Call: _e.mock.On("GetUniqueKeyByID", id)}
func (_e *MockObjectStore_Expecter) GetUniqueKeyById(id interface{}) *MockObjectStore_GetUniqueKeyById_Call {
return &MockObjectStore_GetUniqueKeyById_Call{Call: _e.mock.On("GetUniqueKeyById", id)}
}
func (_c *MockObjectStore_GetUniqueKeyByID_Call) Run(run func(id string)) *MockObjectStore_GetUniqueKeyByID_Call {
func (_c *MockObjectStore_GetUniqueKeyById_Call) Run(run func(id string)) *MockObjectStore_GetUniqueKeyById_Call {
_c.Call.Run(func(args mock.Arguments) {
run(args[0].(string))
})
return _c
}
func (_c *MockObjectStore_GetUniqueKeyByID_Call) Return(key domain.UniqueKey, err error) *MockObjectStore_GetUniqueKeyByID_Call {
func (_c *MockObjectStore_GetUniqueKeyById_Call) Return(key domain.UniqueKey, err error) *MockObjectStore_GetUniqueKeyById_Call {
_c.Call.Return(key, err)
return _c
}
func (_c *MockObjectStore_GetUniqueKeyByID_Call) RunAndReturn(run func(string) (domain.UniqueKey, error)) *MockObjectStore_GetUniqueKeyByID_Call {
func (_c *MockObjectStore_GetUniqueKeyById_Call) RunAndReturn(run func(string) (domain.UniqueKey, error)) *MockObjectStore_GetUniqueKeyById_Call {
_c.Call.Return(run)
return _c
}

4
pkg/lib/localstore/objectstore/objects.go
View file

@ -133,7 +133,7 @@ type ObjectStore interface {
GetDetails(id string) (*model.ObjectDetails, error)
GetObjectByUniqueKey(spaceId string, uniqueKey domain.UniqueKey) (*model.ObjectDetails, error)
GetUniqueKeyByID(id string) (key domain.UniqueKey, err error)
GetUniqueKeyById(id string) (key domain.UniqueKey, err error)
GetInboundLinksByID(id string) ([]string, error)
GetOutboundLinksByID(id string) ([]string, error)
@ -333,7 +333,7 @@ func (s *dsObjectStore) GetDetails(id string) (*model.ObjectDetails, error) {
return details, nil
}
func (s *dsObjectStore) GetUniqueKeyByID(id string) (domain.UniqueKey, error) {
func (s *dsObjectStore) GetUniqueKeyById(id string) (domain.UniqueKey, error) {
details, err := s.GetDetails(id)
if err != nil {
return nil, err

2
space/service_test.go
View file

@ -105,7 +105,7 @@ func (fx *fixture) expectRun(newAccount bool) {
if newAccount {
fx.spaceCore.EXPECT().Derive(mock.Anything, spacecore.SpaceType).Return(&spacecore.AnySpace{Space: fx.personalSpace}, nil)
// fx.objectCache.EXPECT().DeriveTreeObject(mock.Anything, testPersonalSpaceID, mock.Anything).Return(nil, nil)
fx.techSpace.EXPECT().SpaceViewCreate(mock.Anything, testPersonalSpaceID).Return(nil)
fx.techSpace.EXPECT().SpaceViewCreate(mock.Anything, testPersonalSpaceID, nil).Return(nil)
}
// startLoad
fx.techSpace.EXPECT().SpaceViewExists(mock.Anything, testPersonalSpaceID).Return(true, nil)

21
space/techspace/mock_techspace/mock_TechSpace.go
View file

@ -157,13 +157,13 @@ func (_c *MockTechSpace_SetInfo_Call) RunAndReturn(run func(context.Context, spa
return _c
}
// SpaceViewCreate provides a mock function with given fields: ctx, spaceId
func (_m *MockTechSpace) SpaceViewCreate(ctx context.Context, spaceId string) error {
ret := _m.Called(ctx, spaceId)
// SpaceViewCreate provides a mock function with given fields: ctx, spaceId, force
func (_m *MockTechSpace) SpaceViewCreate(ctx context.Context, spaceId string, force bool) error {
ret := _m.Called(ctx, spaceId, force)
var r0 error
if rf, ok := ret.Get(0).(func(context.Context, string) error); ok {
r0 = rf(ctx, spaceId)
if rf, ok := ret.Get(0).(func(context.Context, string, bool) error); ok {
r0 = rf(ctx, spaceId, force)
} else {
r0 = ret.Error(0)
}
@ -179,13 +179,14 @@ type MockTechSpace_SpaceViewCreate_Call struct {
// SpaceViewCreate is a helper method to define mock.On call
// - ctx context.Context
// - spaceId string
func (_e *MockTechSpace_Expecter) SpaceViewCreate(ctx interface{}, spaceId interface{}) *MockTechSpace_SpaceViewCreate_Call {
return &MockTechSpace_SpaceViewCreate_Call{Call: _e.mock.On("SpaceViewCreate", ctx, spaceId)}
// - force bool
func (_e *MockTechSpace_Expecter) SpaceViewCreate(ctx interface{}, spaceId interface{}, force interface{}) *MockTechSpace_SpaceViewCreate_Call {
return &MockTechSpace_SpaceViewCreate_Call{Call: _e.mock.On("SpaceViewCreate", ctx, spaceId, force)}
}
func (_c *MockTechSpace_SpaceViewCreate_Call) Run(run func(ctx context.Context, spaceId string)) *MockTechSpace_SpaceViewCreate_Call {
func (_c *MockTechSpace_SpaceViewCreate_Call) Run(run func(ctx context.Context, spaceId string, force bool)) *MockTechSpace_SpaceViewCreate_Call {
_c.Call.Run(func(args mock.Arguments) {
run(args[0].(context.Context), args[1].(string))
run(args[0].(context.Context), args[1].(string), args[2].(bool))
})
return _c
}
@ -195,7 +196,7 @@ func (_c *MockTechSpace_SpaceViewCreate_Call) Return(err error) *MockTechSpace_S
return _c
}
func (_c *MockTechSpace_SpaceViewCreate_Call) RunAndReturn(run func(context.Context, string) error) *MockTechSpace_SpaceViewCreate_Call {
func (_c *MockTechSpace_SpaceViewCreate_Call) RunAndReturn(run func(context.Context, string, bool) error) *MockTechSpace_SpaceViewCreate_Call {
_c.Call.Return(run)
return _c
}

12
util/testMock/objectstore_mock.go
View file

@ -380,19 +380,19 @@ func (mr *MockObjectStoreMockRecorder) GetRelationLink(arg0, arg1 any) *gomock.C
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRelationLink", reflect.TypeOf((*MockObjectStore)(nil).GetRelationLink), arg0, arg1)
}
// GetUniqueKeyByID mocks base method.
func (m *MockObjectStore) GetUniqueKeyByID(arg0 string) (domain.UniqueKey, error) {
// GetUniqueKeyById mocks base method.
func (m *MockObjectStore) GetUniqueKeyById(arg0 string) (domain.UniqueKey, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "GetUniqueKeyByID", arg0)
ret := m.ctrl.Call(m, "GetUniqueKeyById", arg0)
ret0, _ := ret[0].(domain.UniqueKey)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// GetUniqueKeyByID indicates an expected call of GetUniqueKeyByID.
func (mr *MockObjectStoreMockRecorder) GetUniqueKeyByID(arg0 any) *gomock.Call {
// GetUniqueKeyById indicates an expected call of GetUniqueKeyById.
func (mr *MockObjectStoreMockRecorder) GetUniqueKeyById(arg0 any) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUniqueKeyByID", reflect.TypeOf((*MockObjectStore)(nil).GetUniqueKeyByID), arg0)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUniqueKeyById", reflect.TypeOf((*MockObjectStore)(nil).GetUniqueKeyById), arg0)
}
// GetWithLinksInfoByID mocks base method.