Skip to content

fix(matching): Fix multi-match exception is thrown when local matched instance is null #939

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.

Sign up for GitHub

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
viacheslavkol merged 2 commits into from
Aug 14, 2026
Merged

fix(matching): Fix multi-match exception is thrown when local matched instance is null #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4941aa4
fix(matching): Fix multi-match exception is thrown when local matched…
viacheslavkol Aug 13, 2026
2d0b18c
Merge branch 'master' into MODINV-1400-fix-1
viacheslavkol Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...main/java/org/folio/inventory/dataimport/handlers/matching/AbstractMatchEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ private CompletableFuture<Boolean> matchCentralTenantIfNeeded(DataImportEventPay
return MatchingManager.match(dataImportEventPayload)
.thenCompose(isMatchedConsortium -> {
dataImportEventPayload.setTenant(context.getTenantId());
if (Boolean.TRUE.equals(isMatchedConsortium) && isMatchedLocal && !isShadowEntity(localMatchedInstance, dataImportEventPayload.getContext().get(getEntityType().value()))) {
if (Boolean.TRUE.equals(isMatchedConsortium) && isMatchedLocal && localMatchedInstance != null
&& !isShadowEntity(localMatchedInstance, dataImportEventPayload.getContext().get(getEntityType().value()))) {
LOGGER.warn("matchCentralTenantIfNeeded:: Found multiple results during matching on local tenant: {} and central tenant: {} ",
context.getTenantId(), consortiumConfiguration.get().getCentralTenantId());
return CompletableFuture.failedFuture(new MatchingException(String.format(FOUND_MULTIPLE_ENTITIES, context.getTenantId(), consortiumConfiguration.get().getCentralTenantId())));
Expand Down
23 changes: 20 additions & 3 deletions src/test/java/org/folio/inventory/eventhandlers/MatchInstanceEventHandlerUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,21 +742,38 @@ public void shouldMatchWithSubConditionBasedOnMultiMatchResultOnHandleEventPaylo
@Test
public void shouldPutMultipleMatchResultToPayloadOnHandleEventPayload(TestContext testContext)
throws UnsupportedEncodingException {
// Also covers the consortium case: when central tenant has shadow copies of the same instances,
// both sides return MULTI_MATCH_IDS and no "Found multiple entities" error should be thrown.
Async async = testContext.async();

String centralTenantId = "consortium";
String consortiumId = "consortiumId";
List<Instance> matchedInstances = List.of(
new Instance(UUID.randomUUID().toString(), 1, "in1", "MARC", "Wonderful", "12334"),
new Instance(UUID.randomUUID().toString(), 1, "in2", "MARC", "Wonderful", "12334"));

doAnswer(inv -> Future.succeededFuture(Optional.of(new ConsortiumConfiguration(centralTenantId, consortiumId))))
.when(consortiumService).getConsortiumConfiguration(any());

// Local: unscoped query -> 2 instances -> MULTI_MATCH_IDS
doAnswer(invocation -> {
Consumer<Success<MultipleRecords<Instance>>> successHandler = invocation.getArgument(2);
Success<MultipleRecords<Instance>> result =
new Success<>(new MultipleRecords<>(matchedInstances, 2));
successHandler.accept(result);
successHandler.accept(new Success<>(new MultipleRecords<>(matchedInstances, 2)));
return null;
}).when(instanceCollection)
.findByCql(eq(format("hrid == \"%s\"", INSTANCE_HRID)),
any(PagingParameters.class), any(Consumer.class), any(Consumer.class));

// Central: same instances returned for the MULTI_MATCH_IDS-scoped query (shadow copies)
doAnswer(invocation -> {
Consumer<Success<MultipleRecords<Instance>>> successHandler = invocation.getArgument(2);
successHandler.accept(new Success<>(new MultipleRecords<>(matchedInstances, 2)));
return null;
}).when(instanceCollection)
.findByCql(eq(format("hrid == \"%s\" AND id == (%s OR %s)", INSTANCE_HRID,
matchedInstances.get(0).getId(), matchedInstances.get(1).getId())),
any(PagingParameters.class), any(Consumer.class), any(Consumer.class));

MatchProfile subMatchProfile = new MatchProfile()
.withExistingRecordType(INSTANCE)
.withIncomingRecordType(MARC_BIBLIOGRAPHIC);
Expand Down
Loading