TSK-1827: add sorting by ownerLongName
This commit is contained in:
parent
5795a0efb7
commit
4444816589
|
|
@ -381,6 +381,36 @@ class QueryTasksWithSortingAccTest extends AbstractAccTest {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Nested
|
||||||
|
@TestInstance(Lifecycle.PER_CLASS)
|
||||||
|
class OwnerLongName {
|
||||||
|
@WithAccessId(user = "admin")
|
||||||
|
@Test
|
||||||
|
void should_ReturnOrderedResult_When_OrderByOwnerLongNameDescIsSet() {
|
||||||
|
List<TaskSummary> results =
|
||||||
|
taskanaEngine
|
||||||
|
.getTaskService()
|
||||||
|
.createTaskQuery()
|
||||||
|
.orderByOwnerLongName(DESCENDING)
|
||||||
|
.list();
|
||||||
|
assertThat(results.stream().filter(r -> r.getOwnerLongName() != null))
|
||||||
|
.hasSizeGreaterThan(2)
|
||||||
|
.extracting(TaskSummary::getOwnerLongName)
|
||||||
|
.isSortedAccordingTo(CASE_INSENSITIVE_ORDER.reversed());
|
||||||
|
}
|
||||||
|
|
||||||
|
@WithAccessId(user = "admin")
|
||||||
|
@Test
|
||||||
|
void should_ReturnOrderedResult_When_OrderByOwnerLongNameAscIsSet() {
|
||||||
|
List<TaskSummary> results =
|
||||||
|
taskanaEngine.getTaskService().createTaskQuery().orderByOwnerLongName(ASCENDING).list();
|
||||||
|
assertThat(results.stream().filter(r -> r.getOwnerLongName() != null))
|
||||||
|
.hasSizeGreaterThan(2)
|
||||||
|
.extracting(TaskSummary::getOwnerLongName)
|
||||||
|
.isSortedAccordingTo(CASE_INSENSITIVE_ORDER);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Nested
|
@Nested
|
||||||
@TestInstance(Lifecycle.PER_CLASS)
|
@TestInstance(Lifecycle.PER_CLASS)
|
||||||
class WorkbasketId {
|
class WorkbasketId {
|
||||||
|
|
|
||||||
|
|
@ -438,6 +438,7 @@ public class TaskController {
|
||||||
CREATOR(TaskQuery::orderByCreator),
|
CREATOR(TaskQuery::orderByCreator),
|
||||||
NOTE(TaskQuery::orderByNote),
|
NOTE(TaskQuery::orderByNote),
|
||||||
OWNER(TaskQuery::orderByOwner),
|
OWNER(TaskQuery::orderByOwner),
|
||||||
|
OWNER_LONG_NAME(TaskQuery::orderByOwnerLongName),
|
||||||
BUSINESS_PROCESS_ID(TaskQuery::orderByBusinessProcessId),
|
BUSINESS_PROCESS_ID(TaskQuery::orderByBusinessProcessId),
|
||||||
PARENT_BUSINESS_PROCESS_ID(TaskQuery::orderByParentBusinessProcessId),
|
PARENT_BUSINESS_PROCESS_ID(TaskQuery::orderByParentBusinessProcessId),
|
||||||
WORKBASKET_KEY(TaskQuery::orderByWorkbasketKey),
|
WORKBASKET_KEY(TaskQuery::orderByWorkbasketKey),
|
||||||
|
|
|
||||||
|
|
@ -546,6 +546,21 @@ class TaskControllerIntTest {
|
||||||
assertThat(response.getBody().getLink(IanaLinkRelations.PREV)).isNotNull();
|
assertThat(response.getBody().getLink(IanaLinkRelations.PREV)).isNotNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void should_SortByOwnerLongName() {
|
||||||
|
String url =
|
||||||
|
restHelper.toUrl(RestEndpoints.URL_TASKS)
|
||||||
|
+ "?sort-by=OWNER_LONG_NAME"
|
||||||
|
+ "&order=DESCENDING";
|
||||||
|
HttpEntity<String> auth = new HttpEntity<>(RestHelper.generateHeadersForUser("admin"));
|
||||||
|
|
||||||
|
ResponseEntity<TaskSummaryPagedRepresentationModel> response =
|
||||||
|
TEMPLATE.exchange(url, HttpMethod.GET, auth, TASK_SUMMARY_PAGE_MODEL_TYPE);
|
||||||
|
|
||||||
|
assertThat(response.getBody()).isNotNull();
|
||||||
|
assertThat((response.getBody()).getLink(IanaLinkRelations.SELF)).isNotNull();
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testGetLastPageSortedByDueWithHiddenTasksRemovedFromResult() {
|
void testGetLastPageSortedByDueWithHiddenTasksRemovedFromResult() {
|
||||||
resetDb();
|
resetDb();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue