nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-395: small cleanup

This commit is contained in:
Mustapha Zorgati 2018-03-20 10:41:28 +01:00
parent 8e61e8c4dd
commit 439390adee
3 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/taskana-core/src/main/java/pro/taskana/impl/TaskMonitorServiceImpl.java
View File

@ -76,11 +76,7 @@ public class TaskMonitorServiceImpl implements TaskMonitorService {
List<MonitorQueryItem> monitorQueryItems = taskMonitorMapper.getTaskCountOfWorkbaskets(
workbasketIds, states, categories, domains, customField, customFieldValues);
if (inWorkingDays) {
report.addItems(monitorQueryItems, new DaysToWorkingDaysPreProcessor<>(columnHeaders));
} else {
report.addItems(monitorQueryItems);
}
report.addItems(monitorQueryItems, new DaysToWorkingDaysPreProcessor<>(columnHeaders, inWorkingDays));
return report;
@ -127,11 +123,7 @@ public class TaskMonitorServiceImpl implements TaskMonitorService {
List<MonitorQueryItem> monitorQueryItems = taskMonitorMapper.getTaskCountOfCategories(
workbasketIds, states, categories, domains, customField, customFieldValues);
if (inWorkingDays) {
report.addItems(monitorQueryItems, new DaysToWorkingDaysPreProcessor<>(columnHeaders));
} else {
report.addItems(monitorQueryItems);
}
report.addItems(monitorQueryItems, new DaysToWorkingDaysPreProcessor<>(columnHeaders, inWorkingDays));
return report;
@ -179,11 +171,7 @@ public class TaskMonitorServiceImpl implements TaskMonitorService {
List<MonitorQueryItem> monitorQueryItems = taskMonitorMapper.getTaskCountOfClassifications(
workbasketIds, states, categories, domains, customField, customFieldValues);
if (inWorkingDays) {
report.addItems(monitorQueryItems, new DaysToWorkingDaysPreProcessor<>(columnHeaders));
} else {
report.addItems(monitorQueryItems);
}
report.addItems(monitorQueryItems, new DaysToWorkingDaysPreProcessor<>(columnHeaders, inWorkingDays));
return report;
@ -234,11 +222,8 @@ public class TaskMonitorServiceImpl implements TaskMonitorService {
.getTaskCountOfDetailedClassifications(workbasketIds, states, categories, domains, customField,
customFieldValues);
if (inWorkingDays) {
report.addItems(detailedMonitorQueryItems, new DaysToWorkingDaysPreProcessor<>(columnHeaders));
} else {
report.addItems(detailedMonitorQueryItems);
}
report.addItems(detailedMonitorQueryItems,
new DaysToWorkingDaysPreProcessor<>(columnHeaders, inWorkingDays));
return report;
@ -290,11 +275,7 @@ public class TaskMonitorServiceImpl implements TaskMonitorService {
List<MonitorQueryItem> monitorQueryItems = taskMonitorMapper.getTaskCountOfCustomFieldValues(
workbasketIds, states, categories, domains, customField, customFieldValues);
if (inWorkingDays) {
report.addItems(monitorQueryItems, new DaysToWorkingDaysPreProcessor<>(columnHeaders));
} else {
report.addItems(monitorQueryItems);
}
report.addItems(monitorQueryItems, new DaysToWorkingDaysPreProcessor<>(columnHeaders, inWorkingDays));
return report;

10
lib/taskana-core/src/main/java/pro/taskana/impl/report/impl/DaysToWorkingDaysPreProcessor.java
View File

@ -14,14 +14,18 @@ public class DaysToWorkingDaysPreProcessor<Item extends MonitorQueryItem> implem
private DaysToWorkingDaysConverter instance;
public DaysToWorkingDaysPreProcessor(List<TimeIntervalColumnHeader> columnHeaders)
public DaysToWorkingDaysPreProcessor(List<TimeIntervalColumnHeader> columnHeaders, boolean activate)
throws InvalidArgumentException {
instance = DaysToWorkingDaysConverter.initialize(columnHeaders);
if (activate) {
instance = DaysToWorkingDaysConverter.initialize(columnHeaders);
}
}
@Override
public Item apply(Item item) {
item.setAgeInDays(instance.convertDaysToWorkingDays(item.getAgeInDays()));
if (instance != null) {
item.setAgeInDays(instance.convertDaysToWorkingDays(item.getAgeInDays()));
}
return item;
}
}

12
lib/taskana-core/src/test/java/pro/taskana/impl/TaskMonitorServiceImplTest.java
View File

@ -82,8 +82,7 @@ public class TaskMonitorServiceImplTest {
categories, domains, customField, customFieldValues);
WorkbasketLevelReport actualResult = cut.getWorkbasketLevelReport(workbasketIds, states, categories, domains,
customField,
customFieldValues);
customField, customFieldValues);
verify(taskanaEngineImplMock, times(1)).openConnection();
verify(taskanaEngineImplMock, times(2)).getConfiguration();
@ -121,8 +120,7 @@ public class TaskMonitorServiceImplTest {
categories, domains, customField, customFieldValues);
WorkbasketLevelReport actualResult = cut.getWorkbasketLevelReport(workbasketIds, states, categories, domains,
customField,
customFieldValues, reportLineItemDefinitions);
customField, customFieldValues, reportLineItemDefinitions);
verify(taskanaEngineImplMock, times(1)).openConnection();
verify(taskanaEngineImplMock, times(2)).getConfiguration();
@ -157,8 +155,7 @@ public class TaskMonitorServiceImplTest {
domains, customField, customFieldValues);
CategoryReport actualResult = cut.getCategoryReport(workbasketIds, states, categories, domains,
customField,
customFieldValues);
customField, customFieldValues);
verify(taskanaEngineImplMock, times(1)).openConnection();
verify(taskanaEngineImplMock, times(2)).getConfiguration();
@ -194,8 +191,7 @@ public class TaskMonitorServiceImplTest {
domains, customField, customFieldValues);
CategoryReport actualResult = cut.getCategoryReport(workbasketIds, states, categories, domains,
customField,
customFieldValues, reportLineItemDefinitions);
customField, customFieldValues, reportLineItemDefinitions);
verify(taskanaEngineImplMock, times(1)).openConnection();
verify(taskanaEngineImplMock, times(2)).getConfiguration();