Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public static int compare(Object o1, Object o2) {
} else if (o1 instanceof Long) {
return Long.compare((long) o1, (long) o2);
} else if (o1 instanceof String string) {
return string.compareTo((String) o2);
return string.compareToIgnoreCase((String) o2);
} else if (o1 instanceof Date date) {
return date.compareTo((Date) o2);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,26 @@ public void test_sorting_page() throws IOException {
Assertions.assertThat(page.getItems().get(1).data().get("name")).isEqualTo("test1");
Assertions.assertThat(page.getItems().get(2).data().get("name")).isEqualTo("start");
}

@Test
public void test_sorting_case_insensitive() throws IOException {

var page = fileSystem.query((node, i) -> node)
.orderby("sort_field").asc()
.whereExists("sort_field")
.page(1, 10);

Assertions.assertThat(page.getItems()).hasSize(2);
Assertions.assertThat(page.getItems().get(0).data().get("name")).isEqualTo("test2");
Assertions.assertThat(page.getItems().get(1).data().get("name")).isEqualTo("test1");

page = fileSystem.query((node, i) -> node)
.orderby("sort_field").desc()
.whereExists("sort_field")
.page(1, 10);

Assertions.assertThat(page.getItems()).hasSize(2);
Assertions.assertThat(page.getItems().get(0).data().get("name")).isEqualTo("test1");
Assertions.assertThat(page.getItems().get(1).data().get("name")).isEqualTo("test2");
}
}
3 changes: 2 additions & 1 deletion cms-filesystem/src/test/resources/content/test/test1.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ number1: 1
number2: 5
publish_date: 2024-10-01
keywords: ["eins", "zwei"]
published: true
published: true
sort_field: Superman
3 changes: 2 additions & 1 deletion cms-filesystem/src/test/resources/content/test/test2.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ featured: false
taxonomy:
tags: [zwei, drei]
publish_date: 2024-11-04
published: true
published: true
sort_field: antman