TSK-1377: now properly listing taksIds for selected Items when a subkey is not present.

This commit is contained in:
Mustapha Zorgati 2020-09-14 16:17:47 +02:00
parent 0968bfe2f7
commit 74dc3d8e57
2 changed files with 24 additions and 0 deletions

View File

@ -308,8 +308,10 @@ public interface MonitorMapper {
+ "<foreach collection='selectedItems' item='selectedItem' separator=' OR '>"
+ "#{selectedItem.key} = T.${groupedBy} AND "
+ "<if test=\"joinWithAttachments\">"
+ "<if test='selectedItem.subKey != null'>"
+ "A.CLASSIFICATION_KEY = #{selectedItem.subKey} AND "
+ "</if>"
+ "</if>"
+ "<if test=\"_databaseId == 'db2'\">"
+ "#{selectedItem.upperAgeLimit} >= (DAYS(${timestamp}) - DAYS(CURRENT_TIMESTAMP)) AND "
+ "#{selectedItem.lowerAgeLimit} &lt;= (DAYS(${timestamp}) - DAYS(CURRENT_TIMESTAMP)) "

View File

@ -128,6 +128,28 @@ class GetTaskIdsOfClassificationReportAccTest extends AbstractReportAccTest {
"TKI:000000000000000000000000000000000001", "TKI:000000000000000000000000000000000033");
}
@WithAccessId(user = "monitor")
@Test
void should_ReturnTaskIdsOfDetailedClassificationReport_When_SomeSelectedItemsContainSubKey()
throws Exception {
final List<TimeIntervalColumnHeader> columnHeaders = getListOfColumnHeaders();
final List<SelectedItem> selectedItems =
Arrays.asList(L_30000, new SelectedItem("L10000", "L11000", 0, 0));
List<String> ids =
MONITOR_SERVICE
.createClassificationReportBuilder()
.withColumnHeaders(columnHeaders)
.inWorkingDays()
.listTaskIdsForSelectedItems(selectedItems, TaskTimestamp.DUE);
assertThat(ids).containsExactlyInAnyOrder(
"TKI:000000000000000000000000000000000006",
"TKI:000000000000000000000000000000000033"
);
}
@WithAccessId(user = "monitor")
@Test
void testGetTaskIdsOfClassificationReportWithDomainFilter() throws Exception {