error adjust

This commit is contained in:
mr 2024-07-22 10:11:28 +02:00
parent df556f7c7a
commit 7f294374e8
2 changed files with 12 additions and 12 deletions

View File

@ -11,13 +11,13 @@ import (
type LibDataEnum int
const (
INVALID LibDataEnum = iota
INVALID LibDataEnum = iota
DATA_RESOURCE = utils.DATA_RESOURCE
PROCESSING_RESOURCE = utils.PROCESSING_RESOURCE
STORAGE_RESOURCE = utils.STORAGE_RESOURCE
DATACENTER_RESOURCE = utils.DATACENTER_RESOURCE
WORKFLOW_RESOURCE = utils.WORKFLOW_RESOURCE
WORKFLOW = utils.WORKFLOW
WORKFLOW = utils.WORKFLOW
)
func (d LibDataEnum) EnumIndex() int {
@ -26,8 +26,8 @@ func (d LibDataEnum) EnumIndex() int {
type LibData struct {
Data utils.DBObject `bson:"data" json:"data"`
Code int `bson:"code" json:"code"`
Err error `bson:"error" json:"error"`
Code int `bson:"code" json:"code"`
Err string `bson:"error" json:"error"`
}
func Init(appName string) {
@ -42,27 +42,27 @@ func GetLogger() zerolog.Logger {
func LoadOne(collection LibDataEnum, id string) LibData {
d, code, err := models.Model(collection.EnumIndex()).GetAccessor().LoadOne(id)
return LibData{Data: d, Code: code, Err: err}
return LibData{Data: d, Code: code, Err: err.Error()}
}
func UpdateOne(collection LibDataEnum, set map[string]interface{}, id string) LibData {
d, code, err := models.Model(collection.EnumIndex()).GetAccessor().UpdateOne(set, id)
return LibData{Data: d, Code: code, Err: err}
return LibData{Data: d, Code: code, Err: err.Error()}
}
func DeleteOne(collection LibDataEnum, id string) LibData {
d, code, err := models.Model(collection.EnumIndex()).GetAccessor().DeleteOne(id)
return LibData{Data: d, Code: code, Err: err}
return LibData{Data: d, Code: code, Err: err.Error()}
}
func StoreOne(collection LibDataEnum, object map[string]interface{}) LibData {
model := models.Model(collection.EnumIndex())
d, code, err := model.GetAccessor().StoreOne(model.Deserialize(object))
return LibData{Data: d, Code: code, Err: err}
return LibData{Data: d, Code: code, Err: err.Error()}
}
func CopyOne(collection LibDataEnum, object map[string]interface{}) LibData {
model := models.Model(collection.EnumIndex())
d, code, err := model.GetAccessor().CopyOne(model.Deserialize(object))
return LibData{Data: d, Code: code, Err: err}
return LibData{Data: d, Code: code, Err: err.Error()}
}

View File

@ -10,7 +10,7 @@ import (
)
func TestStoreOneDatacenter(t *testing.T) {
dc := DatacenterResource{Owner: "toto", BookingPrice: 123,
dc := DatacenterResource{BookingPrice: 123,
AbstractResource: resources.AbstractResource{
AbstractObject: utils.AbstractObject{Name: "testDatacenter"},
Description: "Lorem Ipsum",
@ -28,7 +28,7 @@ func TestStoreOneDatacenter(t *testing.T) {
}
func TestLoadOneDatacenter(t *testing.T) {
dc := DatacenterResource{Owner: "toto", BookingPrice: 123,
dc := DatacenterResource{BookingPrice: 123,
AbstractResource: resources.AbstractResource{
AbstractObject: utils.AbstractObject{Name: "testDatacenter"},
Description: "Lorem Ipsum",