From 01f860f7f69a350c7ea18271a9fb3f1a6e954553 Mon Sep 17 00:00:00 2001 From: Denis Arh Date: Thu, 11 Aug 2022 19:49:56 +0200 Subject: [PATCH] Rename record.FindSensitive fn to SearchSensitive --- compose/rest/data_privacy.go | 4 ++-- compose/service/data_privacy.go | 2 +- compose/service/module.go | 6 +++--- compose/service/record.go | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/compose/rest/data_privacy.go b/compose/rest/data_privacy.go index c6b9c4f82..5b4b44f42 100644 --- a/compose/rest/data_privacy.go +++ b/compose/rest/data_privacy.go @@ -35,7 +35,7 @@ type ( } privateDataFinder interface { - FindSensitive(ctx context.Context) (set []types.SensitiveRecordSet, err error) + SearchSensitive(ctx context.Context) (set []types.SensitiveRecordSet, err error) } DataPrivacy struct { @@ -64,7 +64,7 @@ func (ctrl *DataPrivacy) RecordList(ctx context.Context, r *request.DataPrivacyR } // Collect sensitive records - ss, err := ctrl.record.FindSensitive(ctx) + ss, err := ctrl.record.SearchSensitive(ctx) if err != nil { return } diff --git a/compose/service/data_privacy.go b/compose/service/data_privacy.go index 287842d2e..c6c588a88 100644 --- a/compose/service/data_privacy.go +++ b/compose/service/data_privacy.go @@ -49,7 +49,7 @@ func (svc dataPrivacy) FindModules(ctx context.Context, filter types.PrivacyModu tag := locale.GetAcceptLanguageFromContext(ctx) n.DecodeTranslations(svc.locale.Locale().ResourceTranslations(tag, n.ResourceTranslation())) - modules, f, err = svc.m.FindSensitive(ctx, types.PrivacyModuleFilter{ + modules, f, err = svc.m.SearchSensitive(ctx, types.PrivacyModuleFilter{ NamespaceID: n.ID, ConnectionID: filter.ConnectionID, }) diff --git a/compose/service/module.go b/compose/service/module.go index 240f9bf49..35a7dd1ad 100644 --- a/compose/service/module.go +++ b/compose/service/module.go @@ -55,7 +55,7 @@ type ( FindByHandle(ctx context.Context, namespaceID uint64, handle string) (*types.Module, error) FindByAny(ctx context.Context, namespaceID uint64, identifier interface{}) (*types.Module, error) Find(ctx context.Context, filter types.ModuleFilter) (set types.ModuleSet, f types.ModuleFilter, err error) - FindSensitive(ctx context.Context, filter types.PrivacyModuleFilter) (set []types.PrivacyModule, f types.PrivacyModuleFilter, err error) + SearchSensitive(ctx context.Context, filter types.PrivacyModuleFilter) (set []types.PrivacyModule, f types.PrivacyModuleFilter, err error) Create(ctx context.Context, module *types.Module) (*types.Module, error) Update(ctx context.Context, module *types.Module) (*types.Module, error) @@ -436,8 +436,8 @@ func (svc *module) ReloadDALModels(ctx context.Context) (err error) { return DalModelReload(ctx, svc.store, svc.dal) } -// FindSensitive will list all module with at least one private module field -func (svc module) FindSensitive(ctx context.Context, filter types.PrivacyModuleFilter) (set []types.PrivacyModule, f types.PrivacyModuleFilter, err error) { +// SearchSensitive will list all module with at least one private module field +func (svc module) SearchSensitive(ctx context.Context, filter types.PrivacyModuleFilter) (set []types.PrivacyModule, f types.PrivacyModuleFilter, err error) { var ( mm types.ModuleSet diff --git a/compose/service/record.go b/compose/service/record.go index 208eb3e38..e5ca5b4fa 100644 --- a/compose/service/record.go +++ b/compose/service/record.go @@ -107,7 +107,7 @@ type ( Report(ctx context.Context, namespaceID, moduleID uint64, metrics, dimensions, filter string) (interface{}, error) Find(ctx context.Context, filter types.RecordFilter) (set types.RecordSet, f types.RecordFilter, err error) - FindSensitive(ctx context.Context) (set []types.SensitiveRecordSet, err error) + SearchSensitive(ctx context.Context) (set []types.SensitiveRecordSet, err error) SearchRevisions(ctx context.Context, namespaceID, moduleID, recordID uint64) (dal.Iterator, error) RecordExport(context.Context, types.RecordFilter) error RecordImport(context.Context, error) error @@ -321,8 +321,8 @@ func (svc record) Find(ctx context.Context, filter types.RecordFilter) (set type return set, f, svc.recordAction(ctx, aProps, RecordActionSearch, err) } -// FindSensitive returns stripped down records for all namespaces/modules where fields define a sensitivity level -func (svc record) FindSensitive(ctx context.Context) (set []types.SensitiveRecordSet, err error) { +// SearchSensitive returns stripped down records for all namespaces/modules where fields define a sensitivity level +func (svc record) SearchSensitive(ctx context.Context) (set []types.SensitiveRecordSet, err error) { var ( namespaces types.NamespaceSet modules types.ModuleSet @@ -346,7 +346,7 @@ func (svc record) FindSensitive(ctx context.Context) (set []types.SensitiveRecor for _, module := range modules { // Get sensitive record data - aux, err := svc.findSensitive(ctx, userID, namespace, module, types.RecordFilter{ + aux, err := svc.searchSensitive(ctx, userID, namespace, module, types.RecordFilter{ ModuleID: module.ID, NamespaceID: namespace.ID, }) @@ -367,7 +367,7 @@ func (svc record) FindSensitive(ctx context.Context) (set []types.SensitiveRecor return set, err } -func (svc record) findSensitive(ctx context.Context, userID uint64, namespace *types.Namespace, module *types.Module, filter types.RecordFilter) (out types.SensitiveRecordSet, err error) { +func (svc record) searchSensitive(ctx context.Context, userID uint64, namespace *types.Namespace, module *types.Module, filter types.RecordFilter) (out types.SensitiveRecordSet, err error) { out = types.SensitiveRecordSet{ Namespace: namespace, Module: module,