[NAE-2285] Group as a value of userlists

application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy

@@ -33,6 +33,7 @@ import com.netgrif.application.engine.objects.auth.domain.ActorTransformer
 import com.netgrif.application.engine.menu.services.interfaces.DashboardItemService
 import com.netgrif.application.engine.menu.services.interfaces.DashboardManagementService
 import com.netgrif.application.engine.menu.services.interfaces.IMenuItemService
+import com.netgrif.application.engine.objects.auth.domain.Group
 import com.netgrif.application.engine.objects.auth.domain.LoggedUser
 import com.netgrif.application.engine.objects.petrinet.domain.I18nString
 import com.netgrif.application.engine.objects.petrinet.domain.PetriNet
@@ -791,10 +792,27 @@ class ActionDelegate {
             if (field instanceof NumberField) {
                 value = value as Double
             }
-            if (field instanceof UserListField && (value instanceof String[] || value instanceof List)) {
-                LinkedHashSet<UserFieldValue> users = new LinkedHashSet<>()
-                value.each { id -> users.add(new UserFieldValue(userService.findById(id as String, null))) }
-                value = new UserListFieldValue(users)
+            if (field instanceof ActorListField && (value instanceof String[] || value instanceof List)) {
+                LinkedHashSet<ActorFieldValue> actorFieldValues = new LinkedHashSet<>()
+                value.each { id ->
+                    AbstractUser user = userService.findById(id as String, null)
+                    if (user != null) {
+                        actorFieldValues.add(new UserFieldValue(user))
+                    } else {
+                        Group group = groupService.findById((String) id)
+                        actorFieldValues.add(new GroupFieldValue(group))
+                    }
+                }
+                value = new ActorListFieldValue(actorFieldValues)
+            }
+            if (field instanceof ActorField && value instanceof String) {
+                AbstractUser user = userService.findById(value, null)
+                if (user != null) {
+                    value = new UserFieldValue(user)
+                } else {
+                    Group group = groupService.findById(value)
+                    value = new GroupFieldValue(group)
+                }
             }
 //            if (field instanceof TaskField && targetTask.isPresent()) {
 //                dataService.validateTaskRefValue(value, targetTask.get().getStringId());

application-engine/src/main/java/com/netgrif/application/engine/auth/web/UserController.java

@@ -181,17 +181,17 @@ public ResponseEntity<User> getUser(@PathVariable("realmId") String realmId, @Pa
 //            return null;
 //        }
 //        LoggedUser loggedUser = (LoggedUser) auth.getPrincipal();
-//        String userId = updates.getStringId();
+//        String actorId = updates.getStringId();
 //        IUser user;
 //        try {
-//            user = userService.findById(userId, updatedUser.getRealmId());
+//            user = userService.findById(actorId, updatedUser.getRealmId());
 //        } catch (IllegalArgumentException e) {
-//            log.error("Could not find user with id [{}]", userId, e);
+//            log.error("Could not find user with id [{}]", actorId, e);
 //            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
 //        }
 //        user = userService.update(user, updates.getUpdatedUser());
-//        securityContextService.saveToken(userId);
-//        if (Objects.equals(loggedUser.getId(), userId)) {
+//        securityContextService.saveToken(actorId);
+//        if (Objects.equals(loggedUser.getId(), actorId)) {
 //            loggedUser.setFirstName(user.getFirstName());
 //            loggedUser.setLastName(user.getLastName());
 //            securityContextService.reloadSecurityContext(loggedUser);
@@ -239,15 +239,15 @@ public ResponseEntity<ResponseMessage> assignRolesToUser(@PathVariable("realmId"
 //            @ApiResponse(responseCode = "403", description = "Caller doesn't fulfill the authorisation requirements"),
 //            @ApiResponse(responseCode = "500", description = "Internal server error")
 //    })
-//    public ResponseEntity<ResponseMessage> assignNegativeRolesToUser(@PathVariable("realmId") String realmId, @PathVariable("id") String userId, @RequestBody Set<String> roleIds, Authentication auth) {
+//    public ResponseEntity<ResponseMessage> assignNegativeRolesToUser(@PathVariable("realmId") String realmId, @PathVariable("id") String actorId, @RequestBody Set<String> roleIds, Authentication auth) {
 //        try {
-//            AbstractUser user = userService.findById(userId, realmId);
+//            AbstractUser user = userService.findById(actorId, realmId);
 //            processRoleService.assignNegativeRolesToUser(user, roleIds.stream().map(ProcessResourceId::new).collect(Collectors.toSet()), (LoggedUser) auth.getPrincipal());
-//            log.info("Negative process roles {} assigned to user [{}]", roleIds, userId);
-//            return ResponseEntity.ok(ResponseMessage.createSuccessMessage("Selected negative roles assigned to user " + userId));
+//            log.info("Negative process roles {} assigned to user [{}]", roleIds, actorId);
+//            return ResponseEntity.ok(ResponseMessage.createSuccessMessage("Selected negative roles assigned to user " + actorId));
 //        } catch (IllegalArgumentException e) {
-//            log.error("Assigning negative roles to user with id [{}] has failed!", userId, e);
-//            return ResponseEntity.badRequest().body(ResponseMessage.createErrorMessage("Assigning negative roles to user " + userId + " has failed!"));
+//            log.error("Assigning negative roles to user with id [{}] has failed!", actorId, e);
+//            return ResponseEntity.badRequest().body(ResponseMessage.createErrorMessage("Assigning negative roles to user " + actorId + " has failed!"));
 //        }
 //    }
 //