Item 10437: Aliquot Field Inheritance #3472
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
labkey-susanh
approved these changes
Jun 23, 2022
| " exp.PropertyDescriptor D \n" + | ||
| " JOIN exp.PropertyDomain PD ON D.propertyId = PD.propertyid\n" + | ||
| " JOIN exp.DomainDescriptor DD on PD.domainID = DD.domainId\n" + | ||
| "WHERE DD.storageSchemaName = ? AND D.derivationDataScope = ?", SampleTypeDomainKind.PROVISIONED_SCHEMA_NAME, "ChildOnly").getObject(Long.class)); |
There was a problem hiding this comment.
Are there constants in Java code for "ChildOnly", etc?
| .filter(dp -> !ExpSchema.DerivationDataScopeType.ChildOnly.name().equalsIgnoreCase(dp.getDerivationDataScope())) | ||
| .filter(dp -> !ExpMaterialTable.Column.LSID.name().equalsIgnoreCase(dp.getName()) | ||
| && !ExpMaterialTable.Column.Name.name().equalsIgnoreCase(dp.getName())) | ||
| .filter(dp -> StringUtils.isEmpty(dp.getDerivationDataScope()) |
There was a problem hiding this comment.
Is there a need to do a second pass for filtering or can the second filter's conditions be added to the first filter (slightly more efficient)?
| for (Map.Entry<Integer, Map<String, Object>> rowNumSampleRow : sampleRows.entrySet()) | ||
| { | ||
| Integer rowNum = rowNumSampleRow.getKey(); | ||
| String lsidKey = rowNumLsid.get(rowNum); | ||
| Map<String, Object> sampleRow = rowNumSampleRow.getValue(); | ||
|
|
||
| if (!StringUtils.isEmpty((String) sampleRow.get("AliquotedFromLSID"))) |
There was a problem hiding this comment.
Maybe there should be a constant for the AliquotedFromLSID string. It's used in a few places.
This was referenced Jul 6, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rationale
We are re-enabling "Aliquot Specific" fields for sample types (in apps only). Additionally, support for "Samples & Aliquots" fields that allows independent editing of property fields for parent and child samples is added. Prior to the feature, only "Parent Only" sample properties are supported to force aliquots to always inherit properties from its parent sample.
Related Pull Requests
Changes