Fixed issues with notification workflow forwarding from child to parents

Author: frikky

health.go

@@ -2026,6 +2026,7 @@ func GetStaticWorkflowHealth(ctx context.Context, workflow Workflow) (Workflow,
 
 			if len(triggerType) == 0 {
 				log.Printf("[WARNING] No TriggerType specified for User Input node %s in %s (%s)", trigger.Label, workflow.Name, workflow.ID)
+				workflow.Errors = append(workflow.Errors, fmt.Sprintf("No TriggerType specified for User Input node '%s'", trigger.Label))
 				if workflow.PreviouslySaved {
 					//resp.WriteHeader(401)
 					//resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "No contact option specified in user input"}`)))

notifications.go

@@ -261,7 +261,7 @@ func HandleGetNotifications(resp http.ResponseWriter, request *http.Request) {
 
 // how to make sure that the notification workflow bucket always empties itself:
 // call sendToNotificationWorkflow with the first cached notification 
-func sendToNotificationWorkflow(ctx context.Context, notification Notification, userApikey, workflowId string, relieveNotifications bool) error {
+func sendToNotificationWorkflow(ctx context.Context, notification Notification, userApikey, workflowId string, relieveNotifications bool, authOrg Org) error {
 	/*
 	// FIXME: Was used for disabling it before due to possible issues with infinite loops.
 	if project.Environment != "onprem" {
@@ -449,7 +449,7 @@ func sendToNotificationWorkflow(ctx context.Context, notification Notification,
 							totalTimeElapsed, 
 							bucketingMinutesInt,
 					)
-					_ = sendToNotificationWorkflow(ctx, notification, userApikey, workflowId, true)
+					_ = sendToNotificationWorkflow(ctx, notification, userApikey, workflowId, true, authOrg)
 					err = DeleteCache(ctx, cacheKey)
 					if err != nil {
 						log.Printf("[ERROR] Failed deleting cached notifications %s for notification %s: %s. Assuming everything is okay and moving on",
@@ -497,9 +497,10 @@ func sendToNotificationWorkflow(ctx context.Context, notification Notification,
 
 	executionUrl := fmt.Sprintf("%s/api/v1/workflows/%s/execute", backendUrl, workflowId)
 	//log.Printf("\n\n[DEBUG] Notification workflow: %s. APIKEY: %#v\n\n", executionUrl, userApikey)
-	client := &http.Client{
-		Timeout: 10 * time.Second,
-	}
+	client := GetExternalClient(executionUrl)
+
+	// Set timeout to 30 sec
+	client.Timeout = 30 * time.Second
 
 	req, err := http.NewRequest(
 		"POST",
@@ -508,7 +509,7 @@ func sendToNotificationWorkflow(ctx context.Context, notification Notification,
 	)
 
 	req.Header.Add("Authorization", fmt.Sprintf(`Bearer %s`, userApikey))
-	req.Header.Add("Org-Id", notification.OrgId)
+	req.Header.Add("Org-Id", authOrg.Id)
 	newresp, err := client.Do(req)
 	if err != nil {
 		return err
@@ -650,6 +651,8 @@ func CreateOrgNotification(ctx context.Context, title, description, referenceUrl
 		project.Environment = "worker" 
 	}
 
+	log.Printf("[DEBUG] Creating org notification! %s. Env: %s", orgId, project.Environment)
+
 	// Check if the referenceUrl is already in cache or not
 	if len(referenceUrl) > 0 {
 		// Have a 0-0.5 sec timeout here?
@@ -805,7 +808,7 @@ func CreateOrgNotification(ctx context.Context, title, description, referenceUrl
 		if mainNotification.Ignored { 
 			log.Printf("[INFO] Ignored notification %s for %s", mainNotification.Title, mainNotification.UserId)
 		} else {
-			err = sendToNotificationWorkflow(ctx, mainNotification, selectedApikey, org.Defaults.NotificationWorkflow, false)
+			err = sendToNotificationWorkflow(ctx, mainNotification, selectedApikey, org.Defaults.NotificationWorkflow, false, *authOrg)
 			if err != nil {
 				if !strings.Contains(err.Error(), "cache stored") && !strings.Contains(err.Error(), "Same workflow") {
 					log.Printf("[ERROR] Failed sending notification to workflowId %s for reference %s (2): %s", org.Defaults.NotificationWorkflow, mainNotification.Id, err)
@@ -907,7 +910,7 @@ func CreateOrgNotification(ctx context.Context, title, description, referenceUrl
 				}
 			}
 
-			err = sendToNotificationWorkflow(ctx, mainNotification, selectedApikey, org.Defaults.NotificationWorkflow, false)
+			err = sendToNotificationWorkflow(ctx, mainNotification, selectedApikey, org.Defaults.NotificationWorkflow, false, *authOrg)
 			if err != nil {
 				log.Printf("[ERROR] Failed sending notification to workflowId %s for reference %s: %s", org.Defaults.NotificationWorkflow, mainNotification.Id, err)
 			}

shared.go

@@ -7383,7 +7383,7 @@ func diffWorkflows(oldWorkflow Workflow, parentWorkflow Workflow, update bool) {
 				newChildTriggers = append(newChildTriggers, trigger)
 			}
 
-			log.Printf("New triggers: %#v", newChildTriggers)
+			//log.Printf("New triggers: %#v", len(newChildTriggers))
 
 			childWorkflow.Triggers = newChildTriggers
 			childTriggers = childWorkflow.Triggers
@@ -8502,7 +8502,9 @@ func SaveWorkflow(resp http.ResponseWriter, request *http.Request) {
 		// contains reference objects in the workflow that causes
 		// e.g. authenticationIds to be reset.
 		// This is a temporary fix to avoid it.
-		go diffWorkflowWrapper(newWorkflow)
+		// FIXME: Removed goroutine. Does it matter?
+		// Makes the timing problem go away.
+		diffWorkflowWrapper(newWorkflow)
 	}
 
 	workflow.UpdatedBy = user.Username