Remaining TMS tasks

project-properties.gradle

@@ -16,7 +16,7 @@ project.ext {
     isDebugMode = System.getProperty("DEBUG", "false") == "true"
     releaseMode = project.hasProperty("releaseMode") ? project.releaseMode.toBoolean() : false
     scriptsUrl = commonScriptsUrl + (releaseMode ? '5.14.0' : 'develop')
-    migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.14.0' : 'develop')
+    migrationsUrl = migrationsScriptsUrl + (releaseMode ? '5.14.0' : 'feature/EMPRPP-migrate-tms-to-develop')
     manifestSchemaUrl = schemaUrl + ('manifest.schema.json')
     //TODO refactor with archive download
     testScriptsSrc = [
@@ -98,6 +98,7 @@ project.ext {
             (migrationsUrl + '/migrations/1000_tms_initial.up.sql')                    : 'V213__tms_initial.up.sql',
             (migrationsUrl + '/migrations/1001_migrate_auth_integrations.up.sql')      : 'V214__migrate_auth_integrations.up.sql',
             (migrationsUrl + '/migrations/1002_drop_tms_bts_ticket.up.sql')            : 'V215__drop_tms_bts_ticket.up.sql',
+            (migrationsUrl + '/migrations/1003_increase_activity_name_length.up.sql')  : 'V216__increase_activity_name_length.up.sql',
     ]
     excludeTests = ['**/entity/**',
                     '**/aop/**',

src/main/java/com/epam/reportportal/base/core/item/TestItemService.java

@@ -4,17 +4,12 @@
 import static com.epam.reportportal.base.infrastructure.rules.exception.ErrorType.TEST_ITEM_NOT_FOUND;
 import static java.util.Optional.ofNullable;
 
-import com.epam.reportportal.base.core.tms.dto.TmsTestCaseRS;
 import com.epam.reportportal.base.infrastructure.persistence.dao.LaunchRepository;
 import com.epam.reportportal.base.infrastructure.persistence.dao.TestItemRepository;
-import com.epam.reportportal.base.infrastructure.persistence.entity.enums.StatusEnum;
-import com.epam.reportportal.base.infrastructure.persistence.entity.enums.TestItemTypeEnum;
 import com.epam.reportportal.base.infrastructure.persistence.entity.item.TestItem;
-import com.epam.reportportal.base.infrastructure.persistence.entity.item.TestItemResults;
 import com.epam.reportportal.base.infrastructure.persistence.entity.launch.Launch;
 import com.epam.reportportal.base.infrastructure.rules.exception.ReportPortalException;
 import java.util.Optional;
-import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -56,66 +51,6 @@ private Optional<Launch> getLaunch(TestItem testItem) {
             .orElseThrow(() -> new ReportPortalException(LAUNCH_NOT_FOUND)));
   }
 
-  /**
-   * Creates TestItem for TMS test case in TO_RUN status.
-   *
-   * @param testCase test case entity
-   * @param launch   launch entity
-   * @return created test item
-   */
-  @Transactional
-  public TestItem createToRunTestItemForTestCase(TmsTestCaseRS testCase, Launch launch) {
-    log.debug("Creating TO_RUN test item for test case: {} in launch: {}",
-        testCase.getId(), launch.getId());
-
-    // Create TestItem
-    TestItem testItem = new TestItem();
-    testItem.setUuid(UUID.randomUUID().toString());
-    testItem.setName(testCase.getName());
-    testItem.setDescription(testCase.getDescription());
-    testItem.setType(TestItemTypeEnum.TEST);
-    testItem.setLaunchId(launch.getId());
-    testItem.setHasStats(true);
-    testItem.setHasChildren(false);
-    testItem.setRetryOf(null);
-    testItem.setPath(String.valueOf(launch.getId()));
-
-    // Create TestItemResults with TO_RUN status
-    TestItemResults testItemResults = new TestItemResults();
-    testItemResults.setStatus(StatusEnum.TO_RUN);
-    testItemResults.setEndTime(null);
-    testItemResults.setDuration(null);
-
-    // Link TestItem and TestItemResults
-    testItem.setItemResults(testItemResults);
-    testItemResults.setTestItem(testItem);
-
-    // Save (cascade will save TestItemResults)
-    testItem = testItemRepository.save(testItem);
-
-    log.info("Created TO_RUN test item: {} for test case: {}",
-        testItem.getItemId(), testCase.getId());
-
-    return testItem;
-  }
-
-  /**
-   * Deletes test item by ID.
-   *
-   * @param itemId test item ID
-   */
-  @Transactional
-  public void deleteTestItem(Long itemId) {
-    log.debug("Deleting test item: {}", itemId);
-
-    TestItem testItem = testItemRepository.findById(itemId)
-        .orElseThrow(() -> new ReportPortalException(TEST_ITEM_NOT_FOUND, itemId));
-
-    testItemRepository.delete(testItem);
-
-    log.info("Deleted test item: {}", itemId);
-  }
-
   /**
    * Deletes all test items by launch ID.
    *

src/main/java/com/epam/reportportal/base/core/tms/controller/TestCaseController.java

@@ -235,8 +235,7 @@
   @ResponseStatus(HttpStatus.NO_CONTENT)
   @Operation(
       summary = "Delete multiple test cases",
-      description = "Deletes multiple test cases by their IDs within a project.",
-      tags = {"Batch Operations"}
+      description = "Deletes multiple test cases by their IDs within a project."
   )
   @ApiResponse(responseCode = "204", description = "Test cases deleted successfully")
   public void deleteTestCases(@PathVariable("projectKey") String projectKey,
@@ -261,8 +260,8 @@
   @PatchMapping("/batch")
   @Operation(
       summary = "Partially update multiple test cases",
-      description = "Updates multiple test cases at once, particularly useful for changing test case folder for multiple test cases.",
-      tags = {"Batch Operations"}
+      description = "Updates multiple test cases at once, "
+          + "particularly useful for changing test case folder for multiple test cases."
   )
   @ApiResponse(responseCode = "200", description = "Test cases updated successfully")
   public BatchPatchTestCasesRS batchPatchTestCases(@PathVariable("projectKey") String projectKey,
@@ -288,8 +287,7 @@
   @PostMapping(value = "/import", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
   @Operation(
       summary = "Import test cases from CSV",
-      description = "Imports test cases from a CSV file into a project. Supports new CSV format with template, summary, path, labels, test steps, and expected result fields.",
-      tags = {"Import/Export"}
+      description = "Imports test cases from a CSV file into a project. Supports new CSV format with template, summary, path, labels, test steps, and expected result fields."
   )
   @ApiResponse(responseCode = "200", description = "Test cases imported successfully")
   public List<TmsTestFolderRS> importTestCases(@PathVariable("projectKey") String projectKey,
@@ -319,8 +317,7 @@
   @GetMapping("/export")
   @Operation(
       summary = "Export test cases",
-      description = "Exports test cases from a project to a file. Supports JSON and CSV formats.",
-      tags = {"Import/Export"}
+      description = "Exports test cases from a project to a file. Supports JSON and CSV formats."
   )
   @ApiResponse(
       responseCode = "200",
@@ -381,8 +378,7 @@
   @ResponseStatus(HttpStatus.OK)
   @Operation(
       summary = "Patch attributes from multiple test cases",
-      description = "Patch specific attributes for multiple test cases by their IDs.",
-      tags = {"Batch Operations"}
+      description = "Patch specific attributes for multiple test cases by their IDs."
   )
   @ApiResponse(responseCode = "200", description = "Attributes patched successfully")
   public void patchTestCaseAttributes(@PathVariable("projectKey") String projectKey,
@@ -407,8 +403,7 @@
   @PostMapping("/batch/duplicate")
   @Operation(
       summary = "Duplicate multiple test cases",
-      description = "Creates full copies of multiple test cases including their default versions, manual scenarios, and attachments.",
-      tags = {"Batch Operations"}
+      description = "Creates full copies of multiple test cases including their default versions, manual scenarios, and attachments."
   )
   @ApiResponse(responseCode = "200", description = "Test cases duplicated successfully")
   public BatchDuplicateTestCasesRS duplicateTestCases(@PathVariable("projectKey") String projectKey,

src/main/java/com/epam/reportportal/base/core/tms/controller/TmsTestPlanController.java

@@ -181,8 +181,7 @@ public TmsTestPlanRS patchTestPlan(@PathVariable String projectKey,
   @PostMapping("/{id}/test-case/batch")
   @Operation(
       summary = "Add test cases to test plan",
-      description = "Adds multiple test cases to a test plan by their IDs.",
-      tags = {"Batch Operations"}
+      description = "Adds multiple test cases to a test plan by their IDs."
   )
   @ApiResponse(responseCode = "204", description = "Test cases added to test plan successfully")
   public BatchTestCaseOperationResultRS addTestCasesToPlan(@PathVariable String projectKey,
@@ -207,8 +206,7 @@ public BatchTestCaseOperationResultRS addTestCasesToPlan(@PathVariable String pr
   @DeleteMapping("/{id}/test-case/batch")
   @Operation(
       summary = "Remove test cases from test plan",
-      description = "Removes multiple test cases from a test plan by their IDs.",
-      tags = {"Batch Operations"}
+      description = "Removes multiple test cases from a test plan by their IDs."
   )
   @ApiResponse(responseCode = "204", description = "Test cases removed from test plan successfully")
   public BatchTestCaseOperationResultRS removeTestCasesFromPlan(@PathVariable String projectKey,

src/main/java/com/epam/reportportal/base/core/tms/mapper/NestedStepItemBuilder.java

@@ -76,11 +76,33 @@
     nestedStep.setItemResults(nestedResults);
     nestedResults.setTestItem(nestedStep);
 
-    nestedStep.setTestCaseHash(parentTestItem.getTestCaseHash()); //TODO check is it correct
+    nestedStep.setTestCaseHash(parentTestItem.getTestCaseHash());
 
     log.trace("Successfully built nested step item: {}", name);
     return nestedStep;
   }
+
+  public TestItem buildRetryNestedStepItem(TestItem originalStep, TestItem parentRetryItem) {
+    var newStep = new TestItem();
+    newStep.setUuid(UUID.randomUUID().toString());
+    newStep.setName(originalStep.getName());
+    newStep.setDescription(originalStep.getDescription());
+    newStep.setType(TestItemTypeEnum.STEP);
+    newStep.setStartTime(Instant.now());
+    newStep.setLaunchId(parentRetryItem.getLaunchId());
+    newStep.setHasStats(false);
+    newStep.setHasChildren(false);
+    newStep.setRetryOf(null);
+    newStep.setParentId(parentRetryItem.getItemId());
+    newStep.setTestCaseId(parentRetryItem.getTestCaseId());
+
+    var results = new TestItemResults();
+    results.setStatus(StatusEnum.TO_RUN);
+    results.setTestItem(newStep);
+    newStep.setItemResults(results);
+
+    return newStep;
+  }
 
   /**
    * Builds nested step name from instructions and step index.
@@ -112,7 +134,7 @@
     }
 
     if (expectedResult != null && !expectedResult.isEmpty()) {
-      if (description.length() > 0) {
+      if (!description.isEmpty()) {
         description.append("\n\nExpected result: ");
       } else {
         description.append("Expected result: ");

src/main/java/com/epam/reportportal/base/core/tms/mapper/TestCaseItemBuilder.java

@@ -17,10 +17,15 @@
 package com.epam.reportportal.base.core.tms.mapper;
 
 import com.epam.reportportal.base.core.tms.dto.TmsTestCaseRS;
+import com.epam.reportportal.base.infrastructure.persistence.entity.ItemAttribute;
+import com.epam.reportportal.base.infrastructure.persistence.entity.enums.StatusEnum;
 import com.epam.reportportal.base.infrastructure.persistence.entity.enums.TestItemTypeEnum;
+import com.epam.reportportal.base.infrastructure.persistence.entity.item.Parameter;
 import com.epam.reportportal.base.infrastructure.persistence.entity.item.TestItem;
+import com.epam.reportportal.base.infrastructure.persistence.entity.item.TestItemResults;
 import com.epam.reportportal.base.infrastructure.persistence.entity.launch.Launch;
 import java.time.Instant;
+import java.util.HashSet;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -58,7 +63,8 @@
     testItem.setTestCaseId(String.valueOf(tmsTestCaseRS.getId()));
     testItem.setName(tmsTestCaseRS.getName());
     testItem.setDescription(tmsTestCaseRS.getDescription());
-    testItem.setType(TestItemTypeEnum.STEP); //as per the RPP philosophy test case is the step, but test cases steps are inner steps for this step
+    testItem.setType(
+        TestItemTypeEnum.STEP); //as per the RPP philosophy test case is the step, but test cases steps are inner steps for this step
     testItem.setStartTime(Instant.now());
     testItem.setLaunchId(launch.getId());
     testItem.setHasStats(true);  // TEST contributes to statistics
@@ -67,4 +73,55 @@
     testItem.setParentId(parentSuiteItem.getItemId());
     return testItem;
   }
+
+  public TestItem buildRetryTestCaseItem(TestItem originalItem, StatusEnum newStatus) {
+    var retryItem = new TestItem();
+    retryItem.setUuid(UUID.randomUUID().toString());
+    retryItem.setName(originalItem.getName());
+    retryItem.setCodeRef(originalItem.getCodeRef());
+    retryItem.setType(originalItem.getType());
+    retryItem.setStartTime(Instant.now());
+    retryItem.setDescription(originalItem.getDescription());
+    retryItem.setLaunchId(originalItem.getLaunchId());
+    retryItem.setUniqueId(originalItem.getUniqueId());
+    retryItem.setTestCaseId(originalItem.getTestCaseId());
+    retryItem.setTestCaseHash(originalItem.getTestCaseHash());
+
+    // Copy attributes
+    if (originalItem.getAttributes() != null) {
+      var copiedAttributes = new HashSet<ItemAttribute>();
+      for (var attr : originalItem.getAttributes()) {
+        var newAttr = new ItemAttribute(attr.getKey(), attr.getValue(), attr.isSystem());
+        newAttr.setTestItem(retryItem);
+        copiedAttributes.add(newAttr);
+      }
+      retryItem.setAttributes(copiedAttributes);
+    }
+
+    // Copy parameters
+    if (originalItem.getParameters() != null) {
+      var copiedParameters = new HashSet<Parameter>();
+      for (var param : originalItem.getParameters()) {
+        var p = new Parameter();
+        p.setKey(param.getKey());
+        p.setValue(param.getValue());
+        copiedParameters.add(p);
+      }
+      retryItem.setParameters(copiedParameters);
+    }
+
+    retryItem.setRetryOf(originalItem.getItemId());
+    retryItem.setParentId(originalItem.getParentId());
+
+    var results = new TestItemResults();
+    results.setStatus(newStatus);
+    results.setTestItem(retryItem);
+    retryItem.setItemResults(results);
+
+    retryItem.setHasChildren(originalItem.isHasChildren());
+    retryItem.setHasRetries(false);
+    retryItem.setHasStats(originalItem.isHasStats());
+
+    return retryItem;
+  }
 }

src/main/java/com/epam/reportportal/base/core/tms/mapper/processor/TmsTmsTestCaseFieldProcessorImpl.java

@@ -22,9 +22,11 @@
 import com.epam.reportportal.base.infrastructure.persistence.entity.activity.EventAction;
 import com.epam.reportportal.base.model.activity.TestCaseActivityResource;
 
+import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
+import org.apache.commons.collections4.CollectionUtils;
 
 public class TmsTmsTestCaseFieldProcessorImpl implements TmsTestCaseFieldProcessor {
 
@@ -52,7 +54,7 @@
         Object beforeValue = valueExtractor.apply(before);
         Object afterValue = valueExtractor.apply(after);
 
-        if (Objects.equals(beforeValue, afterValue)) {
+        if (areValuesEqual(beforeValue, afterValue)) {
             return Optional.empty();
         }
 
@@ -100,4 +102,11 @@
         }
         return false;
     }
+
+    private boolean areValuesEqual(Object beforeValue, Object afterValue) {
+        if (beforeValue instanceof Collection && afterValue instanceof Collection) {
+            return CollectionUtils.isEqualCollection((Collection<?>) beforeValue, (Collection<?>) afterValue);
+        }
+        return Objects.equals(beforeValue, afterValue);
+    }
 }

src/main/java/com/epam/reportportal/base/core/tms/service/TmsStepExecutionService.java

@@ -110,4 +110,9 @@
   public void deleteByLaunchId(Long launchId) {
     tmsStepExecutionRepository.deleteByLaunchId(launchId);
   }
+
+  @Transactional
+  public void updateTmsStepExecution(TmsStepExecution stepExecution) {
+    tmsStepExecutionRepository.save(stepExecution);
+  }
 }