From 47a09e155d6f361900601dc399b416f69ec9d3d7 Mon Sep 17 00:00:00 2001
From: "m.lettere" <marco.lettere@nubisware.com>
Date: Thu, 12 Oct 2023 15:01:51 +0200
Subject: [PATCH] moved from decision to switch for compatibility with new
 conductor

---
 templates/user-group-role_created.json.j2 |  6 ++--
 templates/user-group-role_deleted.json.j2 | 44 +++++++++++------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/templates/user-group-role_created.json.j2 b/templates/user-group-role_created.json.j2
index bd50a29..de1fbff 100644
--- a/templates/user-group-role_created.json.j2
+++ b/templates/user-group-role_created.json.j2
@@ -54,7 +54,7 @@
 			"inputParameters": {
 				"foundusers" : "${lookup_user.output.body}",
 				"username" : "${workflow.input.user}",
-				"expression": "function f(){for(var i=0; i < $.foundusers.length;i++){if($.foundusers[i]['username'] == $.username) return Java.to([$.foundusers[i]], 'java.lang.Object[]')}} f()",
+				"expression": "function f(){for(var i=0; i < $.foundusers.length;i++){if($.foundusers[i]['username'] == $.username) return $.foundusers[i] } f()",
 				"evaluatorType" : "javascript"
 			},
 			"type": "INLINE"
@@ -63,11 +63,11 @@
 			"name": "check_user_existance",
 			"taskReferenceName": "check_user_existance",
 			"inputParameters": {
-				"users": "${select_user.output.result}"
+				"user": "${select_user.output.result}"
 			},
 			"type": "SWITCH",
 			"evaluatorType": "javascript",
-			"expression": "($.users.length !== 1 ? 'true' : 'false')",
+			"expression": "$.user == null ? 'true' : 'false'",
 			"decisionCases": {
 				"true": [
 					{
diff --git a/templates/user-group-role_deleted.json.j2 b/templates/user-group-role_deleted.json.j2
index 7e44ae1..a399c22 100644
--- a/templates/user-group-role_deleted.json.j2
+++ b/templates/user-group-role_deleted.json.j2
@@ -55,32 +55,32 @@
         			"foundusers": "${lookup_user.output.body}",
         			"username": "${workflow.input.user}",
 					"evaluatorType" : "javascript",
-        			"expression": "function f(){for(var i=0; i < $.foundusers.length;i++){if($.foundusers[i]['username'] == $.username) return Java.to([$.foundusers[i]], 'java.lang.Object[]')}} f()"
+        			"expression": "function f(){for(var i=0; i < $.foundusers.length;i++){if($.foundusers[i]['username'] == $.username) return $.foundusers[i]}} f()"
       			},
       			"type": "INLINE"
     		},
 		{
-                        "name": "check_user_existance",
-                        "taskReferenceName": "check_user_existance",
-                        "inputParameters": {
-							"users": "${select_user.output.result}"
-                        },
-                        "type": "SWITCH",
-						"evaluatorType" : "javascript",
-                        "expression": "($.users.length !== 1 ? 'true' : 'false')",
-                        "decisionCases": {
-                                "true": [
-                                        {
-                                                "name" : "terminate",
-                                                "taskReferenceName" : "terminate_when_no_user",
-                                                "type" : "TERMINATE",
-                                                "inputParameters" : {
-                                                        "terminationStatus" : "COMPLETED"
-                                                }
-                                        }
-                                ]
-                        }
-                },
+				"name": "check_user_existance",
+				"taskReferenceName": "check_user_existance",
+				"inputParameters": {
+					"users": "${select_user.output.result}"
+				},
+				"type": "SWITCH",
+				"evaluatorType" : "javascript",
+				"expression": "($.user == null ? 'true' : 'false')",
+				"decisionCases": {
+						"true": [
+								{
+										"name" : "terminate",
+										"taskReferenceName" : "terminate_when_no_user",
+										"type" : "TERMINATE",
+										"inputParameters" : {
+												"terminationStatus" : "COMPLETED"
+										}
+								}
+						]
+				}
+		},
 		{
 			"name" : "pyrest",
 			"taskReferenceName" : "lookup_client",