From 919b4ed407c6b4f75b59b2c8e37485d049a35776 Mon Sep 17 00:00:00 2001 From: psmagin Date: Wed, 3 Sep 2025 19:15:11 +0300 Subject: [PATCH 1/5] MODSOURCE-941 Remove relatedRecordVersion from quickMarc flow --- NEWS.md | 1 + .../test/java/org/folio/services/QuickMarcKafkaHandlerTest.java | 1 - ramls/raml-storage | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 4e6e2e894..373624a5a 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 quickMarc flow ## 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/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..f20ac5e43 160000 --- a/ramls/raml-storage +++ b/ramls/raml-storage @@ -1 +1 @@ -Subproject commit 437a0eba8cae1f8a274d98f43f4d8ccca0a10f4a +Subproject commit f20ac5e43e1d5f041cfeaa9e7fb70c5ea154c324 From 6cc9bf48357aa9ca6085308da01f2d37bfdff2f4 Mon Sep 17 00:00:00 2001 From: psmagin Date: Thu, 4 Sep 2025 16:46:05 +0300 Subject: [PATCH 2/5] - update raml-storage --- ramls/raml-storage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ramls/raml-storage b/ramls/raml-storage index f20ac5e43..f1b1c42e1 160000 --- a/ramls/raml-storage +++ b/ramls/raml-storage @@ -1 +1 @@ -Subproject commit f20ac5e43e1d5f041cfeaa9e7fb70c5ea154c324 +Subproject commit f1b1c42e162cd4c07d51c57af88e066bcf4263a5 From 445a3353bc63ca019d0a75587fa55f5d27e24f7c Mon Sep 17 00:00:00 2001 From: psmagin Date: Thu, 4 Sep 2025 16:48:49 +0300 Subject: [PATCH 3/5] - update sourceRecord convertion --- .../src/main/java/org/folio/dao/util/RecordDaoUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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())); } From f182d7af300c26d1c81a4bc27f91764911506b24 Mon Sep 17 00:00:00 2001 From: psmagin Date: Tue, 9 Sep 2025 16:59:27 +0300 Subject: [PATCH 4/5] update news --- NEWS.md | 2 +- descriptors/ModuleDescriptor-template.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index 373624a5a..9d661b051 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +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 quickMarc flow +* [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": [ From 357e05353ae7f22166deb44c7f9585bed4927318 Mon Sep 17 00:00:00 2001 From: psmagin Date: Fri, 12 Sep 2025 17:11:58 +0300 Subject: [PATCH 5/5] update raml-storage --- ramls/raml-storage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ramls/raml-storage b/ramls/raml-storage index f1b1c42e1..5e5bf0a70 160000 --- a/ramls/raml-storage +++ b/ramls/raml-storage @@ -1 +1 @@ -Subproject commit f1b1c42e162cd4c07d51c57af88e066bcf4263a5 +Subproject commit 5e5bf0a70542f984c6e6777ff53aec832af4c07e