merge feature/orgs to develop (#42)

Author: grabsefx

build.gradle

@@ -36,9 +36,9 @@ dependencies {
         implementation 'com.epam.reportportal:plugin-api'
         annotationProcessor 'com.epam.reportportal:plugin-api'
     } else {
-        implementation 'com.github.reportportal:commons-dao:1296d7c'
-        implementation 'com.github.reportportal:plugin-api:8874441'
-        annotationProcessor 'com.github.reportportal:plugin-api:8874441'
+        implementation 'com.github.reportportal:commons-dao:9b8b695'
+        implementation 'com.github.reportportal:plugin-api:f59b724'
+        annotationProcessor 'com.github.reportportal:plugin-api:f59b724'
     }
 
     // add lombok support

src/main/java/com/epam/reportportal/extension/gitlab/GitlabExtension.java

@@ -36,6 +36,7 @@
 import com.epam.ta.reportportal.dao.LogRepository;
 import com.epam.ta.reportportal.dao.ProjectRepository;
 import com.epam.ta.reportportal.dao.TestItemRepository;
+import com.epam.ta.reportportal.dao.organization.OrganizationRepositoryCustom;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -77,6 +78,10 @@ public class GitlabExtension implements ReportPortalExtensionPoint, DisposableBe
   private IntegrationRepository integrationRepository;
   @Autowired
   private ProjectRepository projectRepository;
+
+  @Autowired
+  private OrganizationRepositoryCustom organizationRepository;
+
   private final Supplier<Map<String, PluginCommand<?>>> pluginCommandMapping = new MemoizingSupplier<>(
       this::getCommands);
   @Autowired
@@ -182,10 +187,10 @@ private Map<String, PluginCommand<?>> getCommands() {
     commands.add(new SearchMilestonesCommand(gitlabClientProviderSupplier.get()));
     commands.add(new SearchEpicsCommand(gitlabClientProviderSupplier.get()));
     commands.add(new SearchLabelsCommand(gitlabClientProviderSupplier.get()));
-    commands.add(new GetIssueTypesCommand(projectRepository));
-    commands.add(new GetIssueFieldsCommand(projectRepository));
+    commands.add(new GetIssueTypesCommand(projectRepository, organizationRepository));
+    commands.add(new GetIssueFieldsCommand(projectRepository, organizationRepository));
     commands.add(new PostTicketCommand(projectRepository, gitlabClientProviderSupplier.get(),
-        requestEntityConverter, descriptionBuilderServiceSupplier.get()));
+        requestEntityConverter, descriptionBuilderServiceSupplier.get(), organizationRepository));
     return commands.stream().collect(Collectors.toMap(NamedPluginCommand::getName, it -> it));
   }
 }

src/main/java/com/epam/reportportal/extension/gitlab/command/GetIssueFieldsCommand.java

@@ -24,6 +24,7 @@
 import com.epam.reportportal.model.externalsystem.AllowedValue;
 import com.epam.reportportal.model.externalsystem.PostFormField;
 import com.epam.ta.reportportal.dao.ProjectRepository;
+import com.epam.ta.reportportal.dao.organization.OrganizationRepositoryCustom;
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.reportportal.rules.exception.ReportPortalException;
 import com.epam.reportportal.rules.exception.ErrorType;
@@ -46,8 +47,8 @@ public class GetIssueFieldsCommand extends ProjectMemberCommand<List<PostFormFie
   private static final String ASSIGNEE_DESCRIPTION =
       "Note that the free version of GitLab allows only one assignee";
 
-  public GetIssueFieldsCommand(ProjectRepository projectRepository) {
-    super(projectRepository);
+  public GetIssueFieldsCommand(ProjectRepository projectRepository, OrganizationRepositoryCustom organizationRepository) {
+    super(projectRepository, organizationRepository);
   }
 
   @Override

src/main/java/com/epam/reportportal/extension/gitlab/command/GetIssueTypesCommand.java

@@ -17,6 +17,7 @@
 
 import com.epam.reportportal.extension.ProjectMemberCommand;
 import com.epam.ta.reportportal.dao.ProjectRepository;
+import com.epam.ta.reportportal.dao.organization.OrganizationRepositoryCustom;
 import com.epam.ta.reportportal.entity.integration.Integration;
 import java.util.List;
 import java.util.Map;
@@ -29,8 +30,8 @@ public class GetIssueTypesCommand extends ProjectMemberCommand<List<String>> {
   public static final String ISSUE = "Issue";
   public static final String INCIDENT = "Incident";
 
-  public GetIssueTypesCommand(ProjectRepository projectRepository) {
-    super(projectRepository);
+  public GetIssueTypesCommand(ProjectRepository projectRepository, OrganizationRepositoryCustom organizationRepository) {
+    super(projectRepository, organizationRepository);
   }
 
   @Override

src/main/java/com/epam/reportportal/extension/gitlab/command/PostTicketCommand.java

@@ -35,6 +35,7 @@
 import com.epam.reportportal.model.externalsystem.PostTicketRQ;
 import com.epam.reportportal.model.externalsystem.Ticket;
 import com.epam.ta.reportportal.dao.ProjectRepository;
+import com.epam.ta.reportportal.dao.organization.OrganizationRepositoryCustom;
 import com.epam.ta.reportportal.entity.integration.Integration;
 import com.epam.reportportal.rules.exception.ReportPortalException;
 import com.epam.reportportal.rules.exception.ErrorType;
@@ -56,8 +57,8 @@ public class PostTicketCommand extends ProjectMemberCommand<Ticket> {
 
   public PostTicketCommand(ProjectRepository projectRepository,
       GitlabClientProvider gitlabClientProvider, RequestEntityConverter requestEntityConverter,
-      DescriptionBuilderService descriptionBuilderService) {
-    super(projectRepository);
+      DescriptionBuilderService descriptionBuilderService, OrganizationRepositoryCustom organizationRepository) {
+    super(projectRepository, organizationRepository);
     this.gitlabClientProvider = gitlabClientProvider;
     this.requestEntityConverter = requestEntityConverter;
     this.descriptionBuilderService = descriptionBuilderService;