update fails
This commit is contained in:
parent
7a49f6b957
commit
4a90d3379c
@ -42,32 +42,43 @@ func GetLogger() zerolog.Logger {
|
|||||||
|
|
||||||
func LoadOne(collection LibDataEnum, id string) LibData {
|
func LoadOne(collection LibDataEnum, id string) LibData {
|
||||||
d, code, err := models.Model(collection.EnumIndex()).GetAccessor().LoadOne(id)
|
d, code, err := models.Model(collection.EnumIndex()).GetAccessor().LoadOne(id)
|
||||||
if err != nil { return LibData{Data: d, Code: code, Err: err.Error()} }
|
if err != nil {
|
||||||
|
return LibData{Data: d, Code: code, Err: err.Error()}
|
||||||
|
}
|
||||||
return LibData{Data: d, Code: code}
|
return LibData{Data: d, Code: code}
|
||||||
}
|
}
|
||||||
|
|
||||||
func UpdateOne(collection LibDataEnum, set map[string]interface{}, id string) LibData {
|
func UpdateOne(collection LibDataEnum, set map[string]interface{}, id string) LibData {
|
||||||
d, code, err := models.Model(collection.EnumIndex()).GetAccessor().UpdateOne(set, id)
|
model := models.Model(collection.EnumIndex())
|
||||||
if err != nil { return LibData{Data: d, Code: code, Err: err.Error()} }
|
d, code, err := model.GetAccessor().UpdateOne(model.Deserialize(set).Serialize(), id)
|
||||||
|
if err != nil {
|
||||||
|
return LibData{Data: d, Code: code, Err: err.Error()}
|
||||||
|
}
|
||||||
return LibData{Data: d, Code: code}
|
return LibData{Data: d, Code: code}
|
||||||
}
|
}
|
||||||
|
|
||||||
func DeleteOne(collection LibDataEnum, id string) LibData {
|
func DeleteOne(collection LibDataEnum, id string) LibData {
|
||||||
d, code, err := models.Model(collection.EnumIndex()).GetAccessor().DeleteOne(id)
|
d, code, err := models.Model(collection.EnumIndex()).GetAccessor().DeleteOne(id)
|
||||||
if err != nil { return LibData{Data: d, Code: code, Err: err.Error()} }
|
if err != nil {
|
||||||
|
return LibData{Data: d, Code: code, Err: err.Error()}
|
||||||
|
}
|
||||||
return LibData{Data: d, Code: code}
|
return LibData{Data: d, Code: code}
|
||||||
}
|
}
|
||||||
|
|
||||||
func StoreOne(collection LibDataEnum, object map[string]interface{}) LibData {
|
func StoreOne(collection LibDataEnum, object map[string]interface{}) LibData {
|
||||||
model := models.Model(collection.EnumIndex())
|
model := models.Model(collection.EnumIndex())
|
||||||
d, code, err := model.GetAccessor().StoreOne(model.Deserialize(object))
|
d, code, err := model.GetAccessor().StoreOne(model.Deserialize(object))
|
||||||
if err != nil { return LibData{Data: d, Code: code, Err: err.Error()} }
|
if err != nil {
|
||||||
|
return LibData{Data: d, Code: code, Err: err.Error()}
|
||||||
|
}
|
||||||
return LibData{Data: d, Code: code}
|
return LibData{Data: d, Code: code}
|
||||||
}
|
}
|
||||||
|
|
||||||
func CopyOne(collection LibDataEnum, object map[string]interface{}) LibData {
|
func CopyOne(collection LibDataEnum, object map[string]interface{}) LibData {
|
||||||
model := models.Model(collection.EnumIndex())
|
model := models.Model(collection.EnumIndex())
|
||||||
d, code, err := model.GetAccessor().CopyOne(model.Deserialize(object))
|
d, code, err := model.GetAccessor().CopyOne(model.Deserialize(object))
|
||||||
if err != nil { return LibData{Data: d, Code: code, Err: err.Error()} }
|
if err != nil {
|
||||||
|
return LibData{Data: d, Code: code, Err: err.Error()}
|
||||||
|
}
|
||||||
return LibData{Data: d, Code: code}
|
return LibData{Data: d, Code: code}
|
||||||
}
|
}
|
||||||
|
@ -10,8 +10,8 @@ import (
|
|||||||
type DataResource struct {
|
type DataResource struct {
|
||||||
resources.AbstractResource
|
resources.AbstractResource
|
||||||
Protocols []string `json:"protocol,omitempty" bson:"protocol,omitempty"` //TODO Enum type
|
Protocols []string `json:"protocol,omitempty" bson:"protocol,omitempty"` //TODO Enum type
|
||||||
DataType string `json:"datatype" bson:"datatype"`
|
DataType string `json:"datatype,omitempty" bson:"datatype"`
|
||||||
Example string `json:"example" bson:"example" description:"base64 encoded data"`
|
Example string `json:"example,omitempty" bson:"example" description:"base64 encoded data"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dma *DataResource) Deserialize(j map[string]interface{}) utils.DBObject {
|
func (dma *DataResource) Deserialize(j map[string]interface{}) utils.DBObject {
|
||||||
|
@ -9,10 +9,10 @@ import (
|
|||||||
|
|
||||||
type DatacenterResource struct {
|
type DatacenterResource struct {
|
||||||
resources.AbstractResource
|
resources.AbstractResource
|
||||||
BookingPrice int `bson:"booking_price" json:"booking_price"`
|
BookingPrice int `bson:"booking_price" json:"booking_price,omitempty"`
|
||||||
|
|
||||||
CPU DatacenterCpuModel `bson:"cpu,omitempty" json:"cpu,omitempty"`
|
CPU *DatacenterCpuModel `bson:"cpu,omitempty" json:"cpu,omitempty"`
|
||||||
RAM DatacenterMemoryModel `bson:"ram,omitempty" json:"ram,omitempty"`
|
RAM *DatacenterMemoryModel `bson:"ram,omitempty" json:"ram,omitempty"`
|
||||||
GPU []DatacenterGpuModel `bson:"gpu,omitempty" json:"gpu,omitempty"`
|
GPU []DatacenterGpuModel `bson:"gpu,omitempty" json:"gpu,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,15 +8,15 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type URL struct {
|
type URL struct {
|
||||||
Protocol string `bson:"protocol" json:"protocol"`
|
Protocol string `bson:"protocol,omitempty" json:"protocol"`
|
||||||
Path string `bson:"path" json:"path"`
|
Path string `bson:"path,omitempty" json:"path"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type StorageResource struct {
|
type StorageResource struct {
|
||||||
resources.AbstractResource
|
resources.AbstractResource
|
||||||
|
|
||||||
Capacity uint `bson:"capacity,omitempty" json:"capacity,omitempty"`
|
Capacity uint `bson:"capacity,omitempty" json:"capacity,omitempty"`
|
||||||
Url URL `bson:"url,omitempty" json:"url,omitempty"` // Will allow to select between several protocols
|
Url *URL `bson:"url,omitempty" json:"url,omitempty"` // Will allow to select between several protocols
|
||||||
|
|
||||||
Encryption bool `bson:"encryption,omitempty" json:"encryption,omitempty"`
|
Encryption bool `bson:"encryption,omitempty" json:"encryption,omitempty"`
|
||||||
Redundancy string `bson:"redundancy,omitempty" json:"redundancy,omitempty"`
|
Redundancy string `bson:"redundancy,omitempty" json:"redundancy,omitempty"`
|
||||||
|
@ -10,7 +10,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestStoreOneStorage(t *testing.T) {
|
func TestStoreOneStorage(t *testing.T) {
|
||||||
s := StorageResource{Capacity: 123, Url: URL{Protocol: "http", Path: "azerty.fr"},
|
s := StorageResource{Capacity: 123, Url: &URL{Protocol: "http", Path: "azerty.fr"},
|
||||||
AbstractResource: resources.AbstractResource{
|
AbstractResource: resources.AbstractResource{
|
||||||
AbstractObject: utils.AbstractObject{Name: "testData"},
|
AbstractObject: utils.AbstractObject{Name: "testData"},
|
||||||
Description: "Lorem Ipsum",
|
Description: "Lorem Ipsum",
|
||||||
@ -28,7 +28,7 @@ func TestStoreOneStorage(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestLoadOneStorage(t *testing.T) {
|
func TestLoadOneStorage(t *testing.T) {
|
||||||
s := StorageResource{Capacity: 123, Url: URL{Protocol: "http", Path: "azerty.fr"},
|
s := StorageResource{Capacity: 123, Url: &URL{Protocol: "http", Path: "azerty.fr"},
|
||||||
AbstractResource: resources.AbstractResource{
|
AbstractResource: resources.AbstractResource{
|
||||||
AbstractObject: utils.AbstractObject{Name: "testData"},
|
AbstractObject: utils.AbstractObject{Name: "testData"},
|
||||||
Description: "Lorem Ipsum",
|
Description: "Lorem Ipsum",
|
||||||
|
@ -19,7 +19,7 @@ type AbstractWorkflow struct {
|
|||||||
ProcessingResource map[string]processing.ProcessingResource `bson:"processing,omitempty" json:"processing,omitempty"`
|
ProcessingResource map[string]processing.ProcessingResource `bson:"processing,omitempty" json:"processing,omitempty"`
|
||||||
Datacenters map[string]datacenter.DatacenterResource `bson:"datacenters,omitempty" json:"datacenters,omitempty"`
|
Datacenters map[string]datacenter.DatacenterResource `bson:"datacenters,omitempty" json:"datacenters,omitempty"`
|
||||||
Workflows map[string]WorkflowResource `bson:"workflows,omitempty" json:"workflows,omitempty"`
|
Workflows map[string]WorkflowResource `bson:"workflows,omitempty" json:"workflows,omitempty"`
|
||||||
Schedule WorkflowSchedule `bson:"schedule,omitempty" json:"schedule,omitempty"`
|
Schedule *WorkflowSchedule `bson:"schedule,omitempty" json:"schedule,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w *AbstractWorkflow) isDCLink(link graph.GraphLink) bool {
|
func (w *AbstractWorkflow) isDCLink(link graph.GraphLink) bool {
|
||||||
|
Loading…
Reference in New Issue
Block a user