Live Structure

models/workflow_execution/workflow_scheduler.go

@@ -101,10 +101,6 @@ func (ws *WorkflowSchedule) GetBuyAndBook(wfID string, request *tools.APIRequest
 		}
 	}
 
-	if err := ws.GenerateOrder(purchased, bookings, request); err != nil {
-		return false, wf, execs, purchased, bookings, err
-	}
-
 	return true, wf, execs, purchased, bookings, nil
 }
 
@@ -189,6 +185,12 @@ func (ws *WorkflowSchedule) Schedules(wfID string, request *tools.APIRequest) (*
 	for _, purchase := range purchases {
 		go ws.CallDatacenter(purchase, purchase.DestPeerID, tools.PURCHASE_RESOURCE, request, errCh, &m)
 	}
+	for i := 0; i < len(purchases); i++ {
+		if err := <-errCh; err != nil {
+			return ws, wf, executions, errors.New("could not launch the peer execution : " + fmt.Sprintf("%v", err))
+		}
+	}
+
 	errCh = make(chan error, len(bookings))
 
 	for _, booking := range bookings {
@@ -201,6 +203,10 @@ func (ws *WorkflowSchedule) Schedules(wfID string, request *tools.APIRequest) (*
 		}
 	}
 
+	if err := ws.GenerateOrder(purchases, bookings, request); err != nil {
+		return ws, wf, executions, err
+	}
+
 	fmt.Println("Schedules")
 	for _, exec := range executions {
 		err := exec.PurgeDraft(request)
@@ -222,9 +228,12 @@ func (ws *WorkflowSchedule) CallDatacenter(purchase utils.DBObject, destPeerID s
 		return
 	}
 	m.Unlock()
-	if _, err = (&peer.Peer{}).LaunchPeerExecution(destPeerID, "", dt, tools.POST, purchase.Serialize(purchase), &c); err != nil {
+	if res, err := (&peer.Peer{}).LaunchPeerExecution(destPeerID, "", dt, tools.POST, purchase.Serialize(purchase), &c); err != nil {
 		errCh <- err
 		return
+	} else {
+		data := res["data"].(map[string]interface{})
+		purchase.SetID(fmt.Sprintf("%v", data["id"]))
 	}
 	errCh <- nil
 }