IM-270 refactor: Restructure code. Use mixed structure: Use feature-p…

…ackages and in these packages use layers. Cannot move some classes for mongo requirements
integratedmodelling · Feb 20, 2024 · 8587688 · 8587688
1 parent d7caa6e
commit 8587688
Show file tree

Hide file tree

Showing 297 changed files with 803 additions and 713 deletions.
diff --git a/.../src/main/java/org/integratedmodelling/klab/hub/agreements/commands/AgreementCommand.java b/.../src/main/java/org/integratedmodelling/klab/hub/agreements/commands/AgreementCommand.java
@@ -0,0 +1,10 @@
+package org.integratedmodelling.klab.hub.agreements.commands;
+
+import java.util.List;
+
+import org.integratedmodelling.klab.hub.agreements.dto.Agreement;
+
+public interface AgreementCommand {
+    public List<Agreement> execute();
+
+}
diff --git a/...ng/klab/hub/commands/CreateAgreement.java → .../agreements/commands/CreateAgreement.java b/...ng/klab/hub/commands/CreateAgreement.java → .../agreements/commands/CreateAgreement.java
@@ -1,9 +1,9 @@
-package org.integratedmodelling.klab.hub.commands;
+package org.integratedmodelling.klab.hub.agreements.commands;
 
 import java.util.List;
 import java.util.Set;
 
-import org.integratedmodelling.klab.hub.api.Agreement;
+import org.integratedmodelling.klab.hub.agreements.dto.Agreement;
 import org.integratedmodelling.klab.hub.repository.AgreementRepository;
 
 public class CreateAgreement implements AgreementCommand {

diff --git a/...in/java/org/integratedmodelling/klab/hub/agreements/commands/CreateAgreementTemplate.java b/...in/java/org/integratedmodelling/klab/hub/agreements/commands/CreateAgreementTemplate.java
@@ -1,6 +1,6 @@
 package org.integratedmodelling.klab.hub.agreements.commands;
 
-import org.integratedmodelling.klab.hub.api.AgreementTemplate;
+import org.integratedmodelling.klab.hub.agreements.dto.AgreementTemplate;
 import org.integratedmodelling.klab.hub.repository.AgreementTemplateRepository;
 
 public class CreateAgreementTemplate {

diff --git a/...in/java/org/integratedmodelling/klab/hub/agreements/commands/DeleteAgreementTemplate.java b/...in/java/org/integratedmodelling/klab/hub/agreements/commands/DeleteAgreementTemplate.java
@@ -1,6 +1,6 @@
 package org.integratedmodelling.klab.hub.agreements.commands;
 
-import org.integratedmodelling.klab.hub.api.AgreementTemplate;
+import org.integratedmodelling.klab.hub.agreements.dto.AgreementTemplate;
 import org.integratedmodelling.klab.hub.repository.AgreementTemplateRepository;
 
 public class DeleteAgreementTemplate {

diff --git a/...n/java/org/integratedmodelling/klab/hub/agreements/commands/DeleteAgreementTemplates.java b/...n/java/org/integratedmodelling/klab/hub/agreements/commands/DeleteAgreementTemplates.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.integratedmodelling.klab.hub.api.AgreementTemplate;
+import org.integratedmodelling.klab.hub.agreements.dto.AgreementTemplate;
 import org.integratedmodelling.klab.hub.repository.AgreementTemplateRepository;
 
 public class DeleteAgreementTemplates {

diff --git a/...n/java/org/integratedmodelling/klab/hub/agreements/commands/GetAgreementTemplateById.java b/...n/java/org/integratedmodelling/klab/hub/agreements/commands/GetAgreementTemplateById.java
@@ -1,6 +1,6 @@
 package org.integratedmodelling.klab.hub.agreements.commands;
 
-import org.integratedmodelling.klab.hub.api.AgreementTemplate;
+import org.integratedmodelling.klab.hub.agreements.dto.AgreementTemplate;
 import org.integratedmodelling.klab.hub.repository.AgreementTemplateRepository;
 
 public class GetAgreementTemplateById {

diff --git a/...ng/klab/hub/commands/UpdateAgreement.java → .../agreements/commands/UpdateAgreement.java b/...ng/klab/hub/commands/UpdateAgreement.java → .../agreements/commands/UpdateAgreement.java
@@ -1,9 +1,9 @@
-package org.integratedmodelling.klab.hub.commands;
+package org.integratedmodelling.klab.hub.agreements.commands;
 
 import java.util.List;
 import java.util.Set;
 
-import org.integratedmodelling.klab.hub.api.Agreement;
+import org.integratedmodelling.klab.hub.agreements.dto.Agreement;
 import org.integratedmodelling.klab.hub.repository.AgreementRepository;
 
 public class UpdateAgreement implements AgreementCommand {

diff --git a/...in/java/org/integratedmodelling/klab/hub/agreements/commands/UpdateAgreementTemplate.java b/...in/java/org/integratedmodelling/klab/hub/agreements/commands/UpdateAgreementTemplate.java
@@ -1,6 +1,6 @@
 package org.integratedmodelling.klab.hub.agreements.commands;
 
-import org.integratedmodelling.klab.hub.api.AgreementTemplate;
+import org.integratedmodelling.klab.hub.agreements.dto.AgreementTemplate;
 import org.integratedmodelling.klab.hub.repository.AgreementTemplateRepository;
 
 public class UpdateAgreementTemplate {

diff --git a/...ain/java/org/integratedmodelling/klab/hub/agreements/controllers/AgreementController.java b/...ain/java/org/integratedmodelling/klab/hub/agreements/controllers/AgreementController.java
@@ -2,13 +2,13 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.integratedmodelling.klab.api.API;
+import org.integratedmodelling.klab.hub.agreements.dto.Agreement;
 import org.integratedmodelling.klab.hub.agreements.services.AgreementService;
-import org.integratedmodelling.klab.hub.api.Agreement;
-import org.integratedmodelling.klab.hub.controllers.pagination.GenericPageAndFilterConverter;
-import org.integratedmodelling.klab.hub.enums.FilterOperationEnum;
-import org.integratedmodelling.klab.hub.payload.PageRequest;
-import org.integratedmodelling.klab.hub.payload.PageResponse;
-import org.integratedmodelling.klab.hub.service.FilterBuilderService;
+import org.integratedmodelling.klab.hub.paginationAndFilter.GenericPageAndFilterConverter;
+import org.integratedmodelling.klab.hub.paginationAndFilter.enums.FilterOperationEnum;
+import org.integratedmodelling.klab.hub.paginationAndFilter.payload.PageRequest;
+import org.integratedmodelling.klab.hub.paginationAndFilter.payload.PageResponse;
+import org.integratedmodelling.klab.hub.paginationAndFilter.services.FilterBuilderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

diff --git a/.../org/integratedmodelling/klab/hub/agreements/controllers/AgreementTemplateController.java b/.../org/integratedmodelling/klab/hub/agreements/controllers/AgreementTemplateController.java
@@ -3,9 +3,9 @@
 import java.util.List;
 
 import org.integratedmodelling.klab.api.API;
+import org.integratedmodelling.klab.hub.agreements.dto.AgreementTemplate;
 import org.integratedmodelling.klab.hub.agreements.payload.RequestAgreementTemplate;
 import org.integratedmodelling.klab.hub.agreements.services.AgreementTemplateService;
-import org.integratedmodelling.klab.hub.api.AgreementTemplate;
 import org.integratedmodelling.klab.hub.enums.AgreementLevel;
 import org.integratedmodelling.klab.hub.enums.AgreementType;
 import org.integratedmodelling.klab.hub.exception.BadRequestException;

diff --git a/...java/org/integratedmodelling/klab/hub/agreements/controllers/UserAgreementController.java b/...java/org/integratedmodelling/klab/hub/agreements/controllers/UserAgreementController.java
@@ -3,9 +3,9 @@
 import java.util.Collection;
 import javax.annotation.security.RolesAllowed;
 import org.integratedmodelling.klab.api.API;
+import org.integratedmodelling.klab.hub.agreements.dto.Agreement;
+import org.integratedmodelling.klab.hub.agreements.dto.AgreementEntry;
 import org.integratedmodelling.klab.hub.agreements.services.UserAgreementService;
-import org.integratedmodelling.klab.hub.api.Agreement;
-import org.integratedmodelling.klab.hub.api.AgreementEntry;
 import org.integratedmodelling.klab.hub.exception.BadRequestException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

diff --git a/...atedmodelling/klab/hub/api/Agreement.java → ...ng/klab/hub/agreements/dto/Agreement.java b/...atedmodelling/klab/hub/api/Agreement.java → ...ng/klab/hub/agreements/dto/Agreement.java
@@ -1,4 +1,4 @@
-package org.integratedmodelling.klab.hub.api;
+package org.integratedmodelling.klab.hub.agreements.dto;
 
 import java.time.Instant;
 import java.util.Arrays;
@@ -8,6 +8,8 @@
 
 import org.integratedmodelling.klab.hub.enums.AgreementLevel;
 import org.integratedmodelling.klab.hub.enums.AgreementType;
+import org.integratedmodelling.klab.hub.users.dto.GroupEntry;
+import org.integratedmodelling.klab.hub.users.dto.User;
 import org.springframework.data.annotation.Reference;
 import org.springframework.data.annotation.TypeAlias;
 import org.springframework.data.mongodb.core.mapping.Document;

diff --git a/...odelling/klab/hub/api/AgreementEntry.java → ...ab/hub/agreements/dto/AgreementEntry.java b/...odelling/klab/hub/api/AgreementEntry.java → ...ab/hub/agreements/dto/AgreementEntry.java
@@ -1,4 +1,4 @@
-package org.integratedmodelling.klab.hub.api;
+package org.integratedmodelling.klab.hub.agreements.dto;
 
 import org.springframework.data.mongodb.core.mapping.DBRef;
 

diff --git a/...lling/klab/hub/api/AgreementTemplate.java → ...hub/agreements/dto/AgreementTemplate.java b/...lling/klab/hub/api/AgreementTemplate.java → ...hub/agreements/dto/AgreementTemplate.java
@@ -1,4 +1,4 @@
-package org.integratedmodelling.klab.hub.api;
+package org.integratedmodelling.klab.hub.agreements.dto;
 
 
 
@@ -8,6 +8,7 @@
 
 import org.integratedmodelling.klab.hub.enums.AgreementLevel;
 import org.integratedmodelling.klab.hub.enums.AgreementType;
+import org.integratedmodelling.klab.hub.users.dto.GroupEntry;
 import org.springframework.data.annotation.Reference;
 import org.springframework.data.annotation.TypeAlias;
 import org.springframework.data.mongodb.core.mapping.Document;

diff --git a/.../exception/NoValidAgreementException.java → ...exceptions/NoValidAgreementException.java b/.../exception/NoValidAgreementException.java → ...exceptions/NoValidAgreementException.java
@@ -1,4 +1,4 @@
-package org.integratedmodelling.klab.hub.exception;
+package org.integratedmodelling.klab.hub.agreements.exceptions;
 
 public class NoValidAgreementException extends RuntimeException {
 

diff --git a/.../src/main/java/org/integratedmodelling/klab/hub/agreements/services/AgreementService.java b/.../src/main/java/org/integratedmodelling/klab/hub/agreements/services/AgreementService.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.integratedmodelling.klab.hub.api.Agreement;
+import org.integratedmodelling.klab.hub.agreements.dto.Agreement;
 import org.integratedmodelling.klab.hub.enums.AgreementLevel;
 import org.integratedmodelling.klab.hub.enums.AgreementType;
 import org.springframework.data.domain.Page;

diff --git a/.../main/java/org/integratedmodelling/klab/hub/agreements/services/AgreementServiceImpl.java b/.../main/java/org/integratedmodelling/klab/hub/agreements/services/AgreementServiceImpl.java
@@ -8,16 +8,16 @@
 import java.util.List;
 import java.util.Set;
 
-import org.integratedmodelling.klab.hub.api.Agreement;
-import org.integratedmodelling.klab.hub.api.AgreementTemplate;
-import org.integratedmodelling.klab.hub.api.GroupEntry;
-import org.integratedmodelling.klab.hub.api.MongoGroup;
-import org.integratedmodelling.klab.hub.commands.CreateAgreement;
-import org.integratedmodelling.klab.hub.commands.UpdateAgreement;
+import org.integratedmodelling.klab.hub.agreements.commands.CreateAgreement;
+import org.integratedmodelling.klab.hub.agreements.commands.UpdateAgreement;
+import org.integratedmodelling.klab.hub.agreements.dto.Agreement;
+import org.integratedmodelling.klab.hub.agreements.dto.AgreementTemplate;
 import org.integratedmodelling.klab.hub.enums.AgreementLevel;
 import org.integratedmodelling.klab.hub.enums.AgreementType;
 import org.integratedmodelling.klab.hub.groups.services.GroupService;
 import org.integratedmodelling.klab.hub.repository.AgreementRepository;
+import org.integratedmodelling.klab.hub.users.dto.GroupEntry;
+import org.integratedmodelling.klab.hub.users.dto.MongoGroup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

diff --git a/...n/java/org/integratedmodelling/klab/hub/agreements/services/AgreementTemplateService.java b/...n/java/org/integratedmodelling/klab/hub/agreements/services/AgreementTemplateService.java
@@ -2,8 +2,8 @@
 
 import java.util.List;
 
+import org.integratedmodelling.klab.hub.agreements.dto.AgreementTemplate;
 import org.integratedmodelling.klab.hub.agreements.payload.RequestAgreementTemplate;
-import org.integratedmodelling.klab.hub.api.AgreementTemplate;
 import org.integratedmodelling.klab.hub.enums.AgreementLevel;
 import org.integratedmodelling.klab.hub.enums.AgreementType;
 import org.springframework.stereotype.Service;

diff --git a/...va/org/integratedmodelling/klab/hub/agreements/services/AgreementTemplateServiceImpl.java b/...va/org/integratedmodelling/klab/hub/agreements/services/AgreementTemplateServiceImpl.java
@@ -9,11 +9,11 @@
 import org.integratedmodelling.klab.hub.agreements.commands.ExistsAgreementTemplate;
 import org.integratedmodelling.klab.hub.agreements.commands.GetAgreementTemplateById;
 import org.integratedmodelling.klab.hub.agreements.commands.UpdateAgreementTemplate;
+import org.integratedmodelling.klab.hub.agreements.dto.AgreementTemplate;
 import org.integratedmodelling.klab.hub.agreements.exceptions.AgreementTemplateDoesNotExistException;
 import org.integratedmodelling.klab.hub.agreements.exceptions.AgreementTemplateExistException;
 import org.integratedmodelling.klab.hub.agreements.listeners.RemoveAgreementTemplate;
 import org.integratedmodelling.klab.hub.agreements.payload.RequestAgreementTemplate;
-import org.integratedmodelling.klab.hub.api.AgreementTemplate;
 import org.integratedmodelling.klab.hub.enums.AgreementLevel;
 import org.integratedmodelling.klab.hub.enums.AgreementType;
 import org.integratedmodelling.klab.hub.listeners.HubEventPublisher;

diff --git a/.../main/java/org/integratedmodelling/klab/hub/agreements/services/UserAgreementService.java b/.../main/java/org/integratedmodelling/klab/hub/agreements/services/UserAgreementService.java
@@ -2,8 +2,8 @@
 
 import java.util.Collection;
 
-import org.integratedmodelling.klab.hub.api.Agreement;
-import org.integratedmodelling.klab.hub.api.AgreementEntry;
+import org.integratedmodelling.klab.hub.agreements.dto.Agreement;
+import org.integratedmodelling.klab.hub.agreements.dto.AgreementEntry;
 import org.springframework.stereotype.Service;
 
 @Service

diff --git a/...n/java/org/integratedmodelling/klab/hub/agreements/services/UserAgreementServiceImpl.java b/...n/java/org/integratedmodelling/klab/hub/agreements/services/UserAgreementServiceImpl.java
@@ -3,12 +3,12 @@
 import java.util.Collection;
 import java.util.Date;
 
-import org.integratedmodelling.klab.hub.api.Agreement;
-import org.integratedmodelling.klab.hub.api.AgreementEntry;
-import org.integratedmodelling.klab.hub.api.User;
+import org.integratedmodelling.klab.hub.agreements.dto.Agreement;
+import org.integratedmodelling.klab.hub.agreements.dto.AgreementEntry;
 import org.integratedmodelling.klab.hub.exception.BadRequestException;
 import org.integratedmodelling.klab.hub.repository.AgreementRepository;
 import org.integratedmodelling.klab.hub.repository.UserRepository;
+import org.integratedmodelling.klab.hub.users.dto.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

diff --git a/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/AuthProvider.java b/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/AuthProvider.java
diff --git a/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/CreateGroupTask.java b/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/CreateGroupTask.java
@@ -9,7 +9,12 @@
 import org.integratedmodelling.klab.hub.exception.BadRequestException;
 import org.integratedmodelling.klab.hub.groups.services.GroupService;
 import org.integratedmodelling.klab.hub.repository.MongoGroupRepository;
+import org.integratedmodelling.klab.hub.tasks.commands.TaskCommand;
+import org.integratedmodelling.klab.hub.tasks.enums.TaskStatus;
+import org.integratedmodelling.klab.hub.tasks.enums.TaskType;
 import org.integratedmodelling.klab.hub.tasks.services.CommandFactory;
+import org.integratedmodelling.klab.hub.tasks.support.TaskBuilder;
+import org.integratedmodelling.klab.hub.users.dto.MongoGroup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.annotation.Reference;
 import org.springframework.data.annotation.TypeAlias;

diff --git a/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/GenericModel.java b/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/GenericModel.java
@@ -29,6 +29,14 @@ public void setName(String name) {
 		this.name = name;
 	}
 
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;

diff --git a/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/GroupRequestTask.java b/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/GroupRequestTask.java
@@ -4,9 +4,15 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.integratedmodelling.klab.hub.agreements.dto.Agreement;
 import org.integratedmodelling.klab.hub.agreements.services.AgreementService;
 import org.integratedmodelling.klab.hub.repository.UserRepository;
+import org.integratedmodelling.klab.hub.tasks.commands.TaskCommand;
+import org.integratedmodelling.klab.hub.tasks.enums.TaskStatus;
+import org.integratedmodelling.klab.hub.tasks.enums.TaskType;
 import org.integratedmodelling.klab.hub.tasks.services.CommandFactory;
+import org.integratedmodelling.klab.hub.users.dto.GroupEntry;
+import org.integratedmodelling.klab.hub.users.dto.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.annotation.TypeAlias;
 import org.springframework.stereotype.Component;

diff --git a/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/IdentityModel.java b/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/IdentityModel.java
@@ -2,7 +2,7 @@
 
 import java.time.LocalDateTime;
 
-abstract class IdentityModel extends GenericModel{
+public abstract class IdentityModel extends GenericModel{
 
     LocalDateTime registrationDate;
     LocalDateTime lastConnection;

diff --git a/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/ModifyGroupsTask.java b/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/ModifyGroupsTask.java
@@ -15,9 +15,14 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.integratedmodelling.klab.auth.Role;
-import org.integratedmodelling.klab.hub.exception.GroupDoesNotExistException;
 import org.integratedmodelling.klab.hub.repository.MongoGroupRepository;
 import org.integratedmodelling.klab.hub.repository.UserRepository;
+import org.integratedmodelling.klab.hub.tasks.commands.TaskCommand;
+import org.integratedmodelling.klab.hub.tasks.support.TaskBuilder;
+import org.integratedmodelling.klab.hub.users.dto.GroupEntry;
+import org.integratedmodelling.klab.hub.users.dto.MongoGroup;
+import org.integratedmodelling.klab.hub.users.dto.User;
+import org.integratedmodelling.klab.hub.users.exceptions.GroupDoesNotExistException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/ModifyUserAccountStatusTask.java b/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/ModifyUserAccountStatusTask.java
@@ -7,9 +7,14 @@
 import javax.servlet.http.HttpServletRequest;
 import org.integratedmodelling.klab.auth.Role;
 import org.integratedmodelling.klab.hub.api.TaskParameters.TaskParametersWithRoleRequirement;
-import org.integratedmodelling.klab.hub.api.User.AccountStatus;
 import org.integratedmodelling.klab.hub.repository.UserRepository;
+import org.integratedmodelling.klab.hub.tasks.commands.TaskCommand;
+import org.integratedmodelling.klab.hub.tasks.enums.TaskStatus;
+import org.integratedmodelling.klab.hub.tasks.enums.TaskType;
 import org.integratedmodelling.klab.hub.tasks.services.CommandFactory;
+import org.integratedmodelling.klab.hub.tasks.support.TaskBuilder;
+import org.integratedmodelling.klab.hub.users.dto.User;
+import org.integratedmodelling.klab.hub.users.dto.User.AccountStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/RemoveGroupTask.java b/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/RemoveGroupTask.java
@@ -1,13 +1,18 @@
 package org.integratedmodelling.klab.hub.api;
 
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.integratedmodelling.klab.hub.agreements.dto.Agreement;
 import org.integratedmodelling.klab.hub.repository.AgreementRepository;
 import org.integratedmodelling.klab.hub.repository.UserRepository;
+import org.integratedmodelling.klab.hub.tasks.commands.TaskCommand;
+import org.integratedmodelling.klab.hub.tasks.enums.TaskStatus;
+import org.integratedmodelling.klab.hub.tasks.enums.TaskType;
 import org.integratedmodelling.klab.hub.tasks.services.CommandFactory;
+import org.integratedmodelling.klab.hub.users.dto.GroupEntry;
+import org.integratedmodelling.klab.hub.users.dto.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/RemoveRoleTask.java b/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/RemoveRoleTask.java
@@ -10,7 +10,12 @@
 
 import org.integratedmodelling.klab.auth.Role;
 import org.integratedmodelling.klab.hub.repository.UserRepository;
+import org.integratedmodelling.klab.hub.tasks.commands.TaskCommand;
+import org.integratedmodelling.klab.hub.tasks.enums.TaskStatus;
+import org.integratedmodelling.klab.hub.tasks.enums.TaskType;
 import org.integratedmodelling.klab.hub.tasks.services.CommandFactory;
+import org.integratedmodelling.klab.hub.tasks.support.TaskBuilder;
+import org.integratedmodelling.klab.hub.users.dto.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.annotation.TypeAlias;
 import org.springframework.stereotype.Component;

diff --git a/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/SetRoleTask.java b/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/SetRoleTask.java
@@ -10,7 +10,12 @@
 
 import org.integratedmodelling.klab.auth.Role;
 import org.integratedmodelling.klab.hub.repository.UserRepository;
+import org.integratedmodelling.klab.hub.tasks.commands.TaskCommand;
+import org.integratedmodelling.klab.hub.tasks.enums.TaskStatus;
+import org.integratedmodelling.klab.hub.tasks.enums.TaskType;
 import org.integratedmodelling.klab.hub.tasks.services.CommandFactory;
+import org.integratedmodelling.klab.hub.tasks.support.TaskBuilder;
+import org.integratedmodelling.klab.hub.users.dto.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.annotation.TypeAlias;
 import org.springframework.stereotype.Component;