use DataHelper.getShortUuid for filename prefix (SORMAS-Foundation#4057)

Author: syntakker

sormas-api/src/main/java/de/symeda/sormas/api/utils/DataHelper.java

@@ -1,20 +1,18 @@
-/*******************************************************************************
+/*
  * SORMAS® - Surveillance Outbreak Response Management & Analysis System
- * Copyright © 2016-2018 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
- *
+ * Copyright © 2016-2021 Helmholtz-Zentrum für Infektionsforschung GmbH (HZI)
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
- *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *******************************************************************************/
+ */
+
 package de.symeda.sormas.api.utils;
 
 import java.io.BufferedReader;
@@ -35,7 +33,6 @@
 import java.util.TreeSet;
 
 import de.symeda.sormas.api.AgeGroup;
-import de.symeda.sormas.api.EntityDto;
 import de.symeda.sormas.api.HasUuid;
 import de.symeda.sormas.api.Language;
 import de.symeda.sormas.api.caze.AgeAndBirthDateDto;
@@ -156,15 +153,15 @@ public static byte[] longToBytes(long x, long y) {
 		return buffer.array();
 	}
 
-	public static String getShortUuid(EntityDto domainObject) {
+	public static String getShortUuid(HasUuid domainObject) {
 		return getShortUuid(domainObject.getUuid());
 	}
 
 	public static String getShortUuid(String uuid) {
 
 		if (uuid == null)
 			return null;
-		return uuid.substring(0, 6).toUpperCase();
+		return uuid.substring(0, Math.min(uuid.length(), 6)).toUpperCase();
 	}
 
 	public static class Pair<K, V> implements Serializable {

sormas-api/src/test/java/de/symeda/sormas/api/utils/DataHelperTest.java

@@ -42,4 +42,11 @@ public void testTryParseLong() {
 		assertEquals((Long) Long.MAX_VALUE, DataHelper.tryParseLong(String.valueOf(Long.MAX_VALUE)));
 		assertNull(DataHelper.tryParseLong(String.valueOf(Long.MAX_VALUE) + "0"));
 	}
+
+	@Test
+	public void testShortUuid() {
+		assertEquals("A", DataHelper.getShortUuid("A"));
+		assertEquals("UZOUEH", DataHelper.getShortUuid("UZOUEH-HP7DRG-YOJ74F-PXWL2JZ4"));
+		assertNull(DataHelper.getShortUuid((String) null));
+	}
 }

sormas-ui/src/main/java/de/symeda/sormas/ui/docgeneration/EventDocumentLayout.java

@@ -30,6 +30,7 @@
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
+import de.symeda.sormas.api.utils.DataHelper;
 
 public class EventDocumentLayout extends AbstractDocgenerationLayout {
 
@@ -48,8 +49,7 @@ protected List<String> getAvailableTemplates() {
 
 	@Override
 	protected String generateFilename(String templateFile) {
-		String uuid = eventReferenceDto.getUuid();
-		return uuid.substring(0, Math.min(5, uuid.length())) + "_" + templateFile;
+		return DataHelper.getShortUuid(eventReferenceDto) + "_" + templateFile;
 	}
 
 	@Override

sormas-ui/src/main/java/de/symeda/sormas/ui/docgeneration/QuarantineOrderLayout.java

@@ -43,6 +43,7 @@
 import de.symeda.sormas.api.sample.SampleIndexDto;
 import de.symeda.sormas.api.sample.SampleReferenceDto;
 import de.symeda.sormas.api.user.UserReferenceDto;
+import de.symeda.sormas.api.utils.DataHelper;
 import de.symeda.sormas.api.utils.SortProperty;
 import de.symeda.sormas.ui.UserProvider;
 
@@ -108,8 +109,7 @@ protected List<String> getAvailableTemplates() {
 
 	@Override
 	protected String generateFilename(String templateFile) {
-		String uuid = referenceDto.getUuid();
-		return uuid.substring(0, Math.min(5, uuid.length())) + "_" + templateFile;
+		return DataHelper.getShortUuid(referenceDto) + "_" + templateFile;
 	}
 
 	@Override