DATAGRAPH-1290 - Add case insensitive order support for custom queries.

Author: ihordz

spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/Query.java

@@ -129,12 +129,22 @@ private String addSorting(String baseQuery, Sort sort) {
 	}
 
 	private String getSortOrder(Sort sort) {
-
 		return sort.stream()
-				.map(order -> order.getProperty() + " " + order.getDirection())
+				.map(Query::getPropertySortOrder)
 				.collect(Collectors.joining(", "));
 	}
 
+	private static String getPropertySortOrder(Sort.Order order) {
+		StringBuilder sb = new StringBuilder();
+		if(order.isIgnoreCase()){
+			sb.append("toLower(").append(order.getProperty()).append(")");
+		} else {
+			sb.append(order.getProperty());
+		}
+		sb.append(" ").append(order.getDirection());
+		return sb.toString();
+	}
+
 	private String formatBaseQuery(String cypherQuery) {
 		cypherQuery = cypherQuery.trim();
 		if (cypherQuery.endsWith(";")) {

spring-data-neo4j/src/test/java/org/springframework/data/neo4j/queries/PagedQueryTests.java

@@ -46,6 +46,7 @@
  * @author Jasper Blues
  * @author Mark Angrish
  * @author Nicolas Mervaillie
+ * @author Ihor Dziuba
  */
 @ContextConfiguration(classes = MoviesContextConfiguration.class)
 @RunWith(SpringRunner.class)
@@ -465,4 +466,83 @@ public void shouldFindCinemasSortedByNameWithCustomQuery() {
 		assertEquals("Regal", cinemas.get(8).getName());
 		assertEquals("Ritzy", cinemas.get(9).getName());
 	}
+
+	@Test // DATAGRAPH-1290
+	@Transactional
+	public void shouldFindPagedCinemasSortedCaseInsensitiveWithCustomQuery() {
+		setup();
+		Sort sort = Sort.by(Sort.Order.asc("n.name").ignoreCase());
+		Pageable pageable = PageRequest.of(0, 4, sort);
+
+		Page<Cinema> page = cinemaRepository.getPagedCinemas(pageable);
+		assertThat(page.getNumberOfElements()).isEqualTo(4);
+		assertThat(page.hasNext()).isTrue();
+		assertThat(page.getContent().get(0).getName()).isEqualTo("Cineplex");
+		assertThat(page.getContent().get(1).getName()).isEqualTo("Inox");
+		assertThat(page.getContent().get(2).getName()).isEqualTo("Landmark");
+		assertThat(page.getContent().get(3).getName()).isEqualTo("Metro");
+
+		page = cinemaRepository.getPagedCinemas(page.nextPageable());
+		assertThat(page.getNumberOfElements()).isEqualTo(4);
+		assertThat(page.hasNext()).isTrue();
+		assertThat(page.getContent().get(0).getName()).isEqualTo("Movietime");
+		assertThat(page.getContent().get(1).getName()).isEqualTo("Picturehouse");
+		assertThat(page.getContent().get(2).getName()).isEqualTo("PVR");
+		assertThat(page.getContent().get(3).getName()).isEqualTo("Rainbow");
+
+		page = cinemaRepository.getPagedCinemas(page.nextPageable());
+		assertThat(page.getNumberOfElements()).isEqualTo(2);
+		assertThat(page.hasNext()).isFalse();
+		assertThat(page.getContent().get(0).getName()).isEqualTo("Regal");
+		assertThat(page.getContent().get(1).getName()).isEqualTo("Ritzy");
+	}
+
+	@Test // DATAGRAPH-1290
+	@Transactional
+	public void shouldFindSlicedCinemasSortedCaseInsensitiveWithCustomQuery() {
+		setup();
+		Sort sort = Sort.by(Sort.Order.asc("n.name").ignoreCase());
+		Pageable pageable = PageRequest.of(0, 4, sort);
+
+		Slice<Cinema> slice = cinemaRepository.getSlicedCinemasByName(pageable);
+		assertThat(slice.getNumberOfElements()).isEqualTo(4);
+		assertThat(slice.hasNext()).isTrue();
+		assertThat(slice.getContent().get(0).getName()).isEqualTo("Cineplex");
+		assertThat(slice.getContent().get(1).getName()).isEqualTo("Inox");
+		assertThat(slice.getContent().get(2).getName()).isEqualTo("Landmark");
+		assertThat(slice.getContent().get(3).getName()).isEqualTo("Metro");
+
+		slice = cinemaRepository.getSlicedCinemasByName(slice.nextPageable());
+		assertThat(slice.getNumberOfElements()).isEqualTo(4);
+		assertThat(slice.hasNext()).isTrue();
+		assertThat(slice.getContent().get(0).getName()).isEqualTo("Movietime");
+		assertThat(slice.getContent().get(1).getName()).isEqualTo("Picturehouse");
+		assertThat(slice.getContent().get(2).getName()).isEqualTo("PVR");
+		assertThat(slice.getContent().get(3).getName()).isEqualTo("Rainbow");
+
+		slice = cinemaRepository.getSlicedCinemasByName(slice.nextPageable());
+		assertThat(slice.getNumberOfElements()).isEqualTo(2);
+		assertThat(slice.hasNext()).isFalse();
+		assertThat(slice.getContent().get(0).getName()).isEqualTo("Regal");
+		assertThat(slice.getContent().get(1).getName()).isEqualTo("Ritzy");
+	}
+
+	@Test // DATAGRAPH-1290
+	@Transactional
+	public void shouldFindCinemasSortedCaseInsensitiveByNameWithCustomQuery() {
+		setup();
+		Sort sort = Sort.by(Sort.Order.asc("n.name").ignoreCase());
+		List<Cinema> cinemas = cinemaRepository.getCinemasSortedByName(sort);
+		assertThat(cinemas.size()).isEqualTo(10);
+		assertThat(cinemas.get(0).getName()).isEqualTo("Cineplex");
+		assertThat(cinemas.get(1).getName()).isEqualTo("Inox");
+		assertThat(cinemas.get(2).getName()).isEqualTo("Landmark");
+		assertThat(cinemas.get(3).getName()).isEqualTo("Metro");
+		assertThat(cinemas.get(4).getName()).isEqualTo("Movietime");
+		assertThat(cinemas.get(5).getName()).isEqualTo("Picturehouse");
+		assertThat(cinemas.get(6).getName()).isEqualTo("PVR");
+		assertThat(cinemas.get(7).getName()).isEqualTo("Rainbow");
+		assertThat(cinemas.get(8).getName()).isEqualTo("Regal");
+		assertThat(cinemas.get(9).getName()).isEqualTo("Ritzy");
+	}
 }