test of a lightest formula of code

models/resources/workflow/workflow.go

@@ -1,9 +1,7 @@
 package oclib
 
 import (
-	"encoding/json"
-
-	"cloud.o-forge.io/core/oc-lib/models/resource_model"
+	"cloud.o-forge.io/core/oc-lib/models/resources/resource_model"
 	"cloud.o-forge.io/core/oc-lib/models/utils"
 	"cloud.o-forge.io/core/oc-lib/tools"
 )
@@ -15,27 +13,8 @@ type WorkflowResource struct {
 	WorkflowID string `bson:"workflow_id,omitempty" json:"workflow_id,omitempty"` // WorkflowID is the ID of the native workflow
 }
 
-func (d *WorkflowResource) GetAccessor(caller *tools.HTTPCaller) utils.Accessor {
-	data := New()                              // Create a new instance of the accessor
-	data.Init(tools.WORKFLOW_RESOURCE, caller) // Initialize the accessor with the WORKFLOW_RESOURCE model type
+func (d *WorkflowResource) GetAccessor(peerID string, groups []string, caller *tools.HTTPCaller) utils.Accessor {
+	data := New()                                              // Create a new instance of the accessor
+	data.Init(tools.WORKFLOW_RESOURCE, peerID, groups, caller) // Initialize the accessor with the WORKFLOW_RESOURCE model type
 	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, &m)
-	return m
-}

models/resources/workflow/workflow_mongo_accessor.go

@@ -1,9 +1,11 @@
 package oclib
 
 import (
+	"errors"
+
 	"cloud.o-forge.io/core/oc-lib/dbs"
 	"cloud.o-forge.io/core/oc-lib/dbs/mongo"
-	"cloud.o-forge.io/core/oc-lib/models/resource_model"
+	"cloud.o-forge.io/core/oc-lib/models/resources/resource_model"
 	"cloud.o-forge.io/core/oc-lib/models/utils"
 )
 
@@ -12,7 +14,11 @@ type workflowResourceMongoAccessor struct {
 }
 
 func New() *workflowResourceMongoAccessor {
-	return &workflowResourceMongoAccessor{}
+	return &workflowResourceMongoAccessor{
+		utils.AbstractAccessor{
+			ResourceModelAccessor: resource_model.New(),
+		},
+	}
 }
 
 func (wfa *workflowResourceMongoAccessor) DeleteOne(id string) (utils.DBObject, int, error) {
@@ -21,22 +27,22 @@ func (wfa *workflowResourceMongoAccessor) DeleteOne(id string) (utils.DBObject,
 
 func (wfa *workflowResourceMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
 	set.(*WorkflowResource).ResourceModel = nil
-	return wfa.GenericUpdateOne(set, id, wfa, &WorkflowResource{})
+	return wfa.GenericUpdateOne(set.(*WorkflowResource).Trim(), id, wfa, &WorkflowResource{})
 }
 
 func (wfa *workflowResourceMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {
 	data.(*WorkflowResource).ResourceModel = nil
-	return wfa.GenericStoreOne(data, wfa)
+	return wfa.GenericStoreOne(data.(*WorkflowResource).Trim(), wfa)
 }
 
 func (wfa *workflowResourceMongoAccessor) CopyOne(data utils.DBObject) (utils.DBObject, int, error) {
 	res, _, _ := wfa.LoadOne(data.GetID())
 	data.(*WorkflowResource).WorkflowID = data.GetID()
 	if res == nil {
-		return wfa.GenericStoreOne(data, wfa)
+		return wfa.GenericStoreOne(data.(*WorkflowResource).Trim(), wfa)
 	} else {
 		data.(*WorkflowResource).UUID = res.GetID()
-		return wfa.GenericUpdateOne(data, res.GetID(), wfa, &WorkflowResource{})
+		return wfa.GenericUpdateOne(data.(*WorkflowResource).Trim(), res.GetID(), wfa, &WorkflowResource{})
 	}
 }
 
@@ -48,8 +54,10 @@ func (wfa *workflowResourceMongoAccessor) LoadOne(id string) (utils.DBObject, in
 		return nil, code, err
 	}
 	res_mongo.Decode(&workflow)
-	accessor := (&resource_model.ResourceModel{}).GetAccessor(nil)
-	resources, _, err := accessor.Search(nil, wfa.GetType())
+	if !workflow.VerifyAuth(wfa.PeerID, wfa.Groups) {
+		return nil, 403, errors.New("You are not allowed to access this collaborative area")
+	}
+	resources, _, err := wfa.ResourceModelAccessor.Search(nil, wfa.GetType())
 	if err == nil && len(resources) > 0 {
 		workflow.ResourceModel = resources[0].(*resource_model.ResourceModel)
 	}
@@ -67,9 +75,11 @@ func (wfa workflowResourceMongoAccessor) LoadAll() ([]utils.ShallowDBObject, int
 	if err = res_mongo.All(mongo.MngoCtx, &results); err != nil {
 		return nil, 404, err
 	}
-	accessor := (&resource_model.ResourceModel{}).GetAccessor(nil)
-	resources, _, err := accessor.Search(nil, wfa.GetType())
+	resources, _, err := wfa.ResourceModelAccessor.Search(nil, wfa.GetType())
 	for _, r := range results {
+		if !r.VerifyAuth(wfa.PeerID, wfa.Groups) {
+			continue
+		}
 		if err == nil && len(resources) > 0 {
 			r.ResourceModel = resources[0].(*resource_model.ResourceModel)
 		}
@@ -101,9 +111,11 @@ func (wfa *workflowResourceMongoAccessor) Search(filters *dbs.Filters, search st
 	if err = res_mongo.All(mongo.MngoCtx, &results); err != nil {
 		return nil, 404, err
 	}
-	accessor := (&resource_model.ResourceModel{}).GetAccessor(nil)
-	resources, _, err := accessor.Search(nil, wfa.GetType())
+	resources, _, err := wfa.ResourceModelAccessor.Search(nil, wfa.GetType())
 	for _, r := range results {
+		if !r.VerifyAuth(wfa.PeerID, wfa.Groups) {
+			continue
+		}
 		if err == nil && len(resources) > 0 {
 			r.ResourceModel = resources[0].(*resource_model.ResourceModel)
 		}

models/resources/workflow/workflow_test.go

@@ -3,7 +3,7 @@ package oclib
 import (
 	"testing"
 
-	"cloud.o-forge.io/core/oc-lib/models/resource_model"
+	"cloud.o-forge.io/core/oc-lib/models/resources/resource_model"
 	"cloud.o-forge.io/core/oc-lib/models/utils"
 
 	"github.com/stretchr/testify/assert"