diff --git a/NEWS.md b/NEWS.md index 4e6e2e894..9d661b051 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,6 @@ ## 2025-mm-dd 5.11.0-SNAPSHOT * [MODSOURCE-917](https://folio-org.atlassian.net/browse/MODSOURCE-917) "Numerics only" option of existing record section does not work during MARC-BIB to MARC-BIB matching +* [MODSOURCE-941](https://folio-org.atlassian.net/browse/MODSOURCE-941) Remove relatedRecordVersion from parsedRecordDto and add generation field to source record ## 2025-03-13 5.10.0 * [MODSOURMAN-1278](https://folio-org.atlassian.net/browse/MODSOURMAN-1278) Data import job stuck in progress with 99-100% diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index cac2d4df3..49a66d415 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -150,7 +150,7 @@ }, { "id": "source-storage-source-records", - "version": "3.2", + "version": "3.3", "handlers": [ { "methods": [ diff --git a/mod-source-record-storage-server/src/main/java/org/folio/dao/util/RecordDaoUtil.java b/mod-source-record-storage-server/src/main/java/org/folio/dao/util/RecordDaoUtil.java index 3aefa6970..654b16710 100644 --- a/mod-source-record-storage-server/src/main/java/org/folio/dao/util/RecordDaoUtil.java +++ b/mod-source-record-storage-server/src/main/java/org/folio/dao/util/RecordDaoUtil.java @@ -268,7 +268,8 @@ public static SourceRecord toSourceRecord(Row row) { public static SourceRecord toSourceRecord(Record record) { SourceRecord sourceRecord = new SourceRecord() .withRecordId(record.getMatchedId()) - .withSnapshotId(record.getSnapshotId()); + .withSnapshotId(record.getSnapshotId()) + .withGeneration(record.getGeneration()); if (Objects.nonNull(record.getRecordType())) { sourceRecord.withRecordType(SourceRecord.RecordType.valueOf(record.getRecordType().toString())); } diff --git a/mod-source-record-storage-server/src/test/java/org/folio/services/QuickMarcKafkaHandlerTest.java b/mod-source-record-storage-server/src/test/java/org/folio/services/QuickMarcKafkaHandlerTest.java index b0eb6e8fc..b929e4faa 100644 --- a/mod-source-record-storage-server/src/test/java/org/folio/services/QuickMarcKafkaHandlerTest.java +++ b/mod-source-record-storage-server/src/test/java/org/folio/services/QuickMarcKafkaHandlerTest.java @@ -124,7 +124,6 @@ public void shouldUpdateParsedRecordAndSendRecordUpdatedEvent(TestContext contex .withId(record.getMatchedId()) .withParsedRecord(new ParsedRecord() .withContent(UPDATED_PARSED_RECORD_CONTENT)) - .withRelatedRecordVersion("1") .withRecordType(ParsedRecordDto.RecordType.MARC_BIB); var payload = new HashMap(); diff --git a/ramls/raml-storage b/ramls/raml-storage index 437a0eba8..5e5bf0a70 160000 --- a/ramls/raml-storage +++ b/ramls/raml-storage @@ -1 +1 @@ -Subproject commit 437a0eba8cae1f8a274d98f43f4d8ccca0a10f4a +Subproject commit 5e5bf0a70542f984c6e6777ff53aec832af4c07e