🐛 multiple messages couldn't be fetched: missing comparable - invalid "SQL WHERE IN"

Author: Pa-Touche

sormas-api/src/main/java/de/symeda/sormas/api/externalmessage/survey/ExternalMessageSurveyResponseRequest.java

@@ -19,7 +19,7 @@
  * Mandatory fields that require
  * Will be present for {@link ExternalMessageType#SURVEY_RESPONSE}.
  */
-public class ExternalMessageSurveyResponseRequest implements Serializable {
+public class ExternalMessageSurveyResponseRequest implements Serializable, Comparable<ExternalMessageSurveyResponseRequest> {
 
 	private static final long serialVersionUID = 1L;
 
@@ -243,4 +243,19 @@ public String toString() {
 			+ origin + '\'' + ", inputLanguages=" + inputLanguages + ", allowFallbackValues=" + allowFallbackValues + ", skipIfAlreadyProcessed="
 			+ skipIfAlreadyProcessed + '}';
 	}
+
+	@Override
+	public int compareTo(ExternalMessageSurveyResponseRequest o) {
+
+		if (this.responseReceivedDate == null && o.responseReceivedDate == null) {
+			return 0;
+		}
+		if (this.responseReceivedDate == null) {
+			return -1;
+		}
+		if (o.responseReceivedDate == null) {
+			return 1;
+		}
+		return this.responseReceivedDate.compareTo(o.responseReceivedDate);
+	}
 }

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

@@ -19,11 +19,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -35,54 +31,31 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Tuple;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Selection;
+import javax.persistence.criteria.*;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.ReferenceDto;
 import de.symeda.sormas.api.caze.CaseDataDto;
-import de.symeda.sormas.api.docgeneneration.DocumentTemplateCriteria;
-import de.symeda.sormas.api.docgeneneration.DocumentTemplateDto;
-import de.symeda.sormas.api.docgeneneration.DocumentTemplateEntities;
-import de.symeda.sormas.api.docgeneneration.DocumentTemplateException;
-import de.symeda.sormas.api.docgeneneration.DocumentVariables;
-import de.symeda.sormas.api.docgeneneration.DocumentWorkflow;
-import de.symeda.sormas.api.docgeneneration.RootEntityType;
+import de.symeda.sormas.api.docgeneneration.*;
 import de.symeda.sormas.api.document.DocumentDto;
 import de.symeda.sormas.api.externalemail.AttachmentException;
 import de.symeda.sormas.api.externalemail.ExternalEmailException;
 import de.symeda.sormas.api.externalemail.ExternalEmailOptionsDto;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
 import de.symeda.sormas.api.i18n.Validations;
-import de.symeda.sormas.api.survey.SurveyCriteria;
-import de.symeda.sormas.api.survey.SurveyDocumentOptionsDto;
-import de.symeda.sormas.api.survey.SurveyDto;
-import de.symeda.sormas.api.survey.SurveyFacade;
-import de.symeda.sormas.api.survey.SurveyIndexDto;
-import de.symeda.sormas.api.survey.SurveyReferenceDto;
+import de.symeda.sormas.api.survey.*;
 import de.symeda.sormas.api.user.UserRight;
 import de.symeda.sormas.api.utils.SortProperty;
 import de.symeda.sormas.api.utils.ValidationException;
 import de.symeda.sormas.api.utils.ValidationRuntimeException;
 import de.symeda.sormas.backend.FacadeHelper;
 import de.symeda.sormas.backend.caze.CaseService;
 import de.symeda.sormas.backend.common.CriteriaBuilderHelper;
-import de.symeda.sormas.backend.docgeneration.DocGenerationHelper;
-import de.symeda.sormas.backend.docgeneration.DocumentTemplate;
-import de.symeda.sormas.backend.docgeneration.DocumentTemplateEntitiesBuilder;
-import de.symeda.sormas.backend.docgeneration.DocumentTemplateFacadeEjb;
+import de.symeda.sormas.backend.docgeneration.*;
 import de.symeda.sormas.backend.docgeneration.DocumentTemplateFacadeEjb.DocumentTemplateFacadeEjbLocal;
-import de.symeda.sormas.backend.docgeneration.DocumentTemplateService;
-import de.symeda.sormas.backend.docgeneration.RootEntities;
-import de.symeda.sormas.backend.docgeneration.TemplateEngine;
 import de.symeda.sormas.backend.document.DocumentService;
 import de.symeda.sormas.backend.externalemail.ExternalEmailFacadeEjb.ExternalEmailFacadeEjbLocal;
 import de.symeda.sormas.backend.user.UserService;
@@ -241,7 +214,7 @@ public List<SurveyDto> getByExternalIds(List<String> externalIds) {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Survey> cq = cb.createQuery(Survey.class);
 		Root<Survey> from = cq.from(Survey.class);
-		cq.where(cb.equal(from.get(Survey.EXTERNAL_ID), externalIds));
+		cq.where(from.get(Survey.EXTERNAL_ID).in(externalIds));
 		cq.orderBy(cb.desc(from.get(Survey.NAME)));
 
 		return getAsStream(cq).map(this::toDto).collect(Collectors.toList());