[NAE-2286] Group API

application-engine/pom.xml

@@ -370,6 +370,12 @@
             <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
         </dependency>
 
+        <!-- Spring Validator -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
         <!-- Drools -->
         <!--        <dependency>-->
         <!--            <groupId>org.kie</groupId>-->
@@ -503,11 +509,6 @@
         </dependency>
 
         <!-- For Configuration Properties -->
-        <dependency>
-            <groupId>org.hibernate.validator</groupId>
-            <artifactId>hibernate-validator</artifactId>
-            <version>6.2.3.Final</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson</groupId>
             <artifactId>jackson-base</artifactId>

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

@@ -35,6 +35,7 @@ import com.netgrif.application.engine.menu.services.interfaces.DashboardManageme
 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.auth.domain.QGroup
 import com.netgrif.application.engine.objects.petrinet.domain.I18nString
 import com.netgrif.application.engine.objects.petrinet.domain.PetriNet
 import com.netgrif.application.engine.objects.petrinet.domain.Transition
@@ -99,6 +100,7 @@ import org.springframework.data.domain.Page
 import org.springframework.data.domain.PageRequest
 import org.springframework.data.domain.Pageable
 import com.netgrif.application.engine.objects.utils.Nullable
+import org.springframework.data.util.Pair
 
 import java.time.ZoneId
 import java.util.stream.Collectors
@@ -2874,4 +2876,61 @@ class ActionDelegate {
         IStorageService storageService = storageResolverService.resolve(storageField.storageType)
         return storageService.getPath(aCase.stringId, fileFieldId, fileName)
     }
+
+    Group findGroupByIdentifier(String identifier) {
+        return groupService.findByIdentifier(identifier).orElse(null)
+    }
+
+    Group findGroupById(String groupId) {
+        return groupService.findById(groupId)
+    }
+
+    Page<Group> findGroups(Closure<Predicate> predicate = {it.identifier.isNotNull()}, Pageable pageable = Pageable.unpaged()) {
+        QGroup qGroup = new QGroup("group")
+        return groupService.findByPredicate(predicate(qGroup), pageable)
+    }
+
+    Group createGroup(String identifier, String title = "", AbstractUser owner = userService.getLoggedOrSystem()) {
+        return groupService.create(identifier, title, owner)
+    }
+
+    void deleteGroup(Group group) {
+        groupService.delete(group)
+    }
+
+    Group saveGroup(Group group) {
+        return groupService.save(group)
+    }
+
+    Group addUserToGroup(String groupId, String userId, String realmId) {
+        return groupService.addUser(groupId, userId, realmId)
+    }
+
+    Group removeUserFromGroup(String groupId, String userId, String realmId) {
+        return groupService.removeUser(groupId, userId, realmId)
+    }
+
+    Group addAuthorityToGroup(String groupId, String authorityId) {
+        return groupService.addAuthority(groupId, authorityId)
+    }
+
+    Group removeAuthorityFromGroup(String groupId, String authorityId) {
+        return groupService.removeAuthority(groupId, authorityId)
+    }
+
+    Group addRoleToGroup(String groupId, String roleId) {
+        return groupService.addRole(groupId, roleId)
+    }
+
+    Group removeRoleFromGroup(String groupId, String roleId) {
+        return groupService.removeRole(groupId, roleId)
+    }
+
+    Pair<Group, Group> addSubGroup(String groupId, String subGroupId) {
+        return groupService.addSubgroup(groupId, subGroupId)
+    }
+
+    Pair<Group, Group> removeSubGroup(String groupId, String subGroupId) {
+        return groupService.removeSubgroup(groupId, subGroupId)
+    }
 }

application-engine/src/main/java/com/netgrif/application/engine/auth/service/RegistrationService.java

@@ -151,7 +151,7 @@ public AbstractUser createNewUser(NewUserRequest newUser) {
 
         if (newUser.groups != null && !newUser.groups.isEmpty()) {
             for (String group : newUser.groups) {
-                groupService.addUser(user, group);
+                groupService.addUser(group, user);
             }
         }
 

application-engine/src/main/java/com/netgrif/application/engine/auth/service/UserResourceHelperService.java

@@ -1,9 +1,9 @@
 package com.netgrif.application.engine.auth.service;
 
+import com.netgrif.application.engine.auth.web.responsebodies.UserDto;
 import com.netgrif.application.engine.objects.auth.domain.AbstractUser;
 import com.netgrif.application.engine.objects.auth.domain.LoggedUser;
 import com.netgrif.application.engine.auth.service.interfaces.IUserResourceHelperService;
-import com.netgrif.application.engine.auth.web.responsebodies.User;
 import com.netgrif.application.engine.auth.web.responsebodies.UserResource;
 import com.netgrif.application.engine.impersonation.service.interfaces.IImpersonationService;
 import lombok.extern.slf4j.Slf4j;
@@ -32,20 +32,20 @@ public UserResource getResource(LoggedUser loggedUser, Locale locale, boolean sm
 //        User result = loggedUser.isImpersonating() ?
 //                getLocalisedUser(user, getImpersonated(loggedUser, small), locale) :
 //                getLocalisedUser(user, locale);
-        User result = getLocalisedUser(user, locale);
+        UserDto result = getLocalisedUser(user, locale);
         return new UserResource(result, "profile");
     }
 
     @Override
-    public User getLocalisedUser(AbstractUser user, AbstractUser impersonated, Locale locale) {
-        User localisedUser = getLocalisedUser(user, locale);
-        User impersonatedUser = userFactory.getUser(impersonated, locale);
+    public UserDto getLocalisedUser(AbstractUser user, AbstractUser impersonated, Locale locale) {
+        UserDto localisedUser = getLocalisedUser(user, locale);
+        UserDto impersonatedUser = userFactory.getUser(impersonated, locale);
         localisedUser.setImpersonated(impersonatedUser);
         return localisedUser;
     }
 
     @Override
-    public User getLocalisedUser(AbstractUser user, Locale locale) {
+    public UserDto getLocalisedUser(AbstractUser user, Locale locale) {
         return userFactory.getUser(user, locale);
     }
 

application-engine/src/main/java/com/netgrif/application/engine/auth/service/interfaces/IUserResourceHelperService.java

@@ -1,6 +1,6 @@
 package com.netgrif.application.engine.auth.service.interfaces;
 
-import com.netgrif.application.engine.auth.web.responsebodies.User;
+import com.netgrif.application.engine.auth.web.responsebodies.UserDto;
 import com.netgrif.application.engine.auth.web.responsebodies.UserResource;
 import com.netgrif.application.engine.objects.auth.domain.AbstractUser;
 import com.netgrif.application.engine.objects.auth.domain.LoggedUser;
@@ -10,7 +10,7 @@
 public interface IUserResourceHelperService {
     UserResource getResource(LoggedUser loggedUser, Locale locale, boolean small);
 
-    User getLocalisedUser(AbstractUser user, AbstractUser impersonated, Locale locale);
+    UserDto getLocalisedUser(AbstractUser user, AbstractUser impersonated, Locale locale);
 
-    User getLocalisedUser(AbstractUser user, Locale locale);
+    UserDto getLocalisedUser(AbstractUser user, Locale locale);
 }