Skip to content

Ticket 45210: Fall back quietly on demographics sources via linked schema#114

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
bbimber merged 1 commit into from
Apr 28, 2022
Merged

Ticket 45210: Fall back quietly on demographics sources via linked schema #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions laboratory/src/org/labkey/laboratory/AdditionalDataSource.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
package org.labkey.laboratory;

import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.Nullable;
import org.json.JSONException;
import org.json.JSONObject;
Expand DownExpand Up@@ -46,7 +46,7 @@ public static AdditionalDataSource getFromParts(Container c, User u, String item
return new AdditionalDataSource(cat, label, containerId, schemaName, queryName, reportCategory, importIntoWorkbooks, subjectFieldKey, sampleDateFieldKey);
}

public static AdditionalDataSource getFromPropertyManager(Container c, User u, String key, String value) throws IllegalArgumentException
public static @Nullable AdditionalDataSource getFromPropertyManager(Container c, User u, String key, String value) throws IllegalArgumentException
{
if (value == null)
return null;
Expand Down
4 changes: 3 additions & 1 deletion laboratory/src/org/labkey/laboratory/DemographicsSource.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,12 @@ public static DemographicsSource getFromParts(Container c, User u, String label,
return new DemographicsSource(label, containerId, schemaName, queryName, targetColumn);
}

public static DemographicsSource getFromPropertyManager(Container c, User u, String key, String value) throws IllegalArgumentException
public static @Nullable DemographicsSource getFromPropertyManager(Container c, User u, String key, String value) throws IllegalArgumentException
{
if (value == null)
{
return null;
}

try
{
Expand Down
32 changes: 24 additions & 8 deletions laboratory/src/org/labkey/laboratory/LaboratoryServiceImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -431,11 +431,19 @@ public Map<Container, Set<AdditionalDataSource>> getAllAdditionalDataSources(Use
set = new HashSet<>();

AdditionalDataSource source = AdditionalDataSource.getFromPropertyManager(c, u, entry.getKey(), entry.getValue());
if (source != null)
set.add(source);
if (source == null)
{
continue;
}

Container targetContainer = source.getTargetContainer(c);
if (targetContainer == null || !targetContainer.hasPermission(u, ReadPermission.class))
{
continue;
}

if (set.size() > 0)
map.put(c, set);
set.add(source);
map.put(c, set);
}

return Collections.unmodifiableMap(map);
Expand All@@ -457,11 +465,19 @@ public Map<Container, Set<DemographicsSource>> getAllDemographicsSources(User u)
set = new HashSet<>();

DemographicsSource source = DemographicsSource.getFromPropertyManager(c, u, entry.getKey(), entry.getValue());
if (source != null)
set.add(source);
if (source == null)
{
continue;
}

Container targetContainer = source.getTargetContainer(c);
if (targetContainer == null || !targetContainer.hasPermission(u, ReadPermission.class))
{
continue;
}

if (set.size() > 0)
map.put(c, set);
set.add(source);
map.put(c, set);
}

return Collections.unmodifiableMap(map);
Expand Down