Merge pull request #13355 from SORMAS-Foundation/13336-survey-token-sorting-error

sorting issue fix in survey token page

Author: KarnaiahPesula

sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java

@@ -155,7 +155,7 @@ public List<SurveyTokenIndexDto> getIndexList(SurveyTokenCriteria criteria, Inte
 						joins.getGeneratedDocument().get(Document.MIME_TYPE),
 						root.get(SurveyToken.RESPONSE_RECEIVED_DATE)),
 					// add sort properties to select
-					sortBy(sortProperties, root, cb, cq).stream())
+					sortBy(sortProperties, root, cb, cq, joins).stream())
 				.collect(Collectors.toList()));
 
 		Predicate filter = CriteriaBuilderHelper.and(cb, surveyTokenService.buildCriteriaFilter(criteria, cb, root, joins));
@@ -222,7 +222,7 @@ private String getImportTemplateFileName(String baseFilename) {
 		return instanceName + "_" + baseFilename;
 	}
 
-	private List<Selection<?>> sortBy(List<SortProperty> sortProperties, Root<SurveyToken> root, CriteriaBuilder cb, CriteriaQuery<?> cq) {
+	private List<Selection<?>> sortBy(List<SortProperty> sortProperties, Root<SurveyToken> root, CriteriaBuilder cb, CriteriaQuery<?> cq, SurveyTokenJoins joins) {
 
 		List<Selection<?>> selections = new ArrayList<>();
 
@@ -234,8 +234,15 @@ private List<Selection<?>> sortBy(List<SortProperty> sortProperties, Root<Survey
 				switch (sortProperty.propertyName) {
 				case Survey.UUID:
 				case Survey.DISEASE:
+				case SurveyToken.TOKEN:
+				case SurveyToken.ASSIGNMENT_DATE:
+				case SurveyToken.RESPONSE_RECEIVED:
+				case SurveyToken.RESPONSE_RECEIVED_DATE:
 					orderList = orderBuilder.build(root.get(sortProperty.propertyName));
 					break;
+				case SurveyTokenIndexDto.ASSIGNED_CASE_UUID:
+					orderList = orderBuilder.build(joins.getCaseAssignedTo().get(Case.UUID));
+					break;
 				case Survey.NAME:
 					orderList = orderBuilder.build(cb.lower(root.get(sortProperty.propertyName)));
 					break;