Circ 2084 #1475
Merged
Circ 2084 #1475
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
SreejaMangarapu
requested review from
gurleenkaurbp,
SinghAdes,
Vignesh-kalyanasundaram and
alexanderkurash
| @@ -294,8 +296,14 @@ private Result<MultipleRecords<Loan>> mapResponseToLoans(Response response) { | |||
| return MultipleRecords.from(response, Loan::from, RECORDS_PROPERTY_NAME); | |||
| } | |||
|
|
|||
| private static void addIsDcbProperty(Loan loan, Item item, JsonObject storageLoan) { | |||
| write(storageLoan, IS_DCB, (nonNull(loan.getUser()) && nonNull(loan.getUser().getLastName()) | |||
| && loan.getUser().getLastName().equalsIgnoreCase("DcbSystem")) | |||
There was a problem hiding this comment.
Please use string constants for DcbSystem
| private static JsonObject mapToStorageRepresentation(Loan loan, Item item) { | ||
| log.debug("mapToStorageRepresentation:: parameters loan: {}, item: {}", loan, item); | ||
| log.info("mapToStorageRepresentation:: parameters loan: {}, item: {}", loan, item); |
There was a problem hiding this comment.
pls revert this to debug level log
|
@SreejaMangarapu
|
…version to 7.3 in ModuleDescriptor
Vignesh-kalyanasundaram
approved these changes
Jun 6, 2024
Comment on lines
301
to
303
| write(storageLoan, IS_DCB, (nonNull(loan.getUser()) && nonNull(loan.getUser().getLastName()) | ||
| && loan.getUser().getLastName().equalsIgnoreCase(DCB_USER_LASTNAME)) | ||
| || item.isDcbItem()); |
There was a problem hiding this comment.
Please extract 3rd argument into a method, e.g. isDcbLoan(Loan loan, Item item). Also, we can probably do item.isDcbItem() first because it's a quicker check, and then check user name.
Comment on lines
30
to
35
| public IndividualResource createCirculationItemForDcb(String barcode, UUID holdingId, UUID locationId, String instanceTitle,boolean isDcb) { | ||
| CirculationItemsBuilder circulationItemsBuilder = new CirculationItemsBuilder().withBarcode(barcode).withHoldingId(holdingId) | ||
| .withLoanType(loanTypesFixture.canCirculate().getId()).withMaterialType(materialTypesFixture.book().getId()) | ||
| .withLocationId(locationId).withInstanceTitle(instanceTitle).withDcb(isDcb); | ||
| return circulationItemClient.create(circulationItemsBuilder); | ||
| } |
There was a problem hiding this comment.
Suggested change
| public IndividualResource createCirculationItemForDcb(String barcode, UUID holdingId, UUID locationId, String instanceTitle,boolean isDcb) { | |
| CirculationItemsBuilder circulationItemsBuilder = new CirculationItemsBuilder().withBarcode(barcode).withHoldingId(holdingId) | |
| .withLoanType(loanTypesFixture.canCirculate().getId()).withMaterialType(materialTypesFixture.book().getId()) | |
| .withLocationId(locationId).withInstanceTitle(instanceTitle).withDcb(isDcb); | |
| return circulationItemClient.create(circulationItemsBuilder); | |
| } | |
| public IndividualResource createCirculationItemForDcb(String barcode, UUID holdingId, | |
| UUID locationId, String instanceTitle,boolean isDcb) { | |
| CirculationItemsBuilder circulationItemsBuilder = new CirculationItemsBuilder() | |
| .withBarcode(barcode) | |
| .withHoldingId(holdingId) | |
| .withLoanType(loanTypesFixture.canCirculate().getId()) | |
| .withMaterialType(materialTypesFixture.book().getId()) | |
| .withLocationId(locationId) | |
| .withInstanceTitle(instanceTitle).withDcb(isDcb); | |
| return circulationItemClient.create(circulationItemsBuilder); | |
| } | |
| @@ -93,6 +93,10 @@ | |||
| "description": "Indicates whether or not this loan had its due date modified by a recall on the loaned item", | |||
| "type": "boolean" | |||
| }, | |||
| "isDcb": { | |||
There was a problem hiding this comment.
Shouldn't the file name be storage-loan-7-3.json ?
…changes made in LoanRepository
|
OleksandrVidinieiev
approved these changes
Jun 6, 2024
gurleenkaurbp
approved these changes
Jun 6, 2024
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
purpose of the pr - https://folio-org.atlassian.net/browse/CIRC-2084
Approach
checking if the item is dcb item by the feild isDcb of item and user is dcb user by the lastname of user , if they are related to dcb then adding a flag isDcb with value true for loan , if not adding isDcb = false for loan
TODOS and Open Questions
Learning