From 6dfb751bee7004db2363134157500b53f2d8bbc6 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Mon, 2 Aug 2021 17:36:28 +0200 Subject: [PATCH] TSK-1659: Expanded TimeIntervalReportBuilder with custom-X filter Co-authored-by: Tim Gerversmann<72377965+tge20@users.noreply.github.com> --- .run/Prepare RestDocs.run.xml | 1 + .../main/resources/sql/sample-data/task.sql | 14 +- .../common/internal/util/LogSanitizer.java | 2 +- .../common/internal/util/SqlProviderUtil.java | 4 + .../internal/util/LogSanitizerTest.java | 70 +++ .../rest/TaskHistoryEventController.java | 6 +- .../rest/TaskHistoryQueryFilterParameter.java | 2 +- .../reports/ClassificationCategoryReport.java | 17 +- .../api/reports/ClassificationReport.java | 21 +- .../reports/TaskCustomFieldValueReport.java | 16 +- .../monitor/api/reports/TaskStatusReport.java | 12 +- .../reports/TimeIntervalReportBuilder.java | 55 +- .../monitor/api/reports/TimestampReport.java | 16 +- .../monitor/api/reports/WorkbasketReport.java | 17 +- .../header/TaskStatusColumnHeader.java | 2 +- .../monitor/internal/MonitorMapper.java | 420 +------------ .../internal/MonitorMapperSqlProvider.java | 304 +++++++++ ...assificationCategoryReportBuilderImpl.java | 13 +- .../ClassificationReportBuilderImpl.java | 22 +- ...TaskCustomFieldValueReportBuilderImpl.java | 14 +- .../TimeIntervalReportBuilderImpl.java | 271 +++++++- .../reports/TimestampReportBuilderImpl.java | 13 +- .../reports/WorkbasketReportBuilderImpl.java | 12 +- .../task/internal/TaskQuerySqlProvider.java | 13 +- .../acceptance/jobs/JobRunnerAccTest.java | 3 +- ...CustomAttributeValuesForReportAccTest.java | 40 +- ...OfClassificationCategoryReportAccTest.java | 52 +- ...dsOfTaskCustomFieldValueReportAccTest.java | 44 +- ...deClassificationCategoryReportAccTest.java | 53 +- .../ProvideClassificationReportAccTest.java | 60 +- ...deDetailedClassificationReportAccTest.java | 45 +- ...videTaskCustomFieldValueReportAccTest.java | 45 +- .../ProvideTaskStatusReportAccTest.java | 2 +- .../ProvideWorkbasketReportAccTest.java | 53 +- .../acceptance/task/CallbackStateAccTest.java | 2 +- .../task/UpdateTaskAttachmentsAccTest.java | 2 +- .../workbasket/CreateWorkbasketAccTest.java | 3 +- .../QueryWorkbasketAccessItemsAccTest.java | 5 - ...pdateWorkbasketAuthorizations2AccTest.java | 16 +- .../src/docs/asciidoc/rest-api.adoc | 11 +- .../rest/ClassificationController.java | 6 +- .../ClassificationQueryFilterParameter.java | 2 +- .../common/rest/QueryPagingParameter.java | 2 +- .../taskana/common/rest/QueryParameter.java | 5 +- .../common/rest/QuerySortParameter.java | 4 +- .../taskana/common/rest/RestEndpoints.java | 18 +- .../monitor/rest/MonitorController.java | 344 ++++++----- .../TimeIntervalReportFilterParameter.java | 580 ++++++++++++++++++ .../ReportRepresentationModelAssembler.java | 123 ++-- .../pro/taskana/task/rest/TaskController.java | 12 +- .../task/rest/TaskQueryFilterParameter.java | 2 +- .../rest/WorkbasketAccessItemController.java | 6 +- ...kbasketAccessItemQueryFilterParameter.java | 2 +- .../workbasket/rest/WorkbasketController.java | 6 +- .../rest/WorkbasketQueryFilterParameter.java | 2 +- .../pro/taskana/SpringArchitectureTest.java | 32 +- .../rest/AccessIdControllerRestDocTest.java | 2 +- .../common/rest/QuerySortParameterTest.java | 10 +- .../rest/MonitorControllerIntTest.java | 57 +- .../rest/MonitorControllerRestDocTest.java | 50 +- ...portRepresentationModelAssemblerTest.java} | 8 +- .../task/rest/TaskControllerIntTest.java | 1 - ...WorkbasketAccessItemControllerIntTest.java | 33 +- .../rest/WorkbasketControllerIntTest.java | 102 +-- .../app/monitor/services/monitor.service.ts | 10 +- 65 files changed, 2267 insertions(+), 925 deletions(-) create mode 100644 common/taskana-common/src/test/java/pro/taskana/common/internal/util/LogSanitizerTest.java create mode 100644 lib/taskana-core/src/main/java/pro/taskana/monitor/internal/MonitorMapperSqlProvider.java create mode 100644 rest/taskana-rest-spring/src/main/java/pro/taskana/monitor/rest/TimeIntervalReportFilterParameter.java rename rest/taskana-rest-spring/src/test/java/pro/taskana/monitor/rest/{models/ReportRepresentationModelTest.java => assembler/ReportRepresentationModelAssemblerTest.java} (98%) diff --git a/.run/Prepare RestDocs.run.xml b/.run/Prepare RestDocs.run.xml index 0516723ba..ec6ce9cac 100644 --- a/.run/Prepare RestDocs.run.xml +++ b/.run/Prepare RestDocs.run.xml @@ -12,6 +12,7 @@