Skip to content

fix(qm-unify): merge master changes and fix issues after resolving merge conflicts#368

Merged
SvitlanaKovalova1 merged 18 commits intofeature/qm-unifyfrom
MODQM-494
Mar 11, 2026
Merged

fix(qm-unify): merge master changes and fix issues after resolving merge conflicts#368
SvitlanaKovalova1 merged 18 commits intofeature/qm-unifyfrom
MODQM-494

Conversation

@SvitlanaKovalova1
Copy link
Copy Markdown
Contributor

@SvitlanaKovalova1 SvitlanaKovalova1 commented Mar 6, 2026 •
edited
Loading

Purpose

MODQM-494 Merge master changes and fix issues after resolving merge conflicts.

Approach

  • set COMMITTED status for snapshot creation to avoid an issue where more than one ACTUAL state exists for the same record in the record_lb table (SRS).
  • replaced source.getId() with source.getMatchedId() when setting parsedRecordDtoId to align with the previous logic.
  • in AuthorityRecordMerger, replaced IGNORE with SET_TO_NULL so null source values now overwrite target properties instead of being skipped.
  • updated the reorderContentTagsBasedOnSource method so the 001 tag is placed at the top only during record creation; during updates, the 001 tag is ordered as specified in sourceFields.
  • in the integration tests, override the Okapi extension with HTTP/2 disabled to avoid IOException: GOAWAY received errors in Http2Connection.

Changes Checklist

  • API Changes: Document any API paths, methods, request or response bodies changed, added, or removed.
  • Database Schema Changes: Indicate any database schema changes and their impact. Confirm that migration scripts were created.
  • Interface Version Changes: Indicate any changes to interface versions.
  • Interface Dependencies: Document added or removed dependencies.
  • Permissions: Document any changes to permissions.
  • Logging: Confirm that logging is appropriately handled.
  • Unit Testing: Confirm that changed classes were covered by unit tests.
  • Integration Testing: Confirm that changed logic was covered by integration tests.
  • Manual Testing: Confirm that changes were tested on local or dev environment.
  • NEWS: Confirm that the NEWS file is updated with relevant information about the changes made in this pull request.

Screenshots (if applicable)

https://jenkins.ci.folio.org/job/folioTestingTools/job/runKarateTests/694/cucumber-html-reports/overview-features.html
image

dependabot Bot and others added 14 commits January 27, 2026 09:37
@dependabot
chore(deps-dev): bump the dev-deps group with 2 updates (#359)
eb135d5
@psmagin
build: use GitHub workflow for CI/CD (#360)
7e9fbd4
@psmagin
feat: upgrade module to SpringBoot 4.0.x and Spring 7.0.x
6e95581 
Closes: MODQM-487
@SvitlanaKovalova1
fix(links-suggestions): fix linksSuggestionsClient (#362)
bb75862
@dependabot
fix(deps): bump com.puppycrawl.tools:checkstyle (#361)
64e8f85 
Bumps the prod-deps group with 1 update in the / directory: [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle).


Updates `com.puppycrawl.tools:checkstyle` from 13.0.0 to 13.1.0
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](checkstyle/checkstyle@checkstyle-13.0.0...checkstyle-13.1.0)

---
updated-dependencies:
- dependency-name: com.puppycrawl.tools:checkstyle
  dependency-version: 13.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
chore(deps-dev): bump the dev-deps group with 3 updates (#364)
b9d13f1 
Bumps the dev-deps group with 3 updates: org.openapitools:openapi-generator-maven-plugin, [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) and [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire).


Updates `org.openapitools:openapi-generator-maven-plugin` from 7.19.0 to 7.20.0

Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.5.4 to 3.5.5
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.5.4...surefire-3.5.5)

Updates `org.apache.maven.plugins:maven-failsafe-plugin` from 3.5.4 to 3.5.5
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](apache/maven-surefire@surefire-3.5.4...surefire-3.5.5)

---
updated-dependencies:
- dependency-name: org.openapitools:openapi-generator-maven-plugin
  dependency-version: 7.20.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: dev-deps
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-version: 3.5.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dev-deps
- dependency-name: org.apache.maven.plugins:maven-failsafe-plugin
  dependency-version: 3.5.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: dev-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
fix(deps): bump org.springframework.boot:spring-boot-starter-parent (#…
e05fc6b 
…365)

Bumps the prod-deps group with 1 update: [org.springframework.boot:spring-boot-starter-parent](https://github.com/spring-projects/spring-boot).


Updates `org.springframework.boot:spring-boot-starter-parent` from 4.0.2 to 4.0.3
- [Release notes](https://github.com/spring-projects/spring-boot/releases)
- [Commits](spring-projects/spring-boot@v4.0.2...v4.0.3)

---
updated-dependencies:
- dependency-name: org.springframework.boot:spring-boot-starter-parent
  dependency-version: 4.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@psmagin
fix(deps): update mod-record-specifications-validator version to 3.0.…
2189d4b 
…0-SNAPSHOT (#366)
@dependabot
fix(deps): bump com.puppycrawl.tools:checkstyle in the prod-deps group (
3f573bb 
#367)

Bumps the prod-deps group with 1 update: [com.puppycrawl.tools:checkstyle](https://github.com/checkstyle/checkstyle).


Updates `com.puppycrawl.tools:checkstyle` from 13.2.0 to 13.3.0
- [Release notes](https://github.com/checkstyle/checkstyle/releases)
- [Commits](checkstyle/checkstyle@checkstyle-13.2.0...checkstyle-13.3.0)

---
updated-dependencies:
- dependency-name: com.puppycrawl.tools:checkstyle
  dependency-version: 13.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod-deps
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@SvitlanaKovalova1
resolve merge conflicts
90d2267
@SvitlanaKovalova1
fix after resolving merge conflicts
17c2e5c
@SvitlanaKovalova1
fix(qm-unify): fix Sonar issues, add unit tests
c6c78c9
@SvitlanaKovalova1
fix(qm-unify): add integration tests
79d4ea0
@SvitlanaKovalova1
fix(qm-unify): revert marc-records-editor API version
b5c0dc7
@SvitlanaKovalova1 SvitlanaKovalova1 marked this pull request as ready for review March 9, 2026 08:29
@SvitlanaKovalova1 SvitlanaKovalova1 requested a review from a team as a code owner March 9, 2026 08:29
@SvitlanaKovalova1 SvitlanaKovalova1 requested review from psmagin and viacheslavkol and removed request for a team March 9, 2026 08:29
psmagin
psmagin reviewed Mar 9, 2026
View reviewed changes
Comment thread src/main/java/org/folio/qm/client/LinksClient.java Outdated
Comment thread src/main/java/org/folio/qm/service/mapping/MarcMappingHoldingsService.java Outdated
Comment thread src/main/resources/application-dev.yaml
Comment thread src/test/java/org/folio/it/BaseIT.java Outdated
psmagin
psmagin reviewed Mar 10, 2026
View reviewed changes
Comment thread src/main/resources/application-dev.yaml
Comment thread src/main/resources/application-dev.yaml
Comment thread src/test/java/org/folio/it/api/RecordsEditorIT.java
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud Bot commented Mar 10, 2026

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
94.1% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@SvitlanaKovalova1 SvitlanaKovalova1 merged commit e175fce into feature/qm-unify Mar 11, 2026
16 checks passed
@SvitlanaKovalova1 SvitlanaKovalova1 deleted the MODQM-494 branch March 11, 2026 11:24
SvitlanaKovalova1 added a commit that referenced this pull request Mar 13, 2026
@SvitlanaKovalova1
fix(qm-unify): merge master changes and fix issues after resolving me…
5a30dd9 
…rge conflicts (#368)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@psmagin psmagin psmagin approved these changes

@viacheslavkol viacheslavkol viacheslavkol approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@SvitlanaKovalova1 @psmagin @viacheslavkol