feedback from Review (SORMAS-Foundation#4057)

Author: syntakker

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

@@ -161,7 +161,7 @@ public static String getShortUuid(String uuid) {
 
 		if (uuid == null)
 			return null;
-		return uuid.substring(0, Math.min(uuid.length(), 6)).toUpperCase();
+		return uuid.substring(0, 6).toUpperCase();
 	}
 
 	public static class Pair<K, V> implements Serializable {

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

@@ -2,10 +2,13 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
 import de.symeda.sormas.api.Disease;
+import de.symeda.sormas.api.EntityDto;
+import de.symeda.sormas.api.ReferenceDto;
 import de.symeda.sormas.api.caze.CaseDataDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
 
@@ -45,8 +48,26 @@ public void testTryParseLong() {
 
 	@Test
 	public void testShortUuid() {
-		assertEquals("A", DataHelper.getShortUuid("A"));
+		EntityDto entityDto = new EntityDto() {
+		};
+		entityDto.setUuid("ABCDEF-GHIJKL");
+
+		assertEquals("ABCDEF", DataHelper.getShortUuid(entityDto));
+
+		ReferenceDto referenceDto = new ReferenceDto() {
+		};
+		referenceDto.setUuid("MNOPQR-STUVWX");
+
+		assertEquals("MNOPQR", DataHelper.getShortUuid(referenceDto));
+
 		assertEquals("UZOUEH", DataHelper.getShortUuid("UZOUEH-HP7DRG-YOJ74F-PXWL2JZ4"));
 		assertNull(DataHelper.getShortUuid((String) null));
+
+		try {
+			assertEquals("A", DataHelper.getShortUuid("A"));
+			fail("getShortUuid should not be graceful on Uuids that are too short.");
+		} catch (StringIndexOutOfBoundsException e) {
+			assertEquals("begin 0, end 6, length 1", e.getMessage());
+		}
 	}
 }

sormas-cargoserver/src/main/resources/layout/sormasfolders/custom/docgeneration/eventHandout/ExampleDocumentTemplateEventHandout.html

@@ -12,7 +12,7 @@ <h2>$event.uuid</h2>
     Community: <b>$!event_eventLocation_community</b>
 </p>
 
-<p>Reported: $event_reportDateTime by $event_reportingUser_firstName $event_reportingUser_lastName</p>
+<p>Reported: <b>$event_reportDateTime</b> by <b>$event_reportingUser_firstName $event_reportingUser_lastName</b></p>
 
 <h2>Description</h2>
 
@@ -24,11 +24,11 @@ <h1>Actions</h1>
 <div class="actions">
     <h2>$action.title</h2>
     <p>
-        date: $F.format($action.getDate())<br/>
-        status: $!action.getStatus()<br/>
-        status changed: $!F.format($action.getStatusChangeDate())<br/>
-        created: $F.format($action.getCreationDate())<br/>
-        modified: $!F.format($action.getChangeDate())
+        date: <b>$F.format($action.getDate())</b><br/>
+        status: <b>$!action.getActionStatus()</b><br/>
+        status changed: <b>$!F.format($action.getStatusChangeDate())</b><br/>
+        created: <b>$F.format($action.getCreationDate())</b><br/>
+        modified: <b>$!F.format($action.getChangeDate())</b>
     </p>
     <div>#if($action.getDescription()) $action.getDescription() #else <span class="red">*</span> #end</div>
     <div>#if($action.reply) $action.reply #else <span class="red">*</span> #end</div>

sormas-ui/src/main/resources/ExampleDocumentTemplateEventHandout.html

@@ -12,7 +12,7 @@ <h2>$event.uuid</h2>
     Community: <b>$!event_eventLocation_community</b>
 </p>
 
-<p>Reported: $event_reportDateTime by $event_reportingUser_firstName $event_reportingUser_lastName</p>
+<p>Reported: <b>$event_reportDateTime</b> by <b>$event_reportingUser_firstName $event_reportingUser_lastName</b></p>
 
 <h2>Description</h2>
 
@@ -24,11 +24,11 @@ <h1>Actions</h1>
 <div class="actions">
     <h2>$action.title</h2>
     <p>
-        date: $F.format($action.getDate())<br/>
-        status: $!action.getStatus()<br/>
-        status changed: $!F.format($action.getStatusChangeDate())<br/>
-        created: $F.format($action.getCreationDate())<br/>
-        modified: $!F.format($action.getChangeDate())
+        date: <b>$F.format($action.getDate())</b><br/>
+        status: <b>$!action.getActionStatus()</b><br/>
+        status changed: <b>$!F.format($action.getStatusChangeDate())</b><br/>
+        created: <b>$F.format($action.getCreationDate())</b><br/>
+        modified: <b>$!F.format($action.getChangeDate())</b>
     </p>
     <div>#if($action.getDescription()) $action.getDescription() #else <span class="red">*</span> #end</div>
     <div>#if($action.reply) $action.reply #else <span class="red">*</span> #end</div>