Merge pull request #968 from reportportal/EPMRPP-88838

EPMRPP-88838 || Some items of launch are not analyzed by AA
reportportal · Dec 26, 2023 · dc4c3ea · dc4c3ea
2 parents 516ace3 + 9941604
commit dc4c3ea
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/main/java/com/epam/ta/reportportal/dao/TestItemRepositoryCustomImpl.java b/src/main/java/com/epam/ta/reportportal/dao/TestItemRepositoryCustomImpl.java
@@ -730,14 +730,8 @@ public List<TestItem> findAllInIssueGroupByLaunch(Long launchId, TestItemIssueGr
         .on(ISSUE.ISSUE_TYPE.eq(ISSUE_TYPE.ID))
         .join(ISSUE_GROUP)
         .on(ISSUE_TYPE.ISSUE_GROUP_ID.eq(ISSUE_GROUP.ISSUE_GROUP_ID))
-        .leftOuterJoin(ITEM_ATTRIBUTE)
-        .on(TEST_ITEM.ITEM_ID.eq(ITEM_ATTRIBUTE.ITEM_ID)
-            .and(ITEM_ATTRIBUTE.KEY.eq("immediateAA"))
-            .and(ITEM_ATTRIBUTE.VALUE.eq("true"))
-            .and(ITEM_ATTRIBUTE.SYSTEM.eq(true)))
         .where(TEST_ITEM.LAUNCH_ID.eq(launchId)
             .and(ISSUE_GROUP.ISSUE_GROUP_.eq(JIssueGroupEnum.valueOf(issueGroup.getValue()))))
-            .and(ITEM_ATTRIBUTE.ID.isNull())
         .fetch(TEST_ITEM_RECORD_MAPPER);
   }
 
@@ -755,7 +749,7 @@ public List<TestItem> findItemsForAnalyze(Long launchId) {
         .on(ISSUE_TYPE.ISSUE_GROUP_ID.eq(ISSUE_GROUP.ISSUE_GROUP_ID))
         .leftOuterJoin(ITEM_ATTRIBUTE)
         .on(TEST_ITEM.ITEM_ID.eq(ITEM_ATTRIBUTE.ITEM_ID)
-            .and(ITEM_ATTRIBUTE.KEY.eq("immediateAA"))
+            .and(ITEM_ATTRIBUTE.KEY.eq("immediateAutoAnalysis"))
             .and(ITEM_ATTRIBUTE.VALUE.eq("true"))
             .and(ITEM_ATTRIBUTE.SYSTEM.eq(true)))
         .where(TEST_ITEM.LAUNCH_ID.eq(launchId)