add purchase resource in model catalog

config/conf_loader.go

@@ -26,12 +26,12 @@ import (
 func GetConfLoader() *onion.Onion {
 	logger := zerolog.New(os.Stdout).With().Timestamp().Logger()
 	AppName := GetAppName()
-	EnvPrefix := "OC_"
+	EnvPrefix := strings.ToUpper(AppName[0:2]+AppName[3:]) + "_"
 	defaultConfigFile := "/etc/oc/" + AppName[3:] + ".json"
 	localConfigFile := "./" + AppName[3:] + ".json"
 	var configFile string
 	var o *onion.Onion
-	l3 := GetEnvVarLayer(EnvPrefix)
+	l3 := onion.NewEnvLayerPrefix("_", EnvPrefix)
 	l2, err := onion.NewFileLayer(localConfigFile, nil)
 	if err == nil {
 		logger.Info().Msg("Local config file found " + localConfigFile + ", overriding default file")
@@ -54,17 +54,3 @@ func GetConfLoader() *onion.Onion {
 	}
 	return o
 }
-
-func GetEnvVarLayer(prefix string) onion.Layer {
-	envVars := make(map[string]interface{})
-
-	for _, e := range os.Environ() {
-		pair := strings.SplitN(e, "=", 2)
-		key := pair[0]
-		if strings.HasPrefix(key, prefix) {
-			envVars[strings.TrimPrefix(key, prefix)] = pair[1]
-		}
-	}
-
-	return onion.NewMapLayer(envVars)
-}

entrypoint.go

@@ -261,7 +261,7 @@ func (r *Request) Schedule(wfID string, scheduler *workflow_execution.WorkflowSc
 }
 
 func (r *Request) CheckBooking(wfID string, start string, end string, durationInS float64, cron string) bool {
-	ok, _, _, _, err := workflow_execution.NewScheduler(start, end, durationInS, cron).CheckBooking(wfID, &tools.APIRequest{
+	ok, _, _, err := workflow_execution.NewScheduler(start, end, durationInS, cron).CheckBooking(wfID, &tools.APIRequest{
 		Caller:   r.caller,
 		Username: r.user,
 		PeerID:   r.peerID,
@@ -563,9 +563,9 @@ func (l *LibData) ToRule() *rule.Rule {
 	return nil
 }
 
-func (l *LibData) ToWorkflowExecution() *workflow_execution.WorkflowExecution {
+func (l *LibData) ToWorkflowExecution() *workflow_execution.WorkflowExecutions {
 	if l.Data.GetAccessor(nil).GetType() == tools.WORKFLOW_EXECUTION {
-		return l.Data.(*workflow_execution.WorkflowExecution)
+		return l.Data.(*workflow_execution.WorkflowExecutions)
 	}
 	return nil
 }

models/booking/booking.go

@@ -15,9 +15,8 @@ import (
  */
 type Booking struct {
 	utils.AbstractObject                    // AbstractObject contains the basic fields of an object (id, name)
-	ExecutionsID         string             `json:"executions_id,omitempty" bson:"executions_id,omitempty" validate:"required"` // ExecutionsID is the ID of the executions
+	DestPeerID           string             `json:"dest_peer_id,omitempty"`                             // DestPeerID is the ID of the destination peer
-	DestPeerID           string             `json:"dest_peer_id,omitempty"`                                 // DestPeerID is the ID of the destination peer
+	WorkflowID           string             `json:"workflow_id,omitempty" bson:"workflow_id,omitempty"` // WorkflowID is the ID of the workflow
-	WorkflowID           string             `json:"workflow_id,omitempty" bson:"workflow_id,omitempty"`     // WorkflowID is the ID of the workflow
 	ExecutionID          string             `json:"execution_id,omitempty" bson:"execution_id,omitempty" validate:"required"`
 	State                enum.BookingStatus `json:"state,omitempty" bson:"state,omitempty" validate:"required"`                             // State is the state of the booking
 	ExpectedStartDate    time.Time          `json:"expected_start_date,omitempty" bson:"expected_start_date,omitempty" validate:"required"` // ExpectedStartDate is the expected start date of the booking
@@ -81,6 +80,10 @@ func (d *Booking) GetDelayOnDuration() time.Duration {
 	return d.GetRealDuration() - d.GetUsualDuration()
 }
 
+func (d *Booking) GetName() string {
+	return d.GetID() + "_" + d.ExpectedStartDate.String()
+}
+
 func (d *Booking) GetAccessor(request *tools.APIRequest) utils.Accessor {
 	return NewAccessor(request) // Create a new instance of the accessor
 }
@@ -90,7 +93,7 @@ func (d *Booking) VerifyAuth(request *tools.APIRequest) bool {
 }
 
 func (r *Booking) StoreDraftDefault() {
-	r.IsDraft = false
+	r.IsDraft = true
 }
 
 func (r *Booking) CanUpdate(set utils.DBObject) (bool, utils.DBObject) {

models/booking/booking_mongo_accessor.go

@@ -1,7 +1,6 @@
 package booking
 
 import (
-	"errors"
 	"time"
 
 	"cloud.o-forge.io/core/oc-lib/dbs"
@@ -34,11 +33,7 @@ func (a *bookingMongoAccessor) DeleteOne(id string) (utils.DBObject, int, error)
 }
 
 func (a *bookingMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
-	if set.(*Booking).State == 0 {
+	return utils.GenericUpdateOne(set, id, a, &Booking{})
-		return nil, 400, errors.New("state is required")
-	}
-	realSet := &Booking{State: set.(*Booking).State}
-	return utils.GenericUpdateOne(realSet, id, a, &Booking{})
 }
 
 func (a *bookingMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {
@@ -51,15 +46,13 @@ func (a *bookingMongoAccessor) CopyOne(data utils.DBObject) (utils.DBObject, int
 
 func (a *bookingMongoAccessor) LoadOne(id string) (utils.DBObject, int, error) {
 	return utils.GenericLoadOne[*Booking](id, func(d utils.DBObject) (utils.DBObject, int, error) {
-		now := time.Now()
+		if d.(*Booking).State == enum.DRAFT && time.Now().UTC().After(d.(*Booking).ExpectedStartDate) {
-		now = now.Add(time.Second * -60)
-		if d.(*Booking).State == enum.DRAFT && now.UTC().After(d.(*Booking).ExpectedStartDate) {
 			return utils.GenericDeleteOne(d.GetID(), a)
 		}
 		if (d.(*Booking).ExpectedEndDate) == nil {
 			d.(*Booking).State = enum.FORGOTTEN
 			utils.GenericRawUpdateOne(d, id, a)
-		} else if d.(*Booking).State == enum.SCHEDULED && now.UTC().After(d.(*Booking).ExpectedStartDate) {
+		} else if d.(*Booking).State == enum.SCHEDULED && time.Now().UTC().After(*&d.(*Booking).ExpectedStartDate) {
 			d.(*Booking).State = enum.DELAYED
 			utils.GenericRawUpdateOne(d, id, a)
 		}
@@ -77,13 +70,11 @@ func (a *bookingMongoAccessor) Search(filters *dbs.Filters, search string, isDra
 
 func (a *bookingMongoAccessor) getExec() func(utils.DBObject) utils.ShallowDBObject {
 	return func(d utils.DBObject) utils.ShallowDBObject {
-		now := time.Now()
+		if d.(*Booking).State == enum.DRAFT && time.Now().UTC().After(d.(*Booking).ExpectedStartDate) {
-		now = now.Add(time.Second * -60)
-		if d.(*Booking).State == enum.DRAFT && now.UTC().After(d.(*Booking).ExpectedStartDate) {
 			utils.GenericDeleteOne(d.GetID(), a)
 			return nil
 		}
-		if d.(*Booking).State == enum.SCHEDULED && now.UTC().After(d.(*Booking).ExpectedStartDate) {
+		if d.(*Booking).State == enum.SCHEDULED && time.Now().UTC().After(*&d.(*Booking).ExpectedStartDate) {
 			d.(*Booking).State = enum.DELAYED
 			utils.GenericRawUpdateOne(d, d.GetID(), a)
 		}

models/common/enum/size.go

@@ -42,15 +42,13 @@ const (
 	S3
 	MEMORY
 	HARDWARE
-	AZURE
-	GCS
 )
 
 // String() - Returns the string representation of the storage type
 func (t StorageType) String() string {
-	return [...]string{"FILE", "STREAM", "API", "DATABASE", "S3", "MEMORY", "HARDWARE", "AZURE", "GCS"}[t]
+	return [...]string{"FILE", "STREAM", "API", "DATABASE", "S3", "MEMORY", "HARDWARE"}[t]
 }
 
 func TypeList() []StorageType {
-	return []StorageType{FILE, STREAM, API, DATABASE, S3, MEMORY, HARDWARE, AZURE, GCS}
+	return []StorageType{FILE, STREAM, API, DATABASE, S3, MEMORY, HARDWARE}
 }

models/common/planner.go

@@ -7,7 +7,7 @@ import (
 	"cloud.o-forge.io/core/oc-lib/tools"
 )
 
-func GetPlannerNearestStart(start time.Time, planned map[tools.DataType]map[string]pricing.PricedItemITF, request *tools.APIRequest) float64 {
+func GetPlannerNearestStart(start time.Time, planned map[tools.DataType][]pricing.PricedItemITF, request *tools.APIRequest) float64 {
 	near := float64(10000000000)    // set a high value
 	for _, items := range planned { // loop through the planned items
 		for _, priced := range items { // loop through the priced items
@@ -23,7 +23,7 @@ func GetPlannerNearestStart(start time.Time, planned map[tools.DataType]map[stri
 	return near
 }
 
-func GetPlannerLongestTime(end *time.Time, planned map[tools.DataType]map[string]pricing.PricedItemITF, request *tools.APIRequest) float64 {
+func GetPlannerLongestTime(end *time.Time, planned map[tools.DataType][]pricing.PricedItemITF, request *tools.APIRequest) float64 {
 	if end == nil {
 		return -1
 	}

models/models.go

@@ -28,7 +28,7 @@ var models = map[string]func() utils.DBObject{
 	tools.STORAGE_RESOURCE.String():    func() utils.DBObject { return &resource.StorageResource{} },
 	tools.PROCESSING_RESOURCE.String(): func() utils.DBObject { return &resource.ProcessingResource{} },
 	tools.WORKFLOW.String():            func() utils.DBObject { return &w2.Workflow{} },
-	tools.WORKFLOW_EXECUTION.String():  func() utils.DBObject { return &workflow_execution.WorkflowExecution{} },
+	tools.WORKFLOW_EXECUTION.String():  func() utils.DBObject { return &workflow_execution.WorkflowExecutions{} },
 	tools.WORKSPACE.String():           func() utils.DBObject { return &w3.Workspace{} },
 	tools.PEER.String():                func() utils.DBObject { return &peer.Peer{} },
 	tools.COLLABORATIVE_AREA.String():  func() utils.DBObject { return &collaborative_area.CollaborativeArea{} },

models/order/order.go

@@ -68,10 +68,10 @@ func (o *Order) Pay(scheduler *workflow_execution.WorkflowSchedule, request *too
 	} else {
 		o.IsDraft = false
 	}
-	for _, exec := range scheduler.WorkflowExecution {
+	for _, exec := range scheduler.WorkflowExecutions {
 		exec.IsDraft = false
 		_, code, err := utils.GenericUpdateOne(exec, exec.GetID(),
-			workflow_execution.NewAccessor(request), &workflow_execution.WorkflowExecution{})
+			workflow_execution.NewAccessor(request), &workflow_execution.WorkflowExecutions{})
 		if code != 200 || err != nil {
 			return errors.New("could not update the workflow execution" + fmt.Sprintf("%v", err))
 		}
@@ -100,7 +100,7 @@ func (o *Order) draftStoreFromModel(scheduler *workflow_execution.WorkflowSchedu
 	o.IsDraft = true
 	o.OrderBy = request.PeerID
 	o.WorkflowExecutionIDs = []string{} // create an array of ids
-	for _, exec := range scheduler.WorkflowExecution {
+	for _, exec := range scheduler.WorkflowExecutions {
 		o.WorkflowExecutionIDs = append(o.WorkflowExecutionIDs, exec.GetID())
 	}
 	// set the name of the order
@@ -166,12 +166,12 @@ func (o *Order) draftBookOrder(scheduler *workflow_execution.WorkflowSchedule, r
 	if request == nil {
 		return draftedBookings, errors.New("no request found")
 	}
-	for _, exec := range scheduler.WorkflowExecution {
+	for _, exec := range scheduler.WorkflowExecutions {
 		_, priceds, _, err := scheduler.Workflow.Planify(exec.ExecDate, exec.EndDate, request)
 		if err != nil {
 			return draftedBookings, errors.New("could not planify the workflow" + fmt.Sprintf("%v", err))
 		}
-		bookings := exec.Book(scheduler.UUID, scheduler.Workflow.UUID, priceds)
+		bookings := exec.Book(scheduler.Workflow.UUID, priceds)
 		for _, booking := range bookings {
 			_, err := (&peer.Peer{}).LaunchPeerExecution(booking.DestPeerID, "",
 				tools.BOOKING, tools.POST, booking.Serialize(booking), request.Caller)

models/peer/peer_cache.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"regexp"
 	"strings"
 
 	"cloud.o-forge.io/core/oc-lib/tools"
@@ -28,40 +29,47 @@ type PeerCache struct {
 }
 
 // urlFormat formats the URL of the peer with the data type API function
-func (p *PeerCache) urlFormat(hostUrl string, dt tools.DataType) string {
+func (p *PeerCache) urlFormat(url string, dt tools.DataType) string {
 	// localhost is replaced by the local peer URL
 	// because localhost must collide on a web request security protocol
-	/*localhost := ""
+	localhost := ""
-	if strings.Contains(hostUrl, "localhost") {
+	if strings.Contains(url, "localhost") {
 		localhost = "localhost"
 	}
-	if strings.Contains(hostUrl, "127.0.0.1") {
+	if strings.Contains(url, "127.0.0.1") {
 		localhost = "127.0.0.1"
 	}
 	if localhost != "" {
 		r := regexp.MustCompile("(" + localhost + ":[0-9]+)")
-		t := r.FindString(hostUrl)
+		t := r.FindString(url)
 		if t != "" {
-			hostUrl = strings.Replace(hostUrl, t, dt.API()+":8080/oc", -1)
+			url = strings.Replace(url, t, dt.API()+":8080/oc", -1)
 		} else {
-			hostUrl = strings.ReplaceAll(hostUrl, localhost, dt.API()+":8080/oc")
+			url = strings.ReplaceAll(url, localhost, dt.API()+":8080/oc")
 		}
-	} else {*/
+	} else {
-	hostUrl = hostUrl + "/" + strings.ReplaceAll(dt.API(), "oc-", "")
+		url = url + "/" + dt.API()
-	//}
+	}
-	fmt.Println("Contacting", hostUrl)
+	return url
-	return hostUrl
 }
 
 // checkPeerStatus checks the status of a peer
-func (p *PeerCache) checkPeerStatus(peerID string, appName string) (*Peer, bool) {
+func (p *PeerCache) checkPeerStatus(peerID string, appName string, caller *tools.HTTPCaller) (*Peer, bool) {
 	api := tools.API{}
 	access := NewShallowAccessor()
 	res, code, _ := access.LoadOne(peerID) // Load the peer from db
 	if code != 200 {                       // no peer no party
 		return nil, false
 	}
-	url := p.urlFormat(res.(*Peer).Url, tools.PEER) + "/status" // Format the URL
+	methods := caller.URLS[tools.PEER] // Get the methods url of the peer
+	if methods == nil {
+		return res.(*Peer), false
+	}
+	meth := methods[tools.POST] // Get the POST method to check status
+	if meth == "" {
+		return res.(*Peer), false
+	}
+	url := p.urlFormat(res.(*Peer).Url, tools.PEER) + meth // Format the URL
 	state, services := api.CheckRemotePeer(url)
 	res.(*Peer).ServicesState = services                              // Update the services states of the peer
 	access.UpdateOne(res, peerID)                                     // Update the peer in the db
@@ -69,24 +77,23 @@ func (p *PeerCache) checkPeerStatus(peerID string, appName string) (*Peer, bool)
 }
 
 // LaunchPeerExecution launches an execution on a peer
-// The method contacts the path described by : peer.Url + datatype path (from enums) + replacement of id by dataID
 func (p *PeerCache) LaunchPeerExecution(peerID string, dataID string,
 	dt tools.DataType, method tools.METHOD, body interface{}, caller *tools.HTTPCaller) (*PeerExecution, error) {
 	fmt.Println("Launching peer execution on", caller.URLS, dt, method)
 	methods := caller.URLS[dt] // Get the methods url of the data type
 	if m, ok := methods[method]; !ok || m == "" {
-		return nil, errors.New("Requested method " + method.String() + " not declared in HTTPCaller")
+		return nil, errors.New("no path found")
 	}
-	path := methods[method]                        // Get the path corresponding to the action we want to execute
+	meth := methods[method]                        // Get the method url to execute
-	path = strings.ReplaceAll(path, ":id", dataID) // Replace the id in the path in case of a DELETE / UPDATE method (it's a standard naming in OC)
+	meth = strings.ReplaceAll(meth, ":id", dataID) // Replace the id in the url in case of a DELETE / UPDATE method (it's a standard naming in OC)
 	url := ""
 
 	// Check the status of the peer
-	if mypeer, ok := p.checkPeerStatus(peerID, dt.API()); !ok && mypeer != nil {
+	if mypeer, ok := p.checkPeerStatus(peerID, dt.API(), caller); !ok && mypeer != nil {
 		// If the peer is not reachable, add the execution to the failed executions list
 		pexec := &PeerExecution{
 			Method:   method.String(),
-			Url:      p.urlFormat((mypeer.Url), dt) + path,  // the url is constitued of : host URL + resource path + action path (ex : mypeer.com/datacenter/resourcetype/path/to/action)
+			Url:      p.urlFormat((mypeer.Url)+meth, dt),
 			Body:     body,
 			DataType: dt.EnumIndex(),
 			DataID:   dataID,
@@ -99,7 +106,7 @@ func (p *PeerCache) LaunchPeerExecution(peerID string, dataID string,
 			return nil, errors.New("peer not found")
 		}
 		// If the peer is reachable, launch the execution
-		url = p.urlFormat((mypeer.Url), dt) + path       // Format the URL
+		url = p.urlFormat((mypeer.Url)+meth, dt)       // Format the URL
 		tmp := mypeer.FailedExecution                  // Get the failed executions list
 		mypeer.FailedExecution = []PeerExecution{}     // Reset the failed executions list
 		NewShallowAccessor().UpdateOne(mypeer, peerID) // Update the peer in the db

models/resources/compute.go

@@ -17,7 +17,7 @@ import (
 * it defines the resource compute
  */
 type ComputeResource struct {
-	AbstractInstanciatedResource[*ComputeResourceInstance]
+	AbstractIntanciatedResource[*ComputeResourceInstance]
 	Architecture   string                  `json:"architecture,omitempty" bson:"architecture,omitempty"` // Architecture is the architecture
 	Infrastructure enum.InfrastructureType `json:"infrastructure" bson:"infrastructure" default:"-1"`    // Infrastructure is the infrastructure
 }
@@ -35,7 +35,7 @@ func (abs *ComputeResource) ConvertToPricedResource(
 	if t != tools.COMPUTE_RESOURCE {
 		return nil
 	}
-	p := abs.AbstractInstanciatedResource.ConvertToPricedResource(t, request)
+	p := abs.AbstractIntanciatedResource.ConvertToPricedResource(t, request)
 	priced := p.(*PricedResource)
 	return &PricedComputeResource{
 		PricedResource: *priced,
@@ -52,7 +52,6 @@ type ComputeNode struct {
 
 type ComputeResourceInstance struct {
 	ResourceInstance[*ComputeResourcePartnership]
-	Source             string                 `json:"source,omitempty" bson:"source,omitempty"` // Source is the source of the resource
 	SecurityLevel      string                 `json:"security_level,omitempty" bson:"security_level,omitempty"`
 	PowerSources       []string               `json:"power_sources,omitempty" bson:"power_sources,omitempty"`
 	AnnualCO2Emissions float64                `json:"annual_co2_emissions,omitempty" bson:"co2_emissions,omitempty"`

models/resources/data.go

@@ -16,7 +16,7 @@ import (
 * it defines the resource data
  */
 type DataResource struct {
-	AbstractInstanciatedResource[*DataInstance]
+	AbstractIntanciatedResource[*DataInstance]
 	Type                   string     `bson:"type,omitempty" json:"type,omitempty"`
 	Quality                string     `bson:"quality,omitempty" json:"quality,omitempty"`
 	OpenData               bool       `bson:"open_data" json:"open_data" default:"false"` // Type is the type of the storage
@@ -42,7 +42,7 @@ func (abs *DataResource) ConvertToPricedResource(
 	if t != tools.DATA_RESOURCE {
 		return nil
 	}
-	p := abs.AbstractInstanciatedResource.ConvertToPricedResource(t, request)
+	p := abs.AbstractIntanciatedResource.ConvertToPricedResource(t, request)
 	priced := p.(*PricedResource)
 	return &PricedDataResource{
 		PricedResource: *priced,

models/resources/interfaces.go

@@ -12,7 +12,6 @@ type ResourceInterface interface {
 	ConvertToPricedResource(t tools.DataType, request *tools.APIRequest) pricing.PricedItemITF
 	GetType() string
 	GetSelectedInstance() utils.DBObject
-	ClearEnv() utils.DBObject
 	SetAllowedInstances(request *tools.APIRequest)
 }
 
@@ -21,7 +20,6 @@ type ResourceInstanceITF interface {
 	GetID() string
 	GetName() string
 	StoreDraftDefault()
-	ClearEnv()
 	GetPricingsProfiles(peerID string, groups []string) []pricing.PricingProfileITF
 	GetPeerGroups() ([]ResourcePartnerITF, []map[string][]string)
 	ClearPeerGroups()

models/resources/processing.go

@@ -25,7 +25,7 @@ type ProcessingUsage struct {
 * it defines the resource processing
  */
 type ProcessingResource struct {
-	AbstractInstanciatedResource[*ProcessingInstance]
+	AbstractIntanciatedResource[*ProcessingInstance]
 	Infrastructure enum.InfrastructureType `json:"infrastructure" bson:"infrastructure" default:"-1"` // Infrastructure is the infrastructure
 	IsService      bool                    `json:"is_service,omitempty" bson:"is_service,omitempty"`  // IsService is a flag that indicates if the processing is a service
 	Usage          *ProcessingUsage        `bson:"usage,omitempty" json:"usage,omitempty"`            // Usage is the usage of the processing

models/resources/resource.go

@@ -47,12 +47,12 @@ func (r *AbstractResource) CanDelete() bool {
 	return r.IsDraft // only draft bookings can be deleted
 }
 
-type AbstractInstanciatedResource[T ResourceInstanceITF] struct {
+type AbstractIntanciatedResource[T ResourceInstanceITF] struct {
 	AbstractResource     // AbstractResource contains the basic fields of an object (id, name)
 	Instances        []T `json:"instances,omitempty" bson:"instances,omitempty"` // Bill is the bill of the resource            // Bill is the bill of the resource
 }
 
-func (abs *AbstractInstanciatedResource[T]) ConvertToPricedResource(
+func (abs *AbstractIntanciatedResource[T]) ConvertToPricedResource(
 	t tools.DataType, request *tools.APIRequest) pricing.PricedItemITF {
 	instances := map[string]string{}
 	profiles := []pricing.PricingProfileITF{}
@@ -71,14 +71,7 @@ func (abs *AbstractInstanciatedResource[T]) ConvertToPricedResource(
 	}
 }
 
-func (abs *AbstractInstanciatedResource[T]) ClearEnv() utils.DBObject {
+func (r *AbstractIntanciatedResource[T]) GetSelectedInstance() utils.DBObject {
-	for _, instance := range abs.Instances {
-		instance.ClearEnv()
-	}
-	return abs
-}
-
-func (r *AbstractInstanciatedResource[T]) GetSelectedInstance() utils.DBObject {
 	if r.SelectedInstanceIndex != nil && len(r.Instances) > *r.SelectedInstanceIndex {
 		return r.Instances[*r.SelectedInstanceIndex]
 	}
@@ -88,14 +81,11 @@ func (r *AbstractInstanciatedResource[T]) GetSelectedInstance() utils.DBObject {
 	return nil
 }
 
-func (abs *AbstractInstanciatedResource[T]) SetAllowedInstances(request *tools.APIRequest) {
+func (abs *AbstractIntanciatedResource[T]) SetAllowedInstances(request *tools.APIRequest) {
-	if request != nil && request.PeerID == abs.CreatorID && request.PeerID != "" {
-		return
-	}
 	abs.Instances = verifyAuthAction[T](abs.Instances, request)
 }
 
-func (d *AbstractInstanciatedResource[T]) Trim() {
+func (d *AbstractIntanciatedResource[T]) Trim() {
 	d.Type = d.GetType()
 	if ok, _ := (&peer.Peer{AbstractObject: utils.AbstractObject{UUID: d.CreatorID}}).IsMySelf(); !ok {
 		for _, instance := range d.Instances {
@@ -104,7 +94,7 @@ func (d *AbstractInstanciatedResource[T]) Trim() {
 	}
 }
 
-func (abs *AbstractInstanciatedResource[T]) VerifyAuth(request *tools.APIRequest) bool {
+func (abs *AbstractIntanciatedResource[T]) VerifyAuth(request *tools.APIRequest) bool {
 	return len(verifyAuthAction[T](abs.Instances, request)) > 0 || abs.AbstractObject.VerifyAuth(request)
 }
 
@@ -137,11 +127,6 @@ type GeoPoint struct {
 	Longitude float64 `json:"longitude,omitempty" bson:"longitude,omitempty"`
 }
 
-type Credentials struct {
-	Login string `json:"login,omitempty" bson:"login,omitempty"`
-	Pass  string `json:"password,omitempty" bson:"password,omitempty"`
-}
-
 type ResourceInstance[T ResourcePartnerITF] struct {
 	utils.AbstractObject
 	Location       GeoPoint              `json:"location,omitempty" bson:"location,omitempty"`
@@ -153,12 +138,6 @@ type ResourceInstance[T ResourcePartnerITF] struct {
 	Partnerships   []T                   `json:"partnerships,omitempty" bson:"partnerships,omitempty"`
 }
 
-func (ri *ResourceInstance[T]) ClearEnv() {
-	ri.Env = []models.Param{}
-	ri.Inputs = []models.Param{}
-	ri.Outputs = []models.Param{}
-}
-
 func (ri *ResourceInstance[T]) GetPricingsProfiles(peerID string, groups []string) []pricing.PricingProfileITF {
 	pricings := []pricing.PricingProfileITF{}
 	for _, p := range ri.Partnerships {

models/resources/resource_accessor.go

@@ -65,12 +65,6 @@ func (wfa *resourceMongoAccessor[T]) LoadAll(isDraft bool) ([]utils.ShallowDBObj
 }
 
 func (wfa *resourceMongoAccessor[T]) Search(filters *dbs.Filters, search string, isDraft bool) ([]utils.ShallowDBObject, int, error) {
-	if filters == nil && search == "*" {
-		return utils.GenericLoadAll[T](func(d utils.DBObject) utils.ShallowDBObject {
-			d.(T).SetAllowedInstances(wfa.Request)
-			return d
-		}, isDraft, wfa)
-	}
 	return utils.GenericSearch[T](filters, search, wfa.getResourceFilter(search),
 		func(d utils.DBObject) utils.ShallowDBObject {
 			d.(T).SetAllowedInstances(wfa.Request)
@@ -79,6 +73,9 @@ func (wfa *resourceMongoAccessor[T]) Search(filters *dbs.Filters, search string,
 }
 
 func (abs *resourceMongoAccessor[T]) getResourceFilter(search string) *dbs.Filters {
+	if search == "*" {
+		search = ""
+	}
 	return &dbs.Filters{
 		Or: map[string][]dbs.Filter{ // filter by like name, short_description, description, owner, url if no filters are provided
 			"abstractintanciatedresource.abstractresource.abstractobject.name":       {{Operator: dbs.LIKE.String(), Value: search}},

models/resources/storage.go

@@ -17,9 +17,9 @@ import (
 * it defines the resource storage
  */
 type StorageResource struct {
-	AbstractInstanciatedResource[*StorageResourceInstance]                  // AbstractResource contains the basic fields of an object (id, name)
+	AbstractIntanciatedResource[*StorageResourceInstance]                  // AbstractResource contains the basic fields of an object (id, name)
-	StorageType                                            enum.StorageType `bson:"storage_type" json:"storage_type" default:"-1"` // Type is the type of the storage
+	StorageType                                           enum.StorageType `bson:"storage_type" json:"storage_type" default:"-1"` // Type is the type of the storage
-	Acronym                                                string           `bson:"acronym,omitempty" json:"acronym,omitempty"`    // Acronym is the acronym of the storage
+	Acronym                                               string           `bson:"acronym,omitempty" json:"acronym,omitempty"`    // Acronym is the acronym of the storage
 }
 
 func (d *StorageResource) GetAccessor(request *tools.APIRequest) utils.Accessor {
@@ -35,7 +35,7 @@ func (abs *StorageResource) ConvertToPricedResource(
 	if t != tools.STORAGE_RESOURCE {
 		return nil
 	}
-	p := abs.AbstractInstanciatedResource.ConvertToPricedResource(t, request)
+	p := abs.AbstractIntanciatedResource.ConvertToPricedResource(t, request)
 	priced := p.(*PricedResource)
 	return &PricedStorageResource{
 		PricedResource: *priced,
@@ -44,7 +44,6 @@ func (abs *StorageResource) ConvertToPricedResource(
 
 type StorageResourceInstance struct {
 	ResourceInstance[*StorageResourcePartnership]
-	Credentials   *Credentials     `json:"credentials,omitempty" bson:"credentials,omitempty"`
 	Source        string           `bson:"source,omitempty" json:"source,omitempty"` // Source is the source of the storage
 	Local         bool             `bson:"local" json:"local"`
 	SecurityLevel string           `bson:"security_level,omitempty" json:"security_level,omitempty"`
@@ -55,13 +54,6 @@ type StorageResourceInstance struct {
 	Throughput    string           `bson:"throughput,omitempty" json:"throughput,omitempty"` // Throughput is the throughput of the storage
 }
 
-func (ri *StorageResourceInstance) ClearEnv() {
-	ri.Credentials = nil
-	ri.Env = []models.Param{}
-	ri.Inputs = []models.Param{}
-	ri.Outputs = []models.Param{}
-}
-
 func (ri *StorageResourceInstance) StoreDraftDefault() {
 	found := false
 	for _, p := range ri.ResourceInstance.Env {

models/resources/workflow.go

@@ -23,10 +23,6 @@ func (r *WorkflowResource) GetType() string {
 	return tools.WORKFLOW_RESOURCE.String()
 }
 
-func (d *WorkflowResource) ClearEnv() utils.DBObject {
-	return d
-}
-
 func (d *WorkflowResource) Trim() {
 	/* EMPTY */
 }

models/utils/abstracts.go

@@ -91,7 +91,7 @@ func (ao *AbstractObject) UpToDate(user string, peer string, create bool) {
 }
 
 func (ao *AbstractObject) VerifyAuth(request *tools.APIRequest) bool {
-	return ao.AccessMode == Public || (request != nil && ao.CreatorID == request.PeerID && request.PeerID != "")
+	return ao.AccessMode == Public || (request != nil && ao.CreatorID == request.PeerID)
 }
 
 func (ao *AbstractObject) GetObjectFilters(search string) *dbs.Filters {

models/utils/common.go

@@ -66,6 +66,7 @@ func GenericDeleteOne(id string, a Accessor) (DBObject, int, error) {
 		return nil, 403, errors.New("you are not allowed to delete :" + a.GetType().String())
 	}
 	if err != nil {
+		a.GetLogger().Error().Msg("Could not retrieve " + id + " to db. Error: " + err.Error())
 		return nil, code, err
 	}
 	if a.ShouldVerifyAuth() && !res.VerifyAuth(a.GetRequest()) {
@@ -113,6 +114,7 @@ func GenericLoadOne[T DBObject](id string, f func(DBObject) (DBObject, int, erro
 	var data T
 	res_mongo, code, err := mongo.MONGOService.LoadOne(id, a.GetType().String())
 	if err != nil {
+		a.GetLogger().Error().Msg("Could not retrieve " + id + " from db. Error: " + err.Error())
 		return nil, code, err
 	}
 	res_mongo.Decode(&data)
@@ -126,6 +128,7 @@ func genericLoadAll[T DBObject](res *mgb.Cursor, code int, err error, onlyDraft
 	objs := []ShallowDBObject{}
 	var results []T
 	if err != nil {
+		a.GetLogger().Error().Msg("Could not retrieve any from db. Error: " + err.Error())
 		return nil, code, err
 	}
 	if err = res.All(mongo.MngoCtx, &results); err != nil {

models/workflow/workflow.go

@@ -2,7 +2,6 @@ package workflow
 
 import (
 	"errors"
-	"fmt"
 	"time"
 
 	"cloud.o-forge.io/core/oc-lib/models/collaborative_area/shallow_collaborative_area"
@@ -111,7 +110,6 @@ func (wfa *Workflow) CheckBooking(caller *tools.HTTPCaller) (bool, error) {
 	accessor := (&resources.ComputeResource{}).GetAccessor(&tools.APIRequest{Caller: caller})
 	for _, link := range wfa.Graph.Links {
 		if ok, compute_id := link.IsComputeLink(*wfa.Graph); ok { // check if the link is a link between a compute and a resource
-			fmt.Println("compute :" + compute_id)
 			compute, code, _ := accessor.LoadOne(compute_id)
 			if code != 200 {
 				continue
@@ -130,8 +128,8 @@ func (wfa *Workflow) CheckBooking(caller *tools.HTTPCaller) (bool, error) {
 	return true, nil
 }
 
-func (wf *Workflow) Planify(start time.Time, end *time.Time, request *tools.APIRequest) (float64, map[tools.DataType]map[string]pricing.PricedItemITF, *Workflow, error) {
+func (wf *Workflow) Planify(start time.Time, end *time.Time, request *tools.APIRequest) (float64, map[tools.DataType][]pricing.PricedItemITF, *Workflow, error) {
-	priceds := map[tools.DataType]map[string]pricing.PricedItemITF{}
+	priceds := map[tools.DataType][]pricing.PricedItemITF{}
 	ps, priceds, err := plan[*resources.ProcessingResource](tools.PROCESSING_RESOURCE, wf, priceds, request, wf.Graph.IsProcessing,
 		func(res resources.ResourceInterface, priced pricing.PricedItemITF) (time.Time, float64) {
 			return start.Add(time.Duration(wf.Graph.GetAverageTimeProcessingBeforeStart(0, res.GetID(), request)) * time.Second), priced.GetExplicitDurationInS()
@@ -191,12 +189,12 @@ func (wf *Workflow) Planify(start time.Time, end *time.Time, request *tools.APIR
 	return longest, priceds, wf, nil
 }
 
-func plan[T resources.ResourceInterface](dt tools.DataType, wf *Workflow, priceds map[tools.DataType]map[string]pricing.PricedItemITF, request *tools.APIRequest,
+func plan[T resources.ResourceInterface](dt tools.DataType, wf *Workflow, priceds map[tools.DataType][]pricing.PricedItemITF, request *tools.APIRequest,
-	f func(graph.GraphItem) bool, start func(resources.ResourceInterface, pricing.PricedItemITF) (time.Time, float64), end func(time.Time, float64) *time.Time) ([]T, map[tools.DataType]map[string]pricing.PricedItemITF, error) {
+	f func(graph.GraphItem) bool, start func(resources.ResourceInterface, pricing.PricedItemITF) (time.Time, float64), end func(time.Time, float64) *time.Time) ([]T, map[tools.DataType][]pricing.PricedItemITF, error) {
 	resources := []T{}
 	for _, item := range wf.GetGraphItems(f) {
 		if priceds[dt] == nil {
-			priceds[dt] = map[string]pricing.PricedItemITF{}
+			priceds[dt] = []pricing.PricedItemITF{}
 		}
 		dt, realItem := item.GetResource()
 		if realItem == nil {
@@ -214,7 +212,7 @@ func plan[T resources.ResourceInterface](dt tools.DataType, wf *Workflow, priced
 			priced.SetLocationEnd(*e)
 		}
 		resources = append(resources, realItem.(T))
-		priceds[dt][item.ID] = priced
+		priceds[dt] = append(priceds[dt], priced)
 	}
 	return resources, priceds, nil
 }

models/workflow/workflow_mongo_accessor.go

@@ -95,12 +95,12 @@ func (a *workflowMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.
 	if set.(*Workflow).Graph != nil && set.(*Workflow).Graph.Partial {
 		return nil, 403, errors.New("you are not allowed to update a partial workflow")
 	}
-	res, code, err := utils.GenericUpdateOne(set, id, a, &Workflow{})
+	res, code, err := utils.GenericUpdateOne(a.verifyResource(set), id, a, &Workflow{})
 	if code != 200 {
 		return nil, code, err
 	}
 	workflow := res.(*Workflow)
-	a.execute(workflow, false, true)        // update the workspace for the workflow
+	a.execute(workflow, false, false)       // update the workspace for the workflow
 	a.share(workflow, false, a.GetCaller()) // share the update to the peers
 	return res, code, nil
 }
@@ -119,19 +119,12 @@ func (a *workflowMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, i
 	workflow := res.(*Workflow)
 
 	a.share(workflow, false, a.GetCaller()) // share the creation to the peers
-	a.execute(workflow, false, true)        // store the workspace for the workflow
+	a.execute(workflow, false, false)       // store the workspace for the workflow
 	return res, code, nil
 }
 
 // CopyOne copies a workflow in the database
 func (a *workflowMongoAccessor) CopyOne(data utils.DBObject) (utils.DBObject, int, error) {
-	wf := data.(*Workflow)
-	for _, item := range wf.Graph.Items {
-		_, obj := item.GetResource()
-		if obj != nil {
-			obj.ClearEnv()
-		}
-	}
 	return utils.GenericStoreOne(data, a)
 }
 
@@ -214,10 +207,10 @@ func (a *workflowMongoAccessor) verifyResource(obj utils.DBObject) utils.DBObjec
 		} else if t == tools.DATA_RESOURCE {
 			access = resources.NewAccessor[*resources.DataResource](t, a.GetRequest(), func() utils.DBObject { return &resources.DataResource{} })
 		} else {
-			wf.Graph.Clear(resource.GetID())
+			wf.Graph.Clear(item.Data.GetID())
 		}
 		if error := utils.VerifyAccess(access, resource.GetID()); error != nil {
-			wf.Graph.Clear(resource.GetID())
+			wf.Graph.Clear(item.Data.GetID())
 		}
 	}
 	return wf

models/workflow_execution/workflow_execution.go

@@ -15,41 +15,39 @@ import (
 )
 
 /*
-* WorkflowExecution is a struct that represents a list of workflow executions
+* WorkflowExecutions is a struct that represents a list of workflow executions
 * Warning: No user can write (del, post, put) a workflow execution, it is only used by the system
 * workflows generate their own executions
  */
-type WorkflowExecution struct {
+type WorkflowExecutions struct {
-	utils.AbstractObject                                // AbstractObject contains the basic fields of an object (id, name)
+	utils.AbstractObject                    // AbstractObject contains the basic fields of an object (id, name)
-	PeerBookByGraph      map[string]map[string][]string `json:"peer_book_by_graph,omitempty" bson:"peer_book_by_graph,omitempty"` // BookByResource is a map of the resource id and the list of the booking id
+	ExecDate             time.Time          `json:"execution_date,omitempty" bson:"execution_date,omitempty" validate:"required"` // ExecDate is the execution date of the workflow, is required
-	ExecutionsID         string                         `json:"executions_id,omitempty" bson:"executions_id,omitempty"`
+	EndDate              *time.Time         `json:"end_date,omitempty" bson:"end_date,omitempty"`                                 // EndDate is the end date of the workflow
-	ExecDate             time.Time                      `json:"execution_date,omitempty" bson:"execution_date,omitempty" validate:"required"` // ExecDate is the execution date of the workflow, is required
+	State                enum.BookingStatus `json:"state" bson:"state" default:"0"`                                               // TEMPORARY TODO DEFAULT 1 -> 0 State is the state of the workflow
-	EndDate              *time.Time                     `json:"end_date,omitempty" bson:"end_date,omitempty"`                                 // EndDate is the end date of the workflow
+	WorkflowID           string             `json:"workflow_id" bson:"workflow_id,omitempty"`                                     // WorkflowID is the ID of the workflow
-	State                enum.BookingStatus             `json:"state" bson:"state" default:"0"`                                               // TEMPORARY TODO DEFAULT 1 -> 0 State is the state of the workflow
-	WorkflowID           string                         `json:"workflow_id" bson:"workflow_id,omitempty"`                                     // WorkflowID is the ID of the workflow
 }
 
-func (r *WorkflowExecution) StoreDraftDefault() {
+func (r *WorkflowExecutions) StoreDraftDefault() {
-	r.IsDraft = false // TODO: TEMPORARY
+	r.IsDraft = true // TODO: TEMPORARY
-	r.State = enum.SCHEDULED
+	r.State = enum.DRAFT
 }
 
-func (r *WorkflowExecution) CanUpdate(set utils.DBObject) (bool, utils.DBObject) {
+func (r *WorkflowExecutions) CanUpdate(set utils.DBObject) (bool, utils.DBObject) {
-	if r.State != set.(*WorkflowExecution).State {
+	if r.State != set.(*WorkflowExecutions).State {
-		return true, &WorkflowExecution{State: set.(*WorkflowExecution).State} // only state can be updated
+		return true, &WorkflowExecutions{State: set.(*WorkflowExecutions).State} // only state can be updated
 	}
 	return !r.IsDraft, set // only draft buying can be updated
 }
 
-func (r *WorkflowExecution) CanDelete() bool {
+func (r *WorkflowExecutions) CanDelete() bool {
 	return r.IsDraft // only draft bookings can be deleted
 }
 
-func (wfa *WorkflowExecution) Equals(we *WorkflowExecution) bool {
+func (wfa *WorkflowExecutions) Equals(we *WorkflowExecutions) bool {
 	return wfa.ExecDate.Equal(we.ExecDate) && wfa.WorkflowID == we.WorkflowID
 }
 
-func (ws *WorkflowExecution) PurgeDraft(request *tools.APIRequest) error {
+func (ws *WorkflowExecutions) PurgeDraft(request *tools.APIRequest) error {
 	if ws.EndDate == nil {
 		// if no end... then Book like a savage
 		e := ws.ExecDate.Add(time.Hour)
@@ -76,7 +74,7 @@ func (ws *WorkflowExecution) PurgeDraft(request *tools.APIRequest) error {
 }
 
 // tool to transform the argo status to a state
-func (wfa *WorkflowExecution) ArgoStatusToState(status string) *WorkflowExecution {
+func (wfa *WorkflowExecutions) ArgoStatusToState(status string) *WorkflowExecutions {
 	status = strings.ToLower(status)
 	switch status {
 	case "succeeded": // Succeeded
@@ -91,54 +89,38 @@ func (wfa *WorkflowExecution) ArgoStatusToState(status string) *WorkflowExecutio
 	return wfa
 }
 
-func (r *WorkflowExecution) GenerateID() {
+func (r *WorkflowExecutions) GenerateID() {
-	if r.UUID == "" {
+	r.UUID = uuid.New().String()
-		r.UUID = uuid.New().String()
-	}
 }
 
-func (d *WorkflowExecution) GetName() string {
+func (d *WorkflowExecutions) GetName() string {
 	return d.UUID + "_" + d.ExecDate.String()
 }
 
-func (d *WorkflowExecution) GetAccessor(request *tools.APIRequest) utils.Accessor {
+func (d *WorkflowExecutions) GetAccessor(request *tools.APIRequest) utils.Accessor {
 	return NewAccessor(request) // Create a new instance of the accessor
 }
 
-func (d *WorkflowExecution) VerifyAuth(request *tools.APIRequest) bool {
+func (d *WorkflowExecutions) VerifyAuth(request *tools.APIRequest) bool {
 	return true
 }
 
-func (d *WorkflowExecution) Book(executionsID string, wfID string, priceds map[tools.DataType]map[string]pricing.PricedItemITF) []*booking.Booking {
+func (d *WorkflowExecutions) Book(wfID string, priceds map[tools.DataType][]pricing.PricedItemITF) []*booking.Booking {
-	booking := d.bookEach(executionsID, wfID, tools.STORAGE_RESOURCE, priceds[tools.STORAGE_RESOURCE])
+	booking := d.bookEach(wfID, tools.STORAGE_RESOURCE, priceds[tools.STORAGE_RESOURCE])
-	booking = append(booking, d.bookEach(executionsID, wfID, tools.PROCESSING_RESOURCE, priceds[tools.PROCESSING_RESOURCE])...)
+	booking = append(booking, d.bookEach(wfID, tools.PROCESSING_RESOURCE, priceds[tools.PROCESSING_RESOURCE])...)
 	return booking
 }
 
-func (d *WorkflowExecution) bookEach(executionsID string, wfID string, dt tools.DataType, priceds map[string]pricing.PricedItemITF) []*booking.Booking {
+func (d *WorkflowExecutions) bookEach(wfID string, dt tools.DataType, priceds []pricing.PricedItemITF) []*booking.Booking {
 	items := []*booking.Booking{}
-	for itemID, priced := range priceds {
+	for _, priced := range priceds {
-		if d.PeerBookByGraph == nil {
-			d.PeerBookByGraph = map[string]map[string][]string{}
-		}
-		if d.PeerBookByGraph[priced.GetCreatorID()] == nil {
-			d.PeerBookByGraph[priced.GetCreatorID()] = map[string][]string{}
-		}
-		if d.PeerBookByGraph[priced.GetCreatorID()][itemID] == nil {
-			d.PeerBookByGraph[priced.GetCreatorID()][itemID] = []string{}
-		}
 		start := d.ExecDate
 		if s := priced.GetLocationStart(); s != nil {
 			start = *s
 		}
 		end := start.Add(time.Duration(priced.GetExplicitDurationInS()) * time.Second)
 		bookingItem := &booking.Booking{
-			AbstractObject: utils.AbstractObject{
+			State:             enum.DRAFT,
-				UUID: uuid.New().String(),
-				Name: d.GetName() + "_" + executionsID + "_" + wfID,
-			},
-			ExecutionsID:      executionsID,
-			State:             enum.SCHEDULED,
 			ResourceID:        priced.GetID(),
 			ResourceType:      dt,
 			DestPeerID:        priced.GetCreatorID(),
@@ -148,8 +130,6 @@ func (d *WorkflowExecution) bookEach(executionsID string, wfID string, dt tools.
 			ExpectedEndDate:   &end,
 		}
 		items = append(items, bookingItem)
-		d.PeerBookByGraph[priced.GetCreatorID()][itemID] = append(
-			d.PeerBookByGraph[priced.GetCreatorID()][itemID], bookingItem.GetID())
 	}
 	return items
 }

models/workflow_execution/workflow_execution_mongo_accessor.go

@@ -43,11 +43,11 @@ func (wfa *workflowExecutionMongoAccessor) DeleteOne(id string) (utils.DBObject,
 }
 
 func (wfa *workflowExecutionMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils.DBObject, int, error) {
-	if set.(*WorkflowExecution).State == 0 {
+	if set.(*WorkflowExecutions).State == 0 {
 		return nil, 400, errors.New("state is required")
 	}
-	realSet := WorkflowExecution{State: set.(*WorkflowExecution).State}
+	realSet := WorkflowExecutions{State: set.(*WorkflowExecutions).State}
-	return utils.GenericUpdateOne(&realSet, id, wfa, &WorkflowExecution{})
+	return utils.GenericUpdateOne(&realSet, id, wfa, &WorkflowExecutions{})
 }
 
 func (wfa *workflowExecutionMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {
@@ -59,15 +59,13 @@ func (wfa *workflowExecutionMongoAccessor) CopyOne(data utils.DBObject) (utils.D
 }
 
 func (a *workflowExecutionMongoAccessor) LoadOne(id string) (utils.DBObject, int, error) {
-	return utils.GenericLoadOne[*WorkflowExecution](id, func(d utils.DBObject) (utils.DBObject, int, error) {
+	return utils.GenericLoadOne[*WorkflowExecutions](id, func(d utils.DBObject) (utils.DBObject, int, error) {
-		now := time.Now()
+		if d.(*WorkflowExecutions).State == enum.DRAFT && !a.shallow && time.Now().UTC().After(d.(*WorkflowExecutions).ExecDate) {
-		now = now.Add(time.Second * -60)
-		if d.(*WorkflowExecution).State == enum.DRAFT && !a.shallow && now.UTC().After(d.(*WorkflowExecution).ExecDate) {
 			utils.GenericDeleteOne(d.GetID(), newShallowAccessor(a.Request))
 			return nil, 404, errors.New("not found")
 		}
-		if d.(*WorkflowExecution).State == enum.SCHEDULED && !a.shallow && now.UTC().After(d.(*WorkflowExecution).ExecDate) {
+		if d.(*WorkflowExecutions).State == enum.SCHEDULED && !a.shallow && time.Now().UTC().After(d.(*WorkflowExecutions).ExecDate) {
-			d.(*WorkflowExecution).State = enum.FORGOTTEN
+			d.(*WorkflowExecutions).State = enum.FORGOTTEN
 			utils.GenericRawUpdateOne(d, id, newShallowAccessor(a.Request))
 		}
 		return d, 200, nil
@@ -75,23 +73,21 @@ func (a *workflowExecutionMongoAccessor) LoadOne(id string) (utils.DBObject, int
 }
 
 func (a *workflowExecutionMongoAccessor) LoadAll(isDraft bool) ([]utils.ShallowDBObject, int, error) {
-	return utils.GenericLoadAll[*WorkflowExecution](a.getExec(), isDraft, a)
+	return utils.GenericLoadAll[*WorkflowExecutions](a.getExec(), isDraft, a)
 }
 
 func (a *workflowExecutionMongoAccessor) Search(filters *dbs.Filters, search string, isDraft bool) ([]utils.ShallowDBObject, int, error) {
-	return utils.GenericSearch[*WorkflowExecution](filters, search, a.GetExecFilters(search), a.getExec(), isDraft, a)
+	return utils.GenericSearch[*WorkflowExecutions](filters, search, a.GetExecFilters(search), a.getExec(), isDraft, a)
 }
 
 func (a *workflowExecutionMongoAccessor) getExec() func(utils.DBObject) utils.ShallowDBObject {
 	return func(d utils.DBObject) utils.ShallowDBObject {
-		now := time.Now()
+		if d.(*WorkflowExecutions).State == enum.DRAFT && time.Now().UTC().After(d.(*WorkflowExecutions).ExecDate) {
-		now = now.Add(time.Second * -60)
-		if d.(*WorkflowExecution).State == enum.DRAFT && now.UTC().After(d.(*WorkflowExecution).ExecDate) {
 			utils.GenericDeleteOne(d.GetID(), newShallowAccessor(a.Request))
 			return nil
 		}
-		if d.(*WorkflowExecution).State == enum.SCHEDULED && now.UTC().After(d.(*WorkflowExecution).ExecDate) {
+		if d.(*WorkflowExecutions).State == enum.SCHEDULED && time.Now().UTC().After(d.(*WorkflowExecutions).ExecDate) {
-			d.(*WorkflowExecution).State = enum.FORGOTTEN
+			d.(*WorkflowExecutions).State = enum.FORGOTTEN
 			utils.GenericRawUpdateOne(d, d.GetID(), newShallowAccessor(a.Request))
 			return d
 		}

models/workflow_execution/workflow_scheduler.go

@@ -1,19 +1,16 @@
 package workflow_execution
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"strings"
 	"time"
 
-	"cloud.o-forge.io/core/oc-lib/models/booking"
 	"cloud.o-forge.io/core/oc-lib/models/common/enum"
 	"cloud.o-forge.io/core/oc-lib/models/peer"
 	"cloud.o-forge.io/core/oc-lib/models/utils"
 	"cloud.o-forge.io/core/oc-lib/models/workflow"
 	"cloud.o-forge.io/core/oc-lib/tools"
-	"github.com/google/uuid"
 	"github.com/robfig/cron"
 )
 
@@ -23,15 +20,14 @@ import (
  */
 // it's a flying object only use in a session time. It's not stored in the database
 type WorkflowSchedule struct {
-	UUID              string               `json:"id" validate:"required"`                // ExecutionsID is the list of the executions id of the workflow
+	Workflow           *workflow.Workflow    `json:"workflow,omitempty"`                    // Workflow is the workflow dependancy of the schedule
-	Workflow          *workflow.Workflow   `json:"workflow,omitempty"`                    // Workflow is the workflow dependancy of the schedule
+	WorkflowExecutions []*WorkflowExecutions `json:"workflow_executions,omitempty"`         // WorkflowExecutions is the list of executions of the workflow
-	WorkflowExecution []*WorkflowExecution `json:"workflow_executions,omitempty"`         // WorkflowExecution is the list of executions of the workflow
+	Message            string                `json:"message,omitempty"`                     // Message is the message of the schedule
-	Message           string               `json:"message,omitempty"`                     // Message is the message of the schedule
+	Warning            string                `json:"warning,omitempty"`                     // Warning is the warning message of the schedule
-	Warning           string               `json:"warning,omitempty"`                     // Warning is the warning message of the schedule
+	Start              time.Time             `json:"start" validate:"required,ltfield=End"` // Start is the start time of the schedule, is required and must be less than the End time
-	Start             time.Time            `json:"start" validate:"required,ltfield=End"` // Start is the start time of the schedule, is required and must be less than the End time
+	End                *time.Time            `json:"end,omitempty"`                         // End is the end time of the schedule, is required and must be greater than the Start time
-	End               *time.Time           `json:"end,omitempty"`                         // End is the end time of the schedule, is required and must be greater than the Start time
+	DurationS          float64               `json:"duration_s" default:"-1"`               // End is the end time of the schedule
-	DurationS         float64              `json:"duration_s" default:"-1"`               // End is the end time of the schedule
+	Cron               string                `json:"cron,omitempty"`                        // here the cron format : ss mm hh dd MM dw task
-	Cron              string               `json:"cron,omitempty"`                        // here the cron format : ss mm hh dd MM dw task
 }
 
 func NewScheduler(start string, end string, durationInS float64, cron string) *WorkflowSchedule {
@@ -40,7 +36,6 @@ func NewScheduler(start string, end string, durationInS float64, cron string) *W
 		return nil
 	}
 	ws := &WorkflowSchedule{
-		UUID:      uuid.New().String(),
 		Start:     s,
 		DurationS: durationInS,
 		Cron:      cron,
@@ -52,19 +47,19 @@ func NewScheduler(start string, end string, durationInS float64, cron string) *W
 	return ws
 }
 
-func (ws *WorkflowSchedule) CheckBooking(wfID string, request *tools.APIRequest) (bool, *workflow.Workflow, []*WorkflowExecution, []*booking.Booking, error) {
+func (ws *WorkflowSchedule) CheckBooking(wfID string, request *tools.APIRequest) (bool, *workflow.Workflow, []*WorkflowExecutions, error) {
 	if request.Caller == nil && request.Caller.URLS == nil && request.Caller.URLS[tools.BOOKING] == nil || request.Caller.URLS[tools.BOOKING][tools.GET] == "" {
-		return false, nil, []*WorkflowExecution{}, []*booking.Booking{}, errors.New("no caller defined")
+		return false, nil, []*WorkflowExecutions{}, errors.New("no caller defined")
 	}
 	access := workflow.NewAccessor(request)
 	res, code, err := access.LoadOne(wfID)
 	if code != 200 {
-		return false, nil, []*WorkflowExecution{}, []*booking.Booking{}, errors.New("could not load the workflow with id: " + err.Error())
+		return false, nil, []*WorkflowExecutions{}, errors.New("could not load the workflow with id: " + err.Error())
 	}
 	wf := res.(*workflow.Workflow)
 	longest, priceds, wf, err := wf.Planify(ws.Start, ws.End, request)
 	if err != nil {
-		return false, wf, []*WorkflowExecution{}, []*booking.Booking{}, err
+		return false, wf, []*WorkflowExecutions{}, err
 	}
 	ws.DurationS = longest
 	ws.Message = "We estimate that the workflow will start at " + ws.Start.String() + " and last " + fmt.Sprintf("%v", ws.DurationS) + " seconds."
@@ -73,71 +68,55 @@ func (ws *WorkflowSchedule) CheckBooking(wfID string, request *tools.APIRequest)
 	}
 	execs, err := ws.getExecutions(wf)
 	if err != nil {
-		return false, wf, []*WorkflowExecution{}, []*booking.Booking{}, err
+		return false, wf, []*WorkflowExecutions{}, err
 	}
-	bookings := []*booking.Booking{}
 	for _, exec := range execs {
-		bookings = append(bookings, exec.Book(ws.UUID, wfID, priceds)...)
+		bookings := exec.Book(wfID, priceds)
 		for _, b := range bookings {
-			// ------------ DELETE
-			fmt.Println("Booking :")
-			book, _ := json.Marshal(b)
-			fmt.Println(string(book))
-			// ----------------
 			meth := request.Caller.URLS[tools.BOOKING][tools.GET]
 			meth = strings.ReplaceAll(meth, ":id", b.ResourceID)
 			meth = strings.ReplaceAll(meth, ":start_date", b.ExpectedStartDate.Format("2006-01-02T15:04:05"))
 			meth = strings.ReplaceAll(meth, ":end_date", b.ExpectedEndDate.Format("2006-01-02T15:04:05"))
 			request.Caller.URLS[tools.BOOKING][tools.GET] = meth
-			fmt.Println("Peer exec on " + b.DestPeerID)
 			_, err := (&peer.Peer{}).LaunchPeerExecution(b.DestPeerID, b.ResourceID, tools.BOOKING, tools.GET, nil, request.Caller)
 			if err != nil {
-				return false, wf, execs, bookings, err
+				return false, wf, execs, err
 			}
 		}
-
 	}
-	return true, wf, execs, bookings, nil
+	return true, wf, execs, nil
 }
 
-func (ws *WorkflowSchedule) Schedules(wfID string, request *tools.APIRequest) (*WorkflowSchedule, *workflow.Workflow, []*WorkflowExecution, error) {
+func (ws *WorkflowSchedule) Schedules(wfID string, request *tools.APIRequest) (*WorkflowSchedule, *workflow.Workflow, []*WorkflowExecutions, error) {
 	if request == nil {
-		return ws, nil, []*WorkflowExecution{}, errors.New("no request found")
+		return ws, nil, []*WorkflowExecutions{}, errors.New("no request found")
 	}
 	c := request.Caller
 	if c == nil || c.URLS == nil || c.URLS[tools.BOOKING] == nil {
-		return ws, nil, []*WorkflowExecution{}, errors.New("no caller defined")
+		return ws, nil, []*WorkflowExecutions{}, errors.New("no caller defined")
 	}
 	methods := c.URLS[tools.BOOKING]
 	if _, ok := methods[tools.GET]; !ok {
-		return ws, nil, []*WorkflowExecution{}, errors.New("no path found")
+		return ws, nil, []*WorkflowExecutions{}, errors.New("no path found")
 	}
-	ok, wf, executions, bookings, err := ws.CheckBooking(wfID, request)
+	ok, wf, executions, err := ws.CheckBooking(wfID, request)
-	ws.WorkflowExecution = executions
 	if !ok || err != nil {
-		fmt.Println("Error here when scheduling")
+		return ws, nil, []*WorkflowExecutions{}, errors.New("could not book the workflow : " + fmt.Sprintf("%v", err))
-		return ws, nil, executions, errors.New("could not book the workflow : " + fmt.Sprintf("%v", err))
 	}
+
 	ws.Workflow = wf
-	for _, booking := range bookings {
+	ws.WorkflowExecutions = executions
-		fmt.Println("Trying to schedule on ")
+
-		fmt.Println(booking.DestPeerID)
-		_, err := (&peer.Peer{}).LaunchPeerExecution(booking.DestPeerID, "",
-			tools.BOOKING, tools.POST, booking.Serialize(booking), request.Caller)
-		if err != nil {
-			return ws, wf, executions, errors.New("could not launch the peer execution : " + fmt.Sprintf("%v", err))
-		}
-	}
-	fmt.Println("Schedules")
 	for _, exec := range executions {
 		err := exec.PurgeDraft(request)
 		if err != nil {
-			return ws, nil, []*WorkflowExecution{}, errors.New("purge draft" + fmt.Sprintf("%v", err))
+			return ws, nil, []*WorkflowExecutions{}, errors.New("purge draft" + fmt.Sprintf("%v", err))
 		}
+		exec.GenerateID()
 		exec.StoreDraftDefault()
+		// Should DELETE the previous execution2
 		utils.GenericStoreOne(exec, NewAccessor(request))
 	}
-	fmt.Println("Schedules")
 	return ws, wf, executions, nil
 }
 
@@ -153,23 +132,21 @@ VERIFY THAT WE HANDLE DIFFERENCE BETWEEN LOCATION TIME && BOOKING
 * getExecutions is a function that returns the executions of a workflow
 * it returns an array of workflow_execution.WorkflowExecution
  */
-func (ws *WorkflowSchedule) getExecutions(workflow *workflow.Workflow) ([]*WorkflowExecution, error) {
+func (ws *WorkflowSchedule) getExecutions(workflow *workflow.Workflow) ([]*WorkflowExecutions, error) {
-	workflows_executions := []*WorkflowExecution{}
+	workflows_executions := []*WorkflowExecutions{}
 	dates, err := ws.getDates()
 	if err != nil {
 		return workflows_executions, err
 	}
 	for _, date := range dates {
-		obj := &WorkflowExecution{
+		obj := &WorkflowExecutions{
 			AbstractObject: utils.AbstractObject{
-				UUID: uuid.New().String(),                                 // set the uuid of the execution
 				Name: workflow.Name + "_execution_" + date.Start.String(), // set the name of the execution
 			},
-			ExecutionsID: ws.UUID,
+			ExecDate:   date.Start,       // set the execution date
-			ExecDate:     date.Start,       // set the execution date
+			EndDate:    date.End,         // set the end date
-			EndDate:      date.End,         // set the end date
+			State:      enum.DRAFT,       // set the state to 1 (scheduled)
-			State:        enum.DRAFT,       // set the state to 1 (scheduled)
+			WorkflowID: workflow.GetID(), // set the workflow id dependancy of the execution
-			WorkflowID:   workflow.GetID(), // set the workflow id dependancy of the execution
 		}
 		workflows_executions = append(workflows_executions, obj)
 	}

models/workspace/workspace_mongo_accessor.go

@@ -72,11 +72,9 @@ func (a *workspaceMongoAccessor) UpdateOne(set utils.DBObject, id string) (utils
 func (a *workspaceMongoAccessor) StoreOne(data utils.DBObject) (utils.DBObject, int, error) {
 	filters := &dbs.Filters{
 		Or: map[string][]dbs.Filter{
-			"abstractobject.name":       {{Operator: dbs.LIKE.String(), Value: data.GetName() + "_workspace"}},
+			"abstractobject.name": {{Operator: dbs.LIKE.String(), Value: data.GetName() + "_workspace"}},
-			"abstractobject.creator_id": {{Operator: dbs.EQUAL.String(), Value: a.GetPeerID()}},
 		},
 	}
-	// filters *dbs.Filters, word string, isDraft bool
 	res, _, err := a.Search(filters, "", true) // Search for the workspace
 	if err == nil && len(res) > 0 {            // If the workspace already exists, return an error
 		return nil, 409, errors.New("a workspace with the same name already exists")

tools/api.go

@@ -115,8 +115,8 @@ func (a *API) SubscribeRouter(infos []*beego.ControllerInfo) {
 // CheckRemotePeer checks the state of a remote peer
 func (a *API) CheckRemotePeer(url string) (State, map[string]int) {
 	// Check if the database is up
-	var resp APIStatusResponse
 	caller := NewHTTPCaller(map[DataType]map[METHOD]string{}) // Create a new http caller
+	var resp APIStatusResponse
 	b, err := caller.CallPost(url, "", map[string]interface{}{}) // Call the status endpoint of the peer
 	if err != nil {
 		return DEAD, map[string]int{} // If the peer is not reachable, return dead

tools/enums.go

@@ -21,11 +21,6 @@ const (
 	WORKSPACE_HISTORY
 	ORDER
 	PURCHASE_RESOURCE
-	ADMIRALTY_SOURCE
-	ADMIRALTY_TARGET
-	ADMIRALTY_SECRET
-	ADMIRALTY_KUBECONFIG
-	ADMIRALTY_NODES
 )
 
 var NOAPI = ""
@@ -35,11 +30,6 @@ var WORKFLOWAPI = "oc-workflow"
 var WORKSPACEAPI = "oc-workspace"
 var PEERSAPI = "oc-peer"
 var DATACENTERAPI = "oc-datacenter"
-var ADMIRALTY_SOURCEAPI = DATACENTERAPI+"/admiralty/source"
-var ADMIRALTY_TARGETAPI = DATACENTERAPI+"/admiralty/target"
-var ADMIRALTY_SECRETAPI = DATACENTERAPI+"/admiralty/secret"
-var ADMIRALTY_KUBECONFIGAPI = DATACENTERAPI+"/admiralty/kubeconfig"
-var ADMIRALTY_NODESAPI = DATACENTERAPI+"/admiralty/node"
 
 // Bind the standard API name to the data type
 var DefaultAPI = [...]string{
@@ -60,11 +50,6 @@ var DefaultAPI = [...]string{
 	NOAPI,
 	NOAPI,
 	NOAPI,
-	ADMIRALTY_SOURCEAPI,
-	ADMIRALTY_TARGETAPI,
-	ADMIRALTY_SECRETAPI,
-	ADMIRALTY_KUBECONFIGAPI,
-	ADMIRALTY_NODESAPI,
 }
 
 // Bind the standard data name to the data type
@@ -86,11 +71,6 @@ var Str = [...]string{
 	"workspace_history",
 	"order",
 	"purchase_resource",
-	"admiralty_source",
-	"admiralty_target",
-	"admiralty_secret",
-	"admiralty_kubeconfig",
-	"admiralty_node",
 }
 
 func FromInt(i int) string {
@@ -111,5 +91,5 @@ func (d DataType) EnumIndex() int {
 }
 
 func DataTypeList() []DataType {
-	return []DataType{DATA_RESOURCE, PROCESSING_RESOURCE, STORAGE_RESOURCE, COMPUTE_RESOURCE, WORKFLOW_RESOURCE, WORKFLOW, WORKFLOW_EXECUTION, WORKSPACE, PEER, COLLABORATIVE_AREA, RULE, BOOKING, WORKFLOW_HISTORY, WORKSPACE_HISTORY, ORDER, PURCHASE_RESOURCE,ADMIRALTY_SOURCE,ADMIRALTY_TARGET,ADMIRALTY_SECRET,ADMIRALTY_KUBECONFIG,ADMIRALTY_NODES}
+	return []DataType{DATA_RESOURCE, PROCESSING_RESOURCE, STORAGE_RESOURCE, COMPUTE_RESOURCE, WORKFLOW_RESOURCE, WORKFLOW, WORKFLOW_EXECUTION, WORKSPACE, PEER, COLLABORATIVE_AREA, RULE, BOOKING, WORKFLOW_HISTORY, WORKSPACE_HISTORY, ORDER, PURCHASE_RESOURCE}
 }

tools/remote_caller.go

@@ -3,7 +3,6 @@ package tools
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
 	"io"
 	"net/http"
 	"net/url"
@@ -50,9 +49,8 @@ func ToMethod(str string) METHOD {
 var HTTPCallerInstance = &HTTPCaller{} // Singleton instance of the HTTPCaller
 
 type HTTPCaller struct {
-	URLS     	map[DataType]map[METHOD]string 	// Map of the different methods and their urls
+	URLS     map[DataType]map[METHOD]string // Map of the different methods and their urls
-	Disabled 	bool                           	// Disabled flag
+	Disabled bool                           // Disabled flag
-	LastResults map[string]interface{}			// Used to store information regarding the last execution of a given method on a given data type
 }
 
 // NewHTTPCaller creates a new instance of the HTTP Caller
@@ -78,33 +76,17 @@ func (caller *HTTPCaller) CallGet(url string, subpath string, types ...string) (
 		return nil, err
 	}
 	defer resp.Body.Close()
-	err = caller.StoreResp(resp)
+	return io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	return caller.LastResults["body"].([]byte), nil
 }
 
 // CallPut calls the DELETE method on the HTTP server
 func (caller *HTTPCaller) CallDelete(url string, subpath string) ([]byte, error) {
-	req, err := http.NewRequest("DELETE", url+subpath, nil)
+	resp, err := http.NewRequest("DELETE", url+subpath, nil)
-	if err != nil {
+	if err != nil || resp == nil || resp.Body == nil {
-		return nil, err
-	}
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	if err != nil || req == nil || req.Body == nil {
 		return nil, err
 	}
 	defer resp.Body.Close()
-
+	return io.ReadAll(resp.Body)
-	err = caller.StoreResp(resp)
-	if err != nil {
-		return nil, err
-	}
-
-	return caller.LastResults["body"].([]byte), nil
 }
 
 // CallPost calls the POST method on the HTTP server
@@ -123,12 +105,7 @@ func (caller *HTTPCaller) CallPost(url string, subpath string, body interface{},
 		return nil, err
 	}
 	defer resp.Body.Close()
-	err = caller.StoreResp(resp)
+	return io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	return caller.LastResults["body"].([]byte), nil
 }
 
 // CallPost calls the POST method on the HTTP server
@@ -146,12 +123,7 @@ func (caller *HTTPCaller) CallPut(url string, subpath string, body map[string]in
 		return nil, err
 	}
 	defer resp.Body.Close()
-	err = caller.StoreResp(resp)
+	return io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	return caller.LastResults["body"].([]byte), nil
 }
 
 // CallRaw calls the Raw method on the HTTP server
@@ -171,12 +143,7 @@ func (caller *HTTPCaller) CallRaw(method string, url string, subpath string,
 		req.AddCookie(c)
 	}
 	client := &http.Client{}
-	resp, err := client.Do(req)
+	return client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-
-	return resp, nil
 }
 
 // CallRaw calls the Raw method on the HTTP server
@@ -196,17 +163,3 @@ func (caller *HTTPCaller) CallForm(method string, url string, subpath string,
 	client := &http.Client{}
 	return client.Do(req)
 }
-
-func (caller *HTTPCaller) StoreResp(resp *http.Response) error {
-	caller.LastResults = make(map[string]interface{})
-	caller.LastResults["header"] = resp.Header
-	caller.LastResults["code"] = resp.StatusCode
-	data, err := io.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println("Error reading the body of the last request")
-		return err
-	}
-
-	caller.LastResults["body"] = data
-	return nil
-}