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

module name

Browse Source
This commit is contained in:
mr
2024-07-18 13:35:14 +02:00
parent 7d5bdadbef
commit 1999213f8b
19 changed files with 103 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
models/models.go
View File

@@ -1,15 +1,15 @@
package models
import (
oclib "oc-lib"
"oc-lib/dbs/mongo"
r "oc-lib/models/resources"
d "oc-lib/models/resources/data"
dc "oc-lib/models/resources/datacenter"
p "oc-lib/models/resources/processing"
s "oc-lib/models/resources/storage"
"oc-lib/models/utils"
w "oc-lib/models/workflow"
"cloud.o-forge.io/core/oc-lib/dbs/mongo"
"cloud.o-forge.io/core/oc-lib/logs"
r "cloud.o-forge.io/core/oc-lib/models/resources"
d "cloud.o-forge.io/core/oc-lib/models/resources/data"
dc "cloud.o-forge.io/core/oc-lib/models/resources/datacenter"
p "cloud.o-forge.io/core/oc-lib/models/resources/processing"
s "cloud.o-forge.io/core/oc-lib/models/resources/storage"
"cloud.o-forge.io/core/oc-lib/models/utils"
w "cloud.o-forge.io/core/oc-lib/models/workflow"
)
var models = map[string]utils.DBObject{
@@ -21,7 +21,7 @@ var models = map[string]utils.DBObject{
}
func Model(model string) utils.DBObject {
log := oclib.CreateLogger("oclib", "")
log := logs.CreateLogger("oclib", "")
if _, ok := models[model]; ok {
return models[model]
}
@@ -34,5 +34,5 @@ func Init() {
for db := range models {
dbs = append(dbs, db)
}
mongo.Init(dbs)
mongo.MONGOService.Init(dbs)
}

4
models/resources/data/data.go
View File

@@ -1,8 +1,8 @@
package data
import (
resources "oc-lib/models/resources"
"oc-lib/models/utils"
resources "cloud.o-forge.io/core/oc-lib/models/resources"
"cloud.o-forge.io/core/oc-lib/models/utils"
)
type Data struct {

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

@@ -1,8 +1,8 @@
package data
import (
mongo "oc-lib/dbs/mongo"
"oc-lib/models/utils"
mongo "cloud.o-forge.io/core/oc-lib/dbs/mongo"
"cloud.o-forge.io/core/oc-lib/models/utils"
)
type DataMongoAccessor struct {
@@ -18,7 +18,7 @@ func (dma *DataMongoAccessor) UpdateOne(set map[string]interface{}, id string) u
}
func (dma *DataMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
id, err := mongo.StoreOne(data.(*Data), "data")
id, err := mongo.MONGOService.StoreOne(data.(*Data), "data")
if err != nil {
dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error())
return &Data{}
@@ -28,7 +28,7 @@ func (dma *DataMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
func (dma *DataMongoAccessor) LoadOne(id string) utils.DBObject {
var data Data
res_mongo, err := mongo.LoadOne(id, "data")
res_mongo, err := mongo.MONGOService.LoadOne(id, "data")
if err != nil {
dma.Logger.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error())
return &Data{}

3
models/resources/data/data_test.go
View File

@@ -1,9 +1,10 @@
package data
import (
resources "oc-lib/models/resources"
"testing"
resources "cloud.o-forge.io/core/oc-lib/models/resources"
"github.com/stretchr/testify/assert"
)

4
models/resources/datacenter/datacenter.go
View File

@@ -1,8 +1,8 @@
package datacenter
import (
resources "oc-lib/models/resources"
"oc-lib/models/utils"
resources "cloud.o-forge.io/core/oc-lib/models/resources"
"cloud.o-forge.io/core/oc-lib/models/utils"
)
type Datacenter struct {

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

@@ -1,9 +1,9 @@
package datacenter
import (
"oc-lib/dbs/mongo"
logs "oc-lib/logs"
"oc-lib/models/utils"
"cloud.o-forge.io/core/oc-lib/dbs/mongo"
logs "cloud.o-forge.io/core/oc-lib/logs"
"cloud.o-forge.io/core/oc-lib/models/utils"
)
type DatacenterMongoAccessor struct {
@@ -19,7 +19,7 @@ func (dma *DatacenterMongoAccessor) UpdateOne(set map[string]interface{}, id str
}
func (dma *DatacenterMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
id, err := mongo.StoreOne(data.(*Datacenter), "data")
id, err := mongo.MONGOService.StoreOne(data.(*Datacenter), "data")
if err != nil {
dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error())
return &Datacenter{}
@@ -30,7 +30,7 @@ func (dma *DatacenterMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject
func (dca *DatacenterMongoAccessor) LoadOne(id string) utils.DBObject {
var datacenter Datacenter
res_mongo, err := mongo.LoadOne(id, "datacenter")
res_mongo, err := mongo.MONGOService.LoadOne(id, "datacenter")
if err != nil {
l := logs.CreateLogger("oclib", "")
l.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error())

3
models/resources/datacenter/datacenter_test.go
View File

@@ -1,9 +1,10 @@
package datacenter
import (
resources "oc-lib/models/resources"
"testing"
resources "cloud.o-forge.io/core/oc-lib/models/resources"
"github.com/stretchr/testify/assert"
)

4
models/resources/processing/processing.go
View File

@@ -1,8 +1,8 @@
package processing
import (
resources "oc-lib/models/resources"
"oc-lib/models/utils"
resources "cloud.o-forge.io/core/oc-lib/models/resources"
"cloud.o-forge.io/core/oc-lib/models/utils"
)
type Processing struct {

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

@@ -1,9 +1,9 @@
package processing
import (
"oc-lib/dbs/mongo"
"oc-lib/logs"
"oc-lib/models/utils"
"cloud.o-forge.io/core/oc-lib/dbs/mongo"
"cloud.o-forge.io/core/oc-lib/logs"
"cloud.o-forge.io/core/oc-lib/models/utils"
)
type ProcessingMongoAccessor struct {
@@ -19,7 +19,7 @@ func (dma *ProcessingMongoAccessor) UpdateOne(set map[string]interface{}, id str
}
func (dma *ProcessingMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
id, err := mongo.StoreOne(data.(*Processing), "data")
id, err := mongo.MONGOService.StoreOne(data.(*Processing), "data")
if err != nil {
dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error())
return &Processing{}
@@ -31,7 +31,7 @@ func (pma *ProcessingMongoAccessor) LoadOne(id string) utils.DBObject {
var processing Processing
res_mongo, err := mongo.LoadOne(id, "processing")
res_mongo, err := mongo.MONGOService.LoadOne(id, "processing")
if err != nil {
l := logs.CreateLogger("oclib", "")
l.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error())

3
models/resources/processing/processing_test.go
View File

@@ -1,9 +1,10 @@
package processing
import (
resources "oc-lib/models/resources"
"testing"
resources "cloud.o-forge.io/core/oc-lib/models/resources"
"github.com/stretchr/testify/assert"
)

4
models/resources/storage/storage.go
View File

@@ -1,8 +1,8 @@
package storage
import (
resources "oc-lib/models/resources"
"oc-lib/models/utils"
resources "cloud.o-forge.io/core/oc-lib/models/resources"
"cloud.o-forge.io/core/oc-lib/models/utils"
)
type URL struct {

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

@@ -1,9 +1,9 @@
package storage
import (
"oc-lib/dbs/mongo"
"oc-lib/logs"
"oc-lib/models/utils"
"cloud.o-forge.io/core/oc-lib/dbs/mongo"
"cloud.o-forge.io/core/oc-lib/logs"
"cloud.o-forge.io/core/oc-lib/models/utils"
)
type StorageMongoAccessor struct {
@@ -19,7 +19,7 @@ func (dma *StorageMongoAccessor) UpdateOne(set map[string]interface{}, id string
}
func (dma *StorageMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
id, err := mongo.StoreOne(data.(*Storage), "data")
id, err := mongo.MONGOService.StoreOne(data.(*Storage), "data")
if err != nil {
dma.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error())
return &Storage{}
@@ -31,7 +31,7 @@ func (schedulema *StorageMongoAccessor) LoadOne(id string) utils.DBObject {
var storage Storage
res_mongo, err := mongo.LoadOne(id, "storage")
res_mongo, err := mongo.MONGOService.LoadOne(id, "storage")
if err != nil {
l := logs.CreateLogger("oclib", "")
l.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error())

3
models/resources/storage/storage_test.go
View File

@@ -1,9 +1,10 @@
package storage
import (
resources "oc-lib/models/resources"
"testing"
resources "cloud.o-forge.io/core/oc-lib/models/resources"
"github.com/stretchr/testify/assert"
)

11
models/utils/abstracts.go
View File

@@ -1,9 +1,8 @@
package utils
import (
oclib "oc-lib"
"oc-lib/dbs/mongo"
"cloud.o-forge.io/core/oc-lib/dbs/mongo"
"cloud.o-forge.io/core/oc-lib/logs"
"github.com/rs/zerolog"
)
@@ -12,11 +11,11 @@ type AbstractAccessor struct {
}
func (dma *AbstractAccessor) SetLogger() {
dma.Logger = oclib.CreateLogger("oclib", "")
dma.Logger = logs.CreateLogger("oclib", "")
}
func (dma *AbstractAccessor) GenericDeleteOne(id string, accessor Accessor) DBObject {
res := accessor.LoadOne(id)
_, err := mongo.DeleteOne(id, "data")
_, err := mongo.MONGOService.DeleteOne(id, "data")
if err != nil {
dma.Logger.Error().Msg("Could not delete " + id + " to db. Error: " + err.Error())
}
@@ -24,7 +23,7 @@ func (dma *AbstractAccessor) GenericDeleteOne(id string, accessor Accessor) DBOb
}
func (dma *AbstractAccessor) GenericUpdateOne(set map[string]interface{}, id string, accessor Accessor) DBObject {
id, err := mongo.UpdateOne(set, id, "data")
id, err := mongo.MONGOService.UpdateOne(set, id, "data")
if err != nil {
dma.Logger.Error().Msg("Could not update " + id + " to db. Error: " + err.Error())
}

14
models/workflow/workflow.go
View File

@@ -1,13 +1,13 @@
package oclib
import (
"oc-lib/models/resources"
"oc-lib/models/resources/data"
"oc-lib/models/resources/datacenter"
"oc-lib/models/resources/processing"
"oc-lib/models/resources/storage"
"oc-lib/models/utils"
"oc-lib/models/workflow/graph"
"cloud.o-forge.io/core/oc-lib/models/resources"
"cloud.o-forge.io/core/oc-lib/models/resources/data"
"cloud.o-forge.io/core/oc-lib/models/resources/datacenter"
"cloud.o-forge.io/core/oc-lib/models/resources/processing"
"cloud.o-forge.io/core/oc-lib/models/resources/storage"
"cloud.o-forge.io/core/oc-lib/models/utils"
"cloud.o-forge.io/core/oc-lib/models/workflow/graph"
)
const WORKFLOW = "workflow"

10
models/workflow/workflow_mongo_accessor.go
View File

@@ -1,9 +1,9 @@
package oclib
import (
"oc-lib/dbs/mongo"
"oc-lib/logs"
"oc-lib/models/utils"
"cloud.o-forge.io/core/oc-lib/dbs/mongo"
"cloud.o-forge.io/core/oc-lib/logs"
"cloud.o-forge.io/core/oc-lib/models/utils"
)
type WorkflowMongoAccessor struct {
@@ -19,7 +19,7 @@ func (dma *WorkflowMongoAccessor) UpdateOne(set map[string]interface{}, id strin
}
func (dma *WorkflowMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
id, err := mongo.StoreOne(data.(*Workflow), "data")
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{}
@@ -30,7 +30,7 @@ func (dma *WorkflowMongoAccessor) StoreOne(data utils.DBObject) utils.DBObject {
func (wfa *WorkflowMongoAccessor) LoadOne(id string) utils.DBObject {
var workflow Workflow
res_mongo, err := mongo.LoadOne(id, "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())

3
models/workflow/workflow_test.go
View File

@@ -1,9 +1,10 @@
package oclib
import (
"oc-lib/models/resources"
"testing"
"cloud.o-forge.io/core/oc-lib/models/resources"
"github.com/stretchr/testify/assert"
)