-
Notifications
You must be signed in to change notification settings - Fork 5
MODBULKOPS-337 - Stage 3b - FQM Performance (FQL): switching matched records flow to use mod-bulk-operations capabilities #423
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
Merged
Merged
Changes from 14 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
c337f6f
MODBULKOPS-333 Test loan type
obozhko-folio 735fc45
MODBULKOPS-333 Test loan type
obozhko-folio 362e2b3
MODBULKOPS-333 Test loan type
obozhko-folio 91b8eca
MODBULKOPS-333 Test loan type
obozhko-folio 5ff6148
MODBULKOPS-333 Use deserializer
obozhko-folio a947c39
MODBULKOPS-333 Use getter/setter
obozhko-folio 4e244d2
MODBULKOPS-333 Fixed tests
obozhko-folio f597197
MODBULKOPS-333 Fixed missing reference data names
obozhko-folio b550414
Merge branch 'master' into MODBULKOPS-333
obozhko-folio b0a5806
MODBULKOPS-333 Fixed used tenants for ui
obozhko-folio c46cddb
MODBULKOPS-333 Fixed tests
obozhko-folio 829240b
MODBULKOPS-333 Added tests
obozhko-folio 59169d8
MODBULKOPS-333 Added tests
obozhko-folio 47031f7
MODBULKOPS-333 Fixed according to comments
obozhko-folio 4e49e24
Merge branch 'master' into MODBULKOPS-333
obozhko-folio c6496ff
MODBULKOPS-333 Refactored
obozhko-folio 4abbb6e
Merge remote-tracking branch 'origin/MODBULKOPS-333' into MODBULKOPS-333
obozhko-folio 8eb5fc4
MODBULKOPS-333 Logging issue
obozhko-folio 02a5c25
MODBULKOPS-333 Logging issue
obozhko-folio ae9c8c5
MODBULKOPS-333 Added property order
obozhko-folio 2431e15
MODBULKOPS-333 Removed property order, added constructor
obozhko-folio 7ecb1f7
MODBULKOPS-333 Fixed minor
obozhko-folio 9a61d39
MODBULKOPS-333 Fixed error file name
obozhko-folio 749fc59
MODBULKOPS-333 Rolled back jsonproperty
obozhko-folio 0ed1d76
MODBULKOPS-333 Fixed tenant in notes
obozhko-folio ab439fd
MODBULKOPS-333 Fixed tenant in notes
obozhko-folio 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
5 changes: 5 additions & 0 deletions
5
src/main/java/org/folio/bulkops/client/MaterialTypeClient.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 |
---|---|---|
@@ -1,15 +1,20 @@ | ||
package org.folio.bulkops.client; | ||
|
||
import org.folio.bulkops.configs.FeignClientConfiguration; | ||
import org.folio.bulkops.domain.bean.MaterialType; | ||
import org.folio.bulkops.domain.bean.MaterialTypeCollection; | ||
import org.springframework.cloud.openfeign.FeignClient; | ||
import org.springframework.http.MediaType; | ||
import org.springframework.web.bind.annotation.GetMapping; | ||
import org.springframework.web.bind.annotation.PathVariable; | ||
import org.springframework.web.bind.annotation.RequestParam; | ||
|
||
@FeignClient(name = "material-types", configuration = FeignClientConfiguration.class) | ||
public interface MaterialTypeClient { | ||
|
||
@GetMapping(produces = MediaType.APPLICATION_JSON_VALUE) | ||
MaterialTypeCollection getByQuery(@RequestParam String query); | ||
|
||
@GetMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE) | ||
MaterialType getById(@PathVariable String id); | ||
} |
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
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
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
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 |
---|---|---|
@@ -1,5 +1,8 @@ | ||
package org.folio.bulkops.processor.folio; | ||
|
||
import static org.folio.bulkops.util.FolioExecutionContextUtil.prepareContextForTenant; | ||
|
||
import lombok.RequiredArgsConstructor; | ||
import org.folio.bulkops.client.ItemClient; | ||
import org.folio.bulkops.domain.bean.ExtendedItem; | ||
import org.folio.bulkops.domain.dto.EntityType; | ||
|
@@ -11,10 +14,6 @@ | |
import org.folio.spring.scope.FolioExecutionContextSetter; | ||
import org.springframework.stereotype.Component; | ||
|
||
import lombok.RequiredArgsConstructor; | ||
|
||
import static org.folio.bulkops.util.FolioExecutionContextUtil.prepareContextForTenant; | ||
|
||
@Component | ||
@RequiredArgsConstructor | ||
public class ItemUpdateProcessor extends FolioAbstractUpdateProcessor<ExtendedItem> { | ||
|
@@ -40,7 +39,7 @@ public void updateRecord(ExtendedItem extendedItem) { | |
} else { | ||
permissionsValidator.checkIfBulkEditWritePermissionExists(folioExecutionContext.getTenantId(), EntityType.ITEM, | ||
NO_ITEM_WRITE_PERMISSIONS_TEMPLATE + folioExecutionContext.getTenantId()); | ||
itemClient.updateItem(item.withHoldingsData(null), item.getId()); | ||
itemClient.updateItem(item.withHoldingsData(null), item.getId()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Inline: roll-back format. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
} | ||
} | ||
|
||
|
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
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.
Can we use here UUID type instead of String?
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.
Probably yes, but in all other clients related to reference data we use String.
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.
Let's stay as is.