From fa52c71e9341f207aea1fff6a529111f53da0a4b Mon Sep 17 00:00:00 2001 From: mr Date: Fri, 2 Aug 2024 14:07:43 +0200 Subject: [PATCH] logs update --- dbs/dbs.go | 4 ++-- dbs/mongo/mongo.go | 8 ++++++-- .../resource_model/resource_model_mongo_accessor.go | 4 ++-- models/resources/data/data_mongo_accessor.go | 12 ++++++------ .../datacenter/datacenter_mongo_accessor.go | 12 ++++++------ .../processing/processing_mongo_accessor.go | 12 ++++++------ models/resources/storage/storage_mongo_accessor.go | 12 ++++++------ models/resources/workflow/workflow_mongo_accessor.go | 12 ++++++------ models/utils/abstracts.go | 10 +++++----- models/workflow/workflow_mongo_accessor.go | 8 ++++---- models/workspace/workspace_mongo_accessor.go | 4 ++-- 11 files changed, 51 insertions(+), 47 deletions(-) diff --git a/dbs/dbs.go b/dbs/dbs.go index 45e41f6..ae744e6 100644 --- a/dbs/dbs.go +++ b/dbs/dbs.go @@ -101,8 +101,8 @@ func ToValueOperator(operator Operator, value interface{}) interface{} { } type Filters struct { - And map[string]Filter `json:"and"` - Or map[string]Filter `json:"or"` + And map[string][]Filter `json:"and"` + Or map[string][]Filter `json:"or"` } type Filter struct { diff --git a/dbs/mongo/mongo.go b/dbs/mongo/mongo.go index 28594ae..f564484 100644 --- a/dbs/mongo/mongo.go +++ b/dbs/mongo/mongo.go @@ -267,13 +267,17 @@ func (m *MongoDB) Search(filters *dbs.Filters, collection_name string) (*mongo.C f := bson.D{} if filters != nil { for k, filter := range filters.Or { - orList = append(orList, dbs.StringToOperator(filter.Operator).ToMongoOperator(k, filter.Value)) + for _, ff := range filter { + orList = append(orList, dbs.StringToOperator(ff.Operator).ToMongoOperator(k, ff.Value)) + } } if len(orList) > 0 { f = bson.D{{"$or", orList}} } for k, filter := range filters.And { - f = append(f, dbs.StringToOperator(filter.Operator).ToMongoEOperator(k, filter.Value)) + for _, ff := range filter { + f = append(f, dbs.StringToOperator(ff.Operator).ToMongoEOperator(k, ff.Value)) + } } } diff --git a/models/resource_model/resource_model_mongo_accessor.go b/models/resource_model/resource_model_mongo_accessor.go index 8765618..54f0dac 100644 --- a/models/resource_model/resource_model_mongo_accessor.go +++ b/models/resource_model/resource_model_mongo_accessor.go @@ -58,8 +58,8 @@ func (wfa *ResourceModelMongoAccessor) Search(filters *dbs.Filters, search strin objs := []utils.ShallowDBObject{} if (filters == nil || len(filters.And) == 0 || len(filters.Or) == 0) && search != "" { filters = &dbs.Filters{ - Or: map[string]dbs.Filter{ - "resource_type": {Operator: dbs.LIKE.String(), Value: search}, + Or: map[string][]dbs.Filter{ + "resource_type": []dbs.Filter{{Operator: dbs.LIKE.String(), Value: search}}, }, } } diff --git a/models/resources/data/data_mongo_accessor.go b/models/resources/data/data_mongo_accessor.go index 5fac39b..0d44d18 100644 --- a/models/resources/data/data_mongo_accessor.go +++ b/models/resources/data/data_mongo_accessor.go @@ -75,12 +75,12 @@ func (wfa *dataMongoAccessor) Search(filters *dbs.Filters, search string) ([]uti objs := []utils.ShallowDBObject{} if (filters == nil || len(filters.And) == 0 || len(filters.Or) == 0) && search != "" { filters = &dbs.Filters{ - Or: map[string]dbs.Filter{ - "abstractresource.abstractobject.name": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.short_description": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.description": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.owner": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.source_url": {Operator: dbs.LIKE.String(), Value: search}, + Or: map[string][]dbs.Filter{ + "abstractresource.abstractobject.name": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.short_description": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.description": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.owner": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.source_url": {{Operator: dbs.LIKE.String(), Value: search}}, }, } } diff --git a/models/resources/datacenter/datacenter_mongo_accessor.go b/models/resources/datacenter/datacenter_mongo_accessor.go index f423732..429eb07 100644 --- a/models/resources/datacenter/datacenter_mongo_accessor.go +++ b/models/resources/datacenter/datacenter_mongo_accessor.go @@ -77,12 +77,12 @@ func (wfa *datacenterMongoAccessor) Search(filters *dbs.Filters, search string) objs := []utils.ShallowDBObject{} if (filters == nil || len(filters.And) == 0 || len(filters.Or) == 0) && search != "" { filters = &dbs.Filters{ - Or: map[string]dbs.Filter{ - "abstractresource.abstractobject.name": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.short_description": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.description": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.owner": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.source_url": {Operator: dbs.LIKE.String(), Value: search}, + Or: map[string][]dbs.Filter{ + "abstractresource.abstractobject.name": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.short_description": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.description": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.owner": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.source_url": {{Operator: dbs.LIKE.String(), Value: search}}, }, } } diff --git a/models/resources/processing/processing_mongo_accessor.go b/models/resources/processing/processing_mongo_accessor.go index 3368bfa..05b1429 100644 --- a/models/resources/processing/processing_mongo_accessor.go +++ b/models/resources/processing/processing_mongo_accessor.go @@ -78,12 +78,12 @@ func (wfa *processingMongoAccessor) Search(filters *dbs.Filters, search string) objs := []utils.ShallowDBObject{} if (filters == nil || len(filters.And) == 0 || len(filters.Or) == 0) && search != "" { filters = &dbs.Filters{ - Or: map[string]dbs.Filter{ - "abstractresource.abstractobject.name": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.short_description": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.description": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.owner": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.source_url": {Operator: dbs.LIKE.String(), Value: search}, + Or: map[string][]dbs.Filter{ + "abstractresource.abstractobject.name": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.short_description": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.description": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.owner": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.source_url": {{Operator: dbs.LIKE.String(), Value: search}}, }, } } diff --git a/models/resources/storage/storage_mongo_accessor.go b/models/resources/storage/storage_mongo_accessor.go index b4f574d..1eb47a5 100644 --- a/models/resources/storage/storage_mongo_accessor.go +++ b/models/resources/storage/storage_mongo_accessor.go @@ -78,12 +78,12 @@ func (wfa *storageMongoAccessor) Search(filters *dbs.Filters, search string) ([] objs := []utils.ShallowDBObject{} if (filters == nil || len(filters.And) == 0 || len(filters.Or) == 0) && search != "" { filters = &dbs.Filters{ - Or: map[string]dbs.Filter{ - "abstractresource.abstractobject.name": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.short_description": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.description": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.owner": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.source_url": {Operator: dbs.LIKE.String(), Value: search}, + Or: map[string][]dbs.Filter{ + "abstractresource.abstractobject.name": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.short_description": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.description": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.owner": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.source_url": {{Operator: dbs.LIKE.String(), Value: search}}, }, } } diff --git a/models/resources/workflow/workflow_mongo_accessor.go b/models/resources/workflow/workflow_mongo_accessor.go index a066d0e..e024ddd 100644 --- a/models/resources/workflow/workflow_mongo_accessor.go +++ b/models/resources/workflow/workflow_mongo_accessor.go @@ -82,12 +82,12 @@ func (wfa *workflowResourceMongoAccessor) Search(filters *dbs.Filters, search st objs := []utils.ShallowDBObject{} if (filters == nil || len(filters.And) == 0 || len(filters.Or) == 0) && search != "" { filters = &dbs.Filters{ - Or: map[string]dbs.Filter{ - "abstractresource.abstractobject.name": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.short_description": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.description": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.owner": {Operator: dbs.LIKE.String(), Value: search}, - "abstractresource.source_url": {Operator: dbs.LIKE.String(), Value: search}, + Or: map[string][]dbs.Filter{ + "abstractresource.abstractobject.name": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.short_description": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.description": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.owner": {{Operator: dbs.LIKE.String(), Value: search}}, + "abstractresource.source_url": {{Operator: dbs.LIKE.String(), Value: search}}, }, } } diff --git a/models/utils/abstracts.go b/models/utils/abstracts.go index 952fd48..bf2bbb8 100644 --- a/models/utils/abstracts.go +++ b/models/utils/abstracts.go @@ -47,15 +47,15 @@ func (dma *AbstractAccessor) SetLogger(t DataType) { func (wfa *AbstractAccessor) GenericStoreOne(data DBObject, accessor Accessor) (DBObject, int, error) { data.GenerateID() f := dbs.Filters{ - Or: map[string]dbs.Filter{ - "abstractresource.abstractobject.name": { + Or: map[string][]dbs.Filter{ + "abstractresource.abstractobject.name": {{ Operator: dbs.LIKE.String(), Value: data.GetName(), - }, - "abstractobject.name": { + }}, + "abstractobject.name": {{ Operator: dbs.LIKE.String(), Value: data.GetName(), - }, + }}, }, } if cursor, _, _ := accessor.Search(&f, ""); len(cursor) > 0 { diff --git a/models/workflow/workflow_mongo_accessor.go b/models/workflow/workflow_mongo_accessor.go index 8962206..e068625 100644 --- a/models/workflow/workflow_mongo_accessor.go +++ b/models/workflow/workflow_mongo_accessor.go @@ -101,8 +101,8 @@ func (wfa *workflowMongoAccessor) CopyOne(data utils.DBObject) (utils.DBObject, func (wfa *workflowMongoAccessor) execute(workflow *Workflow) { accessor := (&workspace.Workspace{}).GetAccessor() filters := &dbs.Filters{ - Or: map[string]dbs.Filter{ - "abstractobject.name": {dbs.LIKE.String(), workflow.Name + "_workspace"}, + Or: map[string][]dbs.Filter{ + "abstractobject.name": {{dbs.LIKE.String(), workflow.Name + "_workspace"}}, }, } resource, _, err := accessor.Search(filters, "") @@ -166,8 +166,8 @@ func (wfa *workflowMongoAccessor) Search(filters *dbs.Filters, search string) ([ objs := []utils.ShallowDBObject{} if (filters == nil || len(filters.And) == 0 || len(filters.Or) == 0) && search != "" { filters = &dbs.Filters{ - Or: map[string]dbs.Filter{ - "abstractobject.name": {Operator: dbs.LIKE.String(), Value: search}, + Or: map[string][]dbs.Filter{ + "abstractobject.name": {{Operator: dbs.LIKE.String(), Value: search}}, }, } } diff --git a/models/workspace/workspace_mongo_accessor.go b/models/workspace/workspace_mongo_accessor.go index f3cf693..ebb5e1c 100644 --- a/models/workspace/workspace_mongo_accessor.go +++ b/models/workspace/workspace_mongo_accessor.go @@ -140,8 +140,8 @@ func (wfa *workspaceMongoAccessor) Search(filters *dbs.Filters, search string) ( objs := []utils.ShallowDBObject{} if (filters == nil || len(filters.And) == 0 || len(filters.Or) == 0) && search != "" { filters = &dbs.Filters{ - Or: map[string]dbs.Filter{ - "abstractobject.name": {Operator: dbs.LIKE.String(), Value: search}, + Or: map[string][]dbs.Filter{ + "abstractobject.name": {{Operator: dbs.LIKE.String(), Value: search}}, }, } }