resource as resource named

2024-07-19 10:54:58 +02:00
parent 218714683b
commit 2a9a784ec1
28 changed files with 381 additions and 284 deletions
--- a/models/resources/workflow/workflow.go
+++ b/models/resources/workflow/workflow.go
@@ -12,42 +12,17 @@ import (
 	"cloud.o-forge.io/core/oc-lib/models/utils"
 )

-type Workflow struct {
-	resources.AbstractResource
-	Graph       graph.Graph                      `bson:"graph,omitempty" json:"graph,omitempty"`
-	Datas       map[string]data.Data             `bson:"datas,omitempty" json:"datas,omitempty"`
-	Storages    map[string]storage.Storage       `bson:"storages,omitempty" json:"storages,omitempty"`
-	Processing  map[string]processing.Processing `bson:"processing,omitempty" json:"processing,omitempty"`
-	Datacenters map[string]datacenter.Datacenter `bson:"datacenters,omitempty" json:"datacenters,omitempty"`
-	Schedule    WorkflowSchedule                 `bson:"schedule,omitempty" json:"schedule,omitempty"`
+type AbstractWorkflow struct {
+	Graph              graph.Graph                              `bson:"graph,omitempty" json:"graph,omitempty"`
+	Datas              map[string]data.DataResource             `bson:"datas,omitempty" json:"datas,omitempty"`
+	Storages           map[string]storage.StorageResource       `bson:"storages,omitempty" json:"storages,omitempty"`
+	ProcessingResource map[string]processing.ProcessingResource `bson:"processing,omitempty" json:"processing,omitempty"`
+	Datacenters        map[string]datacenter.DatacenterResource `bson:"datacenters,omitempty" json:"datacenters,omitempty"`
+	Workflows          map[string]WorkflowResource              `bson:"workflows,omitempty" json:"workflows,omitempty"`
+	Schedule           WorkflowSchedule                         `bson:"schedule,omitempty" json:"schedule,omitempty"`
 }

-func (d *Workflow) GetAccessor() utils.Accessor {
-	data := &WorkflowMongoAccessor{}
-	data.SetLogger(resources.WORKFLOW)
-	return data
-}
-
-func (dma *Workflow) Deserialize(j map[string]interface{}) utils.DBObject {
-	b, err := json.Marshal(j)
-	if err != nil {
-		return nil
-	}
-	json.Unmarshal(b, dma)
-	return dma
-}
-
-func (dma *Workflow) Serialize() map[string]interface{} {
-	var m map[string]interface{}
-	b, err := json.Marshal(dma)
-	if err != nil {
-		return nil
-	}
-	json.Unmarshal(b, dma)
-	return m
-}
-
-func (w *Workflow) isDCLink(link graph.GraphLink) bool {
+func (w *AbstractWorkflow) isDCLink(link graph.GraphLink) bool {
 	if _, exists := w.Datacenters[link.Destination.ID]; exists {
 		return true
 	} else if _, exists := w.Datacenters[link.Source.ID]; exists {
@@ -56,3 +31,34 @@ func (w *Workflow) isDCLink(link graph.GraphLink) bool {

 	return false
 }
+
+type WorkflowResource struct {
+	resources.AbstractResource
+	AbstractWorkflow
+	WorkflowID string `bson:"workflow_id,omitempty" json:"workflow_id,omitempty"`
+}
+
+func (d *WorkflowResource) GetAccessor() utils.Accessor {
+	data := &WorkflowResourceMongoAccessor{}
+	data.SetLogger(utils.WORKFLOW_RESOURCE)
+	return data
+}
+
+func (dma *WorkflowResource) Deserialize(j map[string]interface{}) utils.DBObject {
+	b, err := json.Marshal(j)
+	if err != nil {
+		return nil
+	}
+	json.Unmarshal(b, dma)
+	return dma
+}
+
+func (dma *WorkflowResource) Serialize() map[string]interface{} {
+	var m map[string]interface{}
+	b, err := json.Marshal(dma)
+	if err != nil {
+		return nil
+	}
+	json.Unmarshal(b, dma)
+	return m
+}
--- a/models/resources/workflow/workflow_mongo_accessor.go
+++ b/models/resources/workflow/workflow_mongo_accessor.go
@@ -5,34 +5,24 @@ import (
 	"cloud.o-forge.io/core/oc-lib/models/utils"
 )

-type WorkflowMongoAccessor struct {
+type WorkflowResourceMongoAccessor struct {
 	utils.AbstractAccessor
 }

-func (wfa *WorkflowMongoAccessor) DeleteOne(id string) (utils.DBObject, error) {
+func (wfa *WorkflowResourceMongoAccessor) DeleteOne(id string) (utils.DBObject, error) {
 	return wfa.GenericDeleteOne(id, wfa)
 }

-func (wfa *WorkflowMongoAccessor) UpdateOne(set map[string]interface{}, id string) (utils.DBObject, error) {
+func (wfa *WorkflowResourceMongoAccessor) UpdateOne(set map[string]interface{}, id string) (utils.DBObject, error) {
 	return wfa.GenericUpdateOne(set, id, wfa)
 }

-func (wfa *WorkflowMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, error) {
-	err := utils.Validate.Struct(data)
-	wfa.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error())
-	if err != nil {
-		return nil, err
-	}
-	id, err := mongo.MONGOService.StoreOne(data.(*Workflow), wfa.GetType())
-	if err != nil {
-		wfa.Logger.Error().Msg("Could not store " + data.GetName() + " to db. Error: " + err.Error())
-		return nil, err
-	}
-	return wfa.LoadOne(id)
+func (wfa *WorkflowResourceMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, error) {
+	return wfa.GenericStoreOne(data, wfa)
 }

-func (wfa *WorkflowMongoAccessor) LoadOne(id string) (utils.DBObject, error) {
-	var workflow Workflow
+func (wfa *WorkflowResourceMongoAccessor) LoadOne(id string) (utils.DBObject, error) {
+	var workflow WorkflowResource
 	res_mongo, err := mongo.MONGOService.LoadOne(id, wfa.GetType())
 	if err != nil {
 		wfa.Logger.Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error())
--- a/models/resources/workflow/workflow_test.go
+++ b/models/resources/workflow/workflow_test.go
@@ -4,41 +4,40 @@ import (
 	"testing"

 	"cloud.o-forge.io/core/oc-lib/models/resources"
+	"cloud.o-forge.io/core/oc-lib/models/utils"

 	"github.com/stretchr/testify/assert"
 )

 func TestStoreOneWorkflow(t *testing.T) {
-	w := Workflow{AbstractResource: resources.AbstractResource{
-		Uuid:        "123",
-		Name:        "testWorkflow",
-		Description: "Lorem Ipsum",
-		Logo:        "azerty.com",
-		Owner:       "toto",
-		OwnerLogo:   "totoLogo",
-		SourceUrl:   "azerty.fr",
+	w := WorkflowResource{AbstractResource: resources.AbstractResource{
+		AbstractObject: utils.AbstractObject{Name: "testWorkflow"},
+		Description:    "Lorem Ipsum",
+		Logo:           "azerty.com",
+		Owner:          "toto",
+		OwnerLogo:      "totoLogo",
+		SourceUrl:      "azerty.fr",
 	},
 	}

-	wma := WorkflowMongoAccessor{}
+	wma := WorkflowResourceMongoAccessor{}
 	id, _ := wma.StoreOne(&w)

 	assert.NotEmpty(t, id)
 }

 func TestLoadOneWorkflow(t *testing.T) {
-	w := Workflow{AbstractResource: resources.AbstractResource{
-		Uuid:        "123",
-		Name:        "testWorkflow",
-		Description: "Lorem Ipsum",
-		Logo:        "azerty.com",
-		Owner:       "toto",
-		OwnerLogo:   "totoLogo",
-		SourceUrl:   "azerty.fr",
+	w := WorkflowResource{AbstractResource: resources.AbstractResource{
+		AbstractObject: utils.AbstractObject{Name: "testWorkflow"},
+		Description:    "Lorem Ipsum",
+		Logo:           "azerty.com",
+		Owner:          "toto",
+		OwnerLogo:      "totoLogo",
+		SourceUrl:      "azerty.fr",
 	},
 	}

-	wma := WorkflowMongoAccessor{}
+	wma := WorkflowResourceMongoAccessor{}
 	new_w, _ := wma.StoreOne(&w)
 	assert.Equal(t, w, new_w)
 }