core/oc-lib
5
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Update Resource

Browse Source
This commit is contained in:
mr 2024-07-24 14:49:04 +02:00
parent ac2111a365
commit 357d79e68b
8 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/resources/data/data_mongo_accessor.go
View File

@ -14,7 +14,7 @@ func (dma *DataMongoAccessor) DeleteOne(id string) (utils.DBObject, int, error)
} }
func (dma *DataMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) { func (dma *DataMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
return dma.GenericUpdateOne(set, id, dma) return dma.GenericUpdateOne(set, id, dma, &DataResource{})
} }
func (dma *DataMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) { func (dma *DataMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {

2
models/resources/datacenter/datacenter_mongo_accessor.go
View File

@ -14,7 +14,7 @@ func (dca *DatacenterMongoAccessor) DeleteOne(id string) (utils.DBObject, int, e
} }
func (dca *DatacenterMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) { func (dca *DatacenterMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
return dca.GenericUpdateOne(set, id, dca) return dca.GenericUpdateOne(set, id, dca, &DatacenterResource{})
} }
func (dca *DatacenterMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) { func (dca *DatacenterMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {

2
models/resources/processing/processing_mongo_accessor.go
View File

@ -14,7 +14,7 @@ func (pma *ProcessingMongoAccessor) DeleteOne(id string) (utils.DBObject, int, e
} }
func (pma *ProcessingMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) { func (pma *ProcessingMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
return pma.GenericUpdateOne(set, id, pma) return pma.GenericUpdateOne(set, id, pma, &ProcessingResource{})
} }
func (pma *ProcessingMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) { func (pma *ProcessingMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {

2
models/resources/storage/storage_mongo_accessor.go
View File

@ -14,7 +14,7 @@ func (sma *StorageMongoAccessor) DeleteOne(id string) (utils.DBObject, int, erro
} }
func (sma *StorageMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) { func (sma *StorageMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
return sma.GenericUpdateOne(set, id, sma) return sma.GenericUpdateOne(set, id, sma, &StorageResource{})
} }
func (sma *StorageMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) { func (sma *StorageMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {

4
models/resources/workflow/workflow_mongo_accessor.go
View File

@ -14,7 +14,7 @@ func (wfa *WorkflowResourceMongoAccessor) DeleteOne(id string) (utils.DBObject,
} }
func (wfa *WorkflowResourceMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) { func (wfa *WorkflowResourceMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
return wfa.GenericUpdateOne(set, id, wfa) return wfa.GenericUpdateOne(set, id, wfa, &WorkflowResource{})
} }
func (wfa *WorkflowResourceMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) { func (wfa *WorkflowResourceMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {
@ -28,7 +28,7 @@ func (wfa *WorkflowResourceMongoAccessor) CopyOne(data utils.DBObject) (utils.DB
return wfa.GenericStoreOne(data, wfa) return wfa.GenericStoreOne(data, wfa)
} else { } else {
data.(*WorkflowResource).UUID = res.GetID() data.(*WorkflowResource).UUID = res.GetID()
return wfa.GenericUpdateOne(data, res.GetID(), wfa) return wfa.GenericUpdateOne(data, res.GetID(), wfa, &WorkflowResource{})
} }
} }

13
models/utils/abstracts.go
View File

@ -1,8 +1,6 @@
package utils package utils
import ( import (
"fmt"
"cloud.o-forge.io/core/oc-lib/dbs/mongo" "cloud.o-forge.io/core/oc-lib/dbs/mongo"
"cloud.o-forge.io/core/oc-lib/logs" "cloud.o-forge.io/core/oc-lib/logs"
"github.com/go-playground/validator/v10" "github.com/go-playground/validator/v10"
@ -71,13 +69,18 @@ func (dma *AbstractAccessor) GenericDeleteOne(id string, accessor Accessor) (DBO
return res, 200, nil return res, 200, nil
} }
func (dma *AbstractAccessor) GenericUpdateOne(set DBObject, id string, accessor Accessor) (DBObject, int, error) { func (dma *AbstractAccessor) GenericUpdateOne(set DBObject, id string, accessor Accessor, new DBObject) (DBObject, int, error) {
r, c, err := accessor.LoadOne(id) r, c, err := accessor.LoadOne(id)
if err != nil { if err != nil {
return nil, c, err return nil, c, err
} }
fmt.Println(set.Serialize(), r.Deserialize(set.Serialize()).Serialize()) change := set.Serialize()
id, code, err := mongo.MONGOService.UpdateOne(r.Deserialize(set.Serialize()), id, accessor.GetType()) loaded := r.Serialize()
for k, v := range change {
loaded[k] = v
}
id, code, err := mongo.MONGOService.UpdateOne(new.Deserialize(loaded), id, accessor.GetType())
if err != nil { if err != nil {
dma.Logger.Error().Msg("Could not update " + id + " to db. Error: " + err.Error()) dma.Logger.Error().Msg("Could not update " + id + " to db. Error: " + err.Error())
return nil, code, err return nil, code, err

2
models/workflow/workflow_mongo_accessor.go
View File

@ -63,7 +63,7 @@ func (wfa *WorkflowMongoAccessor) UpdateOne(set utils.DBObject, id string) (util
if code, err := wfa.execution(set.(*Workflow), true); err != nil { if code, err := wfa.execution(set.(*Workflow), true); err != nil {
return nil, code, err return nil, code, err
} }
return wfa.GenericUpdateOne(set, id, wfa) return wfa.GenericUpdateOne(set, id, wfa, &Workflow{})
} }
func (wfa *WorkflowMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) { func (wfa *WorkflowMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {

2
models/workflow_execution/workflow_execution_mongo_accessor.go
View File

@ -14,7 +14,7 @@ func (wfa *WorkflowExecutionMongoAccessor) DeleteOne(id string) (utils.DBObject,
} }
func (wfa *WorkflowExecutionMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) { func (wfa *WorkflowExecutionMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
return wfa.GenericUpdateOne(set, id, wfa) return wfa.GenericUpdateOne(set, id, wfa, &WorkflowExecution{})
} }
func (wfa *WorkflowExecutionMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) { func (wfa *WorkflowExecutionMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {