Merge pull request SORMAS-Foundation#3298 from hzi-braunschweig/3210_sormas-to-sormas-samples

3210 sormas to sormas samples

Author: leventegal-she

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactReferenceDto.java

@@ -116,6 +116,9 @@ public static class PersonName implements Serializable {
 		@SensitiveData
 		private String lastName;
 
+		public PersonName() {
+		}
+
 		public PersonName(String firstName, String lastName) {
 			this.firstName = firstName;
 			this.lastName = lastName;

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

@@ -1366,6 +1366,7 @@ public interface Captions {
 	String SormasToSormasOptions_pseudonymizePersonalData = "SormasToSormasOptions.pseudonymizePersonalData";
 	String SormasToSormasOptions_pseudonymizeSensitiveData = "SormasToSormasOptions.pseudonymizeSensitiveData";
 	String SormasToSormasOptions_withAssociatedContacts = "SormasToSormasOptions.withAssociatedContacts";
+	String SormasToSormasOptions_withSamples = "SormasToSormasOptions.withSamples";
 	String sormasToSormasSentFrom = "sormasToSormasSentFrom";
 	String sormasToSormasShare = "sormasToSormasShare";
 	String sormasToSormasSharedBy = "sormasToSormasSharedBy";

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

@@ -85,6 +85,7 @@ public interface Validations {
 	String sormasToSormasContactCaseNotExists = "sormasToSormasContactCaseNotExists";
 	String sormasToSormasContactExists = "sormasToSormasContactExists";
 	String sormasToSormasOrganizationIdMissing = "sormasToSormasOrganizationIdMissing";
+	String sormasToSormasSampleExists = "sormasToSormasSampleExists";
 	String sormasToSormasSenderNameMissing = "sormasToSormasSenderNameMissing";
 	String sormasToSormasShareInfoMissing = "sormasToSormasShareInfoMissing";
 	String specifyFirstName = "specifyFirstName";

sormas-api/src/main/java/de/symeda/sormas/api/sample/SampleDto.java

@@ -25,6 +25,7 @@
 import de.symeda.sormas.api.contact.ContactReferenceDto;
 import de.symeda.sormas.api.event.EventParticipantReferenceDto;
 import de.symeda.sormas.api.facility.FacilityReferenceDto;
+import de.symeda.sormas.api.sormastosormas.SormasToSormasOriginInfoDto;
 import de.symeda.sormas.api.user.UserReferenceDto;
 import de.symeda.sormas.api.utils.DataHelper;
 import de.symeda.sormas.api.utils.Required;
@@ -117,6 +118,9 @@ public class SampleDto extends PseudonymizableDto {
 	private String requestedOtherPathogenTests;
 	private String requestedOtherAdditionalTests;
 
+	private SormasToSormasOriginInfoDto sormasToSormasOriginInfo;
+	private boolean ownershipHandedOver;
+
 	@ImportIgnore
 	public CaseReferenceDto getAssociatedCase() {
 		return associatedCase;
@@ -367,6 +371,22 @@ public void setRequestedOtherAdditionalTests(String requestedOtherAdditionalTest
 		this.requestedOtherAdditionalTests = requestedOtherAdditionalTests;
 	}
 
+	public SormasToSormasOriginInfoDto getSormasToSormasOriginInfo() {
+		return sormasToSormasOriginInfo;
+	}
+
+	public void setSormasToSormasOriginInfo(SormasToSormasOriginInfoDto sormasToSormasOriginInfo) {
+		this.sormasToSormasOriginInfo = sormasToSormasOriginInfo;
+	}
+
+	public boolean isOwnershipHandedOver() {
+		return ownershipHandedOver;
+	}
+
+	public void setOwnershipHandedOver(boolean ownershipHandedOver) {
+		this.ownershipHandedOver = ownershipHandedOver;
+	}
+
 	public static SampleDto build(UserReferenceDto userRef, CaseReferenceDto caseRef) {
 
 		final SampleDto sampleDto = getSampleDto(userRef);

sormas-api/src/main/java/de/symeda/sormas/api/sormastosormas/SormasToSormasCaseDto.java

@@ -30,7 +30,9 @@ public class SormasToSormasCaseDto implements Serializable {
 
 	private CaseDataDto caze;
 
-	private List<AssociatedContactDto> associatedContacts;
+	private List<SormasToSormasCaseDto.AssociatedContactDto> associatedContacts;
+
+	private List<SormasToSormasSampleDto> samples;
 
 	private SormasToSormasOriginInfoDto originInfo;
 
@@ -51,14 +53,22 @@ public CaseDataDto getCaze() {
 		return caze;
 	}
 
-	public List<AssociatedContactDto> getAssociatedContacts() {
+	public List<SormasToSormasCaseDto.AssociatedContactDto> getAssociatedContacts() {
 		return associatedContacts;
 	}
 
-	public void setAssociatedContacts(List<AssociatedContactDto> associatedContacts) {
+	public void setAssociatedContacts(List<SormasToSormasCaseDto.AssociatedContactDto> associatedContacts) {
 		this.associatedContacts = associatedContacts;
 	}
 
+	public List<SormasToSormasSampleDto> getSamples() {
+		return samples;
+	}
+
+	public void setSamples(List<SormasToSormasSampleDto> samples) {
+		this.samples = samples;
+	}
+
 	public SormasToSormasOriginInfoDto getOriginInfo() {
 		return originInfo;
 	}

sormas-api/src/main/java/de/symeda/sormas/api/sormastosormas/SormasToSormasContactDto.java

@@ -16,6 +16,7 @@
 package de.symeda.sormas.api.sormastosormas;
 
 import java.io.Serializable;
+import java.util.List;
 
 import de.symeda.sormas.api.contact.ContactDto;
 import de.symeda.sormas.api.person.PersonDto;
@@ -28,12 +29,17 @@ public class SormasToSormasContactDto implements Serializable {
 
 	private ContactDto contact;
 
+	private List<SormasToSormasSampleDto> samples;
+
+	private SormasToSormasOriginInfoDto originInfo;
+
 	public SormasToSormasContactDto() {
 	}
 
-	public SormasToSormasContactDto(PersonDto person, ContactDto contact) {
+	public SormasToSormasContactDto(PersonDto person, ContactDto contact, SormasToSormasOriginInfoDto originInfo) {
 		this.person = person;
 		this.contact = contact;
+		this.originInfo = originInfo;
 	}
 
 	public PersonDto getPerson() {
@@ -43,4 +49,16 @@ public PersonDto getPerson() {
 	public ContactDto getContact() {
 		return contact;
 	}
+
+	public List<SormasToSormasSampleDto> getSamples() {
+		return samples;
+	}
+
+	public void setSamples(List<SormasToSormasSampleDto> samples) {
+		this.samples = samples;
+	}
+
+	public SormasToSormasOriginInfoDto getOriginInfo() {
+		return originInfo;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/sormastosormas/SormasToSormasOptionsDto.java

@@ -28,6 +28,7 @@ public class SormasToSormasOptionsDto implements Serializable {
 	public static final String COMMENT = "comment";
 
 	public static final String WITH_ASSOCIATED_CONTACTS = "withAssociatedContacts";
+	public static final String WITH_SAMPLES = "withSamples";
 
 	private ServerAccessDataReferenceDto organization;
 
@@ -41,6 +42,8 @@ public class SormasToSormasOptionsDto implements Serializable {
 
 	private boolean withAssociatedContacts;
 
+	private boolean withSamples;
+
 	public ServerAccessDataReferenceDto getOrganization() {
 		return organization;
 	}
@@ -88,4 +91,12 @@ public boolean isWithAssociatedContacts() {
 	public void setWithAssociatedContacts(boolean withAssociatedContacts) {
 		this.withAssociatedContacts = withAssociatedContacts;
 	}
+
+	public boolean isWithSamples() {
+		return withSamples;
+	}
+
+	public void setWithSamples(boolean withSamples) {
+		this.withSamples = withSamples;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/sormastosormas/SormasToSormasSampleDto.java

@@ -0,0 +1,67 @@
+/*
+ * SORMAS® - Surveillance Outbreak Response Management & Analysis System
+ * Copyright © 2016-2020 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.sormastosormas;
+
+import java.io.Serializable;
+import java.util.List;
+
+import de.symeda.sormas.api.sample.AdditionalTestDto;
+import de.symeda.sormas.api.sample.PathogenTestDto;
+import de.symeda.sormas.api.sample.SampleDto;
+
+public class SormasToSormasSampleDto implements Serializable {
+
+	private static final long serialVersionUID = 5867733293483599601L;
+
+	private SampleDto sample;
+
+	private List<PathogenTestDto> pathogenTests;
+
+	private List<AdditionalTestDto> additionalTests;
+
+	public SormasToSormasSampleDto() {
+	}
+
+	public SormasToSormasSampleDto(SampleDto sample, List<PathogenTestDto> pathogenTests, List<AdditionalTestDto> additionalTests) {
+		this.sample = sample;
+		this.pathogenTests = pathogenTests;
+		this.additionalTests = additionalTests;
+	}
+
+	public SampleDto getSample() {
+		return sample;
+	}
+
+	public void setSample(SampleDto sample) {
+		this.sample = sample;
+	}
+
+	public List<PathogenTestDto> getPathogenTests() {
+		return pathogenTests;
+	}
+
+	public void setPathogenTests(List<PathogenTestDto> pathogenTests) {
+		this.pathogenTests = pathogenTests;
+	}
+
+	public List<AdditionalTestDto> getAdditionalTests() {
+		return additionalTests;
+	}
+
+	public void setAdditionalTests(List<AdditionalTestDto> additionalTests) {
+		this.additionalTests = additionalTests;
+	}
+}

sormas-api/src/main/java/de/symeda/sormas/api/sormastosormas/SormasToSormasShareInfoCriteria.java

@@ -18,6 +18,7 @@
 import de.symeda.sormas.api.BaseCriteria;
 import de.symeda.sormas.api.caze.CaseReferenceDto;
 import de.symeda.sormas.api.contact.ContactReferenceDto;
+import de.symeda.sormas.api.sample.SampleReferenceDto;
 
 public class SormasToSormasShareInfoCriteria extends BaseCriteria {
 
@@ -27,6 +28,8 @@ public class SormasToSormasShareInfoCriteria extends BaseCriteria {
 
 	private ContactReferenceDto contact;
 
+	private SampleReferenceDto sample;
+
 	public CaseReferenceDto getCaze() {
 		return caze;
 	}
@@ -46,4 +49,14 @@ public SormasToSormasShareInfoCriteria contact(ContactReferenceDto contact) {
 
 		return this;
 	}
+
+	public SampleReferenceDto getSample() {
+		return sample;
+	}
+
+	public SormasToSormasShareInfoCriteria sample(SampleReferenceDto sample) {
+		this.sample = sample;
+
+		return this;
+	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/sormastosormas/SormasToSormasShareInfoDto.java

@@ -18,6 +18,7 @@
 import de.symeda.sormas.api.EntityDto;
 import de.symeda.sormas.api.caze.CaseReferenceDto;
 import de.symeda.sormas.api.contact.ContactReferenceDto;
+import de.symeda.sormas.api.sample.SampleReferenceDto;
 import de.symeda.sormas.api.user.UserReferenceDto;
 
 public class SormasToSormasShareInfoDto extends EntityDto {
@@ -26,6 +27,7 @@ public class SormasToSormasShareInfoDto extends EntityDto {
 
 	private CaseReferenceDto caze;
 	private ContactReferenceDto contact;
+	private SampleReferenceDto sample;
 	private ServerAccessDataReferenceDto target;
 	private UserReferenceDto sender;
 	private boolean ownershipHandedOver;
@@ -47,6 +49,14 @@ public void setContact(ContactReferenceDto contact) {
 		this.contact = contact;
 	}
 
+	public SampleReferenceDto getSample() {
+		return sample;
+	}
+
+	public void setSample(SampleReferenceDto sample) {
+		this.sample = sample;
+	}
+
 	public ServerAccessDataReferenceDto getTarget() {
 		return target;
 	}