From 6039a2d8a14b37f619e674e3b2f90e812e4a7944 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 9 Apr 2025 12:26:06 -0700 Subject: [PATCH 1/2] Issue 52098: Switch lookupByAlternateKey to enum with three choices --- ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java | 2 +- ehr/src/org/labkey/ehr/EHRController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java b/ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java index 7a9cf6e0c..a4c0873a8 100644 --- a/ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java +++ b/ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java @@ -323,7 +323,7 @@ private void importFile(TsvImport tsvImport, Container container, User user) thr auditEvent = createTransactionAuditEvent(container, QueryService.AuditAction.INSERT); AbstractQueryImportAction.importData(loader, table, updateService, QueryUpdateService.InsertOption.INSERT, - new HashMap<>(), errors, behaviorType, auditEvent, null, user, container, null); + new HashMap<>(), null, errors, behaviorType, auditEvent, null, user, container, null); } private static class TsvImport diff --git a/ehr/src/org/labkey/ehr/EHRController.java b/ehr/src/org/labkey/ehr/EHRController.java index c7805f3d2..12d3aef2a 100644 --- a/ehr/src/org/labkey/ehr/EHRController.java +++ b/ehr/src/org/labkey/ehr/EHRController.java @@ -1493,7 +1493,7 @@ private void loadFile(UserSchema schema, String tableName, Resource resource, bo auditEvent = createTransactionAuditEvent(getContainer(), QueryService.AuditAction.INSERT); AbstractQueryImportAction.importData(loader, table, updateService, QueryUpdateService.InsertOption.INSERT, - new HashMap<>(), batchErrors, behaviorType, auditEvent, null, getUser(), getContainer(), null); + new HashMap<>(), null, batchErrors, behaviorType, auditEvent, null, getUser(), getContainer(), null); if (batchErrors.hasErrors()) { From 76e4ebb1aeb412a861eba8c4b9519507293bfc96 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 9 Apr 2025 12:26:06 -0700 Subject: [PATCH 2/2] Issue 52098: Switch lookupByAlternateKey to enum with three choices --- ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java | 2 +- ehr/src/org/labkey/ehr/EHRController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java b/ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java index 7a9cf6e0c..a4c0873a8 100644 --- a/ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java +++ b/ehr/api-src/org/labkey/api/ehr/SharedEHRUpgradeCode.java @@ -323,7 +323,7 @@ private void importFile(TsvImport tsvImport, Container container, User user) thr auditEvent = createTransactionAuditEvent(container, QueryService.AuditAction.INSERT); AbstractQueryImportAction.importData(loader, table, updateService, QueryUpdateService.InsertOption.INSERT, - new HashMap<>(), errors, behaviorType, auditEvent, null, user, container, null); + new HashMap<>(), null, errors, behaviorType, auditEvent, null, user, container, null); } private static class TsvImport diff --git a/ehr/src/org/labkey/ehr/EHRController.java b/ehr/src/org/labkey/ehr/EHRController.java index c7805f3d2..12d3aef2a 100644 --- a/ehr/src/org/labkey/ehr/EHRController.java +++ b/ehr/src/org/labkey/ehr/EHRController.java @@ -1493,7 +1493,7 @@ private void loadFile(UserSchema schema, String tableName, Resource resource, bo auditEvent = createTransactionAuditEvent(getContainer(), QueryService.AuditAction.INSERT); AbstractQueryImportAction.importData(loader, table, updateService, QueryUpdateService.InsertOption.INSERT, - new HashMap<>(), batchErrors, behaviorType, auditEvent, null, getUser(), getContainer(), null); + new HashMap<>(), null, batchErrors, behaviorType, auditEvent, null, getUser(), getContainer(), null); if (batchErrors.hasErrors()) {