Circ 1886 add dropdown for item service point #1335
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
rgupta-nla
requested review from
MagzhanArtykov,
nlaforwardism and
fcrimmins
rgupta-nla
requested review from
MagzhanArtykov,
nlaforwardism and
fcrimmins
and removed request for
MagzhanArtykov,
nlaforwardism and
fcrimmins
fcrimmins
reviewed
Sep 28, 2023
src/main/java/org/folio/circulation/domain/RequestRepresentation.java
Outdated
Show resolved
Hide resolved
fcrimmins
reviewed
Sep 28, 2023
src/main/java/org/folio/circulation/infrastructure/storage/ServicePointRepository.java
Show resolved
Hide resolved
fcrimmins
reviewed
Sep 28, 2023
src/main/java/org/folio/circulation/infrastructure/storage/ServicePointRepository.java
Outdated
Show resolved
Hide resolved
fcrimmins
reviewed
Sep 28, 2023
src/main/java/org/folio/circulation/resources/RequestCollectionResource.java
Outdated
Show resolved
Hide resolved
fcrimmins
reviewed
Sep 28, 2023
src/test/java/org/folio/circulation/infrastructure/storage/ServicePointRepositoryTest.java
Show resolved
Hide resolved
fcrimmins
approved these changes
Oct 4, 2023
|
Kudos, SonarCloud Quality Gate passed! |
| @@ -148,6 +148,9 @@ private static JsonObject locationSummary(Location location) { | |||
| write(locationSummary, "name", location.getName()); | |||
| write(locationSummary, "libraryName", location.getLibraryName()); | |||
| write(locationSummary, "code", location.getCode()); | |||
| if(location.getPrimaryServicePoint() != null) { | |||
There was a problem hiding this comment.
Suggested change
| if(location.getPrimaryServicePoint() != null) { | |
| if (location.getPrimaryServicePoint() != null) { |
| break; | ||
| } | ||
| } | ||
| if(!foundSP) { |
There was a problem hiding this comment.
Suggested change
| if(!foundSP) { | |
| if (!foundSP) { |
| boolean foundSP = false; | ||
|
|
||
| for(ServicePoint servicePoint : spCollection) { | ||
| if(request.getItem() != null && request.getItem().getLocation() != null && request.getItem().getLocation().getPrimaryServicePointId() != null && |
There was a problem hiding this comment.
Suggested change
| if(request.getItem() != null && request.getItem().getLocation() != null && request.getItem().getLocation().getPrimaryServicePointId() != null && | |
| if (request.getItem() != null && request.getItem().getLocation() != null && request.getItem().getLocation().getPrimaryServicePointId() != null && |
| List<Request> newRequestList = new ArrayList<>(); | ||
| Collection<ServicePoint> spCollection = multipleServicePoints.getRecords(); | ||
|
|
||
| for(Request request : requests) { |
There was a problem hiding this comment.
Suggested change
| for(Request request : requests) { | |
| for (Request request : requests) { |
| Request newRequest = null; | ||
| boolean foundSP = false; | ||
|
|
||
| for(ServicePoint servicePoint : spCollection) { |
There was a problem hiding this comment.
Suggested change
| for(ServicePoint servicePoint : spCollection) { | |
| for (ServicePoint servicePoint : spCollection) { |
| import io.vertx.core.json.JsonArray; | ||
| import io.vertx.core.json.JsonObject; | ||
| import org.apache.commons.lang.StringUtils; | ||
| import org.folio.circulation.domain.*; |
There was a problem hiding this comment.
don't import all package
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.Mockito.*; |
| } | ||
|
|
||
| @Test | ||
| void parseQueryWithThreePSPIds() { |
There was a problem hiding this comment.
Does it make sense to do the same as previous tests do? Maybe it makes sense to consider including inclusion within a single test?
Comment on lines
+204
to
+210
| final List<String> servicePointsToFetch = requests.stream() | ||
| .filter(Objects::nonNull) | ||
| .map(r -> r.getItem() != null ? r.getItem().getLocation().getPrimaryServicePointId() : null) | ||
| .filter(Objects::nonNull) | ||
| .map(Object::toString) | ||
| .distinct() | ||
| .toList(); |
There was a problem hiding this comment.
Suggested change
| final List<String> servicePointsToFetch = requests.stream() | |
| .filter(Objects::nonNull) | |
| .map(r -> r.getItem() != null ? r.getItem().getLocation().getPrimaryServicePointId() : null) | |
| .filter(Objects::nonNull) | |
| .map(Object::toString) | |
| .distinct() | |
| .toList(); | |
| List<String> servicePointsToFetch = requests.stream() | |
| .map(Request::getItem) | |
| .filter(Objects::nonNull) | |
| .map(Item::getLocation) | |
| .map(Location::getPrimaryServicePointId) | |
| .filter(Objects::nonNull) | |
| .map(Object::toString) | |
| .distinct() | |
| .toList(); |
Comment on lines
+219
to
+221
| multipleServicePoints -> { | ||
| List<Request> newRequestList = new ArrayList<>(); | ||
| Collection<ServicePoint> spCollection = multipleServicePoints.getRecords(); |
There was a problem hiding this comment.
consider moving this lambda into separate method
alexanderkurash
requested changes
Oct 5, 2023
|
Kudos, SonarCloud Quality Gate passed! |
|
1 similar comment
|
|
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.
Purpose
https://issues.folio.org/browse/CIRC-1886
To populate the drop down the (ServicePoint) code will need to be used, this allows the already existing service point code to be leveraged.
User must have the view request permission. Users: View requests, this should also limit them to their assigned service point/s. (This may need to be updated to suit general open source) This does match the generic permission in snapshot.
Approach
The request list is filtered in the backend based on the item selected in Primary Service Point name dropdown.
TODOS and Open Questions
Learning