-
Notifications
You must be signed in to change notification settings - Fork 8
[MODORDERS-1403]. Enhance the holding-detail endpoint to always return all linked PO lines #1241
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
Open
BKadirkhodjaev
wants to merge
10
commits into
master
Choose a base branch
from
MODORDERS-1403
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
d728de1
[MODORDERS-1403]. Enhance the holding-detail endpoint to always retur…
BKadirkhodjaev c5b3f30
Merge branch 'master' into MODORDERS-1403
BKadirkhodjaev 05e0d6d
[MODORDERS-1403]. Comment out old tests
BKadirkhodjaev 738084e
[MODORDERS-1403]. Update tests
BKadirkhodjaev c2685ae
[MODORDERS-1403]. Improve HoldingDetailAggregator
BKadirkhodjaev 4ef515c
[MODORDERS-1403]. Add code to support ECS (multiple-tenants)
BKadirkhodjaev 8cc3b35
[MODORDERS-1403]. Fix indentation
BKadirkhodjaev 1e82e75
[MODORDERS-1403]. Set checkinItems in PoLinesDetail
BKadirkhodjaev f9da115
[MODORDERS-1403]. Update unit tests
BKadirkhodjaev 5863870
[MODORDERS-1403]. Remove logger
BKadirkhodjaev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Submodule acq-models
updated
2 files
| +4 −2 | mod-orders/examples/holdingDetailResults.sample | |
| +5 −0 | mod-orders/schemas/holdingDetail.json |
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
65 changes: 65 additions & 0 deletions
65
src/main/java/org/folio/models/HoldingDetailAggregator.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| package org.folio.models; | ||
|
|
||
| import io.vertx.core.json.JsonObject; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.folio.rest.jaxrs.model.Piece; | ||
| import org.folio.rest.jaxrs.model.PoLine; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
|
|
||
| public class HoldingDetailAggregator { | ||
|
|
||
| private String tenant; | ||
| private Map<String, List<PoLine>> poLinesByHoldingId = new HashMap<>(); | ||
| private Map<String, List<Piece>> piecesByHoldingId = new HashMap<>(); | ||
| private Map<String, List<JsonObject>> itemsByHoldingId = new HashMap<>(); | ||
|
|
||
| public String getTenant() { | ||
| return tenant; | ||
| } | ||
|
|
||
| public Map<String, List<PoLine>> getPoLinesByHoldingId() { | ||
| return poLinesByHoldingId; | ||
| } | ||
|
|
||
| public Map<String, List<Piece>> getPiecesByHoldingId() { | ||
| return piecesByHoldingId; | ||
| } | ||
|
|
||
| public Map<String, List<JsonObject>> getItemsByHoldingId() { | ||
| return itemsByHoldingId; | ||
| } | ||
|
|
||
| public String getPieceTenantIdByItemId(String itemId) { | ||
| if (Objects.isNull(itemId)) { | ||
| return null; | ||
| } | ||
| return piecesByHoldingId.values().stream() | ||
| .flatMap(List::stream) | ||
| .filter(Objects::nonNull) | ||
| .filter(piece -> StringUtils.equals(itemId, piece.getItemId())) | ||
| .map(Piece::getReceivingTenantId) | ||
| .filter(Objects::nonNull) | ||
| .findFirst() | ||
| .orElse(null); | ||
| } | ||
|
|
||
| public void setTenant(String tenant) { | ||
| this.tenant = tenant; | ||
| } | ||
|
|
||
| public void setPoLinesByHoldingId(Map<String, List<PoLine>> poLines) { | ||
| this.poLinesByHoldingId = Objects.requireNonNullElse(poLines, new HashMap<>()); | ||
| } | ||
|
|
||
| public void setPiecesByHoldingId(Map<String, List<Piece>> pieces) { | ||
| this.piecesByHoldingId = Objects.requireNonNullElse(pieces, new HashMap<>()); | ||
| } | ||
|
|
||
| public void setItemsByHoldingId(Map<String, List<JsonObject>> items) { | ||
| this.itemsByHoldingId = Objects.requireNonNullElse(items, new HashMap<>()); | ||
| } | ||
| } | ||
This file was deleted.
Oops, something went wrong.
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
Oops, something went wrong.
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.
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.
lombock can be used