Skip to content

Add auditing of what method was used for data imports, updates, deletes #944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
XingY merged 5 commits into from
Nov 2, 2025
Merged

Add auditing of what method was used for data imports, updates, deletes #944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ccbf4c8
Add auditing of what method was used for data imports, updates, deletes
XingY Oct 23, 2025
310616a
Merge branch 'develop' into fb_transactionAuditDetails
XingY Oct 27, 2025
fc9b5ba
Merge branch 'develop' into fb_transactionAuditDetails
XingY Oct 29, 2025
cc15f70
crlf
XingY Oct 30, 2025
e03f1c5
Merge branch 'develop' into fb_transactionAuditDetails
XingY Nov 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions luminex/src/org/labkey/luminex/LuminexRunCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.audit.TransactionAuditProvider;
import org.labkey.api.data.Container;
import org.labkey.api.exp.ExperimentException;
import org.labkey.api.exp.ObjectProperty;
Expand Down Expand Up @@ -53,14 +54,14 @@ public LuminexRunCreator(LuminexAssayProvider provider)
}

@Override
public ExpExperiment saveExperimentRun(AssayRunUploadContext<LuminexAssayProvider> uploadContext, @Nullable ExpExperiment batch, @NotNull ExpRun run, boolean forceSaveBatchProps) throws ExperimentException, ValidationException
public ExpExperiment saveExperimentRun(AssayRunUploadContext<LuminexAssayProvider> uploadContext, @Nullable ExpExperiment batch, @NotNull ExpRun run, boolean forceSaveBatchProps, @Nullable Map<TransactionAuditProvider.TransactionDetail, Object> transactionDetails) throws ExperimentException, ValidationException
{
// Only allow one thread to be running a Luminex transform script and importing its results at a time
// See issue 17424
synchronized (LOCK_OBJECT)
{
LuminexRunContext context = (LuminexRunContext)uploadContext;
batch = super.saveExperimentRun(context, batch, run, forceSaveBatchProps);
batch = super.saveExperimentRun(context, batch, run, forceSaveBatchProps, transactionDetails);
Container container = context.getContainer();

// Save the analyte properties
Expand Down
2 changes: 1 addition & 1 deletion luminex/src/org/labkey/luminex/query/WellExclusionTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ private void rerunTransformScripts(BatchValidationException errors) throws Query
{
AssayProvider provider = AssayService.get().getProvider(run);
AssayRunDatabaseContext context = provider.createRunDatabaseContext(run, _userSchema.getUser(), null);
provider.getRunCreator().saveExperimentRun(context, AssayService.get().findBatch(run), run, false);
provider.getRunCreator().saveExperimentRun(context, AssayService.get().findBatch(run), run, false, null);
}
}
catch (ExperimentException e)
Expand Down