Skip to content

Commit

Permalink
MODDATAIMP-1052 Error appears when edit via quickMARC MARC Instance s…
Browse files Browse the repository at this point in the history 
…hared from Member tenant (#723)

* MODDATAIMP-1052: removed IsNotEmpty check for externalHolder InstanceHrid

(cherry picked from commit 2b91a0b)
  • Loading branch information
@Maksat-Galymzhan @KaterynaSenchenko
Maksat-Galymzhan authored and KaterynaSenchenko committed May 29, 2024
1 parent c59021c commit 4a3eaf3
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 8 deletions.
3 changes: 1 addition & 2 deletions src/main/java/org/folio/inventory/dataimport/util/AdditionalFieldsUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -682,8 +682,7 @@ private static boolean isFieldContainsValue(VariableField field, char subfield,
}

private static boolean isValidIdAndHrid(String id, String hrid, String externalId, String externalHrid) {
return (isNotEmpty(externalId) && isNotEmpty(externalHrid)) && (id.equals(externalId) && !hrid.equals(
externalHrid));
return (isNotEmpty(externalId)) && (id.equals(externalId) && !hrid.equals(externalHrid));
}

private static void addDataFieldInNumericalOrder(DataField field, org.marc4j.marc.Record marcRecord) {
Expand Down
24 changes: 22 additions & 2 deletions .../java/org/folio/inventory/dataimport/handlers/actions/CreateInstanceEventHandlerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.folio.processing.value.StringValue;
import org.folio.rest.client.SourceStorageRecordsClient;
import org.folio.rest.jaxrs.model.EntityType;
import org.folio.rest.jaxrs.model.ExternalIdsHolder;
import org.folio.rest.jaxrs.model.MappingDetail;
import org.folio.rest.jaxrs.model.MappingRule;
import org.folio.rest.jaxrs.model.ParsedRecord;
Expand Down Expand Up @@ -423,6 +424,7 @@ public void shouldProcessConsortiumEvent() throws InterruptedException, Executio
String recordId = "567859ad-505a-400d-a699-0028a1fdbf84";
String instanceId = "957985c6-97e3-4038-b0e7-343ecd0b8120";
String title = "titleValue";
String instanceHrid = "in00000000028";
RecordToEntity recordToInstance = RecordToEntity.builder().recordId(recordId).entityId(instanceId).build();

when(fakeReader.read(any(MappingRule.class))).thenReturn(StringValue.of(instanceTypeId), StringValue.of(title));
Expand All @@ -437,12 +439,28 @@ public void shouldProcessConsortiumEvent() throws InterruptedException, Executio
MappingManager.registerWriterFactory(new InstanceWriterFactory());

HashMap<String, String> context = new HashMap<>();
Record record = new Record().withParsedRecord(new ParsedRecord().withContent(PARSED_CONTENT_999ffi));
Record record = new Record().withParsedRecord(new ParsedRecord().withContent(PARSED_CONTENT_999ffi))
.withExternalIdsHolder(new ExternalIdsHolder().withInstanceId(instanceId));
record.setId(recordId);

doAnswer(invocationOnMock -> {
Instance instanceRecord = invocationOnMock.getArgument(0);
JsonObject instanceJson = instanceRecord.getJsonForStorage();
instanceJson.put("hrid", instanceHrid);
Instance instanceRecordToSubstitute = Instance.fromJson(instanceJson);

instanceRecordToSubstitute.setPrecedingTitles(instanceRecord.getPrecedingTitles());
instanceRecordToSubstitute.setSucceedingTitles(instanceRecord.getSucceedingTitles());
instanceRecordToSubstitute.setNotes(instanceRecord.getNotes());

Consumer<Success<Instance>> successHandler = invocationOnMock.getArgument(1);
successHandler.accept(new Success<>(instanceRecordToSubstitute));
return null;
}).when(instanceRecordCollection).add(any(), any(Consumer.class), any(Consumer.class));

context.put(MARC_BIBLIOGRAPHIC.value(), Json.encode(record));

Buffer buffer = BufferImpl.buffer("{\"id\":\"567859ad-505a-400d-a699-0028a1fdbf84\",\"parsedRecord\":{\"content\":\"{\\\"leader\\\":\\\"00567nam 22001211a 4500\\\",\\\"fields\\\":[{\\\"035\\\":{\\\"subfields\\\":[{\\\"a\\\":\\\"ybp7406411\\\"}],\\\"ind1\\\":\\\" \\\",\\\"ind2\\\":\\\" \\\"}},{\\\"245\\\":{\\\"subfields\\\":[{\\\"a\\\":\\\"titleValue\\\"}],\\\"ind1\\\":\\\"1\\\",\\\"ind2\\\":\\\"0\\\"}},{\\\"336\\\":{\\\"subfields\\\":[{\\\"b\\\":\\\"b6698d38-149f-11ec-82a8-0242ac130003\\\"}],\\\"ind1\\\":\\\"1\\\",\\\"ind2\\\":\\\"0\\\"}},{\\\"780\\\":{\\\"subfields\\\":[{\\\"t\\\":\\\"Houston oil directory\\\"}],\\\"ind1\\\":\\\"0\\\",\\\"ind2\\\":\\\"0\\\"}},{\\\"785\\\":{\\\"subfields\\\":[{\\\"t\\\":\\\"SAIS review of international affairs\\\"},{\\\"x\\\":\\\"1945-4724\\\"}],\\\"ind1\\\":\\\"0\\\",\\\"ind2\\\":\\\"0\\\"}},{\\\"500\\\":{\\\"subfields\\\":[{\\\"a\\\":\\\"Adaptation of Xi xiang ji by Wang Shifu.\\\"}],\\\"ind1\\\":\\\" \\\",\\\"ind2\\\":\\\" \\\"}},{\\\"520\\\":{\\\"subfields\\\":[{\\\"a\\\":\\\"Ben shu miao shu le cui ying ying he zhang sheng wei zheng qu hun yin zi you li jin qu zhe jian xin zhi hou, zhong cheng juan shu de ai qing gu shi. jie lu le bao ban hun yin he feng jian li jiao de zui e.\\\"}],\\\"ind1\\\":\\\" \\\",\\\"ind2\\\":\\\" \\\"}},{\\\"999\\\":{\\\"subfields\\\":[{\\\"i\\\":\\\"957985c6-97e3-4038-b0e7-343ecd0b8120\\\"}],\\\"ind1\\\":\\\"f\\\",\\\"ind2\\\":\\\"f\\\"}}]}\"},\"deleted\":false,\"state\":\"ACTUAL\"}");
Buffer buffer = BufferImpl.buffer("{\"id\": \"567859ad-505a-400d-a699-0028a1fdbf84\",\"parsedRecord\": {\"content\": \"{\\\"leader\\\":\\\"00567nam 22001211a 4500\\\",\\\"fields\\\":[{\\\"035\\\":{\\\"subfields\\\":[{\\\"a\\\":\\\"ybp7406411\\\"}],\\\"ind1\\\":\\\" \\\",\\\"ind2\\\":\\\" \\\"}},{\\\"245\\\":{\\\"subfields\\\":[{\\\"a\\\":\\\"titleValue\\\"}],\\\"ind1\\\":\\\"1\\\",\\\"ind2\\\":\\\"0\\\"}},{\\\"336\\\":{\\\"subfields\\\":[{\\\"b\\\":\\\"b6698d38-149f-11ec-82a8-0242ac130003\\\"}],\\\"ind1\\\":\\\"1\\\",\\\"ind2\\\":\\\"0\\\"}},{\\\"780\\\":{\\\"subfields\\\":[{\\\"t\\\":\\\"Houston oil directory\\\"}],\\\"ind1\\\":\\\"0\\\",\\\"ind2\\\":\\\"0\\\"}},{\\\"785\\\":{\\\"subfields\\\":[{\\\"t\\\":\\\"SAIS review of international affairs\\\"},{\\\"x\\\":\\\"1945-4724\\\"}],\\\"ind1\\\":\\\"0\\\",\\\"ind2\\\":\\\"0\\\"}},{\\\"500\\\":{\\\"subfields\\\":[{\\\"a\\\":\\\"Adaptation of Xi xiang ji by Wang Shifu.\\\"}],\\\"ind1\\\":\\\" \\\",\\\"ind2\\\":\\\" \\\"}},{\\\"520\\\":{\\\"subfields\\\":[{\\\"a\\\":\\\"Ben shu miao shu le cui ying ying he zhang sheng wei zheng qu hun yin zi you li jin qu zhe jian xin zhi hou, zhong cheng juan shu de ai qing gu shi. jie lu le bao ban hun yin he feng jian li jiao de zui e.\\\"}],\\\"ind1\\\":\\\" \\\",\\\"ind2\\\":\\\" \\\"}},{\\\"999\\\":{\\\"subfields\\\":[{\\\"i\\\":\\\"957985c6-97e3-4038-b0e7-343ecd0b8120\\\"}],\\\"ind1\\\":\\\"f\\\",\\\"ind2\\\":\\\"f\\\"}}]}\"},\"deleted\": false,\"order\": 0,\"externalIdsHolder\": {\"instanceId\": \"b5e25bc3-a5a5-474a-8333-4a728d2f3485\",\"instanceHrid\": \"in00000000028\"},\"state\": \"ACTUAL\"}");
HttpResponse<Buffer> resp = buildHttpResponseWithBuffer(buffer);
when(sourceStorageClient.postSourceStorageRecords(any())).thenReturn(Future.succeededFuture(resp));

Expand All @@ -465,6 +483,8 @@ public void shouldProcessConsortiumEvent() throws InterruptedException, Executio
String actualInstanceId = createdInstance.getString("id");
assertNotNull(actualInstanceId);
assertEquals(instanceId, actualInstanceId);
assertNotNull(createdInstance.getString("hrid"));
assertEquals(instanceHrid, createdInstance.getString("hrid"));
assertEquals(title, createdInstance.getString("title"));
assertEquals(instanceTypeId, createdInstance.getString("instanceTypeId"));
assertEquals("MARC", createdInstance.getString("source"));
Expand Down
28 changes: 24 additions & 4 deletions src/test/java/org/folio/inventory/dataimport/util/AdditionalFieldsUtilTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,18 +241,38 @@ public void shouldReplaceControlledFieldInMarcRecord() throws IOException {
public void isFieldsFillingNeededTrue() {
String instanceId = UUID.randomUUID().toString();
String instanceHrId = UUID.randomUUID().toString();
Record record = new Record().withExternalIdsHolder(new ExternalIdsHolder().withInstanceId(instanceId).withInstanceHrid(UUID.randomUUID().toString()));
Record srcRecord = new Record().withExternalIdsHolder(new ExternalIdsHolder().withInstanceId(instanceId).withInstanceHrid(UUID.randomUUID().toString()));
Instance instance = new Instance(instanceId, "0", instanceHrId, "", "", "");
Assert.assertTrue(AdditionalFieldsUtil.isFieldsFillingNeeded(record, instance));
Assert.assertTrue(AdditionalFieldsUtil.isFieldsFillingNeeded(srcRecord, instance));

srcRecord.getExternalIdsHolder().setInstanceHrid(null);
Assert.assertTrue(AdditionalFieldsUtil.isFieldsFillingNeeded(srcRecord, instance));
}

@Test
public void isFieldsFillingNeededFalse() {
String instanceId = UUID.randomUUID().toString();
String instanceHrId = UUID.randomUUID().toString();
Record record = new Record().withExternalIdsHolder(new ExternalIdsHolder().withInstanceId(instanceId).withInstanceHrid(instanceHrId));
Record srcRecord = new Record().withExternalIdsHolder(new ExternalIdsHolder().withInstanceId(instanceId).withInstanceHrid(instanceHrId));
Instance instance = new Instance(instanceId, "0", instanceHrId, "", "", "");
Assert.assertFalse(AdditionalFieldsUtil.isFieldsFillingNeeded(record, instance));
assertFalse(AdditionalFieldsUtil.isFieldsFillingNeeded(srcRecord, instance));

srcRecord.getExternalIdsHolder().withInstanceId(instanceId);
instance = new Instance(UUID.randomUUID().toString(), "0", instanceHrId, "", "", "");
assertFalse(AdditionalFieldsUtil.isFieldsFillingNeeded(srcRecord, instance));

srcRecord.getExternalIdsHolder().withInstanceId(null).withInstanceHrid(null);
instance = new Instance(UUID.randomUUID().toString(), "0", instanceHrId, "", "", "");
assertFalse(AdditionalFieldsUtil.isFieldsFillingNeeded(srcRecord, instance));
}

@Test(expected = Exception.class)
public void isFieldsFillingNeededForExternalHolderInstanceShouldThrowException() {
String instanceId = UUID.randomUUID().toString();
String instanceHrId = UUID.randomUUID().toString();
Record srcRecord = new Record().withExternalIdsHolder(new ExternalIdsHolder().withInstanceId(instanceId).withInstanceHrid(instanceHrId));
Instance instance = new Instance(null, "0", instanceHrId, "", "", "");
AdditionalFieldsUtil.isFieldsFillingNeeded(srcRecord, instance);
}

@Test
Expand Down

0 comments on commit 4a3eaf3

Please sign in to comment.