SORMAS-Foundation#3927 fix findings

changed column type of additionalInfo and simplified query in the SystemEventFacadeEjb

Author: FredrikSchäferVitagroup

sormas-backend/src/main/java/de/symeda/sormas/backend/systemevent/SystemEvent.java

@@ -74,7 +74,7 @@ public void setStatus(SystemEventStatus status) {
 		this.status = status;
 	}
 
-	@Column(length = COLUMN_LENGTH_DEFAULT)
+	@Column(columnDefinition = "text")
 	public String getAdditionalInfo() {
 		return additionalInfo;
 	}

sormas-backend/src/main/java/de/symeda/sormas/backend/systemevent/SystemEventFacadeEjb.java

@@ -14,6 +14,7 @@
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -45,17 +46,15 @@ public class SystemEventFacadeEjb implements SystemEventFacade {
 	public Date getLatestSuccessByType(SystemEventType type) {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<SystemEvent> cq = cb.createQuery(SystemEvent.class);
-		Root<SystemEvent> systemEvent = cq.from(SystemEvent.class);
-
-		Predicate filter = cb.equal(systemEvent.get(SystemEvent.STATUS), SystemEventStatus.SUCCESS);
-		cq.where(filter);
-		cq.orderBy(cb.desc(systemEvent.get(SystemEvent.START_DATE)));
+		Root<SystemEvent> systemEventRoot = cq.from(SystemEvent.class);
 
-		List<SystemEvent> resultList = em.createQuery(cq).getResultList();
+		cq.where(cb.equal(systemEventRoot.get(SystemEvent.STATUS), SystemEventStatus.SUCCESS));
+		cq.orderBy(cb.desc(systemEventRoot.get(SystemEvent.START_DATE)));
 
-		if (resultList != null) {
-			return resultList.get(0).getStartDate();
-		} else {
+		try {
+			SystemEvent systemEvent = em.createQuery(cq).setMaxResults(1).getSingleResult();
+			return systemEvent.getStartDate();
+		} catch (NoResultException e) {
 			return null;
 		}
 	}

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -6206,7 +6206,7 @@ CREATE TABLE systemevent (
     startdate timestamp not null,
     enddate timestamp,
     status varchar(255) not null,
-    additionalInfo varchar(512),
+    additionalInfo text,
     primary key(id)
 );