diff --git a/src/org/labkey/test/util/AuditLogHelper.java b/src/org/labkey/test/util/AuditLogHelper.java index 82c01a8f64..1c599f6f9a 100644 --- a/src/org/labkey/test/util/AuditLogHelper.java +++ b/src/org/labkey/test/util/AuditLogHelper.java @@ -188,10 +188,16 @@ public DataRegionTable goToAuditEventView(String eventType) */ public SelectRowsResponse getAuditLogsFromLKS(String containerPath, AuditEvent auditEventName, List columnNames, @Nullable List filters, @Nullable Integer maxRows, @Nullable ContainerFilter containerFilter) throws IOException, CommandException + { + return getAuditLogsFromLKS(containerPath, _wrapper.getCurrentProject(), auditEventName, columnNames, filters, maxRows, containerFilter); + } + + public SelectRowsResponse getAuditLogsFromLKS(String containerPath, @NotNull String projectName, AuditEvent auditEventName, List columnNames, + @Nullable List filters, @Nullable Integer maxRows, @Nullable ContainerFilter containerFilter) throws IOException, CommandException { SelectRowsCommand cmd = new SelectRowsCommand("auditLog", auditEventName.getName()); cmd.setColumns(columnNames); - cmd.addFilter("ProjectId/Name", _wrapper.getCurrentProject(), Filter.Operator.EQUAL); + cmd.addFilter("ProjectId/Name", projectName, Filter.Operator.EQUAL); if (filters != null) filters.forEach(cmd::addFilter); if (maxRows != null) @@ -208,7 +214,7 @@ public List> getAuditLogsForTransactionId(String containerPa } public List> getAuditLogsForTransactionId(String containerPath, AuditEvent auditEventName, List columnNames, - Integer transactionId, List eventFilters, @Nullable ContainerFilter containerFilter) throws IOException, CommandException + Integer transactionId, @Nullable List eventFilters, @Nullable ContainerFilter containerFilter) throws IOException, CommandException { List transactionFilter = new ArrayList<>(); if (transactionId != null) @@ -218,6 +224,22 @@ public List> getAuditLogsForTransactionId(String containerPa return getAuditLogsFromLKS(containerPath, auditEventName, columnNames, transactionFilter, null, containerFilter).getRows(); } + public List> getAuditLogsForTransactionId(String containerPath, + AuditEvent auditEventName, + List columnNames, + String projectName, + Integer transactionId, + List eventFilters, + @Nullable ContainerFilter containerFilter) throws IOException, CommandException + { + List transactionFilter = new ArrayList<>(); + if (transactionId != null) + transactionFilter.add(new Filter("TransactionId", transactionId, Filter.Operator.EQUAL)); + if (eventFilters != null && !eventFilters.isEmpty()) + transactionFilter.addAll(eventFilters); + return getAuditLogsFromLKS(containerPath, projectName, auditEventName, columnNames, transactionFilter, null, containerFilter).getRows(); + } + public void checkAuditEventValuesForTransactionId(String containerPath, AuditEvent auditEventName, Integer transactionId, int rowCount, Map expectedValues) throws IOException, CommandException { checkAuditEventValuesForTransactionId(containerPath, auditEventName, transactionId, null, rowCount, expectedValues);