SORMAS-Foundation#3927 fix unit test and nullable constraints

Author: FredrikSchäferVitagroup

sormas-api/src/main/java/de/symeda/sormas/api/systemevents/SystemEventStatus.java

@@ -4,7 +4,9 @@
 
 public enum SystemEventStatus {
 
+	STARTED,
 	SUCCESS,
+	CANCELLED,
 	ERROR;
 
 	public String toString() {

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

@@ -11,6 +11,7 @@
 import javax.persistence.Enumerated;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.Objects;
 
@@ -35,6 +36,7 @@ public class SystemEvent extends AbstractDomainObject {
 	private String additionalInfo;
 
 	@Enumerated(EnumType.STRING)
+	@Column(nullable = false)
 	public SystemEventType getType() {
 		return type;
 	}
@@ -44,6 +46,7 @@ public void setType(SystemEventType type) {
 	}
 
 	@Temporal(TemporalType.TIMESTAMP)
+	@Column(nullable = false)
 	public Date getStartDate() {
 		return startDate;
 	}
@@ -62,6 +65,7 @@ public void setEndDate(Date endDate) {
 	}
 
 	@Enumerated(EnumType.STRING)
+	@Column(nullable = false)
 	public SystemEventStatus getStatus() {
 		return status;
 	}

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

@@ -6203,9 +6203,9 @@ CREATE TABLE systemevent (
     changedate timestamp not null,
     creationdate timestamp not null,
     type varchar(255) not null,
-    startdate timestamp,
+    startdate timestamp not null,
     enddate timestamp,
-    status varchar(255),
+    status varchar(255) not null,
     additionalInfo varchar(512),
     primary key(id)
 );

sormas-backend/src/test/java/de/symeda/sormas/backend/systemevent/SystemEventFacadeEjbTest.java

@@ -6,6 +6,7 @@
 import de.symeda.sormas.backend.AbstractBeanTest;
 import de.symeda.sormas.backend.TestDataCreator;
 
+import static org.hamcrest.Matchers.hasSize;
 import org.junit.Test;
 
 import javax.persistence.criteria.CriteriaBuilder;
@@ -16,6 +17,7 @@
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 public class SystemEventFacadeEjbTest extends AbstractBeanTest {
@@ -42,25 +44,26 @@ public void testGetLatestSuccessByType() {
 	@Test
 	public void testDeleteAllDeletableSystemEvents() throws InterruptedException {
 
-		LocalDateTime earliest = LocalDateTime.now();
+		LocalDateTime start = LocalDateTime.now();
+		// Small delay for the timesteps to have different milliseconds
+		Thread.sleep(5L);
 		SystemEventDto systemEvent1 = creator.createSystemEvent(SystemEventType.FETCH_LAB_MESSAGES, new Date(), SystemEventStatus.ERROR);
 		getSystemEventFacade().saveSystemEvent(systemEvent1);
-		// Small delay for the persistence
-		Thread.sleep(100L);
+		Thread.sleep(5L);
 
 		LocalDateTime inBetween = LocalDateTime.now();
+		Thread.sleep(5L);
+
 		SystemEventDto systemEvent2 = creator.createSystemEvent(SystemEventType.FETCH_LAB_MESSAGES, new Date(), SystemEventStatus.SUCCESS);
 		getSystemEventFacade().saveSystemEvent(systemEvent2);
-		// Small delay for the persistence
-		Thread.sleep(100L);
 
 		SystemEventFacadeEjb systemEventFacadeEjb = (SystemEventFacadeEjb) getSystemEventFacade();
 
-		systemEventFacadeEjb.deleteAllDeletableSystemEvents(earliest);
-		assertTrue(getAllSystemEvents().size() == 2);
+		systemEventFacadeEjb.deleteAllDeletableSystemEvents(start);
+		assertThat(getAllSystemEvents(), hasSize(2));
 
 		getSystemEventFacade().deleteAllDeletableSystemEvents(1);
-		assertTrue(getAllSystemEvents().size() == 2);
+		assertThat(getAllSystemEvents(), hasSize(2));
 
 		systemEventFacadeEjb.deleteAllDeletableSystemEvents(inBetween);
 		assertEquals(systemEventFacadeEjb.fromDto(systemEvent2, null), getAllSystemEvents().get(0));