-
Notifications
You must be signed in to change notification settings - Fork 516
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.
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
Binning of custom data #10039
Binning of custom data #10039
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me in general. I can't see any major issues with the PR. Thanks!
One quick question. Why do we need to include the binary frontend-cbioportal-0.3.0.jar
file?
@@ -0,0 +1,5093 @@ | |||
{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we really need a test file this big? :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reduced the size of the test file in dc81111
Jar is removed in dc81111 |
61685ad
to
1625740
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@BasLee It looks good to me, thanks for performing refactoring work to make it organized. Most of my comments are about style or some code that might need clarification. I don't see anything wrong with it. Please feel free to reach out to me if there is anything not clear in my comments. Thanks!
service/src/main/java/org/cbioportal/service/util/CustomAttributeWithData.java
Show resolved
Hide resolved
service/src/main/java/org/cbioportal/service/util/CustomDataSession.java
Show resolved
Hide resolved
web/src/main/java/org/cbioportal/web/util/CustomDataDatatype.java
Outdated
Show resolved
Hide resolved
uniqueSampleKeys.addAll(studyViewFilterApplier.getUniqkeyKeys(studyIds, sampleIds)); | ||
uniquePatientKeys.addAll(studyViewFilterApplier.getUniqkeyKeys(studyIdsOfPatients, patientIds)); | ||
|
||
if (clinicalAttributes != null && ! clinicalAttributes.isEmpty()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer to leave no space between logical not
and variable, maybe we can change to
if (clinicalAttributes != null && ! clinicalAttributes.isEmpty()) { | |
if (clinicalAttributes != null && !clinicalAttributes.isEmpty()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in 948c8b9
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, @BasLee, it looks good to me! I will rebase your pr to the latest master. If everything looks good, I will merge it then.
8ed06b6
to
01ba3dc
Compare
01ba3dc
to
bae8b2b
Compare
SonarCloud Quality Gate failed. |
Thanks @dippindots ! |
Allow users to bin and filter their own custom (numerical and categorical) datasets using a new endpoint.
These changes will be used in a front end PR.
Changes
/custom-data-bin-counts/fetch
toStudyViewController
to bin custom datasetsCustomDataServiceImpl
, and share functionality at relevant placesCustomDataFilterApplier
ClinicalDataBinUtil
to bin both clinical and custom data.Tests
StudyViewFilterApplierTest
ClinicalDataBinUtilTest
applicationContext-web-test.xml
in integration tests to fix missingCustomDataServiceImpl
(and related) beans