[NAE-2070] Admin create/edit endpoints

- after merge fix

Author: SamuelPalaj

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

@@ -183,7 +183,8 @@ public PagedModel<UserResource> getAllWithRole(@RequestBody Set<String> roleIds,
     })
     public MessageResource assignRolesToUser(@PathVariable("id") String userId, @RequestBody Set<String> roleIds, Authentication auth) {
         try {
-            processRoleService.assignRolesToUser(userId, roleIds.stream().map(ProcessResourceId::new).collect(Collectors.toSet()), (LoggedUser) auth.getPrincipal());
+            IUser user = userService.findById(userId, null);
+            processRoleService.assignRolesToUser(user, roleIds.stream().map(ProcessResourceId::new).collect(Collectors.toSet()), (LoggedUser) auth.getPrincipal());
             log.info("Process roles " + roleIds + " assigned to user " + userId);
             return MessageResource.successMessage("Selected roles assigned to user " + userId);
         } catch (IllegalArgumentException e) {

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

@@ -8,6 +8,8 @@
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Map;
 import java.util.Set;
 
 @Setter
@@ -113,6 +115,26 @@ public boolean isImpersonating() {
         return false;
     }
 
+    @Override
+    public LocalDateTime getCreatedAt() {
+        return null;
+    }
+
+    @Override
+    public Map<String, Attribute<?>> getAttributes() {
+        return Map.of();
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean isEmailVerified() {
+        return false;
+    }
+
     @Override
     public IUser getSelfOrImpersonated() {
         return null;
@@ -223,6 +245,16 @@ public Set<ProcessRole> getProcessRoles() {
         return Set.of();
     }
 
+    @Override
+    public Set<ProcessRole> getNegativeProcessRoles() {
+        return Set.of();
+    }
+
+    @Override
+    public void setNegativeProcessRoles(Set<ProcessRole> processRoles) {
+
+    }
+
     @Override
     public void setProcessRoles(Set<ProcessRole> set) {
 
@@ -273,6 +305,16 @@ public void removeProcessRole(ProcessRole processRole) {
 
     }
 
+    @Override
+    public void addNegativeProcessRole(ProcessRole role) {
+
+    }
+
+    @Override
+    public void removeNegativeProcessRole(ProcessRole role) {
+
+    }
+
     @Override
     public void setAttribute(String s, Object o, boolean b) {
 

application-engine/src/main/java/com/netgrif/application/engine/configuration/security/jwt/JwtService.java

@@ -75,7 +75,8 @@ public LoggedUser getLoggedUser(String token, String authority) {
                 userMap.get("username").toString(),
                 userMap.get("password").toString(),
                 Collections.singleton(authorityService.getOrCreate(authority)),
-                Collections.singleton(roleService.anonymousRole())
+                Collections.singleton(roleService.anonymousRole()),
+                Collections.emptySet()
         );
         user.setFirstName(userMap.get("firstName").toString());
         user.getAttributes().put("anonymous", new Attribute<>(true, false));

application-engine/src/main/java/com/netgrif/application/engine/orgstructure/web/GroupController.java

@@ -9,13 +9,15 @@
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.data.domain.Pageable;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -45,7 +47,7 @@ public GroupController(GroupService service) {
             @ApiResponse(responseCode = "403", description = "Caller doesn't fulfill the authorisation requirements"),
     })
     public GroupsResource getAllGroups() {
-        Set<com.netgrif.application.engine.objects.auth.domain.Group> groups = service.findAll();
+        List<com.netgrif.application.engine.objects.auth.domain.Group> groups = service.findAll(Pageable.unpaged()).getContent();
         Set<Group> groupResponse = groups.stream()
                 .map(g -> new Group(g.getStringId(), g.getDisplayName()))
                 .collect(Collectors.toCollection(HashSet::new));

application-engine/src/main/java/com/netgrif/application/engine/petrinet/config/ProcessBeansConfiguration.java

@@ -1,6 +1,7 @@
 package com.netgrif.application.engine.petrinet.config;
 
 import com.netgrif.application.engine.adapter.spring.petrinet.service.ProcessRoleService;
+import com.netgrif.application.engine.auth.service.GroupService;
 import com.netgrif.application.engine.petrinet.domain.dataset.logic.action.runner.RoleActionsRunner;
 import com.netgrif.application.engine.petrinet.domain.repositories.PetriNetRepository;
 import com.netgrif.application.engine.petrinet.domain.roles.ProcessRoleRepository;
@@ -25,15 +26,18 @@ public ProcessRoleService processRoleService(ProcessRoleRepository processRoleRe
                                                  RoleActionsRunner roleActionsRunner,
                                                  @Lazy PetriNetService petriNetService,
                                                  @Lazy UserService userService,
-                                                 ISecurityContextService securityContextService) {
+                                                 ISecurityContextService securityContextService,
+                                                 @Lazy GroupService groupService
+                                                 ) {
         return new com.netgrif.application.engine.petrinet.service.ProcessRoleService(
                 processRoleRepository,
                 petriNetRepository,
                 publisher,
                 roleActionsRunner,
                 petriNetService,
                 userService,
-                securityContextService
+                securityContextService,
+                groupService
         );
     }
 

application-engine/src/main/java/com/netgrif/application/engine/petrinet/service/PetriNetService.java

@@ -482,11 +482,9 @@ public Page<PetriNetReference> search(PetriNetSearch criteriaClass, LoggedUser u
         }
         if (criteriaClass.getGroup() != null) {
             if (criteriaClass.getGroup().size() == 1) {
-                IUser owner = userService.findById(this.groupService.findById(criteriaClass.getGroup().getFirst()).getOwnerId(), null);
-                this.addValueCriteria(query, queryTotal, Criteria.where("author.email").is(owner.getEmail()));
+                this.addValueCriteria(query, queryTotal, Criteria.where("author.email").is(groupService.getGroupOwnerEmail(criteriaClass.getGroup().get(0))));
             } else {
-                List<IUser> owners = userService.findAllByIds(this.groupService.findAllByIds(new HashSet<>(criteriaClass.getGroup())).stream().map(Group::getOwnerId).collect(Collectors.toSet()), null);
-                this.addValueCriteria(query, queryTotal, Criteria.where("author.email").in(owners.stream().map(IUser::getEmail).collect(Collectors.toSet())));
+                this.addValueCriteria(query, queryTotal, Criteria.where("author.email").in(groupService.getGroupsOwnerEmails(criteriaClass.getGroup())));
             }
         }
         if (criteriaClass.getVersion() != null) {