Issue #2 fix order by clause for multiple fields

avrilfanomar · Oct 12, 2021 · ff63bc4 · ff63bc4
1 parent fef3eb6
commit ff63bc4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/org/bitbucket/andriichukandrii/hybris/flexiblesearchbuilder/OrderByClause.java b/src/org/bitbucket/andriichukandrii/hybris/flexiblesearchbuilder/OrderByClause.java
@@ -1,10 +1,11 @@
 package org.bitbucket.andriichukandrii.hybris.flexiblesearchbuilder;
 
-import static org.bitbucket.andriichukandrii.hybris.flexiblesearchbuilder.FlexibleSearchBuilderFieldUtils.buildFieldsQueryString;
+import static org.bitbucket.andriichukandrii.hybris.flexiblesearchbuilder.FlexibleSearchQueryConstants.FIELD_SEPARATOR;
 import static org.bitbucket.andriichukandrii.hybris.flexiblesearchbuilder.FlexibleSearchQueryConstants.ORDER_BY;
 import static org.bitbucket.andriichukandrii.hybris.flexiblesearchbuilder.FlexibleSearchQueryConstants.SPACE;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 public class OrderByClause extends TerminateQueryChainElement
@@ -25,7 +26,12 @@ protected void appendQuery(final StringBuilder sb)
 	{
 		super.appendQuery(sb);
 
-		sb.append(SPACE).append(ORDER_BY).append(SPACE).append(buildFieldsQueryString(fields)).append(SPACE)
-				.append(sortingType.getOperator());
+		sb.append(SPACE).append(ORDER_BY).append(SPACE).append(joinFields()).append(SPACE).append(sortingType.getOperator());
+	}
+
+	private String joinFields()
+	{
+		final String delimiter = SPACE + sortingType.getOperator() + FIELD_SEPARATOR;
+		return fields.stream().map(Object::toString).collect(Collectors.joining(delimiter));
 	}
 }
diff --git a/...et/andriichukandrii/hybris/flexiblesearchbuilder/FlexibleSearchBuilderBasicUsageTest.java b/...et/andriichukandrii/hybris/flexiblesearchbuilder/FlexibleSearchBuilderBasicUsageTest.java
@@ -37,6 +37,7 @@
 
 //This test relies on the constants and current implementation. However, it serves as a point of safety and a reference now.
 @UnitTest
+@SuppressWarnings({"LawOfDemeter"})
 public class FlexibleSearchBuilderBasicUsageTest
 {
 
@@ -285,7 +286,7 @@ public void testSelectWithOrderBy()
 				selectFrom(ProductModel.class)
 				.orderByAsc(ProductModel.CODE, ProductModel.CATALOGVERSION)
 				.build();
-		assertEquals("Query does not match", "SELECT {pk} FROM {Product} ORDER BY {code},{catalogVersion} ASC", fQuery.getQuery());
+		assertEquals("Query does not match", "SELECT {pk} FROM {Product} ORDER BY {code} ASC,{catalogVersion} ASC", fQuery.getQuery());
 		assertEquals("Wrong number of query parameters", 0, fQuery.getQueryParameters().size());
 	}
 
@@ -356,7 +357,7 @@ public void testSelectWithJoinAndDifferentConditions()
 
 		assertEquals("Query does not match", "SELECT {o.pk} FROM {Order AS o LEFT JOIN OrderEntry AS e ON " +
 				"{o.pk}={e.order} JOIN Product AS p ON {p.pk}={e.product}} WHERE {p.code}=?code1 AND {o.totalPrice}>?totalPrice1" +
-				" GROUP BY {o.pk},{o.code},{e.entryNumber} ORDER BY {o.code},{e.entryNumber} DESC",
+				" GROUP BY {o.pk},{o.code},{e.entryNumber} ORDER BY {o.code} DESC,{e.entryNumber} DESC",
 				fQuery.getQuery());
 		assertEquals("Wrong number of query parameters", 2, fQuery.getQueryParameters().size());
 		assertEquals("Query parameter doesn't match", productCode, fQuery.getQueryParameters().get("code1"));