Merge pull request #13535 from SORMAS-Foundation/bugfix-aefi_events_sorting

Added missing columns in AEFI and Events sorting

Author: raulbob

sormas-backend/src/main/java/de/symeda/sormas/backend/adverseeventsfollowingimmunization/AefiInvestigationService.java

@@ -88,6 +88,8 @@ public class AefiInvestigationService extends AbstractCoreAdoService<AefiInvesti
 	@EJB
 	private FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal featureConfigurationFacade;
 
+	private static final String PRIMARY_VACCINE_COLUMN = "primaryVaccineColumn";
+
 	public AefiInvestigationService() {
 		super(AefiInvestigation.class, DeletableEntityType.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION);
 	}
@@ -264,12 +266,18 @@ private List<Selection<?>> sortBy(List<SortProperty> sortProperties, AefiInvesti
 				Expression<?> expression;
 				switch (sortProperty.propertyName) {
 				case AefiInvestigationIndexDto.UUID:
-				case AefiInvestigationIndexDto.DISEASE:
+				case AefiInvestigationIndexDto.INVESTIGATION_CASE_ID:
 				case AefiInvestigationIndexDto.INVESTIGATION_DATE:
+				case AefiInvestigationIndexDto.INVESTIGATION_STATUS:
+				case AefiInvestigationIndexDto.INVESTIGATION_STAGE:
 				case AefiInvestigationIndexDto.STATUS_ON_DATE_OF_INVESTIGATION:
 				case AefiInvestigationIndexDto.AEFI_CLASSIFICATION:
+				case AefiInvestigationIndexDto.REPORT_DATE:
 					expression = queryContext.getRoot().get(sortProperty.propertyName);
 					break;
+				case AefiInvestigationIndexDto.DISEASE:
+					expression = queryContext.getJoins().getAefiJoins().getImmunizationJoins().getRoot().get(Immunization.DISEASE);
+					break;					
 				case AefiInvestigationIndexDto.AEFI_REPORT_UUID:
 					expression = queryContext.getJoins().getAefi().get(Aefi.UUID);
 					break;
@@ -285,6 +293,9 @@ private List<Selection<?>> sortBy(List<SortProperty> sortProperties, AefiInvesti
 				case AefiInvestigationIndexDto.SEX:
 					expression = queryContext.getJoins().getAefiJoins().getImmunizationJoins().getPerson().get(Person.SEX);
 					break;
+				case PRIMARY_VACCINE_COLUMN:
+					expression = queryContext.getJoins().getAefiJoins().getPrimarySuspectVaccination().get(Vaccination.VACCINE_NAME);
+					break;
 				case AefiInvestigationIndexDto.REGION:
 					expression = cb.lower(
 						queryContext.getJoins()

sormas-backend/src/main/java/de/symeda/sormas/backend/event/EventFacadeEjb.java

@@ -764,14 +764,16 @@ private List<Selection<?>> sortBy(List<SortProperty> sortProperties, EventQueryC
 				case EventIndexDto.EVENT_INVESTIGATION_STATUS:
 				case EventIndexDto.EVENT_MANAGEMENT_STATUS:
 				case EventIndexDto.DISEASE:
-				case EventIndexDto.DISEASE_VARIANT:
 				case EventIndexDto.START_DATE:
 				case EventIndexDto.EVOLUTION_DATE:
 				case EventIndexDto.SRC_TYPE:
 				case EventIndexDto.REPORT_DATE_TIME:
 				case EventIndexDto.EVENT_IDENTIFICATION_SOURCE:
 					orderList = orderBuilder.build(eventQueryContext.getRoot().get(sortProperty.propertyName));
 					break;
+				case EventIndexDto.DISEASE_VARIANT:
+					orderList = orderBuilder.build(eventQueryContext.getRoot().get(Event.DISEASE_VARIANT_VALUE));
+					break;
 				case EventIndexDto.EXTERNAL_ID:
 				case EventIndexDto.EXTERNAL_TOKEN:
 				case EventIndexDto.INTERNAL_TOKEN: