From 6942be326d5ec086b0c1875aa9c40d6178d47e30 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Mon, 26 May 2025 15:37:47 -0700 Subject: [PATCH 1/2] More forUpdate parameters and make methods for data classes and sample types more similar --- .../src/org/labkey/discvrcore/AuditSummaryUserSchema.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/discvrcore/src/org/labkey/discvrcore/AuditSummaryUserSchema.java b/discvrcore/src/org/labkey/discvrcore/AuditSummaryUserSchema.java index 92df1507d..c77aacc4a 100644 --- a/discvrcore/src/org/labkey/discvrcore/AuditSummaryUserSchema.java +++ b/discvrcore/src/org/labkey/discvrcore/AuditSummaryUserSchema.java @@ -201,10 +201,10 @@ private Dataset createDataset(String name, boolean isDemographics) throws Except Dataset d1 = StudyService.get().createDataset(getContainer(true), TestContext.get().getUser(), name, null, isDemographics); d1.setKeyManagementType(Dataset.KeyManagementType.GUID); d1.setKeyPropertyName("objectId"); - DomainProperty objectId1 = d1.getDomain().addProperty(); + DomainProperty objectId1 = d1.getDomain(true).addProperty(); objectId1.setName("objectId"); objectId1.setPropertyURI(AuditSummaryUserSchema.class.getName() + ":ObjectId"); - d1.getDomain().save(TestContext.get().getUser()); + d1.getDomain(true).save(TestContext.get().getUser()); d1.save(TestContext.get().getUser()); return d1; From 61323c511904ddba59ecaa060113dcc3e5419c5a Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 30 May 2025 06:26:15 -0700 Subject: [PATCH 2/2] Use the same mutable domain --- .../src/org/labkey/discvrcore/AuditSummaryUserSchema.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/discvrcore/src/org/labkey/discvrcore/AuditSummaryUserSchema.java b/discvrcore/src/org/labkey/discvrcore/AuditSummaryUserSchema.java index c77aacc4a..afbf634b6 100644 --- a/discvrcore/src/org/labkey/discvrcore/AuditSummaryUserSchema.java +++ b/discvrcore/src/org/labkey/discvrcore/AuditSummaryUserSchema.java @@ -19,6 +19,7 @@ import org.labkey.api.data.SimpleFilter; import org.labkey.api.data.TableInfo; import org.labkey.api.data.TableSelector; +import org.labkey.api.exp.property.Domain; import org.labkey.api.exp.property.DomainProperty; import org.labkey.api.module.Module; import org.labkey.api.module.ModuleLoader; @@ -201,10 +202,11 @@ private Dataset createDataset(String name, boolean isDemographics) throws Except Dataset d1 = StudyService.get().createDataset(getContainer(true), TestContext.get().getUser(), name, null, isDemographics); d1.setKeyManagementType(Dataset.KeyManagementType.GUID); d1.setKeyPropertyName("objectId"); - DomainProperty objectId1 = d1.getDomain(true).addProperty(); + Domain domain = d1.getDomain(true); + DomainProperty objectId1 = domain.addProperty(); objectId1.setName("objectId"); objectId1.setPropertyURI(AuditSummaryUserSchema.class.getName() + ":ObjectId"); - d1.getDomain(true).save(TestContext.get().getUser()); + domain.save(TestContext.get().getUser()); d1.save(TestContext.get().getUser()); return d1;