Merge branch 'development' of https://github.com/hzi-braunschweig/SORMAS-Project into development

Author: MateStrysewske

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

@@ -5538,4 +5538,9 @@ ALTER TABLE events ALTER COLUMN eventdesc DROP NOT NULL;
 
 INSERT INTO schema_version (version_number, comment) VALUES (273, 'Drop not null constraint from event description #3223');
 
+-- 2020-11-05 Drop not null constraint from event history description #3391
+ALTER TABLE events_history ALTER COLUMN eventdesc DROP NOT NULL;
+
+INSERT INTO schema_version (version_number, comment) VALUES (274, 'Drop not null constraint from event history description #3391');
+
 -- *** Insert new sql commands BEFORE this line ***

sormas-backend/src/test/java/de/symeda/sormas/backend/event/EventFacadeEjbTest.java

@@ -29,6 +29,8 @@
 import java.util.List;
 
 import org.hamcrest.Matchers;
+import org.jboss.weld.bean.builtin.FacadeInjectionPoint;
+import org.junit.Assert;
 import org.junit.Test;
 
 import de.symeda.sormas.api.Disease;
@@ -127,6 +129,39 @@ public void testEventDeletion() {
 		assertNull(getActionFacade().getByUuid(action.getUuid()));
 	}
 
+	@Test
+	public void testEventUpdate() {
+
+		RDCF rdcf = creator.createRDCF("Region", "District", "Community", "Facility");
+		UserDto user = creator
+			.createUser(rdcf.region.getUuid(), rdcf.district.getUuid(), rdcf.facility.getUuid(), "Surv", "Sup", UserRole.SURVEILLANCE_SUPERVISOR);
+		UserDto admin = creator.createUser(rdcf.region.getUuid(), rdcf.district.getUuid(), rdcf.facility.getUuid(), "Ad", "Min", UserRole.ADMIN);
+		EventDto event = creator.createEvent(
+			EventStatus.SIGNAL,
+			EventInvestigationStatus.PENDING,
+			"Title",
+			null,
+			"First",
+			"Name",
+			"12345",
+			TypeOfPlace.PUBLIC_PLACE,
+			null,
+			new Date(),
+			user.toReference(),
+			user.toReference(),
+			Disease.EVD,
+			rdcf.district);
+
+		final String testDescription = "testDescription";
+		final Date startDate = DateHelper.subtractDays(new Date(), 1);
+		event.setEventDesc(testDescription);
+		event.setStartDate(startDate);
+
+		final EventDto updatedEvent = getEventFacade().saveEvent(event);
+		Assert.assertEquals(testDescription, updatedEvent.getEventDesc());
+		Assert.assertEquals(startDate, updatedEvent.getStartDate());
+	}
+
 	@Test
 	public void testGetIndexList() {