diff --git a/models/resources/data/data.go b/models/resources/data/data.go index 72bf213..e911385 100644 --- a/models/resources/data/data.go +++ b/models/resources/data/data.go @@ -10,8 +10,8 @@ import ( type DataResource struct { resources.AbstractResource Protocols []string `json:"protocol,omitempty" bson:"protocol,omitempty"` //TODO Enum type - DataType string `json:"datatype,omitempty" bson:"datatype"` - Example string `json:"example,omitempty" bson:"example" description:"base64 encoded data"` + DataType string `json:"datatype,omitempty" bson:"datatype,omitempty"` + Example string `json:"example,omitempty" bson:"example,omitempty" description:"base64 encoded data"` } func (dma *DataResource) Deserialize(j map[string]interface{}) utils.DBObject { diff --git a/models/resources/datacenter/datacenter.go b/models/resources/datacenter/datacenter.go index 0419bca..e8233ba 100644 --- a/models/resources/datacenter/datacenter.go +++ b/models/resources/datacenter/datacenter.go @@ -9,7 +9,7 @@ import ( type DatacenterResource struct { resources.AbstractResource - BookingPrice int `bson:"booking_price" json:"booking_price,omitempty"` + BookingPrice int `bson:"booking_price,omitempty" json:"booking_price,omitempty"` CPU *DatacenterCpuModel `bson:"cpu,omitempty" json:"cpu,omitempty"` RAM *DatacenterMemoryModel `bson:"ram,omitempty" json:"ram,omitempty"` diff --git a/models/resources/resource.go b/models/resources/resource.go index cd58b55..eac5cdd 100644 --- a/models/resources/resource.go +++ b/models/resources/resource.go @@ -16,12 +16,12 @@ type Resource interface { type AbstractResource struct { utils.AbstractObject - ShortDescription string `json:"short_description" bson:"short_description" validate:"required"` - Description string `json:"description,omitempty" bson:"description"` - Logo string `json:"logo" bson:"logo" validate:"required"` - Owner string `json:"owner" bson:"owner" validate:"required"` - OwnerLogo string `json:"owner_logo" bson:"owner_logo"` - SourceUrl string `json:"source_url" bson:"source_url" validate:"required"` + ShortDescription string `json:"short_description,omitempty" bson:"short_description,omitempty" validate:"required"` + Description string `json:"description,omitempty" bson:"description,omitempty"` + Logo string `json:"logo,omitempty" bson:"logo,omitempty" validate:"required"` + Owner string `json:"owner,omitempty" bson:"owner,omitempty" validate:"required"` + OwnerLogo string `json:"owner_logo,omitempty" bson:"owner_logo,omitempty"` + SourceUrl string `json:"source_url,omitempty" bson:"source_url,omitempty" validate:"required"` } func (r *AbstractResource) GetID() string { diff --git a/models/resources/storage/storage.go b/models/resources/storage/storage.go index e1428f3..8906823 100644 --- a/models/resources/storage/storage.go +++ b/models/resources/storage/storage.go @@ -8,8 +8,8 @@ import ( ) type URL struct { - Protocol string `bson:"protocol,omitempty" json:"protocol"` - Path string `bson:"path,omitempty" json:"path"` + Protocol string `bson:"protocol,omitempty" json:"protocol,omitempty"` + Path string `bson:"path,omitempty" json:"path,omitempty"` } type StorageResource struct { diff --git a/models/utils/abstracts.go b/models/utils/abstracts.go index 7e82a70..5c460c0 100644 --- a/models/utils/abstracts.go +++ b/models/utils/abstracts.go @@ -11,8 +11,8 @@ import ( var validate = validator.New(validator.WithRequiredStructEnabled()) type AbstractObject struct { - UUID string `json:"id" required:"true" bson:"id" validate:"required"` - Name string `json:"name" required:"true" bson:"name" validate:"required"` + UUID string `json:"id,omitempty" bson:"id,omitempty" validate:"required"` + Name string `json:"name,omitempty" bson:"name,omitempty" validate:"required"` } func (ao *AbstractObject) GetID() string {