diff --git a/dbs/mongo/mongo.go b/dbs/mongo/mongo.go index f732fa1..1c7f84c 100644 --- a/dbs/mongo/mongo.go +++ b/dbs/mongo/mongo.go @@ -3,7 +3,6 @@ package mongo import ( "context" "errors" - "fmt" "slices" "time" @@ -248,16 +247,11 @@ 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{}{} - fmt.Println("sqdqsd", obj) - b, _ := bson.Marshal(obj) - bson.Unmarshal(b, &doc) - doc["_id"] = id targetDBCollection := CollectionMap[collection_name] MngoCtx, cancel = context.WithTimeout(context.Background(), 5*time.Second) //defer cancel() - _, err := targetDBCollection.InsertOne(MngoCtx, doc) + _, err := targetDBCollection.InsertOne(MngoCtx, obj) if err != nil { // m.Logger.Error().Msg("Couldn't insert resource: " + err.Error()) return "", 409, err diff --git a/models/utils/abstracts.go b/models/utils/abstracts.go index 5fcc525..e11e70b 100755 --- a/models/utils/abstracts.go +++ b/models/utils/abstracts.go @@ -27,6 +27,7 @@ const ( * every data in base root model should inherit from this struct (only exception is the ResourceModel) */ type AbstractObject struct { + ID string `bson:"_id"` 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"` @@ -44,6 +45,7 @@ func (ri *AbstractObject) GetAccessor(request *tools.APIRequest) Accessor { } func (r *AbstractObject) SetID(id string) { + r.ID = id r.UUID = id } diff --git a/models/utils/common.go b/models/utils/common.go index 7953f22..bb43065 100755 --- a/models/utils/common.go +++ b/models/utils/common.go @@ -32,6 +32,7 @@ func GenericStoreOne(data DBObject, a Accessor) (DBObject, int, error) { if data.GetID() == "" { data.GenerateID() } + data.SetID(data.GetID()) data.StoreDraftDefault() data.UpToDate(a.GetUser(), a.GetPeerID(), true) f := dbs.Filters{