Merge pull request SORMAS-Foundation#2714 from fuatse/feature-2670_add_externalId_to_person_if_german

Add externalId to Person and show it on PersonEditForm on German Systems

Author: MateStrysewske

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

@@ -1039,6 +1039,7 @@ public interface Captions {
 	String Person_educationDetails = "Person.educationDetails";
 	String Person_educationType = "Person.educationType";
 	String Person_emailAddress = "Person.emailAddress";
+	String Person_externalId = "Person.externalId";
 	String Person_fathersName = "Person.fathersName";
 	String Person_generalPractitionerDetails = "Person.generalPractitionerDetails";
 	String Person_gestationAgeAtBirth = "Person.gestationAgeAtBirth";

sormas-api/src/main/java/de/symeda/sormas/api/person/PersonDto.java

@@ -110,6 +110,7 @@ public class PersonDto extends PseudonymizableDto {
 
 	public static final String HAS_COVID_APP = "hasCovidApp";
 	public static final String COVID_CODE_DELIVERED = "covidCodeDelivered";
+	public static final String EXTERNAL_ID = "externalId";
 
 	// Fields are declared in the order they should appear in the import template
 
@@ -277,6 +278,9 @@ public class PersonDto extends PseudonymizableDto {
 	private boolean covidCodeDelivered;
 
 	private SymptomJournalStatus symptomJournalStatus;
+	@SensitiveData
+	@HideForCountriesExcept(countries = "de")
+	private String externalId;
 
 	public Integer getBirthdateDD() {
 		return birthdateDD;
@@ -695,6 +699,14 @@ public void setCovidCodeDelivered(boolean covidCodeDelivered) {
 		this.covidCodeDelivered = covidCodeDelivered;
 	}
 
+	public String getExternalId() {
+		return externalId;
+	}
+
+	public void setExternalId(String externalId) {
+		this.externalId = externalId;
+	}
+
 	@Override
 	public String toString() {
 		return buildCaption(firstName, lastName);

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

@@ -1196,6 +1196,7 @@ Person.nationalHealthId=National health ID
 Person.uuid=Person ID
 Person.hasCovidApp=Has COVID app
 Person.covidCodeDelivered=COVID code was generated and delivered
+Person.externalId=External ID
 
 pointOfEntryActivePointsOfEntry=Active points of entry
 pointOfEntryArchivedPointsOfEntry=Archived points of entry

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

@@ -128,7 +128,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
 	public static final String DATABASE_NAME = "sormas.db";
 	// any time you make changes to your database objects, you may have to increase the database version
 
-	public static final int DATABASE_VERSION = 227;
+	public static final int DATABASE_VERSION = 229;
 
 	private static DatabaseHelper instance = null;
 
@@ -1590,6 +1590,10 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 				getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD COLUMN quarantineReduced boolean DEFAULT false;");
 				getDao(Case.class).executeRaw("ALTER TABLE cases ADD COLUMN quarantineReduced boolean DEFAULT false;");
 
+			case 228:
+				currentVersion = 228;
+				getDao(Person.class).executeRaw("ALTER TABLE person ADD COLUMN externalId varchar(255);");
+
 				// ATTENTION: break should only be done after last version
 				break;
 			default:

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/person/Person.java

@@ -185,6 +185,9 @@ public class Person extends PseudonymizableAdo {
 
 	private List<Location> addresses = new ArrayList<>();
 
+	@Column
+	private String externalId;
+
 	public Person() {
 	}
 
@@ -595,4 +598,8 @@ public List<Location> getAddresses() {
 	public void setAddresses(List<Location> addresses) {
 		this.addresses = addresses;
 	}
+
+	public String getExternalId() { return externalId; }
+
+	public void setExternalId(String externalId) { this.externalId = externalId; }
 }

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/person/PersonDtoHelper.java

@@ -139,6 +139,8 @@ public void fillInnerFromDto(Person target, PersonDto source) {
 			}
 		}
 		target.setAddresses(addresses);
+
+		target.setExternalId(source.getExternalId());
 	}
 
 	@Override
@@ -254,6 +256,8 @@ public void fillInnerFromAdo(PersonDto target, Person source) {
 			locationDtos.add(locationDto);
 		}
 		target.setAddresses(locationDtos);
+
+		target.setExternalId(source.getExternalId());
 	}
 
 	public static PersonReferenceDto toReferenceDto(Person ado) {

sormas-backend/src/main/java/de/symeda/sormas/backend/person/Person.java

@@ -114,6 +114,7 @@ public class Person extends AbstractDomainObject {
 	public static final String ADDRESSES = "addresses";
 
 	public static final String SYMPTOM_JOURNAL_STATUS = "symptomJournalStatus";
+	public static final String EXTERNAL_ID = "externalId";
 
 	private String firstName;
 	private String lastName;
@@ -177,6 +178,7 @@ public class Person extends AbstractDomainObject {
 
 	private boolean hasCovidApp;
 	private boolean covidCodeDelivered;
+	private String externalId;
 
 	@Column(nullable = false, length = COLUMN_LENGTH_DEFAULT)
 	public String getFirstName() {
@@ -652,6 +654,11 @@ public void setCovidCodeDelivered(boolean covidCodeDelivered) {
 		this.covidCodeDelivered = covidCodeDelivered;
 	}
 
+	@Column
+	public String getExternalId() { return externalId; }
+
+	public void setExternalId(String externalId) { this.externalId = externalId; }
+
 	@Override
 	public String toString() {
 		return PersonDto.buildCaption(firstName, lastName);

sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonFacadeEjb.java

@@ -530,6 +530,7 @@ public Person fillOrBuildEntity(@NotNull PersonDto source, Person target) {
 
 		target.setHasCovidApp(source.isHasCovidApp());
 		target.setCovidCodeDelivered(source.isCovidCodeDelivered());
+		target.setExternalId(source.getExternalId());
 
 		return target;
 	}
@@ -691,6 +692,7 @@ public static PersonDto toDto(Person source) {
 
 		target.setHasCovidApp(source.isHasCovidApp());
 		target.setCovidCodeDelivered(source.isCovidCodeDelivered());
+		target.setExternalId(source.getExternalId());
 
 		return target;
 	}

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

@@ -5317,4 +5317,10 @@ ALTER TABLE contact_history ADD COLUMN quarantinereduced boolean DEFAULT false;
 
 INSERT INTO schema_version (version_number, comment) VALUES (253, 'Store if quarantine period has been reduced #2235');
 
+-- 2020-09-21 Add new field externalId as per feature #2670
+ALTER TABLE person ADD COLUMN externalid varchar(255);
+ALTER TABLE person_history ADD COLUMN externalid varchar(255);
+
+INSERT INTO schema_version (version_number, comment) VALUES (254, 'Add new field externalId as per feature #2670');
+
 -- *** Insert new sql commands BEFORE this line ***

sormas-ui/src/main/java/de/symeda/sormas/ui/person/PersonEditForm.java

@@ -135,6 +135,9 @@ public class PersonEditForm extends AbstractEditForm<PersonDto> {
                             oneOfTwoCol(PersonDto.BURIAL_PLACE_DESCRIPTION)
                     ) +
                     fluidRowLocs(PersonDto.PASSPORT_NUMBER, PersonDto.NATIONAL_HEALTH_ID) +
+					fluidRowLocs(PersonDto.EXTERNAL_ID, "") +
+
+
 
 					fluidRowLocs(PersonDto.HAS_COVID_APP, PersonDto.COVID_CODE_DELIVERED) +
 
@@ -260,7 +263,8 @@ protected void addFields() {
 			PersonDto.PHONE_OWNER,
 			PersonDto.EMAIL_ADDRESS,
 			PersonDto.PASSPORT_NUMBER,
-			PersonDto.NATIONAL_HEALTH_ID);
+			PersonDto.NATIONAL_HEALTH_ID,
+			PersonDto.EXTERNAL_ID);
 
 		addField(PersonDto.HAS_COVID_APP).addStyleName(CssStyles.FORCE_CAPTION_CHECKBOX);
 		addField(PersonDto.COVID_CODE_DELIVERED).addStyleName(CssStyles.FORCE_CAPTION_CHECKBOX);