From 064c554c25145502dae0b3c1ff79b31cc54a84a4 Mon Sep 17 00:00:00 2001
From: "m.lettere" <marco.lettere@nubisware.com>
Date: Mon, 24 Jul 2023 15:37:45 +0200
Subject: [PATCH] fixed issues and add first member additions

---
 .../create_vre_folder_for_context.json.j2     | 58 +++++++++----------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/templates/create_vre_folder_for_context.json.j2 b/templates/create_vre_folder_for_context.json.j2
index 6a44a66..e90e1cb 100644
--- a/templates/create_vre_folder_for_context.json.j2
+++ b/templates/create_vre_folder_for_context.json.j2
@@ -77,6 +77,32 @@
       "asyncComplete": false,
       "loopOver": []
     },
+    {
+      "name": "LAMBDA_TASK",
+      "taskReferenceName": "build_add_vre_folder_users_tasks",
+      "type": "LAMBDA",
+      "inputParameters": {
+        "admins" : "${workflow.input.folder_admins}",
+        "url": "${init.input.storagehub}/groups/${init.output.result.shubified_context_name}/users",
+        "scriptExpression": "inputs={},tasks=[];for(var i=0;i<$.admins.length;i++)a=$.admins[i],tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'tu_'+i}),inputs['tu_'+i]={url:$.url,body:{userId:a},method:'PUT',headers:{Authorization:'Bearer ${authorize_with_uma_rpt.output.body.access_token}', Accept: 'text/plain'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
+      }
+    },
+    {
+      "name" : "fork_dynamic",
+      "type" : "FORK_JOIN_DYNAMIC",
+      "taskReferenceName" : "parallel_add_vre_folder_users",
+      "inputParameters" : {
+        "tasks" : "${build_add_vre_folder_admins_tasks.output.result.tasks}",
+        "inputs" : "${build_add_vre_folder_admins_tasks.output.result.inputs}"
+      },
+      "dynamicForkTasksParam": "tasks",
+      "dynamicForkTasksInputParamName": "inputs"
+    },
+    {
+      "name" : "join",
+      "type" : "JOIN",
+      "taskReferenceName" : "join_parallel_add_vre_folder_users"
+    },
     {
       "name": "LAMBDA_TASK",
       "taskReferenceName": "build_add_vre_folder_admins_tasks",
@@ -84,7 +110,7 @@
       "inputParameters": {
         "admins" : "${workflow.input.folder_admins}",
         "url": "${init.input.storagehub}/groups/${init.output.result.shubified_context_name}/admins",
-        "scriptExpression": "inputs={},tasks=[];for(var i=0;i<$.admins.length;i++)a=$.admins[i],tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'t_'+i}),inputs['t_'+i]={url:$.url,body:{userid:a},method:'POST',headers:{Authorization:'Bearer ${authorize_with_uma_rpt.output.body.access_token}', Accept: 'text/plain'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
+        "scriptExpression": "inputs={},tasks=[];for(var i=0;i<$.admins.length;i++)a=$.admins[i],tasks.push({name:'pyrest',type:'SIMPLE',taskReferenceName:'ta_'+i}),inputs['ta_'+i]={url:$.url,body:{userId:a},method:'PUT',headers:{Authorization:'Bearer ${authorize_with_uma_rpt.output.body.access_token}', Accept: 'text/plain'}};return {tasks:Java.to(tasks,'java.util.Map[]'),inputs:inputs};"
       }
     },
     {
@@ -102,36 +128,6 @@
       "name" : "join",
       "type" : "JOIN",
       "taskReferenceName" : "join_parallel_add_vre_folder_admins"
-    },
-    {
-      "name": "pyrest",
-      "taskReferenceName": "add_vre_folder_admins",
-      "inputParameters": {
-        "url": "${init.input.storagehub}/groups/${init.output.result.shubified_context_name}/admins",
-        "method": "PUT",
-        "headers": {
-          "Authorization": "Bearer ${authorize_with_uma_rpt.output.body.access_token}",
-          "Accept": "text/plain"
-        },
-        "body": {
-          "accessType": [
-            "WRITE_OWNER",
-            "application/json"
-          ],
-          "group": "${init.output.result.shubified_context_name}",
-          "folderOwner": "${workflow.input.folder_owner}"
-        }
-      },
-      "type": "SIMPLE",
-      "decisionCases": {},
-      "defaultCase": [],
-      "forkTasks": [],
-      "startDelay": 0,
-      "joinOn": [],
-      "optional": false,
-      "defaultExclusiveJoinTask": [],
-      "asyncComplete": false,
-      "loopOver": []
     }
   ],
   "inputParameters": [