Skip to content

GitHub Issue 1366: inventory-addSamples API cleanup #7916

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

Open
XingY wants to merge 1 commit into
base: develop
Choose a base branch
from
+31 −0
Open

GitHub Issue 1366: inventory-addSamples API cleanup #7916

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
5 changes: 5 additions & 0 deletions api/src/org/labkey/api/exp/api/ExperimentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1263,6 +1263,11 @@ List<? extends ExpProtocol> getExpProtocolsWithParameterValue(
void clearMaterialAncestors(Collection<Long> materialRowIds);
void repopulateAncestors();

boolean hasSampleIdsNotInScope(Container container, User user, Collection<Long> sampleIds);

boolean hasSourceIdsNotInScope(Container container, User user, Collection<Long> sourceIds);


class XarExportOptions
{
String _lsidRelativizer = LSID_OPTION_FOLDER_RELATIVE;
Expand Down
26 changes: 26 additions & 0 deletions experiment/src/org/labkey/experiment/api/ExperimentServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,6 +969,32 @@ public List<Long> findIdsNotPermittedForOperation(List<? extends ExpMaterial> ca
.map(ExpObject::getRowId).collect(Collectors.toList());
}

@Override
public boolean hasSampleIdsNotInScope(Container container, User user, Collection<Long> sampleIds)
{
return hasEntityIdsNotInScope(container, user, getTinfoMaterial(), sampleIds);
}

@Override
public boolean hasSourceIdsNotInScope(Container container, User user, Collection<Long> sourceIds)
{
return hasEntityIdsNotInScope(container, user, getTinfoData(), sourceIds);
}

// GitHub Issue 1309
private boolean hasEntityIdsNotInScope(Container container, User user, TableInfo entityTable, Collection<Long> entityIds)
{
if (entityIds.isEmpty())
return false;

ContainerFilter cf = container.getProductFoldersDataContainerFilter(user);
SimpleFilter filter = new SimpleFilter().addInClause(FieldKey.fromParts("RowId"), entityIds);
filter.addClause(cf.createFilterClause(entityTable.getSchema(), FieldKey.fromParts("Container")));

Set<Long> inScope = new HashSet<>(new TableSelector(entityTable, Collections.singleton("RowId"), filter, null).getArrayList(Long.class));
return entityIds.stream().anyMatch(id -> !inScope.contains(id));
}

private @NotNull List<Material> getMaterials(SimpleFilter filter, @Nullable Sort sort)
{
return new TableSelector(getTinfoMaterial(), filter, sort).getArrayList(Material.class);
Expand Down