diff --git a/models/workflow/workflow.go b/models/workflow/workflow.go index 59c8cea..2f146dd 100644 --- a/models/workflow/workflow.go +++ b/models/workflow/workflow.go @@ -271,31 +271,31 @@ func (d *Workflow) extractResourcePlantUML(line string, resource resources.Resou json.Unmarshal([]byte(comment), instance) } // deserializer les instances... une instance doit par défaut avoir certaines valeurs d'accès. - graphID := uuid.New() - graphItem := &graph.GraphItem{ - ID: graphID.String(), - } - graphItem = d.getNewGraphItem(dataName, graphItem, resource) - - if graphItem != nil { - d.Graph.Items[graphID.String()] = *graphItem + item := d.getNewGraphItem(dataName, resource) + if item != nil { + d.Graph.Items[item.ID] = *item } - return varName, graphItem, nil + return varName, item, nil } -func (d *Workflow) getNewGraphItem(dataName string, graphItem *graph.GraphItem, resource resources.ResourceInterface) *graph.GraphItem { +func (d *Workflow) getNewGraphItem(dataName string, resource resources.ResourceInterface) *graph.GraphItem { if resource == nil { return nil } + graphItem := &graph.GraphItem{ + ID: uuid.New().String(), + } switch dataName { case "Data": d.Datas = append(d.Datas, resource.GetID()) d.DataResources = append(d.DataResources, resource.(*resources.DataResource)) + fmt.Println("r", graphItem, resource) graphItem.Data = resource.(*resources.DataResource) case "Processing": d.Processings = append(d.Processings, resource.GetID()) d.ProcessingResources = append(d.ProcessingResources, resource.(*resources.ProcessingResource)) + fmt.Println("r", graphItem, resource) graphItem.Processing = resource.(*resources.ProcessingResource) case "Event": access := resources.NewAccessor[*resources.NativeTool](tools.NATIVE_TOOL, &tools.APIRequest{ @@ -309,15 +309,17 @@ func (d *Workflow) getNewGraphItem(dataName string, graphItem *graph.GraphItem, case "Storage": d.Storages = append(d.Storages, resource.GetID()) d.StorageResources = append(d.StorageResources, resource.(*resources.StorageResource)) + fmt.Println("r", graphItem, resource) graphItem.Storage = resource.(*resources.StorageResource) case "ComputeUnit": d.Computes = append(d.Computes, resource.GetID()) d.ComputeResources = append(d.ComputeResources, resource.(*resources.ComputeResource)) + fmt.Println("r", graphItem, resource) graphItem.Compute = resource.(*resources.ComputeResource) default: - return graphItem + return nil } - return graphItem + return nil } func (d *Workflow) getNewInstance(dataName string, name string, peerID string) resources.ResourceInstanceITF {