From dd5f8f5b2d408cf78c5a154bc5745fd0050d2bb9 Mon Sep 17 00:00:00 2001 From: mr Date: Mon, 5 Aug 2024 10:10:58 +0200 Subject: [PATCH] kick out print --- .../resource_model_mongo_accessor.go | 2 +- models/utils/abstracts.go | 24 +++++++++++++++++++ models/utils/interfaces.go | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/models/resource_model/resource_model_mongo_accessor.go b/models/resource_model/resource_model_mongo_accessor.go index 54f0dac..ebea024 100644 --- a/models/resource_model/resource_model_mongo_accessor.go +++ b/models/resource_model/resource_model_mongo_accessor.go @@ -59,7 +59,7 @@ func (wfa *ResourceModelMongoAccessor) Search(filters *dbs.Filters, search strin if (filters == nil || len(filters.And) == 0 || len(filters.Or) == 0) && search != "" { filters = &dbs.Filters{ Or: map[string][]dbs.Filter{ - "resource_type": []dbs.Filter{{Operator: dbs.LIKE.String(), Value: search}}, + "resource_type": {{Operator: dbs.LIKE.String(), Value: search}}, }, } } diff --git a/models/utils/abstracts.go b/models/utils/abstracts.go index bf2bbb8..f70d013 100644 --- a/models/utils/abstracts.go +++ b/models/utils/abstracts.go @@ -1,6 +1,7 @@ package utils import ( + "encoding/json" "errors" "cloud.o-forge.io/core/oc-lib/dbs" @@ -26,6 +27,29 @@ func (ao *AbstractObject) GetName() string { return ao.Name } +func (dma *AbstractObject) GetAccessor() Accessor { + return nil +} + +func (dma *AbstractObject) Deserialize(j map[string]interface{}) DBObject { + b, err := json.Marshal(j) + if err != nil { + return nil + } + json.Unmarshal(b, dma) + return dma +} + +func (dma *AbstractObject) Serialize() map[string]interface{} { + var m map[string]interface{} + b, err := json.Marshal(dma) + if err != nil { + return nil + } + json.Unmarshal(b, &m) + return m +} + func (r *AbstractObject) GenerateID() { r.UUID = uuid.New().String() } diff --git a/models/utils/interfaces.go b/models/utils/interfaces.go index 037ccc4..d32ff50 100644 --- a/models/utils/interfaces.go +++ b/models/utils/interfaces.go @@ -6,6 +6,8 @@ type ShallowDBObject interface { GenerateID() GetID() string GetName() string + Deserialize(j map[string]interface{}) DBObject + Serialize() map[string]interface{} } type DBObject interface {