Skip to content

Release 2.0.1#291

Merged
roman-barannyk merged 6 commits into
b2.0from
tmp-release-2.0.1
Jul 21, 2026
Merged

Release 2.0.1#291
roman-barannyk merged 6 commits into
b2.0from
tmp-release-2.0.1

Conversation

@roman-barannyk

Copy link
Copy Markdown
Contributor

Resolves: MODDCB-299

OleksandrVidinieiev and others added 3 commits July 20, 2026 16:44
* MODDCB-292 Use claim returned resolution during check-in

* MODDCB-292 Refactoring

* MODDCB-292 Add wiremock stub files

* MODDCB-292 Refactoring

* MODDCB-292 Extract claim returned resolution type

* MODDCB-292 Refactoring

* MODDCB-292 Refactoring

* MODDCB-292 Refactoring

* MODDCB-292 Remove redundant import

* MODDCB-292 Fix checkstyle violations

* MODDCB-292 Debug logging

* MODDCB-292 Debug logging

* MODDCB-292 Debug logging

* MODDCB-292 Debug logging

* MODDCB-292 Fix incorrect naming

* MODDCB-292 Remove debug logging

(cherry picked from commit 3ac9ff2)
* MODDCB-284 Add claimed return actions

* MODDCB-292 Tests

* MODDCB-292 Fix checkstyle violations

* MODDCB-293 Refactoring

---------

Co-authored-by: alexanderkurash <alexander.kurash@gmail.com>

(cherry picked from commit 4373ccb)
@roman-barannyk
roman-barannyk requested a review from a team as a code owner July 20, 2026 14:22
@roman-barannyk
roman-barannyk force-pushed the tmp-release-2.0.1 branch 2 times, most recently from 11bbb19 to e6fc019 Compare July 20, 2026 15:33
@roman-barannyk

Copy link
Copy Markdown
Contributor Author

I'll analyze the PR to verify the backport of those commits and check for redundant changes.Now let me get the full file changes for the backported commits to compare them:## Summary

I've verified the backport of the two commits. Here's my analysis:

Backport Status: Clean

Both commits were successfully backported to the b2.0 branch with no redundant changes:

Commit 1: 3ac9ff2105d9e4

  • MODDCB-292: Use claim returned resolution during check-in
  • Changes: +277, -6 across 16 files
  • Backport verification: ✓ Correctly cherry-picked with identical code content

Commit 2: 4373ccbdfec085

  • MODDCB-293: Handle claimed returned check-in loan actions
  • Changes: +84, -6 across 3 files
  • Backport verification: ✓ Correctly cherry-picked with identical code content

Key Changes Verified:

  1. Service Layer - Claim returned resolution support:

    • Added overloaded checkInByBarcode() method accepting ClaimedReturnedResolution
    • Proper null-handling with Optional pattern in BorrowingLibraryServiceImpl
  2. Kafka Integration - Event mapping for claimed returns:

    • New loan action types: checkedInFoundByLibrary, checkedInReturnedByPatron
    • Proper mapping to resolution enums
  3. API/Tests - Schema and test coverage:

    • WireMock stubs added for both resolution types
    • Unit tests validating the new functionality

⚠️ Minor Note on TransactionHelper.java

There's an inconsistency in the backported TransactionHelper.java at lines 68-72—the variable reference changed from event (in original) to kafkaEvent (in backport). This appears to be a genuine bug that exists in the cherry-pick. The code references an undefined variable kafkaEvent:

if (kafkaEvent.getNewNode().has(STATUS) && kafkaEvent.getNewNode().get(STATUS).has(STATUS_NAME)) {

Should likely be:

if (event.getNewNode().has(STATUS) && event.getNewNode().get(STATUS).has(STATUS_NAME)) {

This bug would cause a compilation error. I recommend checking if this issue exists in the original main branch or if it was introduced during the backport conflict resolution.

@sonarqubecloud

Copy link
Copy Markdown

@roman-barannyk
roman-barannyk merged commit f060226 into b2.0 Jul 21, 2026
18 checks passed
@roman-barannyk
roman-barannyk deleted the tmp-release-2.0.1 branch July 21, 2026 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants