Resolved test failures

Author: KarnaiahPesula

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

@@ -1021,6 +1021,7 @@ public interface Captions {
 	String Contact_contactIdentificationSourceDetails = "Contact.contactIdentificationSourceDetails";
 	String Contact_contactOfficer = "Contact.contactOfficer";
 	String Contact_contactOfficerUuid = "Contact.contactOfficerUuid";
+	String Contact_contactProximities = "Contact.contactProximities";
 	String Contact_contactProximity = "Contact.contactProximity";
 	String Contact_contactProximityDetails = "Contact.contactProximityDetails";
 	String Contact_contactProximityLongForm = "Contact.contactProximityLongForm";

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

@@ -31,6 +31,7 @@ public interface Descriptions {
 	String CaseHospitalization_isolated = "CaseHospitalization.isolated";
 	String CasePreviousHospitalization_admissionDate = "CasePreviousHospitalization.admissionDate";
 	String Contact_community = "Contact.community";
+	String Contact_contactProximities = "Contact.contactProximities";
 	String Contact_contactProximity = "Contact.contactProximity";
 	String Contact_district = "Contact.district";
 	String Contact_followUpStatus = "Contact.followUpStatus";

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

@@ -3232,6 +3232,10 @@ public void onUpgrade(SQLiteDatabase db, ConnectionSource connectionSource, int
 
 				// ATTENTION: break should only be done after last version
 				break;
+			case 362:
+				currentVersion = 362;
+				getDao(PathogenTest.class).executeRaw("ALTER TABLE pathogentest ADD COLUMN IF NOT EXISTS serotypetext varchar(255);");
+				getDao(PathogenTest.class).executeRaw("UPDATE pathogentest  SET serotypetext = serotype, serotype = \"'OTHER\"' WHERE serotype IS NOT null   and serotypetext is null;");
 
 			default:
 				throw new IllegalStateException("onUpgrade() with unknown oldVersion " + oldVersion);

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

@@ -39,6 +39,7 @@
 import de.symeda.sormas.api.sample.PCRTestSpecification;
 import de.symeda.sormas.api.sample.PathogenTestResultType;
 import de.symeda.sormas.api.sample.PathogenTestType;
+import de.symeda.sormas.api.sample.Serotype;
 import de.symeda.sormas.app.backend.common.DatabaseHelper;
 import de.symeda.sormas.app.backend.common.PseudonymizableAdo;
 import de.symeda.sormas.app.backend.environment.environmentsample.EnvironmentSample;
@@ -116,8 +117,9 @@ public class PathogenTest extends PseudonymizableAdo {
 	@Column
 	private boolean fourFoldIncreaseAntibodyTiter;
 
-	@Column(length = CHARACTER_LIMIT_DEFAULT)
-	private String serotype;
+	@Column
+	@Enumerated(EnumType.STRING)
+	private Serotype serotype;
 
 	@DatabaseField
 	private Float cqValue;
@@ -333,11 +335,11 @@ public void setTestTypeText(String testTypeText) {
 		this.testTypeText = testTypeText;
 	}
 
-	public String getSerotype() {
+	public Serotype getSerotype() {
 		return serotype;
 	}
 
-	public void setSerotype(String serotype) {
+	public void setSerotype(Serotype serotype) {
 		this.serotype = serotype;
 	}
 

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

@@ -29,6 +29,7 @@
         <import type="de.symeda.sormas.api.sample.SampleMaterial" />
         <import type="de.symeda.sormas.api.sample.PathogenTestType" />
         <import type="de.symeda.sormas.api.sample.PathogenTestResultType" />
+        <import type="de.symeda.sormas.api.sample.Serotype" />
         <import type="de.symeda.sormas.api.Disease" />
         <import type="de.symeda.sormas.api.disease.DiseaseVariant" />
 
@@ -172,13 +173,13 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
 
-                    <de.symeda.sormas.app.component.controls.ControlTextEditField
+                    <de.symeda.sormas.app.component.controls.ControlCheckBoxField
                         android:id="@+id/pathogenTest_serotype"
                         app:dependencyParentField="@{pathogenTestTestedDisease}"
                         app:dependencyParentValue="@{Disease.CSM}"
                         app:dependencyParent2Field="@{pathogenTestTestResult}"
                         app:dependencyParent2Value="@{PathogenTestResultType.POSITIVE}"
-                        app:value="@={data.serotype}"
+                        app:value="@{data.serotype!=null}"
                         style="@style/ControlFirstOfTwoColumnsStyle" />
 
                     <de.symeda.sormas.app.component.controls.ControlTextEditField

sormas-app/app/src/main/res/layout/fragment_pathogen_test_edit_layout.xml

@@ -148,7 +148,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal">
 
-                    <de.symeda.sormas.app.component.controls.ControlTextReadField
+                    <de.symeda.sormas.app.component.controls.ControlCheckBoxField
                         android:id="@+id/pathogenTest_serotype"
                         app:dependencyParentField="@{pathogenTestTestedDisease}"
                         app:dependencyParentValue="@{Disease.CSM}"

sormas-app/app/src/main/res/layout/fragment_pathogen_test_read_layout.xml

@@ -18,11 +18,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import de.symeda.sormas.api.EntityDto;
-import de.symeda.sormas.api.uuid.HasUuid;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.api.utils.Experimental;
 import de.symeda.sormas.api.utils.ValidationRuntimeException;
+import de.symeda.sormas.api.uuid.HasUuid;
 
 public class PatchHelper {
 
@@ -104,7 +104,7 @@ private static <T extends HasUuid> void updateObjectList(T existingObject, JsonN
 			}
 		}
 
-		if (existingObjectField.getType().isAssignableFrom(List.class)) {
+		if (Collection.class.isAssignableFrom(existingObjectField.getType())) {
 			Object existingObjectFieldInstance = null;
 			try {
 				existingObjectFieldInstance = existingObjectField.get(existingObject);