SORMAS-Foundation#3210 sormas to sormas transfer samples android

Author: lgal

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

@@ -137,7 +137,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 = 237;
+	public static final int DATABASE_VERSION = 238;
 
 	private static DatabaseHelper instance = null;
 
@@ -1705,6 +1705,12 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 				currentVersion = 236;
 				getDao(Contact.class).executeRaw("ALTER TABLE contacts ADD COLUMN returningTraveler varchar(255);");
 
+			case 237:
+				currentVersion = 237;
+				getDao(Sample.class)
+					.executeRaw("ALTER TABLE samples ADD COLUMN sormasToSormasOriginInfo_id bigint REFERENCES sormasToSormasOriginInfo(id);");
+				getDao(Sample.class).executeRaw("ALTER TABLE samples ADD COLUMN ownershipHandedOver boolean;");
+
 				// ATTENTION: break should only be done after last version
 				break;
 			default:

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/contact/ContactDtoHelper.java

@@ -275,6 +275,10 @@ public void fillInnerFromAdo(ContactDto target, Contact source) {
 			target.setHealthConditions(null);
 		}
 
+		if (source.getSormasToSormasOriginInfo() != null) {
+			target.setSormasToSormasOriginInfo(sormasToSormasOriginInfoDtoHelper.adoToDto(source.getSormasToSormasOriginInfo()));
+		}
+
 		target.setEndOfQuarantineReason(source.getEndOfQuarantineReason());
 		target.setEndOfQuarantineReasonDetails(source.getEndOfQuarantineReasonDetails());
 

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/sample/Sample.java

@@ -46,6 +46,7 @@
 import de.symeda.sormas.app.backend.contact.Contact;
 import de.symeda.sormas.app.backend.event.EventParticipant;
 import de.symeda.sormas.app.backend.facility.Facility;
+import de.symeda.sormas.app.backend.sormastosormas.SormasToSormasOriginInfo;
 import de.symeda.sormas.app.backend.user.User;
 import de.symeda.sormas.app.util.DateFormatHelper;
 
@@ -170,6 +171,11 @@ public class Sample extends PseudonymizableAdo {
 	@Column(length = COLUMN_LENGTH_DEFAULT)
 	private String requestedOtherAdditionalTests;
 
+	@DatabaseField(foreign = true, foreignAutoRefresh = true)
+	private SormasToSormasOriginInfo sormasToSormasOriginInfo;
+	@DatabaseField
+	private boolean ownershipHandedOver;
+
 	public Case getAssociatedCase() {
 		return associatedCase;
 	}
@@ -509,4 +515,20 @@ public Float getReportLatLonAccuracy() {
 	public void setReportLatLonAccuracy(Float reportLatLonAccuracy) {
 		this.reportLatLonAccuracy = reportLatLonAccuracy;
 	}
+
+	public SormasToSormasOriginInfo getSormasToSormasOriginInfo() {
+		return sormasToSormasOriginInfo;
+	}
+
+	public void setSormasToSormasOriginInfo(SormasToSormasOriginInfo sormasToSormasOriginInfo) {
+		this.sormasToSormasOriginInfo = sormasToSormasOriginInfo;
+	}
+
+	public boolean isOwnershipHandedOver() {
+		return ownershipHandedOver;
+	}
+
+	public void setOwnershipHandedOver(boolean ownershipHandedOver) {
+		this.ownershipHandedOver = ownershipHandedOver;
+	}
 }

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/sample/SampleDtoHelper.java

@@ -26,6 +26,7 @@
 import de.symeda.sormas.app.backend.common.DatabaseHelper;
 import de.symeda.sormas.app.backend.facility.Facility;
 import de.symeda.sormas.app.backend.facility.FacilityDtoHelper;
+import de.symeda.sormas.app.backend.sormastosormas.SormasToSormasOriginInfoDtoHelper;
 import de.symeda.sormas.app.backend.user.User;
 import de.symeda.sormas.app.backend.user.UserDtoHelper;
 import de.symeda.sormas.app.rest.NoConnectionException;
@@ -34,6 +35,8 @@
 
 public class SampleDtoHelper extends AdoDtoHelper<Sample, SampleDto> {
 
+	private SormasToSormasOriginInfoDtoHelper sormasToSormasOriginInfoDtoHelper = new SormasToSormasOriginInfoDtoHelper();
+
 	@Override
 	protected Class<Sample> getAdoClass() {
 		return Sample.class;
@@ -102,6 +105,10 @@ public void fillInnerFromDto(Sample target, SampleDto source) {
 		target.setReportLon(source.getReportLon());
 		target.setReportLatLonAccuracy(source.getReportLatLonAccuracy());
 
+		target.setSormasToSormasOriginInfo(
+			sormasToSormasOriginInfoDtoHelper.fillOrCreateFromDto(target.getSormasToSormasOriginInfo(), source.getSormasToSormasOriginInfo()));
+		target.setOwnershipHandedOver(source.isOwnershipHandedOver());
+
 		target.setPseudonymized(source.isPseudonymized());
 	}
 
@@ -163,6 +170,10 @@ public void fillInnerFromAdo(SampleDto target, Sample source) {
 		target.setReportLon(source.getReportLon());
 		target.setReportLatLonAccuracy(source.getReportLatLonAccuracy());
 
+		if (source.getSormasToSormasOriginInfo() != null) {
+			target.setSormasToSormasOriginInfo(sormasToSormasOriginInfoDtoHelper.adoToDto(source.getSormasToSormasOriginInfo()));
+		}
+
 		target.setPseudonymized(source.isPseudonymized());
 	}
 

sormas-app/app/src/main/java/de/symeda/sormas/app/backend/sample/SampleEditAuthorization.java

@@ -11,7 +11,12 @@ public class SampleEditAuthorization {
 	public static boolean isSampleEditAllowed(Sample sample) {
 		User user = ConfigProvider.getUser();
 
-		return SampleJurisdictionHelper.isInJurisdictionOrOwned(
+		if (sample.getSormasToSormasOriginInfo() != null) {
+			return sample.getSormasToSormasOriginInfo().isOwnershipHandedOver();
+		}
+
+		return !sample.isOwnershipHandedOver()
+				&& SampleJurisdictionHelper.isInJurisdictionOrOwned(
 			UserRole.getJurisdictionLevel(user.getUserRoles()),
 			JurisdictionHelper.createUserJurisdiction(user),
 			JurisdictionHelper.createSampleJurisdictionDto(sample));