Merge pull request #13523 from SORMAS-Foundation/task-#13516_automated_tests_multiple_tests_are_failing

Task #13516 automated tests multiple tests are failing

Author: raulbob

sormas-api/src/main/java/de/symeda/sormas/api/importexport/DatabaseTable.java

@@ -158,7 +158,9 @@ public enum DatabaseTable {
 	SYSTEM_CONFIGURATION_VALUES(DatabaseTableType.CONFIGURATION, "system_configuration_values", null),
 	SYSTEM_CONFIGURATION_CATEGORIES(DatabaseTableType.CONFIGURATION, "system_configuration_categories", null),
 
-	NOTIFIER(DatabaseTableType.SORMAS, "notifier", null);
+	NOTIFIER(DatabaseTableType.SORMAS, "notifier", null),
+
+	DRUG_SUSCEPTIBILITY(DatabaseTableType.SORMAS, "drug_susceptibility", null);
 
 	private static BiFunction<List<FeatureConfigurationDto>, ConfigFacade, Boolean> dependingOnFeature(FeatureType... featureTypes) {
 		return (featureConfigurations, configFacade) -> featureConfigurations.stream()

sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessage.java

@@ -702,7 +702,7 @@ public void setDiagnosticDate(Date diagnosticDate) {
 		this.diagnosticDate = diagnosticDate;
 	}
 
-	@Column(name = "activitiesascase", columnDefinition = "jsonb")
+	@Column(columnDefinition = "jsonb")
 	@Type(type = "jsonb")
 	public String getActivitiesAsCase() {
 		return activitiesAsCase;
@@ -712,7 +712,7 @@ public void setActivitiesAsCase(String activitiesAsCase) {
 		this.activitiesAsCase = activitiesAsCase;
 	}
 
-	@Column(name = "exposures", columnDefinition = "jsonb")
+	@Column(columnDefinition = "jsonb")
 	@Type(type = "jsonb")
 	public String getExposures() {
 		return exposures;

sormas-backend/src/main/java/de/symeda/sormas/backend/importexport/DatabaseExportService.java

@@ -42,6 +42,7 @@
 
 import de.symeda.sormas.api.feature.FeatureConfigurationDto;
 import de.symeda.sormas.api.importexport.DatabaseTable;
+import de.symeda.sormas.api.therapy.Drug;
 import de.symeda.sormas.backend.action.Action;
 import de.symeda.sormas.backend.activityascase.ActivityAsCase;
 import de.symeda.sormas.backend.campaign.Campaign;
@@ -106,6 +107,7 @@
 import de.symeda.sormas.backend.systemconfiguration.SystemConfigurationCategory;
 import de.symeda.sormas.backend.systemconfiguration.SystemConfigurationValue;
 import de.symeda.sormas.backend.task.Task;
+import de.symeda.sormas.backend.therapy.DrugSusceptibility;
 import de.symeda.sormas.backend.therapy.Prescription;
 import de.symeda.sormas.backend.therapy.Therapy;
 import de.symeda.sormas.backend.therapy.Treatment;
@@ -212,6 +214,7 @@ public class DatabaseExportService {
 		EXPORT_CONFIGS.put(DatabaseTable.SYSTEM_CONFIGURATION_VALUES, SystemConfigurationValue.TABLE_NAME);
 		EXPORT_CONFIGS.put(DatabaseTable.SYSTEM_CONFIGURATION_CATEGORIES, SystemConfigurationCategory.TABLE_NAME);
 		EXPORT_CONFIGS.put(DatabaseTable.NOTIFIER, Notifier.TABLE_NAME);
+		EXPORT_CONFIGS.put(DatabaseTable.DRUG_SUSCEPTIBILITY, DrugSusceptibility.TABLE_NAME);
 	}
 
 	private final Logger logger = LoggerFactory.getLogger(getClass());

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

@@ -14404,4 +14404,16 @@ alter table symptoms add column IF NOT EXISTS nocturnalcough varchar(255);
 
 INSERT INTO schema_version (version_number, comment) VALUES (577, 'Pertussis missed symptom, #13373');
 
+-- 2025-06-27 Fix failing tests #13516
+alter table symptoms_history add nocturnalcough varchar(255);
+
+alter table drugsusceptibility_history add column IF NOT EXISTS ceftriaxonemic numeric;
+alter table drugsusceptibility_history add column IF NOT EXISTS ceftriaxoneSusceptibility varchar(255);
+alter table drugsusceptibility_history add column IF NOT EXISTS penicillinmic numeric;
+alter table drugsusceptibility_history add column IF NOT EXISTS penicillinSusceptibility varchar(255);
+alter table drugsusceptibility_history add column IF NOT EXISTS erythromycinmic numeric;
+alter table drugsusceptibility_history add column IF NOT EXISTS erythromycinSusceptibility varchar(255);
+
+INSERT INTO schema_version (version_number, comment) VALUES (578, 'Update history tables #13516');
+
 -- *** Insert new sql commands BEFORE this line. Remember to always consider _history tables. ***