fix: block lock issue

[lu-yg]

English | 简体中文

PR

PR Checklist

Please check if your PR fulfills the following requirements:

• The commit message follows our Commit Message Guidelines
• Tests for the changes have been added (for bug fixes / features)
• Docs have been added / updated (for bug fixes / features)
• Built its own designer, fully self-validated

PR Type

What kind of change does this PR introduce?

• Bugfix
• Feature
• Code style update (formatting, local variables)
• Refactoring (no functional changes, no api changes)
• Build related changes
• CI related changes
• Documentation content changes
• Other... Please describe:

Background and solution

What is the current behavior?

Issue Number: N/A

What is the new behavior?

Does this PR introduce a breaking change?

• Yes
• No

Other information

Summary by CodeRabbit

• Bug Fixes
  • Ensured that new blocks are initially assigned to the current logged-in user, unless a different occupier is specified.

[coderabbitai]

Walkthrough

A line was added to the createBlock method in BlockServiceImpl to set the occupierBy field of a new Block entity to the current user's ID from loginUserContext. This assignment occurs before any potential reassignment based on the incoming parameter's occupier value.

Changes

File Path	Change Summary
base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java	Added initial assignment of occupierBy to current user ID in createBlock before conditional logic.

Poem

In the code where blocks are born anew,
The occupier’s claim is now clear and true.
First set to the user who’s logged in today,
Unless a new owner comes into play.
With every block, a rabbit hops with glee—
Code neat and tidy, as it should be! 🐇

Tip

⚡️ Faster reviews with caching

• CodeRabbit now supports caching for code and dependencies, helping speed up reviews. This means quicker feedback, reduced wait times, and a smoother review experience overall. Cached data is encrypted and stored securely. This feature will be automatically enabled for all accounts on May 16th. To opt out, configure Review - Disable Cache at either the organization or repository level. If you prefer to disable all data retention across your organization, simply turn off the Data Retention setting under your Organization Settings.

Enjoy the performance boost—your workflow just got faster.

---

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 83bc77f and 243d8f9.

📒 Files selected for processing (1)

• base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java (1 hunks)

🔇 Additional comments (1)

base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java (1)

231-231:

Details

✅ Verification successful

Excellent fix for the block lock issue.

This change ensures that the occupierBy field is always initialized with the current user's ID when creating a new block, before any potential reassignment based on the incoming parameter's occupier value. This matches the behavior in the updateBlockById method (line 173) and fixes a potential race condition where newly created blocks might not have had a proper lock owner assigned if no explicit occupier was specified in the parameters.

Let's verify if there are other similar methods in the codebase that might need the same fix:

---

🏁 Script executed:

#!/bin/bash
# Look for methods that create or manipulate Block entities but might not set the occupierBy field

# Find other methods that create Block objects but might not set occupierBy
echo "Methods that might create Block objects but don't set occupierBy:"
rg -p "new Block\(\)" --type java | grep -v "setOccupierBy" -A 10 -B 5

Length of output: 1785

---

#!/bin/bash
set -e

echo "=== Inspecting Block instantiations in BlockGroupServiceImpl ==="
rg -n 'new Block' base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java -A5 -B5

echo ""
echo "=== Inspecting Block instantiations in CanvasServiceImpl ==="
rg -n 'new Block' base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java -A5 -B5

echo ""
echo "=== Inspecting all Block instantiations in BlockServiceImpl ==="
rg -n 'new Block' base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java -A5 -B5

---

#!/bin/bash
set -e

echo "=== BlockGroupServiceImpl ==="
rg -n "new Block" base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java -A5 -B5

echo ""
echo "Checking for setOccupierBy usage in BlockGroupServiceImpl:"
rg -n "setOccupierBy" base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java || echo "No setOccupierBy in BlockGroupServiceImpl"

echo ""
echo "=== CanvasServiceImpl ==="
rg -n "new Block" base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java -A5 -B5

echo ""
echo "Checking for setOccupierBy usage in CanvasServiceImpl:"
rg -n "setOccupierBy" base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java || echo "No setOccupierBy in CanvasServiceImpl"

---

#!/bin/bash
set -e

echo "=== Context for new Block in BlockGroupServiceImpl.java ==="
rg -n 'new Block' -A5 -B5 base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java

echo ""
echo "=== setOccupierBy occurrences in BlockGroupServiceImpl.java ==="
rg -n 'setOccupierBy' -n base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java || echo "No setOccupierBy in BlockGroupServiceImpl"

echo ""
echo "=== Context for new Block in CanvasServiceImpl.java ==="
rg -n 'new Block' -A5 -B5 base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java

echo ""
echo "=== setOccupierBy occurrences in CanvasServiceImpl.java ==="
rg -n 'setOccupierBy' -n base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java || echo "No setOccupierBy in CanvasServiceImpl"

---

🏁 Script executed:

#!/bin/bash
set -e

echo "=== BlockGroupServiceImpl: new Block instantiations ==="
rg -n 'new Block' base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java -A5 -B5

echo ""
echo "=== BlockGroupServiceImpl: setOccupierBy occurrences ==="
rg -n 'setOccupierBy' base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java || echo "No setOccupierBy in BlockGroupServiceImpl"

echo ""
echo "=== CanvasServiceImpl: new Block instantiations ==="
rg -n 'new Block' base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java -A5 -B5

echo ""
echo "=== CanvasServiceImpl: setOccupierBy occurrences ==="
rg -n 'setOccupierBy' base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java || echo "No setOccupierBy in CanvasServiceImpl"

Length of output: 6267

---

No additional occupierBy initialization required
All other new Block() usages either occur in tests or in contexts where blocks aren’t newly persisted locks:

• In BlockGroupServiceImpl, the new Block() instances within getBlockGroupIds are used only to carry an existing ID (never saved).
• In CanvasServiceImpl, the update path explicitly calls setOccupierBy before saving.

The only place a created block lacked an initial owner was in BlockServiceImpl, which you’ve correctly fixed. Approved.

✨ Finishing Touches

• 📝 Generate Docstrings

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>, please review it.
  • Generate unit testing code for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai generate docstrings to generate docstrings for this PR.
• @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Other keywords and placeholders

• Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
• Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
• Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.