MODFQMMGR-543 Add support for ordering ET sources in composites #626
Conversation
This file contains 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
mweaver-ebsco
commented
Feb 11, 2025
src/main/java/org/folio/fqm/service/EntityTypeFlatteningService.java
Outdated
Show resolved
Hide resolved
mweaver-ebsco
commented
Feb 11, 2025
mweaver-ebsco
commented
Feb 11, 2025
| EntityTypeSource newSource = SourceUtils.copySource(sourceFromParent, source, renamedAliases); | ||
| flattenedEntityType.addSourcesItem(newSource); | ||
| // Sort the sources, so that the resulting columns end up sorted appropriately | ||
| Iterable<EntityTypeSource> orderedSources = originalEntityType.getSources().stream().sorted(sourceComparator())::iterator; |
There was a problem hiding this comment.
Fun trick that probably shouldn't be done very often: Using Stream::iterator as an Iterable, so that you can use an enhanced for-loop with streams (instead of .forEach(), which brings some limitations) :)
mweaver-ebsco
force-pushed
the
MODFQMMGR-543-ordered-sources
branch
2 times, most recently
from
fea67b7 to
a3f53fd
Compare
bvsharp
approved these changes
Feb 12, 2025
kjain110
approved these changes
Feb 12, 2025
mweaver-ebsco
force-pushed
the
MODFQMMGR-543-ordered-sources
branch
from
a3f53fd to
a5b4edf
Compare
mweaver-ebsco
commented
Feb 14, 2025
| @@ -7,7 +7,8 @@ | |||
| type: 'entity-type', | |||
| targetId: '00349126-c923-4045-a29f-3b6db4c6bea9', // simple_loan | |||
| useIdColumns: true, | |||
| essentialOnly: true | |||
| essentialOnly: true, | |||
| order: 10, | |||
There was a problem hiding this comment.
I decided to set the orders in increments of 10 for 2 reasons:
- It provides the ability to shuffle things around and add new sources later on with fewer changes later. It just seems like a useful pattern without any real downside that I see
- Since this is the first ET with a set order, it doubles as some light documentation. By spacing the orders out, it subtly provides some insight into what does and doesn't work (if you want to space them out later, you don't need to go look up code to see if it works when you've already got an example of it working right off the bat)
mweaver-ebsco
force-pushed
the
MODFQMMGR-543-ordered-sources
branch
from
a5b4edf to
ada3c9b
Compare
|
This commit makes it so columns within a composite are grouped together in an order defined by the new "order" property on ET sources. Within each group, the columns are sorted by labelAlias. One major result of this is that in all cases, the columns in a flattened entity type are always sorted list this; before they were only sorted in some cases.
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.
No description provided.