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

TSK-1344: renamed TaskCustomFieldValueReport getter in MonitorService

This commit is contained in:
Mustapha Zorgati 2020-07-26 00:48:24 +02:00
parent d8cf2479fe
commit 38133484c0
5 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/taskana-core/src/main/java/pro/taskana/monitor/api/MonitorService.java
View File

@ -44,7 +44,7 @@ public interface MonitorService {
* @param taskCustomField the customField whose values should appear in the report * @param taskCustomField the customField whose values should appear in the report
* @return a {@link TaskCustomFieldValueReport.Builder} * @return a {@link TaskCustomFieldValueReport.Builder}
*/ */
TaskCustomFieldValueReport.Builder createCustomFieldValueReportBuilder( TaskCustomFieldValueReport.Builder createTaskCustomFieldValueReportBuilder(
TaskCustomField taskCustomField); TaskCustomField taskCustomField);
/** /**

2
lib/taskana-core/src/main/java/pro/taskana/monitor/internal/MonitorServiceImpl.java
View File

@ -44,7 +44,7 @@ public class MonitorServiceImpl implements MonitorService {
} }
@Override @Override
public TaskCustomFieldValueReport.Builder createCustomFieldValueReportBuilder( public TaskCustomFieldValueReport.Builder createTaskCustomFieldValueReportBuilder(
TaskCustomField taskCustomField) { TaskCustomField taskCustomField) {
return new CustomFieldValueReportBuilderImpl(taskanaEngine, monitorMapper, taskCustomField); return new CustomFieldValueReportBuilderImpl(taskanaEngine, monitorMapper, taskCustomField);
} }

14
lib/taskana-core/src/test/java/acceptance/report/GetTaskIdsOfTaskCustomFieldValueReportAccTest.java
View File

@ -36,7 +36,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes
ThrowingCallable call = ThrowingCallable call =
() -> () ->
monitorService monitorService
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.listTaskIdsForSelectedItems(selectedItems); .listTaskIdsForSelectedItems(selectedItems);
assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class);
} }
@ -70,7 +70,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes
List<String> ids = List<String> ids =
monitorService monitorService
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.inWorkingDays() .inWorkingDays()
.listTaskIdsForSelectedItems(selectedItems); .listTaskIdsForSelectedItems(selectedItems);
@ -118,7 +118,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes
List<String> ids = List<String> ids =
monitorService monitorService
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.inWorkingDays() .inWorkingDays()
.workbasketIdIn(workbasketIds) .workbasketIdIn(workbasketIds)
@ -160,7 +160,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes
List<String> ids = List<String> ids =
monitorService monitorService
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.inWorkingDays() .inWorkingDays()
.stateIn(Collections.singletonList(TaskState.READY)) .stateIn(Collections.singletonList(TaskState.READY))
@ -207,7 +207,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes
List<String> ids = List<String> ids =
monitorService monitorService
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.inWorkingDays() .inWorkingDays()
.classificationCategoryIn(categories) .classificationCategoryIn(categories)
@ -248,7 +248,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes
List<String> ids = List<String> ids =
monitorService monitorService
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.inWorkingDays() .inWorkingDays()
.domainIn(Collections.singletonList("DOMAIN_A")) .domainIn(Collections.singletonList("DOMAIN_A"))
@ -291,7 +291,7 @@ class GetTaskIdsOfTaskCustomFieldValueReportAccTest extends AbstractReportAccTes
List<String> ids = List<String> ids =
monitorService monitorService
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.inWorkingDays() .inWorkingDays()
.customAttributeFilterIn(customAttributeFilter) .customAttributeFilterIn(customAttributeFilter)

34
lib/taskana-core/src/test/java/acceptance/report/ProvideTaskCustomFieldValueReportAccTest.java
View File

@ -40,7 +40,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest {
ThrowingCallable call = ThrowingCallable call =
() -> { () -> {
MONITOR_SERVICE MONITOR_SERVICE
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.buildReport(); .buildReport();
}; };
assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class);
@ -50,7 +50,9 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void should_augmentDisplayNames_When_ReportIsBuild() throws Exception { void should_augmentDisplayNames_When_ReportIsBuild() throws Exception {
TaskCustomFieldValueReport report = TaskCustomFieldValueReport report =
MONITOR_SERVICE.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1).buildReport(); MONITOR_SERVICE
.createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.buildReport();
assertThat(report.getRows()).hasSize(3); assertThat(report.getRows()).hasSize(3);
assertThat(report.getRow("Geschaeftsstelle A").getDisplayName()) assertThat(report.getRow("Geschaeftsstelle A").getDisplayName())
@ -65,7 +67,9 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTotalNumbersOfTasksOfCustomFieldValueReportForCustom1() throws Exception { void testGetTotalNumbersOfTasksOfCustomFieldValueReportForCustom1() throws Exception {
TaskCustomFieldValueReport report = TaskCustomFieldValueReport report =
MONITOR_SERVICE.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1).buildReport(); MONITOR_SERVICE
.createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.buildReport();
assertThat(report).isNotNull(); assertThat(report).isNotNull();
assertThat(report.rowSize()).isEqualTo(3); assertThat(report.rowSize()).isEqualTo(3);
@ -84,7 +88,9 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest {
@Test @Test
void testGetTotalNumbersOfTasksOfCustomFieldValueReportForCustom2() throws Exception { void testGetTotalNumbersOfTasksOfCustomFieldValueReportForCustom2() throws Exception {
TaskCustomFieldValueReport report = TaskCustomFieldValueReport report =
MONITOR_SERVICE.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_2).buildReport(); MONITOR_SERVICE
.createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_2)
.buildReport();
assertThat(report).isNotNull(); assertThat(report).isNotNull();
assertThat(report.rowSize()).isEqualTo(2); assertThat(report.rowSize()).isEqualTo(2);
@ -106,7 +112,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest {
TaskCustomFieldValueReport report = TaskCustomFieldValueReport report =
MONITOR_SERVICE MONITOR_SERVICE
.createCustomFieldValueReportBuilder(taskCustomField) .createTaskCustomFieldValueReportBuilder(taskCustomField)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.inWorkingDays() .inWorkingDays()
.buildReport(); .buildReport();
@ -132,7 +138,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest {
ThrowingCallable callable = ThrowingCallable callable =
() -> () ->
MONITOR_SERVICE MONITOR_SERVICE
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.buildReport(timestamp); .buildReport(timestamp);
assertThatCode(callable).doesNotThrowAnyException(); assertThatCode(callable).doesNotThrowAnyException();
}; };
@ -146,7 +152,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest {
TaskCustomFieldValueReport report = TaskCustomFieldValueReport report =
MONITOR_SERVICE MONITOR_SERVICE
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.inWorkingDays() .inWorkingDays()
.buildReport(); .buildReport();
@ -171,7 +177,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest {
TaskCustomFieldValueReport report = TaskCustomFieldValueReport report =
MONITOR_SERVICE MONITOR_SERVICE
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.inWorkingDays() .inWorkingDays()
.buildReport(TaskTimestamp.PLANNED); .buildReport(TaskTimestamp.PLANNED);
@ -196,7 +202,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest {
TaskCustomFieldValueReport report = TaskCustomFieldValueReport report =
MONITOR_SERVICE MONITOR_SERVICE
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.buildReport(); .buildReport();
@ -222,7 +228,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest {
TaskCustomFieldValueReport report = TaskCustomFieldValueReport report =
MONITOR_SERVICE MONITOR_SERVICE
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.inWorkingDays() .inWorkingDays()
.workbasketIdIn(workbasketIds) .workbasketIdIn(workbasketIds)
@ -249,7 +255,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest {
TaskCustomFieldValueReport report = TaskCustomFieldValueReport report =
MONITOR_SERVICE MONITOR_SERVICE
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.inWorkingDays() .inWorkingDays()
.stateIn(states) .stateIn(states)
@ -276,7 +282,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest {
TaskCustomFieldValueReport report = TaskCustomFieldValueReport report =
MONITOR_SERVICE MONITOR_SERVICE
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.inWorkingDays() .inWorkingDays()
.classificationCategoryIn(categories) .classificationCategoryIn(categories)
@ -303,7 +309,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest {
TaskCustomFieldValueReport report = TaskCustomFieldValueReport report =
MONITOR_SERVICE MONITOR_SERVICE
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.inWorkingDays() .inWorkingDays()
.domainIn(domains) .domainIn(domains)
@ -331,7 +337,7 @@ class ProvideTaskCustomFieldValueReportAccTest extends AbstractReportAccTest {
TaskCustomFieldValueReport report = TaskCustomFieldValueReport report =
MONITOR_SERVICE MONITOR_SERVICE
.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) .createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.customAttributeFilterIn(customAttributeFilter) .customAttributeFilterIn(customAttributeFilter)
.withColumnHeaders(columnHeaders) .withColumnHeaders(columnHeaders)
.inWorkingDays() .inWorkingDays()

6
lib/taskana-core/src/test/java/pro/taskana/monitor/internal/TaskCustomFieldValueReportBuilderImplTest.java
View File

@ -80,7 +80,7 @@ class TaskCustomFieldValueReportBuilderImplTest {
.thenReturn(expectedResult); .thenReturn(expectedResult);
final TaskCustomFieldValueReport actualResult = final TaskCustomFieldValueReport actualResult =
cut.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) cut.createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.workbasketIdIn(workbasketIds) .workbasketIdIn(workbasketIds)
.stateIn(states) .stateIn(states)
.classificationCategoryIn(categories) .classificationCategoryIn(categories)
@ -142,7 +142,7 @@ class TaskCustomFieldValueReportBuilderImplTest {
.thenReturn(expectedResult); .thenReturn(expectedResult);
final TaskCustomFieldValueReport actualResult = final TaskCustomFieldValueReport actualResult =
cut.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) cut.createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.workbasketIdIn(workbasketIds) .workbasketIdIn(workbasketIds)
.stateIn(states) .stateIn(states)
.classificationCategoryIn(categories) .classificationCategoryIn(categories)
@ -205,7 +205,7 @@ class TaskCustomFieldValueReportBuilderImplTest {
.thenReturn(expectedResult); .thenReturn(expectedResult);
final List<String> actualResult = final List<String> actualResult =
cut.createCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1) cut.createTaskCustomFieldValueReportBuilder(TaskCustomField.CUSTOM_1)
.workbasketIdIn(workbasketIds) .workbasketIdIn(workbasketIds)
.stateIn(states) .stateIn(states)
.classificationCategoryIn(categories) .classificationCategoryIn(categories)