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

Author: sergiupacurariu

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -413,7 +413,6 @@ public interface Strings {
 	String headingSetOutbreakStatus = "headingSetOutbreakStatus";
 	String headingSignsAndSymptoms = "headingSignsAndSymptoms";
 	String headingSomeEventsNotDeleted = "headingSomeEventsNotDeleted";
-	String headingSourceContacts = "headingSourceContacts";
 	String headingStoppedFollowUp = "headingStoppedFollowUp";
 	String headingTasksDeleted = "headingTasksDeleted";
 	String headingTemplateNotAvailable = "headingTemplateNotAvailable";

sormas-api/src/main/resources/strings.properties

@@ -478,7 +478,6 @@ headingExtendFollowUp = Extend follow-up period
 headingExposureInvestigation = Exposure Investigation
 headingEpiDataSourceCaseContacts = Contacts with Source Case
 headingExposureDetails = Exposure Details
-headingSourceContacts = Source Contacts
 headingAnimalContactDetails = Animal Contact Details
 headingBurialDetails = Burial Details
 
@@ -640,7 +639,7 @@ messageEventDearchived = Event has been de-archived
 messageEventParticipantCreated = New person created
 messageEventParticipantSaved = Person data saved
 messageEventParticipantsDeleted = All selected event participants have been deleted
-messageEventParticipantResponsibleJurisdictionUpdated = Changing or removing the responsible jurisdiction could make the current event participant read only or pseudonymized . Are you sure you want to continue?
+messageEventParticipantResponsibleJurisdictionUpdated = Changing or removing the responsible jurisdiction could make the current event participant read-only or pseudonymized. Are you sure you want to continue?
 messageEventSaved = Event data saved
 messageEventsArchived = All selected events have been archived
 messageEventsDearchived = All selected events have been de-archived

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/common/DatabaseHelper.java

@@ -1757,7 +1757,8 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 
 			case 245:
 				currentVersion = 245;
-				getDao(EpiData.class).executeRaw("ALTER TABLE epidata ADD COLUMN exposureDetailsKnown varchar(255);");
+				// Mistakenly added
+				//getDao(EpiData.class).executeRaw("ALTER TABLE epidata ADD COLUMN exposureDetailsKnown varchar(255);");
 
 			case 246:
 				currentVersion = 246;

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseGridDetailed.java

@@ -50,11 +50,11 @@ protected Stream<String> getPersonColumns() {
 			Stream.of(
 				CaseIndexDetailedDto.SEX,
 				CaseIndexDetailedDto.AGE_AND_BIRTH_DATE,
+				CaseIndexDetailedDto.POSTAL_CODE,
 				CaseIndexDetailedDto.CITY,
 				CaseIndexDetailedDto.STREET,
 				CaseIndexDetailedDto.HOUSE_NUMBER,
 				CaseIndexDetailedDto.ADDITIONAL_INFORMATION,
-				CaseIndexDetailedDto.POSTAL_CODE,
 				CaseIndexDetailedDto.PHONE));
 	}
 
@@ -66,11 +66,11 @@ protected void initColumns() {
 
 		getColumn(CaseIndexDetailedDto.SEX).setWidth(80);
 		getColumn(CaseIndexDetailedDto.AGE_AND_BIRTH_DATE).setWidth(100);
+		getColumn(CaseIndexDetailedDto.POSTAL_CODE).setWidth(100);
 		getColumn(CaseIndexDetailedDto.CITY).setWidth(150);
 		getColumn(CaseIndexDetailedDto.STREET).setWidth(150);
 		getColumn(CaseIndexDetailedDto.HOUSE_NUMBER).setWidth(50);
 		getColumn(CaseIndexDetailedDto.ADDITIONAL_INFORMATION).setWidth(200);
-		getColumn(CaseIndexDetailedDto.POSTAL_CODE).setWidth(100);
 		getColumn(CaseIndexDetailedDto.PHONE).setWidth(100);
 		getColumn(CaseIndexDetailedDto.EVENT_COUNT).setWidth(80).setSortable(false);
 		getColumn(CaseIndexDetailedDto.LATEST_EVENT_ID).setWidth(80).setSortable(false);

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactGridDetailed.java

@@ -45,11 +45,11 @@ protected Stream<String> getPersonColumns() {
 				ContactIndexDetailedDto.SEX,
 				ContactIndexDetailedDto.APPROXIMATE_AGE,
 				ContactIndexDetailedDto.DISTRICT_NAME,
+				ContactIndexDetailedDto.POSTAL_CODE,
 				ContactIndexDetailedDto.CITY,
 				ContactIndexDetailedDto.STREET,
 				ContactIndexDetailedDto.HOUSE_NUMBER,
 				ContactIndexDetailedDto.ADDITIONAL_INFORMATION,
-				ContactIndexDetailedDto.POSTAL_CODE,
 				ContactIndexDetailedDto.PHONE));
 	}
 
@@ -67,11 +67,11 @@ protected void initColumns() {
 		getColumn(ContactIndexDetailedDto.SEX).setWidth(80);
 		getColumn(ContactIndexDetailedDto.APPROXIMATE_AGE).setWidth(50);
 		getColumn(ContactIndexDetailedDto.DISTRICT_NAME).setWidth(150);
+		getColumn(ContactIndexDetailedDto.POSTAL_CODE).setWidth(100);
 		getColumn(ContactIndexDetailedDto.CITY).setWidth(150);
 		getColumn(ContactIndexDetailedDto.STREET).setWidth(150);
 		getColumn(ContactIndexDetailedDto.HOUSE_NUMBER).setWidth(50);
 		getColumn(ContactIndexDetailedDto.ADDITIONAL_INFORMATION).setWidth(200);
-		getColumn(ContactIndexDetailedDto.POSTAL_CODE).setWidth(100);
 		getColumn(ContactIndexDetailedDto.PHONE).setWidth(100);
 		((Column<ContactIndexDetailedDto, CaseReferenceDto>) getColumn(ContactIndexDetailedDto.CAZE)).setWidth(150)
 			.setRenderer(entry -> entry != null ? entry.getUuid() : null, new UuidRenderer());

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/SourceContactListComponent.java

@@ -64,7 +64,7 @@ private void createSourceContactListComponent(SourceContactList sourceContactLis
 		addComponent(list);
 		list.reload();
 
-		Label sourceContactsHeader = new Label(I18nProperties.getString(Strings.headingSourceContacts));
+		Label sourceContactsHeader = new Label(I18nProperties.getString(Strings.headingEpiDataSourceCaseContacts));
 		sourceContactsHeader.addStyleName(CssStyles.H3);
 		componentHeader.addComponent(sourceContactsHeader);
 

sormas-ui/src/main/java/de/symeda/sormas/ui/document/DocumentListComponent.java

@@ -28,9 +28,9 @@
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
+import com.vaadin.ui.Upload;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
-import com.vaadin.v7.ui.Upload;
 
 import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.ReferenceDto;
@@ -96,11 +96,10 @@ private Button buildUploadButton() {
 		uploadLayout.setWidth(250, Unit.PIXELS);
 
 		DocumentReceiver receiver = new DocumentReceiver(relatedEntityType, entityRef.getUuid(), this::reload);
-		@SuppressWarnings("deprecation")
 		Upload upload = new Upload("", receiver);
+		receiver.setUpload(upload);
 		upload.setButtonCaption(I18nProperties.getCaption(Captions.importImportData));
 		CssStyles.style(upload, CssStyles.VSPACE_2);
-		upload.addSucceededListener(receiver);
 
 		uploadLayout.addComponentsAndExpand(upload);
 

sormas-ui/src/main/java/de/symeda/sormas/ui/importer/DocumentReceiver.java

@@ -14,20 +14,24 @@
  */
 package de.symeda.sormas.ui.importer;
 
+import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Date;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.vaadin.server.Page;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
-import com.vaadin.v7.ui.Upload;
+import com.vaadin.ui.Upload;
+import com.vaadin.ui.Upload.FailedEvent;
+import com.vaadin.ui.Upload.StartedEvent;
 
 import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.document.DocumentDto;
@@ -41,13 +45,18 @@
 import de.symeda.sormas.ui.UserProvider;
 import de.symeda.sormas.ui.utils.VaadinUiUtil;
 
-@SuppressWarnings("deprecation")
-public class DocumentReceiver implements com.vaadin.v7.ui.Upload.Receiver, com.vaadin.v7.ui.Upload.SucceededListener {
+public class DocumentReceiver
+	implements Upload.Receiver, Upload.StartedListener, Upload.ProgressListener, Upload.SucceededListener, Upload.FailedListener {
+
+	private static final long serialVersionUID = 1L;
+	private static final long MAX_CONTENT_LENGTH = 52_428_800L;
 
+	private final Logger logger = LoggerFactory.getLogger(getClass());
 	private final DocumentRelatedEntityType relatedEntityType;
 	private final String relatedEntityUuid;
 	private final Runnable callback;
 	private File file;
+	private Upload upload;
 
 	public DocumentReceiver(DocumentRelatedEntityType relatedEntityType, String relatedEntityUuid, Runnable callback) {
 		this.relatedEntityType = relatedEntityType;
@@ -57,7 +66,6 @@ public DocumentReceiver(DocumentRelatedEntityType relatedEntityType, String rela
 
 	@Override
 	public OutputStream receiveUpload(String fileName, String mimeType) {
-		final FileOutputStream fos;
 		// Reject empty files
 		if (fileName == null || fileName.isEmpty()) {
 			file = null;
@@ -73,10 +81,12 @@ public OutputStream receiveUpload(String fileName, String mimeType) {
 		try {
 			String newFileName = ImportExportUtils.TEMP_FILE_PREFIX + "_document_upload" + DateHelper.formatDateForExport(new Date()) + "_"
 				+ DataHelper.getShortUuid(UserProvider.getCurrent().getUuid());
-			file = new File(Paths.get(FacadeProvider.getConfigFacade().getTempFilesPath()).resolve(newFileName).toString());
-			fos = new FileOutputStream(file);
-		} catch (FileNotFoundException e) {
-			file = null;
+			file = Paths.get(FacadeProvider.getConfigFacade().getTempFilesPath()).resolve(newFileName).toFile();
+			return new BufferedOutputStream(Files.newOutputStream(file.toPath()));
+
+		} catch (IOException e) {
+			deleteFile();
+			logger.error(e.getMessage(), e);
 			new Notification(
 				I18nProperties.getString(Strings.headingImportError),
 				I18nProperties.getString(Strings.messageImportError),
@@ -85,12 +95,28 @@ public OutputStream receiveUpload(String fileName, String mimeType) {
 			// Workaround because returning null here throws an uncatchable UploadException
 			return new ByteArrayOutputStream();
 		}
+	}
 
-		return fos;
+	@Override
+	public void uploadStarted(StartedEvent event) {
+		if (event.getContentLength() > MAX_CONTENT_LENGTH) {
+			event.getUpload().interruptUpload();
+			new Notification(I18nProperties.getString(Strings.headingImportFailed), "", Notification.Type.ERROR_MESSAGE, false)
+				.show(Page.getCurrent());
+		}
+	}
+
+	@Override
+	public void updateProgress(long readBytes, long contentLength) {
+		if (contentLength < 0 && Math.max(readBytes, contentLength) > MAX_CONTENT_LENGTH) {
+			upload.interruptUpload();
+			new Notification(I18nProperties.getString(Strings.headingImportFailed), "", Notification.Type.ERROR_MESSAGE, false)
+				.show(Page.getCurrent());
+		}
 	}
 
 	@Override
-	public void uploadSucceeded(com.vaadin.v7.ui.Upload.SucceededEvent succeededEvent) {
+	public void uploadSucceeded(Upload.SucceededEvent succeededEvent) {
 		if (file == null) {
 			return;
 		}
@@ -108,13 +134,20 @@ public void uploadSucceeded(com.vaadin.v7.ui.Upload.SucceededEvent succeededEven
 					if (ok) {
 						FacadeProvider.getDocumentFacade().deleteDocument(existing);
 						saveDocument(succeededEvent);
+					} else {
+						deleteFile();
 					}
 				});
 		} else {
 			saveDocument(succeededEvent);
 		}
 	}
 
+	@Override
+	public void uploadFailed(FailedEvent event) {
+		deleteFile();
+	}
+
 	private void saveDocument(Upload.SucceededEvent succeededEvent) {
 		try {
 			DocumentDto document = DocumentDto.build();
@@ -133,8 +166,26 @@ private void saveDocument(Upload.SucceededEvent succeededEvent) {
 				I18nProperties.getString(Strings.headingUploadSuccess),
 				I18nProperties.getString(Strings.messageUploadSuccessful));
 		} catch (IOException | IllegalArgumentException e) {
-			new Notification(I18nProperties.getString(Strings.headingImportFailed), e.getMessage(), Notification.Type.ERROR_MESSAGE, false)
+			logger.error(e.getMessage(), e);
+			new Notification(I18nProperties.getString(Strings.headingImportFailed), "", Notification.Type.ERROR_MESSAGE, false)
 				.show(Page.getCurrent());
+		} finally {
+			deleteFile();
 		}
 	}
+
+	private void deleteFile() {
+		if (file != null) {
+			file.delete();
+			file = null;
+		}
+	}
+
+	public void setUpload(Upload upload) {
+		this.upload = upload;
+		upload.addStartedListener(this);
+		upload.addProgressListener(this);
+		upload.addSucceededListener(this);
+		upload.addFailedListener(this);
+	}
 }