LKSM Projects: Container Filtering & Storage issues (#3870)

LabKey · Nov 29, 2022 · 88c0e42 · 88c0e42
1 parent 1ad8e07
commit 88c0e42
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 3 deletions.
diff --git a/api/src/org/labkey/api/audit/AuditLogService.java b/api/src/org/labkey/api/audit/AuditLogService.java
@@ -105,6 +105,9 @@ default AuditTypeProvider getAuditProvider(String eventType)
     @Nullable
     <K extends AuditTypeEvent> K getAuditEvent(User user, String eventType, int rowId);
 
+    @Nullable
+    <K extends AuditTypeEvent> K getAuditEvent(User user, String eventType, int rowId, @Nullable ContainerFilter cf);
+
     <K extends AuditTypeEvent> List<K> getAuditEvents(Container container, User user, String eventType, @Nullable SimpleFilter filter, @Nullable Sort sort);
 
     <K extends AuditTypeEvent> List<K> getAuditEvents(Container container, User user, String eventType, @Nullable SimpleFilter filter, @Nullable Sort sort, @Nullable ContainerFilter cf);

diff --git a/api/src/org/labkey/api/audit/DefaultAuditProvider.java b/api/src/org/labkey/api/audit/DefaultAuditProvider.java
@@ -64,6 +64,12 @@ public <K extends AuditTypeEvent> K getAuditEvent(User user, String eventType, i
         return null;
     }
 
+    @Override
+    public <K extends AuditTypeEvent> @Nullable K getAuditEvent(User user, String eventType, int rowId, @Nullable ContainerFilter cf)
+    {
+        return null;
+    }
+
     @Override
     public <K extends AuditTypeEvent> List<K> getAuditEvents(Container container, User user, String eventType, @Nullable SimpleFilter filter, @Nullable Sort sort)
     {

diff --git a/audit/src/org/labkey/audit/AuditController.java b/audit/src/org/labkey/audit/AuditController.java
@@ -15,6 +15,8 @@
  */
 package org.labkey.audit;
 
+import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.action.ApiSimpleResponse;
 import org.labkey.api.action.QueryViewAction;
@@ -246,11 +248,22 @@ public void addNavTrail(NavTree root)
     @RequiresPermission(ReadPermission.class)
     public static class GetDetailedAuditChangesAction extends ReadOnlyApiAction<AuditChangesForm>
     {
+        private @NotNull ContainerFilter getContainerFilter(AuditChangesForm form) throws IllegalArgumentException
+        {
+            Container container = getContainer();
+            User user = getUser();
+
+            if (!StringUtils.isEmpty(form.getContainerFilter()))
+                return ContainerFilter.Type.valueOf(form.getContainerFilter()).create(container, user);
+
+            return ContainerFilter.Type.Current.create(container, user);
+        }
+
         @Override
         public Object execute(AuditChangesForm form, BindException errors)
         {
             ApiSimpleResponse response = new ApiSimpleResponse();
-            DetailedAuditTypeEvent event = AuditLogService.get().getAuditEvent(getUser(), form.getAuditEventType(), form.getAuditRowId());
+            DetailedAuditTypeEvent event = AuditLogService.get().getAuditEvent(getUser(), form.getAuditEventType(), form.getAuditRowId(), getContainerFilter(form));
 
             if (event != null)
             {
@@ -328,6 +341,7 @@ public static class AuditChangesForm
     {
         private int auditRowId;
         private String auditEventType;
+        private String _containerFilter;
 
         public int getAuditRowId()
         {
@@ -348,6 +362,17 @@ public void setAuditEventType(String auditEventType)
         {
             this.auditEventType = auditEventType;
         }
+
+        public String getContainerFilter()
+        {
+            return _containerFilter;
+        }
+
+        public void setContainerFilter(String containerFilter)
+        {
+            _containerFilter = containerFilter;
+        }
+
     }
 
     @RequiresPermission(ReadPermission.class)

diff --git a/audit/src/org/labkey/audit/AuditLogImpl.java b/audit/src/org/labkey/audit/AuditLogImpl.java
@@ -212,6 +212,13 @@ public <K extends AuditTypeEvent> K getAuditEvent(User user, String eventType, i
         return LogManager.get().getAuditEvent(user, eventType, rowId);
     }
 
+    @Nullable
+    @Override
+    public <K extends AuditTypeEvent> K getAuditEvent(User user, String eventType, int rowId, @Nullable ContainerFilter cf)
+    {
+        return LogManager.get().getAuditEvent(user, eventType, rowId, cf);
+    }
+
     @Override
     public <K extends AuditTypeEvent> List<K> getAuditEvents(Container container, User user, String eventType, @Nullable SimpleFilter filter, @Nullable Sort sort)
     {

diff --git a/audit/src/org/labkey/audit/model/LogManager.java b/audit/src/org/labkey/audit/model/LogManager.java
@@ -183,7 +183,7 @@ public <K extends AuditTypeEvent> void insertEvents(User user, List<K> events)
     }
 
     @Nullable
-    public <K extends AuditTypeEvent> K getAuditEvent(User user, String eventType, int rowId)
+    public <K extends AuditTypeEvent> K getAuditEvent(User user, String eventType, int rowId, @Nullable ContainerFilter cf)
     {
         AuditTypeProvider provider = AuditLogService.get().getAuditProvider(eventType);
         if (provider != null)
@@ -192,7 +192,7 @@ public <K extends AuditTypeEvent> K getAuditEvent(User user, String eventType, i
 
             if (schema != null)
             {
-                TableInfo table = schema.getTable(provider.getEventName());
+                TableInfo table = schema.getTable(provider.getEventName(), cf);
                 TableSelector selector = new TableSelector(table, null, null);
 
                 return (K)selector.getObject(rowId, provider.getEventClass());
@@ -201,6 +201,12 @@ public <K extends AuditTypeEvent> K getAuditEvent(User user, String eventType, i
         return null;
     }
 
+    @Nullable
+    public <K extends AuditTypeEvent> K getAuditEvent(User user, String eventType, int rowId)
+    {
+        return getAuditEvent(user, eventType, rowId, null);
+    }
+
     public <K extends AuditTypeEvent> List<K> getAuditEvents(Container container, User user, String eventType, @Nullable SimpleFilter filter, @Nullable Sort sort)
     {
         return getAuditEvents(container, user, eventType, filter, sort, null);