From 2795c924f75d603f4ba31b3849b7d55037fcfbee Mon Sep 17 00:00:00 2001 From: mr Date: Wed, 31 Jul 2024 11:47:47 +0200 Subject: [PATCH] optionnal vars failed --- models/resource_model/resource_model.go | 1 + models/utils/abstracts.go | 2 +- models/utils/common.go | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 models/utils/common.go diff --git a/models/resource_model/resource_model.go b/models/resource_model/resource_model.go index 115cced..a666c21 100644 --- a/models/resource_model/resource_model.go +++ b/models/resource_model/resource_model.go @@ -16,6 +16,7 @@ type AbstractResource struct { OwnerLogo string `json:"owner_logo,omitempty" bson:"owner_logo,omitempty"` SourceUrl string `json:"source_url,omitempty" bson:"source_url,omitempty" validate:"required"` Price string `json:"price,omitempty" bson:"price,omitempty"` + Currency string `json:"price,omitempty" bson:"price,omitempty"` License string `json:"license,omitempty" bson:"license,omitempty"` ResourceModel *ResourceModel `json:"resource_model,omitempty" bson:"resource_model,omitempty"` //Proxy *ResourceProxy `json:"proxy,omitempty" bson:"proxy,omitempty"` diff --git a/models/utils/abstracts.go b/models/utils/abstracts.go index d25ca0a..4d17af5 100644 --- a/models/utils/abstracts.go +++ b/models/utils/abstracts.go @@ -45,7 +45,7 @@ func (dma *AbstractAccessor) SetLogger(t DataType) { func (wfa *AbstractAccessor) GenericStoreOne(data DBObject, accessor Accessor) (DBObject, int, error) { data.GenerateID() - if cursor, _, _ := accessor.Search(data.GetName(), []string{"abstractresource.abstractobject.name", "abstractobject.name"}...); len(cursor) > 0 { + if cursor, _, _ := accessor.Search(data.GetName(), "abstractresource.abstractobject.name", "abstractobject.name"); len(cursor) > 0 { return nil, 409, errors.New(accessor.GetType() + " with name " + data.GetName() + " already exists") } err := validate.Struct(data) diff --git a/models/utils/common.go b/models/utils/common.go new file mode 100644 index 0000000..ff98910 --- /dev/null +++ b/models/utils/common.go @@ -0,0 +1,8 @@ +package utils + +/* +type Price struct { + Price float64 `json:"price,omitempty" bson:"price,omitempty"` + Currency string `json:"currency,omitempty" bson:"currency,omitempty"` +} +*/