determine returnal
This commit is contained in:
@@ -10,34 +10,32 @@ type WorkflowMongoAccessor struct {
|
||||
utils.AbstractAccessor
|
||||
}
|
||||
|
||||
func (dma *WorkflowMongoAccessor) DeleteOne(id string) utils.DBObject {
|
||||
func (dma *WorkflowMongoAccessor) DeleteOne(id string) (utils.DBObject, error) {
|
||||
return dma.GenericDeleteOne(id, dma)
|
||||
}
|
||||
|
||||
func (dma *WorkflowMongoAccessor) UpdateOne(set map[string]interface{}, id string) utils.DBObject {
|
||||
func (dma *WorkflowMongoAccessor) UpdateOne(set map[string]interface{}, id string) (utils.DBObject, error) {
|
||||
return dma.GenericUpdateOne(set, id, dma)
|
||||
}
|
||||
|
||||
func (dma *WorkflowMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
|
||||
func (dma *WorkflowMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, error) {
|
||||
id, err := mongo.MONGOService.StoreOne(data.(*Workflow), "data")
|
||||
if err != nil {
|
||||
dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error())
|
||||
return &Workflow{}
|
||||
return nil, err
|
||||
}
|
||||
return dma.LoadOne(id)
|
||||
}
|
||||
|
||||
func (wfa *WorkflowMongoAccessor) LoadOne(id string) utils.DBObject {
|
||||
func (wfa *WorkflowMongoAccessor) LoadOne(id string) (utils.DBObject, error) {
|
||||
var workflow Workflow
|
||||
|
||||
res_mongo, err := mongo.MONGOService.LoadOne(id, "workflow")
|
||||
if err != nil {
|
||||
l := logs.CreateLogger("oclib", "")
|
||||
l.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error())
|
||||
return &Workflow{}
|
||||
return nil, err
|
||||
}
|
||||
|
||||
res_mongo.Decode(&workflow)
|
||||
|
||||
return &workflow
|
||||
return &workflow, nil
|
||||
}
|
||||
|
@@ -21,7 +21,7 @@ func TestStoreOneWorkflow(t *testing.T) {
|
||||
}
|
||||
|
||||
wma := WorkflowMongoAccessor{}
|
||||
id := wma.StoreOne(&w)
|
||||
id, _ := wma.StoreOne(&w)
|
||||
|
||||
assert.NotEmpty(t, id)
|
||||
}
|
||||
@@ -39,6 +39,6 @@ func TestLoadOneWorkflow(t *testing.T) {
|
||||
}
|
||||
|
||||
wma := WorkflowMongoAccessor{}
|
||||
new_w := wma.StoreOne(&w)
|
||||
new_w, _ := wma.StoreOne(&w)
|
||||
assert.Equal(t, w, new_w)
|
||||
}
|
||||
|
Reference in New Issue
Block a user