Merge pull request #115 from reportportal/EPMRPP-112181-fix

EPMRPP-112181 labels mapping

Author: grabsefx

build.gradle

@@ -2,9 +2,10 @@ plugins {
     id 'io.spring.dependency-management' version '1.1.7'
     id 'java'
     id 'jacoco'
-    id "com.github.node-gradle.node" version "2.2.1"
+    id "com.github.node-gradle.node" version "7.1.0"
     id "org.openapi.generator" version "7.16.0"
-    id "org.springframework.boot" version "3.4.2" apply false
+    id "org.springframework.boot" version "${springBootVersion}" apply false
+    id 'com.gradleup.shadow' version '9.3.1'
 }
 
 import org.openapitools.generator.gradle.plugin.tasks.GenerateTask
@@ -19,11 +20,9 @@ apply from: scriptsUrl + '/release-fat.gradle'
 apply from: scriptsUrl + '/signing.gradle'
 
 repositories {
-    mavenCentral { url "https://repo1.maven.org/maven2" }
-    maven { url "https://packages.atlassian.com/maven/repository/public" }
-
+    mavenCentral { url = "https://repo1.maven.org/maven2" }
     if (!releaseMode) {
-        maven { url 'https://jitpack.io' }
+        maven { url = 'https://jitpack.io' }
     }
 }
 
@@ -59,15 +58,16 @@ dependencies {
     testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}"
 
     testImplementation('org.junit.jupiter:junit-jupiter:5.11.4')
-    testImplementation "org.mockito:mockito-junit-jupiter:5.14.2"
+    testImplementation "org.mockito:mockito-junit-jupiter:5.21.0"
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
 }
 
 sourceSets {
     main {
         java {
-            srcDirs "$buildDir/generated/src/main/java"
-            exclude("$buildDir/generated/src/main/java/com/epam/reportportal/api/jira/MyselfApi.java")
+            srcDirs layout.buildDirectory.dir("generated/src/main/java").get().asFile.path
+            exclude("${layout.buildDirectory.dir("generated/src/main/java").get().asFile.path}/com/epam/reportportal/api/jira/MyselfApi.java")
         }
     }
 }
@@ -76,7 +76,7 @@ sourceSets {
 tasks.register('generateJiraApi', GenerateTask) {
     generatorName.set("java")
     inputSpec.set("$rootDir/src/main/resources/openapi/swagger-v3.v3.json")
-    outputDir.set("$buildDir/generated")
+    outputDir.set(layout.buildDirectory.dir("generated").get().asFile.path)
     configFile.set("$rootDir/src/main/resources/openapi/config.json")
     ignoreFileOverride = "${projectDir.path}/.openapi-generator-ignore"
     skipOverwrite.set(true)
@@ -93,9 +93,7 @@ test {
 
 build.dependsOn jacocoTestReport
 
-artifacts {
-    archives shadowJar
-}
+assemble.dependsOn shadowJar
 
 sourceSets {
     main {
@@ -135,7 +133,7 @@ shadowJar {
         into("/resources")
     }
     configurations = [project.configurations.compileClasspath]
-    zip64 true
+    zip64 = true
     dependencies {
         include(dependency("jakarta.ws.rs:jakarta.ws.rs-api:.*"))
         include(dependency("org.apache.tomcat:tomcat-annotations-api:.*"))

gradle.properties

@@ -1,6 +1,6 @@
-version=5.13.7
+version=5.13.8
 description=EPAM Report Portal. Cloud Jira plugin
 pluginId = JIRA Cloud
 
-springBootVersion=3.4.2
+springBootVersion=3.4.12
 lombokVersion=1.18.36

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -7,5 +7,5 @@ project.ext {
     publishRepo = "https://maven.pkg.github.com/reportportal/plugin-bts-jira-cloud"
     dependencyRepos = ["plugin-api", "commons-bom"]
     releaseMode = project.hasProperty("releaseMode")
-    pluginsDir = "$buildDir/plugins"
+    pluginsDir = layout.buildDirectory.dir("plugins").get().asFile.path
 }

project-properties.gradle

@@ -99,7 +99,8 @@ public static IssueUpdateDetails toIssueInput(JiraRestClient client, Project jir
 
     ProjectIssueCreateMetadata project = issueCreateMetadata.getProjects().get(0);
     BusinessRule.expect(project, Predicates.notNull())
-        .verify(ErrorType.UNABLE_INTERACT_WITH_INTEGRATION, String.format("Project %s not found", jiraProject.getKey()));
+        .verify(ErrorType.UNABLE_INTERACT_WITH_INTEGRATION,
+            String.format("Project %s not found", jiraProject.getKey()));
 
     List<IssueTypeIssueCreateMetadata> cimIssueType = project.getIssuetypes();
 
@@ -117,7 +118,8 @@ public static IssueUpdateDetails toIssueInput(JiraRestClient client, Project jir
 
       // Skip issuetype and project fields cause got them in
       // issueInputBuilder already
-      if (one.getId().equalsIgnoreCase(IssueField.ISSUE_TYPE_FIELD.value) || one.getId().equalsIgnoreCase(IssueField.PROJECT_FIELD.value)) {
+      if (one.getId().equalsIgnoreCase(IssueField.ISSUE_TYPE_FIELD.value)
+          || one.getId().equalsIgnoreCase(IssueField.PROJECT_FIELD.value)) {
         continue;
       }
 
@@ -182,9 +184,7 @@ public static IssueUpdateDetails toIssueInput(JiraRestClient client, Project jir
         }
       } else {
         if (one.getFieldType().equalsIgnoreCase(IssueFieldType.ARRAY.getName())) {
-          List<Object> arrayOfValues = new ArrayList<>();
-          one.getValue().forEach(value -> arrayOfValues.add(Map.entry("value", value)));
-          issueUpdateDetails.putFieldsItem(one.getId(), arrayOfValues);
+          issueUpdateDetails.putFieldsItem(one.getId(), one.getValue());
         } else if (one.getFieldType().equalsIgnoreCase(IssueFieldType.NUMBER.getName())) {
           issueUpdateDetails.putFieldsItem(one.getId(), Long.valueOf(one.getValue().get(0)));
         } else if (one.getFieldType().equalsIgnoreCase(IssueFieldType.USER.getName())) {

src/main/java/com/epam/reportportal/extension/jira/command/utils/JIRATicketUtils.java

@@ -21,32 +21,36 @@
 import static com.epam.reportportal.extension.jira.command.utils.CloudJiraProperties.URL;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import com.epam.reportportal.extension.jira.utils.SampleData.WorkType;
 import com.epam.reportportal.model.externalsystem.PostFormField;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.EnumSource;
 
+@Slf4j
 class GetIssueFieldsCommandTest extends BaseCommandTest {
 
   @ParameterizedTest
-  @CsvSource(value = {
-      "Epic"
-  })
-  void getIssueFields(String issueType) {
+  @EnumSource(value = WorkType.class)
+  void getIssueFields(WorkType workType) throws JsonProcessingException {
     if (disabled()) {
       return;
     }
 
     Map<String, Object> params = new HashMap<>(JIRA_COMMAND_PARAMS);
     params.put(PROJECT.getName(), PROJECT.getParam(INTEGRATION.getParams()));
     params.put(URL.getName(), URL.getParam(INTEGRATION.getParams()));
-    params.put(ISSUE_TYPE, issueType);
+    params.put(ISSUE_TYPE, workType.name());
 
     var command = new GetIssueFieldsCommand(projectRepository, cloudJiraClientProvider);
     List<PostFormField> response = command.invokeCommand(INTEGRATION, params);
 
+    log.info(new ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(response));
     assertFalse(response.isEmpty());
   }
 }

src/test/java/com/epam/reportportal/extension/jira/command/GetIssueFieldsCommandTest.java

@@ -19,7 +19,7 @@
 import static com.epam.reportportal.extension.jira.command.GetIssueFieldsCommand.ISSUE_TYPE;
 import static com.epam.reportportal.extension.jira.command.utils.CloudJiraProperties.PROJECT;
 import static com.epam.reportportal.extension.jira.command.utils.CloudJiraProperties.URL;
-import static com.epam.reportportal.extension.jira.utils.SampleData.BUG;
+import static com.epam.reportportal.extension.jira.utils.SampleData.getSample;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -29,6 +29,7 @@
 import static org.mockito.Mockito.when;
 
 import com.epam.reportportal.extension.jira.command.utils.JIRATicketDescriptionService;
+import com.epam.reportportal.extension.jira.utils.SampleData.WorkType;
 import com.epam.reportportal.extension.util.RequestEntityConverter;
 import com.epam.reportportal.model.externalsystem.PostTicketRQ;
 import com.epam.reportportal.model.externalsystem.Ticket;
@@ -43,7 +44,7 @@
 import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.mockito.Mock;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.web.client.RestTemplate;
@@ -62,23 +63,21 @@ class PostTicketCommandTest extends BaseCommandTest {
   LogRepository logRepository;
 
   @ParameterizedTest
-  @CsvSource(value = {
-      "Story"
-  })
-  void postTicketCommand(String issueType) throws JsonProcessingException {
+  @EnumSource(WorkType.class)
+  void postTicketCommand(WorkType issueType) throws JsonProcessingException {
     if (disabled()) {
       return;
     }
     TestItem testItem = new TestItem();
     when(itemRepository.findById(anyLong())).thenReturn(Optional.of(testItem));
 
-    PostTicketRQ entity = objectMapper.readValue(BUG, PostTicketRQ.class);
+    PostTicketRQ postTicketRQ = objectMapper.readValue(getSample(issueType), PostTicketRQ.class);
 
     Map<String, Object> params = new HashMap<>(JIRA_COMMAND_PARAMS);
     params.put(PROJECT.getName(), PROJECT.getParam(INTEGRATION.getParams()));
     params.put(URL.getName(), URL.getParam(INTEGRATION.getParams()));
     params.put(ISSUE_TYPE, issueType);
-    params.put("entity", entity);
+    params.put("entity", postTicketRQ);
 
     lenient().when(dataStoreService.load(anyString()))
         .thenReturn(Optional.of(getClass().getClassLoader().getResourceAsStream("attachment.txt")));