Merge branch 'Shuffle:main' into main

Author: yashsinghcodes

db-connector.go

@@ -3726,7 +3726,7 @@ func GetOrg(ctx context.Context, id string) (*Org, error) {
 		if err := project.Dbclient.Get(ctx, key, curOrg); err != nil {
 			log.Printf("[ERROR] Error in org loading (2) for %s: %s", key, err)
 			//log.Printf("Users: %s", curOrg.Users)
-			if strings.Contains(err.Error(), `cannot load field`) && strings.Contains(err.Error(), `users`) {
+			if strings.Contains(err.Error(), `cannot load field`) && strings.Contains(err.Error(), `users`) && !strings.Contains(err.Error(), `users_last_session`) {
 				//Self correcting Org handler for user migration. This may come in handy if we change the structure of private apps later too.
 				log.Printf("[INFO] Error in org loading (3). Migrating org to new org and user handler (2): %s", err)
 				err = nil
@@ -8000,6 +8000,11 @@ func SetWorkflow(ctx context.Context, workflow Workflow, id string, optionalEdit
 	// Handles parent/child workflow relationships
 	if len(workflow.ParentWorkflowId) > 0 {
 		DeleteCache(ctx, fmt.Sprintf("workflow_%s_childworkflows", workflow.ID))
+		DeleteCache(ctx, fmt.Sprintf("workflow_%s_childworkflows", workflow.ParentWorkflowId))
+	} 
+
+	if len(workflow.ChildWorkflowIds) > 0 {
+		DeleteCache(ctx, fmt.Sprintf("workflow_%s_childworkflows", workflow.ID))
 	}
 
 	if project.CacheDb {

files.go

@@ -48,7 +48,7 @@ func fileAuthentication(request *http.Request) (string, error) {
 		ctx := GetContext(request)
 		workflowExecution, err := GetWorkflowExecution(ctx, executionId[0])
 		if err != nil {
-			log.Printf("[ERROR] Couldn't find execution ID %s", executionId[0])
+			log.Printf("[ERROR] Couldn't find execution ID from '%s'", executionId)
 			return "", err
 		}