diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskQueryFilterParameter.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskQueryFilterParameter.java index ce89c62c8..1ed7e3370 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskQueryFilterParameter.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/TaskQueryFilterParameter.java @@ -525,7 +525,7 @@ public class TaskQueryFilterParameter implements QueryParameter // endregion // region classificationKey /** Filter by the classification key of the task. This is an exact match. */ - @JsonProperty("classification.key") + @JsonProperty("classification-key") private final String[] classificationKeyIn; /** Filter by the classification key of the task. This is an exact match. */ @@ -719,7 +719,7 @@ public class TaskQueryFilterParameter implements QueryParameter // endregion // region primaryObjectReferenceCompany /** Filter by the company of the primary object reference of the task. This is an exact match. */ - @JsonProperty("por.company") + @JsonProperty("por-company") private final String[] porCompanyIn; /** @@ -747,7 +747,7 @@ public class TaskQueryFilterParameter implements QueryParameter // endregion // region primaryObjectReferenceSystem /** Filter by the system of the primary object reference of the task. This is an exact match. */ - @JsonProperty("por.system") + @JsonProperty("por-system") private final String[] porSystemIn; /** @@ -778,7 +778,7 @@ public class TaskQueryFilterParameter implements QueryParameter * Filter by the system instance of the primary object reference of the task. This is an exact * match. */ - @JsonProperty("por.instance") + @JsonProperty("por-instance") private final String[] porInstanceIn; /** @@ -806,7 +806,7 @@ public class TaskQueryFilterParameter implements QueryParameter // endregion // region primaryObjectReferenceSystemType /** Filter by the type of the primary object reference of the task. This is an exact match. */ - @JsonProperty("por.type") + @JsonProperty("por-type") private final String[] porTypeIn; /** @@ -834,7 +834,7 @@ public class TaskQueryFilterParameter implements QueryParameter // endregion // region primaryObjectReferenceSystemValue /** Filter by the value of the primary object reference of the task. This is an exact match. */ - @JsonProperty("por.value") + @JsonProperty("por-value") private final String[] porValueIn; /** @@ -1477,7 +1477,7 @@ public class TaskQueryFilterParameter implements QueryParameter "state-not", "classification-id", "classification-id-not", - "classification.key", + "classification-key", "classification-key-not", "classification-key-like", "classification-key-not-like", @@ -1507,23 +1507,23 @@ public class TaskQueryFilterParameter implements QueryParameter "owner-like", "owner-not-like", "por", - "por.company", + "por-company", "por-company-not", "por-company-like", "por-company-not-like", - "por.system", + "por-system", "por-system-not", "por-system-like", "por-system-not-like", - "por.instance", + "por-instance", "por-instance-not", "por-instance-like", "por-instance-not-like", - "por.type", + "por-type", "por-type-not", "por-type-like", "por-type-not-like", - "por.value", + "por-value", "por-value-not", "por-value-like", "por-value-not-like", diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerIntTest.java index c93023476..1602f9988 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerIntTest.java @@ -460,7 +460,7 @@ class TaskControllerIntTest { void testGetAllTasksKeepingFilters() { String url = restHelper.toUrl(RestEndpoints.URL_TASKS) - + "?por.type=VNR&por.value=22334455&sort-by=POR_VALUE&order=DESCENDING"; + + "?por-type=VNR&por-value=22334455&sort-by=POR_VALUE&order=DESCENDING"; HttpEntity auth = new HttpEntity<>(RestHelper.generateHeadersForUser("teamlead-1")); ResponseEntity response = @@ -470,7 +470,7 @@ class TaskControllerIntTest { assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull(); assertThat(response.getBody().getRequiredLink(IanaLinkRelations.SELF).getHref()) .endsWith( - "/api/v1/tasks?por.type=VNR&por.value=22334455" + "/api/v1/tasks?por-type=VNR&por-value=22334455" + "&sort-by=POR_VALUE&order=DESCENDING"); } @@ -542,8 +542,8 @@ class TaskControllerIntTest { // tasks and this test depends on the tasks as they are in sampledata String url = restHelper.toUrl(RestEndpoints.URL_TASKS) - + "?por.company=00&por.system=PASystem&por.instance=00&" - + "por.type=VNR&por.value=22334455&sort-by=POR_TYPE&" + + "?por-company=00&por-system=PASystem&por-instance=00&" + + "por-type=VNR&por-value=22334455&sort-by=POR_TYPE&" + "order=ASCENDING&page-size=5&page=2"; HttpEntity auth = new HttpEntity<>(RestHelper.generateHeadersForUser("teamlead-1")); @@ -557,8 +557,8 @@ class TaskControllerIntTest { assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull(); assertThat(response.getBody().getRequiredLink(IanaLinkRelations.SELF).getHref()) .endsWith( - "/api/v1/tasks?por.company=00&por.system=PASystem&por.instance=00&" - + "por.type=VNR&por.value=22334455&sort-by=POR_TYPE&order=ASCENDING&" + "/api/v1/tasks?por-company=00&por-system=PASystem&por-instance=00&" + + "por-type=VNR&por-value=22334455&sort-by=POR_TYPE&order=ASCENDING&" + "page-size=5&page=2"); assertThat(response.getBody().getLink(IanaLinkRelations.FIRST)).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.LAST)).isNotNull(); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerRestDocTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerRestDocTest.java index b66e5a6ca..7258c67a4 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerRestDocTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/TaskControllerRestDocTest.java @@ -30,7 +30,7 @@ class TaskControllerRestDocTest extends BaseRestDocTest { @Test void getAllTasksDocTest() throws Exception { mockMvc - .perform(get(RestEndpoints.URL_TASKS + "?por.type=VNR&por.value=22334455&sort-by=NAME")) + .perform(get(RestEndpoints.URL_TASKS + "?por-type=VNR&por-value=22334455&sort-by=NAME")) .andExpect(MockMvcResultMatchers.status().isOk()); } diff --git a/web/src/app/shared/models/task-query-filter-parameter.ts b/web/src/app/shared/models/task-query-filter-parameter.ts index f0091d281..c7cc09eb4 100644 --- a/web/src/app/shared/models/task-query-filter-parameter.ts +++ b/web/src/app/shared/models/task-query-filter-parameter.ts @@ -5,18 +5,18 @@ export interface TaskQueryFilterParameter { 'name-like'?: string[]; priority?: number[]; state?: TaskState[]; - 'classification.key'?: string[]; + 'classification-key'?: string[]; 'task-id'?: string[]; 'workbasket-id'?: string[]; 'workbasket-key'?: string[]; domain?: string[]; owner?: string[]; 'owner-like'?: string[]; - 'por.company'?: string[]; - 'por.system'?: string[]; - 'por.instance'?: string[]; - 'por.type'?: string[]; - 'por.value'?: string[]; + 'por-company'?: string[]; + 'por-system'?: string[]; + 'por-instance'?: string[]; + 'por-type'?: string[]; + 'por-value'?: string[]; planned?: string[]; 'planned-from'?: string[]; 'planned-until'?: string[]; diff --git a/web/src/app/shared/store/filter-store/filter.state.ts b/web/src/app/shared/store/filter-store/filter.state.ts index bc50e7d2b..31d6987ad 100644 --- a/web/src/app/shared/store/filter-store/filter.state.ts +++ b/web/src/app/shared/store/filter-store/filter.state.ts @@ -17,7 +17,7 @@ const emptyTaskFilter: TaskQueryFilterParameter = { 'owner-like': [], state: [], priority: [], - 'por.value': [], + 'por-value': [], 'wildcard-search-fields': [], 'wildcard-search-value': [] }; diff --git a/web/src/app/shared/util/query-parameters.ts b/web/src/app/shared/util/query-parameters.ts index f8ebb13cb..3ab63dd0e 100644 --- a/web/src/app/shared/util/query-parameters.ts +++ b/web/src/app/shared/util/query-parameters.ts @@ -17,8 +17,8 @@ export class TaskanaQueryParameters { PRIORITY: 'priority', STATE: 'state', WORKBASKET_ID: 'workbasket-id', - TASK_PRIMARY_OBJ_REF_TYPE_LIKE: 'por.type', - TASK_PRIMARY_OBJ_REF_VALUE_LIKE: 'por.value', + TASK_PRIMARY_OBJ_REF_TYPE_LIKE: 'por-type', + TASK_PRIMARY_OBJ_REF_VALUE_LIKE: 'por-value', // Access REQUIREDPERMISSION: 'required-permission', ACCESSIDS: 'access-ids',