DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Rename ModelFilter to ModelRef

Browse Source
This commit is contained in:
Denis Arh
2022-07-28 12:58:40 +02:00
parent 2959f43f0d
commit 98722f67eb
12 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compose/dalutils/records.go
+11 -11
View File
@@ -11,23 +11,23 @@ import (
type (
creator interface {
Create(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, vv ...dal.ValueGetter) error
Create(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, vv ...dal.ValueGetter) error
}
updater interface {
Update(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, rr ...dal.ValueGetter) (err error)
Update(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, rr ...dal.ValueGetter) (err error)
}
searcher interface {
Search(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, f filter.Filter) (dal.Iterator, error)
Search(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, f filter.Filter) (dal.Iterator, error)
}
lookuper interface {
Lookup(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, lookup dal.ValueGetter, dst dal.ValueSetter) (err error)
Lookup(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, lookup dal.ValueGetter, dst dal.ValueSetter) (err error)
}
deleter interface {
Delete(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, pkv ...dal.ValueGetter) (err error)
Delete(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, pkv ...dal.ValueGetter) (err error)
}
)
@@ -57,7 +57,7 @@ func ComposeRecordsIterator(ctx context.Context, s searcher, mod *types.Module,
func ComposeRecordsFind(ctx context.Context, l lookuper, mod *types.Module, recordID uint64) (out *types.Record, err error) {
out = prepareRecordTarget(mod)
err = l.Lookup(ctx, mod.ModelFilter(), recLookupCapabilities(mod), dal.PKValues{"id": recordID}, out)
err = l.Lookup(ctx, mod.ModelRef(), recLookupCapabilities(mod), dal.PKValues{"id": recordID}, out)
if err != nil {
return
}
@@ -66,19 +66,19 @@ func ComposeRecordsFind(ctx context.Context, l lookuper, mod *types.Module, reco
}
func ComposeRecordCreate(ctx context.Context, c creator, mod *types.Module, records ...*types.Record) (err error) {
return c.Create(ctx, mod.ModelFilter(), recCreateCapabilities(mod), recToGetters(records...)...)
return c.Create(ctx, mod.ModelRef(), recCreateCapabilities(mod), recToGetters(records...)...)
}
func ComposeRecordUpdate(ctx context.Context, u updater, mod *types.Module, records ...*types.Record) (err error) {
return u.Update(ctx, mod.ModelFilter(), recUpdateCapabilities(mod), recToGetters(records...)...)
return u.Update(ctx, mod.ModelRef(), recUpdateCapabilities(mod), recToGetters(records...)...)
}
func ComposeRecordSoftDelete(ctx context.Context, u updater, mod *types.Module, records ...*types.Record) (err error) {
return u.Update(ctx, mod.ModelFilter(), recUpdateCapabilities(mod), recToGetters(records...)...)
return u.Update(ctx, mod.ModelRef(), recUpdateCapabilities(mod), recToGetters(records...)...)
}
func ComposeRecordDelete(ctx context.Context, d deleter, mod *types.Module, records ...*types.Record) (err error) {
return d.Delete(ctx, mod.ModelFilter(), recDeleteCapabilities(mod), recToGetters(records...)...)
return d.Delete(ctx, mod.ModelRef(), recDeleteCapabilities(mod), recToGetters(records...)...)
}
func WalkIterator(ctx context.Context, iter dal.Iterator, mod *types.Module, f func(r *types.Record) error) (err error) {
@@ -111,7 +111,7 @@ func prepFilter(filter types.RecordFilter, mod *types.Module) (dalFilter filter.
func prepIterator(ctx context.Context, dal searcher, mod *types.Module, filter types.RecordFilter) (iter dal.Iterator, err error) {
dalFilter := prepFilter(filter, mod)
iter, err = dal.Search(ctx, mod.ModelFilter(), recSearchCapabilities(mod, filter), dalFilter)
iter, err = dal.Search(ctx, mod.ModelRef(), recSearchCapabilities(mod, filter), dalFilter)
return
}
compose/service/dal_interfaces.go
+6 -6
View File
@@ -21,12 +21,12 @@ type (
}
dalDater interface {
Create(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, vv ...dal.ValueGetter) error
Update(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, rr ...dal.ValueGetter) (err error)
Search(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, f filter.Filter) (dal.Iterator, error)
Lookup(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, lookup dal.ValueGetter, dst dal.ValueSetter) (err error)
Delete(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, pkv ...dal.ValueGetter) (err error)
Truncate(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set) (err error)
Create(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, vv ...dal.ValueGetter) error
Update(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, rr ...dal.ValueGetter) (err error)
Search(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, f filter.Filter) (dal.Iterator, error)
Lookup(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, lookup dal.ValueGetter, dst dal.ValueSetter) (err error)
Delete(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, pkv ...dal.ValueGetter) (err error)
Truncate(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set) (err error)
}
dalService interface {
compose/service/module.go
+1 -1
View File
@@ -71,7 +71,7 @@ type (
// Model management on DAL Service
dalModelManager interface {
GetConnectionMeta(ctx context.Context, ID uint64) (cm dal.ConnectionMeta, err error)
Search(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, f filter.Filter) (dal.Iterator, error)
Search(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, f filter.Filter) (dal.Iterator, error)
ReplaceModel(context.Context, *dal.Model) error
RemoveModel(ctx context.Context, connectionID, ID uint64) error
compose/service/record_test.go
+3 -3
View File
@@ -122,7 +122,7 @@ func makeTestRecordService(t *testing.T, mods ...any) *record {
return svc
}
func modelFilter(svc *record, moduleID uint64) *dal.Model {
func ModelRef(svc *record, moduleID uint64) *dal.Model {
type (
modelFinder interface {
FindModelByResourceID(connectionID uint64, resourceID uint64) *dal.Model
@@ -698,7 +698,7 @@ func TestRecord_searchAccessControl(t *testing.T) {
}
// search for module's model to be used as a filter
model = modelFilter(svc, mod.ID)
model = ModelRef(svc, mod.ID)
)
req.NotNil(model)
@@ -789,7 +789,7 @@ func TestRecord_contextualRolesAccessControl(t *testing.T) {
}
// search for module's model to be used as a filter
model = modelFilter(svc, mod.ID)
model = ModelRef(svc, mod.ID)
// setting up rbac context role expression parser
roleCheckFnMaker = func(expression string) func(scope map[string]interface{}) bool {
compose/types/module.go
+2 -2
View File
@@ -124,8 +124,8 @@ func (m *Module) encodeTranslations() (out locale.ResourceTranslationSet) {
return
}
func (m *Module) ModelFilter() dal.ModelFilter {
return dal.ModelFilter{
func (m *Module) ModelRef() dal.ModelRef {
return dal.ModelRef{
ConnectionID: m.ModelConfig.ConnectionID,
ResourceID: m.ID,
pkg/dal/model.go
+4 -4
View File
@@ -10,8 +10,8 @@ import (
)
type (
// ModelFilter is used to retrieve a model from the DAL based on given params
ModelFilter struct {
// ModelRef is used to retrieve a model from the DAL based on given params
ModelRef struct {
ConnectionID uint64
ResourceID uint64
@@ -148,8 +148,8 @@ func (aa ModelSet) FilterByReferenced(b *Model) (out ModelSet) {
return
}
func (m Model) ToFilter() ModelFilter {
return ModelFilter{
func (m Model) ToFilter() ModelRef {
return ModelRef{
ConnectionID: m.ConnectionID,
ResourceID: m.ResourceID,
pkg/dal/service.go
+8 -8
View File
@@ -389,7 +389,7 @@ func (svc *service) RemoveConnection(ctx context.Context, ID uint64) (err error)
// DML
// Create stores new data (create compose record)
func (svc *service) Create(ctx context.Context, mf ModelFilter, capabilities capabilities.Set, rr ...ValueGetter) (err error) {
func (svc *service) Create(ctx context.Context, mf ModelRef, capabilities capabilities.Set, rr ...ValueGetter) (err error) {
if err = svc.canOpRecord(mf.ConnectionID, mf.ResourceID); err != nil {
return wrapError("cannot create record", err)
}
@@ -402,7 +402,7 @@ func (svc *service) Create(ctx context.Context, mf ModelFilter, capabilities cap
return cw.connection.Create(ctx, model, rr...)
}
func (svc *service) Update(ctx context.Context, mf ModelFilter, capabilities capabilities.Set, rr ...ValueGetter) (err error) {
func (svc *service) Update(ctx context.Context, mf ModelRef, capabilities capabilities.Set, rr ...ValueGetter) (err error) {
if err = svc.canOpRecord(mf.ConnectionID, mf.ResourceID); err != nil {
return wrapError("cannot update record", err)
}
@@ -421,7 +421,7 @@ func (svc *service) Update(ctx context.Context, mf ModelFilter, capabilities cap
return
}
func (svc *service) Search(ctx context.Context, mf ModelFilter, capabilities capabilities.Set, f filter.Filter) (iter Iterator, err error) {
func (svc *service) Search(ctx context.Context, mf ModelRef, capabilities capabilities.Set, f filter.Filter) (iter Iterator, err error) {
if err = svc.canOpRecord(mf.ConnectionID, mf.ResourceID); err != nil {
err = wrapError("cannot search record", err)
return
@@ -436,7 +436,7 @@ func (svc *service) Search(ctx context.Context, mf ModelFilter, capabilities cap
return cw.connection.Search(ctx, model, f)
}
func (svc *service) Lookup(ctx context.Context, mf ModelFilter, capabilities capabilities.Set, lookup ValueGetter, dst ValueSetter) (err error) {
func (svc *service) Lookup(ctx context.Context, mf ModelRef, capabilities capabilities.Set, lookup ValueGetter, dst ValueSetter) (err error) {
if err = svc.canOpRecord(mf.ConnectionID, mf.ResourceID); err != nil {
return wrapError("cannot lookup record", err)
}
@@ -448,7 +448,7 @@ func (svc *service) Lookup(ctx context.Context, mf ModelFilter, capabilities cap
return cw.connection.Lookup(ctx, model, lookup, dst)
}
func (svc *service) Delete(ctx context.Context, mf ModelFilter, capabilities capabilities.Set, vv ...ValueGetter) (err error) {
func (svc *service) Delete(ctx context.Context, mf ModelRef, capabilities capabilities.Set, vv ...ValueGetter) (err error) {
if err = svc.canOpRecord(mf.ConnectionID, mf.ResourceID); err != nil {
return wrapError("cannot delete record", err)
}
@@ -466,7 +466,7 @@ func (svc *service) Delete(ctx context.Context, mf ModelFilter, capabilities cap
return
}
func (svc *service) Truncate(ctx context.Context, mf ModelFilter, capabilities capabilities.Set) (err error) {
func (svc *service) Truncate(ctx context.Context, mf ModelRef, capabilities capabilities.Set) (err error) {
if err = svc.canOpRecord(mf.ConnectionID, mf.ResourceID); err != nil {
return wrapError("cannot truncate record", err)
}
@@ -479,7 +479,7 @@ func (svc *service) Truncate(ctx context.Context, mf ModelFilter, capabilities c
return cw.connection.Truncate(ctx, model)
}
func (svc *service) storeOpPrep(ctx context.Context, mf ModelFilter, capabilities capabilities.Set) (model *Model, cw *ConnectionWrap, err error) {
func (svc *service) storeOpPrep(ctx context.Context, mf ModelRef, capabilities capabilities.Set) (model *Model, cw *ConnectionWrap, err error) {
model = svc.getModelByFilter(mf)
if model == nil {
err = errModelNotFound(mf.ResourceID)
@@ -890,7 +890,7 @@ func (svc *service) registerModelToConnection(ctx context.Context, cw *Connectio
return nil, nil
}
func (svc *service) getModelByFilter(mf ModelFilter) *Model {
func (svc *service) getModelByFilter(mf ModelRef) *Model {
if mf.ConnectionID == 0 {
mf.ConnectionID = svc.defConnID
}
pkg/envoy/store/compose.go
+4 -4
View File
@@ -34,10 +34,10 @@ type (
}
dalService interface {
Create(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, vv ...dal.ValueGetter) error
Search(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, f filter.Filter) (dal.Iterator, error)
Delete(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, pkv ...dal.ValueGetter) (err error)
Update(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, pkv ...dal.ValueGetter) (err error)
Create(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, vv ...dal.ValueGetter) error
Search(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, f filter.Filter) (dal.Iterator, error)
Delete(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, pkv ...dal.ValueGetter) (err error)
Update(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, pkv ...dal.ValueGetter) (err error)
}
composeDecoder struct {
pkg/seeder/seeder.go
+3 -3
View File
@@ -59,9 +59,9 @@ type (
}
dalService interface {
Create(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, vv ...dal.ValueGetter) error
Search(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, f filter.Filter) (dal.Iterator, error)
Delete(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, pkv ...dal.ValueGetter) (err error)
Create(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, vv ...dal.ValueGetter) error
Search(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, f filter.Filter) (dal.Iterator, error)
Delete(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, pkv ...dal.ValueGetter) (err error)
}
moduleService interface {
tests/compose/main_test.go
+6 -6
View File
@@ -70,12 +70,12 @@ type (
ReplaceModelAttribute(ctx context.Context, model *dal.Model, old, new *dal.Attribute, trans ...dal.TransformationFunction) (err error)
SearchModelIssues(connectionID, resourceID uint64) (out []error)
Create(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, vv ...dal.ValueGetter) error
Update(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, rr ...dal.ValueGetter) (err error)
Search(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, f filter.Filter) (dal.Iterator, error)
Lookup(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, lookup dal.ValueGetter, dst dal.ValueSetter) (err error)
Delete(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, pkv ...dal.ValueGetter) (err error)
Truncate(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set) (err error)
Create(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, vv ...dal.ValueGetter) error
Update(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, rr ...dal.ValueGetter) (err error)
Search(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, f filter.Filter) (dal.Iterator, error)
Lookup(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, lookup dal.ValueGetter, dst dal.ValueSetter) (err error)
Delete(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, pkv ...dal.ValueGetter) (err error)
Truncate(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set) (err error)
}
)
tests/dal/dal_utils.go
+6 -6
View File
@@ -45,12 +45,12 @@ type (
FindModelByResourceIdent(connectionID uint64, resourceType, resourceIdent string) *dal.Model
FindModelByIdent(connectionID uint64, ident string) *dal.Model
Create(ctx context.Context, mf dal.ModelFilter, capabilities capabilities.Set, rr ...dal.ValueGetter) (err error)
Update(ctx context.Context, mf dal.ModelFilter, capabilities capabilities.Set, rr ...dal.ValueGetter) (err error)
Search(ctx context.Context, mf dal.ModelFilter, capabilities capabilities.Set, f filter.Filter) (iter dal.Iterator, err error)
Lookup(ctx context.Context, mf dal.ModelFilter, capabilities capabilities.Set, lookup dal.ValueGetter, dst dal.ValueSetter) (err error)
Delete(ctx context.Context, mf dal.ModelFilter, capabilities capabilities.Set, vv ...dal.ValueGetter) (err error)
Truncate(ctx context.Context, mf dal.ModelFilter, capabilities capabilities.Set) (err error)
Create(ctx context.Context, mf dal.ModelRef, capabilities capabilities.Set, rr ...dal.ValueGetter) (err error)
Update(ctx context.Context, mf dal.ModelRef, capabilities capabilities.Set, rr ...dal.ValueGetter) (err error)
Search(ctx context.Context, mf dal.ModelRef, capabilities capabilities.Set, f filter.Filter) (iter dal.Iterator, err error)
Lookup(ctx context.Context, mf dal.ModelRef, capabilities capabilities.Set, lookup dal.ValueGetter, dst dal.ValueSetter) (err error)
Delete(ctx context.Context, mf dal.ModelRef, capabilities capabilities.Set, vv ...dal.ValueGetter) (err error)
Truncate(ctx context.Context, mf dal.ModelRef, capabilities capabilities.Set) (err error)
SearchConnectionIssues(connectionID uint64) (out []error)
SearchModelIssues(connectionID, resourceID uint64) (out []error)
tests/workflows/main_test.go
+6 -6
View File
@@ -41,12 +41,12 @@ type (
ReplaceModelAttribute(ctx context.Context, model *dal.Model, old, new *dal.Attribute, trans ...dal.TransformationFunction) (err error)
SearchModelIssues(connectionID, resourceID uint64) (out []error)
Create(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, vv ...dal.ValueGetter) error
Update(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, rr ...dal.ValueGetter) (err error)
Search(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, f filter.Filter) (dal.Iterator, error)
Lookup(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, lookup dal.ValueGetter, dst dal.ValueSetter) (err error)
Delete(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set, pkv ...dal.ValueGetter) (err error)
Truncate(ctx context.Context, m dal.ModelFilter, capabilities capabilities.Set) (err error)
Create(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, vv ...dal.ValueGetter) error
Update(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, rr ...dal.ValueGetter) (err error)
Search(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, f filter.Filter) (dal.Iterator, error)
Lookup(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, lookup dal.ValueGetter, dst dal.ValueSetter) (err error)
Delete(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set, pkv ...dal.ValueGetter) (err error)
Truncate(ctx context.Context, m dal.ModelRef, capabilities capabilities.Set) (err error)
}
)