diff --git a/dbs/mongo/mongo.go b/dbs/mongo/mongo.go index 1c7f84c..a9de082 100644 --- a/dbs/mongo/mongo.go +++ b/dbs/mongo/mongo.go @@ -247,17 +247,18 @@ func (m *MongoDB) StoreOne(obj interface{}, id string, collection_name string) ( if err := m.createClient(mngoConfig.GetUrl(), false); err != nil { return "", 503, err } + doc := map[string]interface{}{"_id": id} targetDBCollection := CollectionMap[collection_name] MngoCtx, cancel = context.WithTimeout(context.Background(), 5*time.Second) //defer cancel() - _, err := targetDBCollection.InsertOne(MngoCtx, obj) + _, err := targetDBCollection.InsertOne(MngoCtx, doc) if err != nil { // m.Logger.Error().Msg("Couldn't insert resource: " + err.Error()) return "", 409, err } - return id, 200, nil + return m.UpdateOne(obj, id, collection_name) } func (m *MongoDB) LoadOne(id string, collection_name string) (*mongo.SingleResult, int, error) { diff --git a/models/utils/abstracts.go b/models/utils/abstracts.go index 7793339..5fcc525 100755 --- a/models/utils/abstracts.go +++ b/models/utils/abstracts.go @@ -27,7 +27,7 @@ const ( * every data in base root model should inherit from this struct (only exception is the ResourceModel) */ type AbstractObject struct { - UUID string `json:"id,omitempty" bson:"_id,omitempty" validate:"required"` + UUID string `json:"id,omitempty" bson:"id,omitempty" validate:"required"` Name string `json:"name,omitempty" bson:"name,omitempty" validate:"required"` IsDraft bool `json:"is_draft" bson:"is_draft" default:"false"` CreatorID string `json:"creator_id,omitempty" bson:"creator_id,omitempty"` diff --git a/models/utils/common.go b/models/utils/common.go index bb43065..2747440 100755 --- a/models/utils/common.go +++ b/models/utils/common.go @@ -2,7 +2,6 @@ package utils import ( "errors" - "fmt" "os" "cloud.o-forge.io/core/oc-lib/dbs" @@ -57,7 +56,6 @@ func GenericStoreOne(data DBObject, a Accessor) (DBObject, int, error) { if err != nil { return nil, 422, errors.New("error when validating the received struct: " + err.Error()) } - fmt.Println(data.GetName(), data.GetCreatorID()) id, code, err := mongo.MONGOService.StoreOne(data, data.GetID(), a.GetType().String()) if err != nil { a.GetLogger().Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error())